Corrected as-needed patch (thanks to Flameeyes)

Package-Manager: portage-2.1.3_rc7

4 files changed, 20 insertions, 29 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 96576be11ca1..59c57ed24d51 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/commoncpp2
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.30 2007/06/16 14:02:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.31 2007/07/11 18:29:21 dev-zero Exp $
+
+  11 Jul 2007; Tiziano Müller <dev-zero@gentoo.org>
+  files/1.5.7-as-needed.patch, commoncpp2-1.5.7.ebuild:
+  Corrected as-needed patch (thanks to Flameeyes)
 
 *commoncpp2-1.5.7 (16 Jun 2007)
 
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 92b4c18d4ddb..5294d86e48f4 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -2,10 +2,10 @@ AUX 1.5.1-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 S
 MD5 19e8c5d30a29269e4a3b5a0f5f6a927b files/1.5.1-ssl_config.patch 958
 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 files/1.5.1-ssl_config.patch 958
 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4 files/1.5.1-ssl_config.patch 958
-AUX 1.5.7-as-needed.patch 1239 RMD160 d14377eeab863f860b9a5e745967179f0f69614f SHA1 0dd6fa600100d99fffd3e37e1dcf14c19d77866a SHA256 1e432c954cc1b6283f087c990ddab74c92d74631608039b1c8f9bd6b4a4827ec
-MD5 02c2f29f4ff2386757fb2f98270078a5 files/1.5.7-as-needed.patch 1239
-RMD160 d14377eeab863f860b9a5e745967179f0f69614f files/1.5.7-as-needed.patch 1239
-SHA256 1e432c954cc1b6283f087c990ddab74c92d74631608039b1c8f9bd6b4a4827ec files/1.5.7-as-needed.patch 1239
+AUX 1.5.7-as-needed.patch 820 RMD160 0514d2d2685e7828aca94487c5c5eac73320a287 SHA1 22cf0e3d13cd27d07d7fde4bb5ecba1f86ce585e SHA256 ea2a356d1e21431ac950c6668bf96e529cf7e182bd83e9544aa1e46ac6559095
+MD5 c7cd541917def55d9e665f516ec97233 files/1.5.7-as-needed.patch 820
+RMD160 0514d2d2685e7828aca94487c5c5eac73320a287 files/1.5.7-as-needed.patch 820
+SHA256 ea2a356d1e21431ac950c6668bf96e529cf7e182bd83e9544aa1e46ac6559095 files/1.5.7-as-needed.patch 820
 AUX 1.5.7-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 SHA1 b762f044b3ea612b9ec6afc08d96b486646be221 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4
 MD5 19e8c5d30a29269e4a3b5a0f5f6a927b files/1.5.7-ssl_config.patch 958
 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 files/1.5.7-ssl_config.patch 958
@@ -29,14 +29,14 @@ EBUILD commoncpp2-1.5.1-r1.ebuild 1670 RMD160 cc1d5c1d5d8ab685a16f5f82b33dd1e421
 MD5 0ea8eccc031091dba97d54a032bc41ac commoncpp2-1.5.1-r1.ebuild 1670
 RMD160 cc1d5c1d5d8ab685a16f5f82b33dd1e4210f573c commoncpp2-1.5.1-r1.ebuild 1670
 SHA256 45a6931f86fc3434e7a55478650e7e1383231b3ea58271afe37cbe46739cb59c commoncpp2-1.5.1-r1.ebuild 1670
-EBUILD commoncpp2-1.5.7.ebuild 1708 RMD160 871bffe4184a2528df33333f80ce2333126dc7bc SHA1 44ade2400438fcf0affa63c3b16c1a90f4f0c596 SHA256 49d6104a3ae92dc916ad5831e5e9893cb69b22e2fe983b7c899ea1ba2593bf5a
-MD5 7d0884733d04ab893bfdfbee8cc7054b commoncpp2-1.5.7.ebuild 1708
-RMD160 871bffe4184a2528df33333f80ce2333126dc7bc commoncpp2-1.5.7.ebuild 1708
-SHA256 49d6104a3ae92dc916ad5831e5e9893cb69b22e2fe983b7c899ea1ba2593bf5a commoncpp2-1.5.7.ebuild 1708
-MISC ChangeLog 5206 RMD160 9b7a050e9574db34989429daac0fc9a96072a72f SHA1 7c03502876aa22e8cd26b3f797d9f6e633718b90 SHA256 a0ec8bf534e93940f64f9cd16472943013fc1f747f3df57ea69b4e174628801f
-MD5 4a1b240359b05286828fd65617b3f0a9 ChangeLog 5206
-RMD160 9b7a050e9574db34989429daac0fc9a96072a72f ChangeLog 5206
-SHA256 a0ec8bf534e93940f64f9cd16472943013fc1f747f3df57ea69b4e174628801f ChangeLog 5206
+EBUILD commoncpp2-1.5.7.ebuild 1725 RMD160 3326bb2bff5c45899d135e00118740c6b2609f54 SHA1 94a3debf372a444c49a066b3b02ee5523d1ff7e8 SHA256 826238690f088997e79625714bbc9a6f3394274f273678f790c33f76a68567ce
+MD5 15a00cab2ee613271685ae47250edcdf commoncpp2-1.5.7.ebuild 1725
+RMD160 3326bb2bff5c45899d135e00118740c6b2609f54 commoncpp2-1.5.7.ebuild 1725
+SHA256 826238690f088997e79625714bbc9a6f3394274f273678f790c33f76a68567ce commoncpp2-1.5.7.ebuild 1725
+MISC ChangeLog 5366 RMD160 1dc2943570c5a6e025b8b7d11b9e3dca29664bf9 SHA1 194e92f6c1488821d76b1b6e86a7ccf7a5280860 SHA256 f61a08293fd2954cb58ff84ab3a16e42f0f6c211164d1fd85d0f826335c4dc6d
+MD5 0ce2b9ab7af0cef02197e29fbbc80087 ChangeLog 5366
+RMD160 1dc2943570c5a6e025b8b7d11b9e3dca29664bf9 ChangeLog 5366
+SHA256 f61a08293fd2954cb58ff84ab3a16e42f0f6c211164d1fd85d0f826335c4dc6d ChangeLog 5366
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild
index 0a164087aca8..9feb26ca6396 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild,v 1.1 2007/06/16 14:02:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild,v 1.2 2007/07/11 18:29:21 dev-zero Exp $
 
 inherit autotools eutils
 
@@ -58,7 +58,7 @@ src_install () {
 	fi
 }
 
-# Don't work...
+# Some of the tests hang forever
 #src_test() {
 #	cd "${S}/tests"
 #	emake || die "emake tests failed"
diff --git a/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
index a1d20c610198..db59ff6e9c44 100644
--- a/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
+++ b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
@@ -1,16 +1,3 @@
-diff -Naur commoncpp2-1.5.7.orig/configure.ac commoncpp2-1.5.7/configure.ac
---- commoncpp2-1.5.7.orig/configure.ac	2007-06-16 15:23:05.000000000 +0200
-+++ commoncpp2-1.5.7/configure.ac	2007-06-16 15:24:39.000000000 +0200
-@@ -357,6 +357,9 @@
- darwin*)
- 	MODULE_FLAGS="-dynamic -bundle -undefined suppress -flat_namespace -read_only_relocs suppress"
- 	;;
-+linux*)
-+	BASE_LIB="../src/libccgnu2.la"
-+	;;
- esac
- 
- AC_SUBST(COMMON_FLAGS)
 diff -Naur commoncpp2-1.5.7.orig/src/Makefile.am commoncpp2-1.5.7/src/Makefile.am
 --- commoncpp2-1.5.7.orig/src/Makefile.am	2007-06-16 15:23:05.000000000 +0200
 +++ commoncpp2-1.5.7/src/Makefile.am	2007-06-16 15:23:32.000000000 +0200
@@ -28,7 +15,7 @@ diff -Naur commoncpp2-1.5.7.orig/src/Makefile.am commoncpp2-1.5.7/src/Makefile.a
  
  if EXTRAS
 -libccext2_la_LDFLAGS = @BASE_LIB@ @THREAD_LIBS@ @SSL_LIBS@ @ZSTREAM_LIBS@ $(RELEASE) $(SHARED_FLAGS)
-+libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
++libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@ libccgnu2.la
 +libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
  
  if GETOPT_LONG