Forcing a bump to the soname unnecessarily breaks backwards compat

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 23 insertions, 7 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 3d3c5379716d..f58e992a0bb4 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.207 2012/03/24 17:49:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.208 2012/03/26 00:13:23 blueness Exp $
+
+  26 Mar 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0.ebuild:
+  Forcing a bump to the soname unnecessarily breaks backwards compat
 
 *curl-7.25.0 (24 Mar 2012)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cb13252c7acb..34c347bf892c 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX config.h.ed 501 RMD160 54a470cde54020ac4820d1189b90d9e742a6c309 SHA1 ea728418a3b06317a8cfa22c70cb7fda3fa5414a SHA256 ab7941abb65756bc18dac7310e413ede974b1556fafdb5f8ba6990542b7d5558
 AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
@@ -21,6 +24,13 @@ EBUILD curl-7.21.7.ebuild 3552 RMD160 9c6603e702433d9a0d1b7175690c3e601545e694 S
 EBUILD curl-7.22.0.ebuild 3623 RMD160 f8c1b529548f6ca91d02fb433ee09018a55905c3 SHA1 5a0976b5674f5eb06553dcd8be7d7e879eb959a5 SHA256 1a8ec1b6d7ac6de349cc8fcbc7314752a1fbbb5ba6eff5ca75ca53936683aaa2
 EBUILD curl-7.23.1.ebuild 3704 RMD160 ba889eed9125b675446bc3bc4bd92813f14e5bae SHA1 01849e67262e0370d334ef665351d1ea3c00c564 SHA256 597b4979e67cef1e945fdf711e16270092805045ae13184072c02057f48bf0d6
 EBUILD curl-7.24.0.ebuild 3726 RMD160 5ff58b36d5a575f6a7d210102d58a14bab510d88 SHA1 2fbedfcf4999e9da471671d90a422aa769ebc04c SHA256 1cc1658dfe9bd0355751b9096b34f7dab3b0217ea7380bf650e3e5d8788f31cb
-EBUILD curl-7.25.0.ebuild 4308 RMD160 759a9c19e56e5e6004c5b2cec36bf6edd3f63e83 SHA1 bd1e95bdfa6bb11f4eae5dd1fbb1f2e4f8cbc729 SHA256 20ce0a366696821efbfcfe8e95a122603b9994a643c8dab3ca9621d3e23a93dd
-MISC ChangeLog 34311 RMD160 81f03ab2a34e0f685eb2949e1f98fb9691a60f4d SHA1 7a66a20aaf567be6f7cbd32db6a87264c323ff64 SHA256 5fa819a3d1899c2a7fb7999285ca2fe99084e34196fe9096a9573f2297b7ea4e
+EBUILD curl-7.25.0.ebuild 4531 RMD160 a8e9da0df1ffe68a4eef3fa9f24c70d646e4b2fd SHA1 062c38119d3a6465ff46f28630132796d57ae4b9 SHA256 f24e2ef52b4a00240ace583f2de3fcb468c9bb497536c16d95b4c5fc562662c9
+MISC ChangeLog 34456 RMD160 e8aee29c714bf34552db8207808269e5157ccad8 SHA1 f0e7f9a4738f42ad7ff2f862ed11af6ef752ad3a SHA256 e119ee304a7b9ff49f1bfc5d46de2b3e0fe2c2926fb76fd89dfb4308a0439266
 MISC metadata.xml 741 RMD160 6461e1dadf405f3d3bb619386bc2a3760ef777c2 SHA1 c3232f9c75c8a2999bb35ada343b8c69ba2d61ba SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk9vtKwACgkQl5yvQNBFVTWs6ACgoxbY1+xIYFDfotCAXPPYh6U9
+cL4AoJvxSPpdWgYyu5VZ7XfIRTvoyPdO
+=roT+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.25.0.ebuild b/net-misc/curl/curl-7.25.0.ebuild
index e133d8663495..05b67415169d 100644
--- a/net-misc/curl/curl-7.25.0.ebuild
+++ b/net-misc/curl/curl-7.25.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.2 2012/03/25 20:57:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.3 2012/03/26 00:13:23 blueness Exp $
 
 EAPI="4"
 
@@ -15,12 +15,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
 
+#Note: If we enable more than one of gnutls, ssl or nss, then we will only
+#use one.  gnutls takes priority over ssl which takes priority over nss.
 RDEPEND="ldap? ( net-nds/openldap )
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
 	ssl? ( !gnutls? ( dev-libs/openssl ) )
 	nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
 	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.6 )
+	ares? ( net-dns/c-ares )
 	kerberos? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 	sys-libs/zlib"
@@ -57,6 +59,7 @@ src_prepare() {
 src_configure() {
 	local myconf=()
 
+	#gnutls takes priority over ssl which takes priority over nss --- see RDEPENED
 	if use gnutls; then
 		myconf+=( --without-ssl --with-gnutls    --without-nss )
 		myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
@@ -103,11 +106,11 @@ src_configure() {
 		--enable-manual \
 		--enable-nonblocking \
 		--enable-proxy \
-		--enable-soname-bump \
+		--disable-soname-bump \
 		--disable-sspi \
 		$(use_enable static-libs static) \
 		$(use_enable threads threaded-resolver) \
-		--enable-versioned-symbols \
+		--disable-versioned-symbols \
 		$(use_with idn libidn) \
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
 		--without-krb4 \