Fix as-needed patch mess up reported by Daniel Glockner (bug #166374)

Package-Manager: portage-2.1.2-r9

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 88714878bdd70b6cd2ee897f29f5a103d1e7df4b..0190c97c558badcb9ba3d1d59964bf066b2a74c8 100644 (file)
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.245 2007/02/11 16:45:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.246 2007/03/03 15:59:55 falco Exp $
+
+  03 Mar 2007; Raphael Marichez <falco@gentoo.org> glib-1.2.10-r5.ebuild:
+  Fix as-needed patch mess up reported by Daniel Glöckner (bug #166374)
 
   11 Feb 2007; Fabian Groffen <grobian@gentoo.org> glib-1.2.10-r5.ebuild,
   glib-2.10.3-r1.ebuild, glib-2.12.4-r1.ebuild, glib-2.12.6.ebuild,

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b376aeddf811372ece7f7c13cc3e516149b6dd64..cb6ea40a6ce5b6599c139b6ce73c0d0776215806 100644 (file)
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -34,7 +34,7 @@ AUX glib-2.8.3-macos.patch 307 RMD160 f9212f17245cec6767cc1f0447e461c6e4917a6c S
 MD5 02673367ae3d806f2df4dd6fbfff54f4 files/glib-2.8.3-macos.patch 307
 RMD160 f9212f17245cec6767cc1f0447e461c6e4917a6c files/glib-2.8.3-macos.patch 307
 SHA256 2c98a14c2df57484e73525c4cc249a7e1a73da3ae97193b34dbc83981d5df9d6 files/glib-2.8.3-macos.patch 307
-DIST glib-1.2.10-as-needed.patch.bz2 9154 RMD160 b2b27f306b2ae2391acfaf1a4fe3dc29cb11c84e SHA1 eed5f3d5653a201cdc5d3ed6eca3cea55382e478 SHA256 1b936f7bfad4320e0af0b6b8bebfe7aac81e2be816300262d396bffa094b871f
+DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
 DIST glib-2.10.3.tar.bz2 2774011 RMD160 da56e238f4f6e9c6e7c08d4e53f75128b5178047 SHA1 bba1dea73c4426f6a130c82e0b7a07b78dfc73ce SHA256 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f
 DIST glib-2.12.4.tar.bz2 2868828 RMD160 3aac5f23cedcef25f7fd7acb6d4ebfa744e38edc SHA1 35be8f8a7ce47bb0f53ffcd50605a6f9596ebd04 SHA256 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d
@@ -42,10 +42,10 @@ DIST glib-2.12.6.tar.bz2 2902553 RMD160 a7bf002c5baf6fedce54eaf47109b5a193578d89
 DIST glib-2.12.7.tar.bz2 2900849 RMD160 0c95bd3a5970263b72be9cacfc64c0e7f4bbe254 SHA1 42024d775f5b1550c0f86091609cd1c7d1440413 SHA256 e25321ab635eb6e4ec42135600a5ac9a1327e910d3aed0edf97fff30500747b2
 DIST glib-2.12.9.tar.bz2 2902738 RMD160 f762b65131f5c1f30ee2e25cb771c296715e6bd6 SHA1 387da30929047ef88a6f369831a34f41a3d027f7 SHA256 10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058
 DIST glib-2.8.6.tar.bz2 2691171 RMD160 54b3b5c96f5050793fbadbd523bc33b6bd36b257 SHA1 28731dc4799efc1824610971c88a571f18bd8471 SHA256 e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea
-EBUILD glib-1.2.10-r5.ebuild 1712 RMD160 cc7c57ba0a51c9b465eb8d0462806eaa5a68059a SHA1 587b18230e82ce1d85103585e86cdd7d038fd704 SHA256 ac81b9bdee51adffa91496e70a15947f1d7f050ea08c131126281ed5832d6ccb
-MD5 b9e686c5958792e7d2bea4a02aa24933 glib-1.2.10-r5.ebuild 1712
-RMD160 cc7c57ba0a51c9b465eb8d0462806eaa5a68059a glib-1.2.10-r5.ebuild 1712
-SHA256 ac81b9bdee51adffa91496e70a15947f1d7f050ea08c131126281ed5832d6ccb glib-1.2.10-r5.ebuild 1712
+EBUILD glib-1.2.10-r5.ebuild 1716 RMD160 068c9be8d342da4aa927c39c1ec63f266408b03d SHA1 2f48154af232513d7d40d91dbb89d2b033082e53 SHA256 14a7cc736b4aec42c5efe2eae04627a6066a48b55ae445f037ae3e7ba93704ec
+MD5 a47e1db6dea09032240f97e5cf08177e glib-1.2.10-r5.ebuild 1716
+RMD160 068c9be8d342da4aa927c39c1ec63f266408b03d glib-1.2.10-r5.ebuild 1716
+SHA256 14a7cc736b4aec42c5efe2eae04627a6066a48b55ae445f037ae3e7ba93704ec glib-1.2.10-r5.ebuild 1716
 EBUILD glib-2.10.3-r1.ebuild 2134 RMD160 082bb1d5fce43392cb245d6e922b30f4a9bf930b SHA1 79a03a54da782a54271756e453f556f0458e1234 SHA256 2e577043819ee67ca69af43f0bfc11b0976d3e2975144f96aaed94280eec1e49
 MD5 cd4f40181e11847ecd657ebede501426 glib-2.10.3-r1.ebuild 2134
 RMD160 082bb1d5fce43392cb245d6e922b30f4a9bf930b glib-2.10.3-r1.ebuild 2134
@@ -74,17 +74,17 @@ EBUILD glib-2.8.6.ebuild 1586 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 SH
 MD5 86a8a7a320663e2e62d3e5d655caa664 glib-2.8.6.ebuild 1586
 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 glib-2.8.6.ebuild 1586
 SHA256 0e8d42185e9bbee3008004bd262ca31e98b69a150a455a3a1c52ad227d95d584 glib-2.8.6.ebuild 1586
-MISC ChangeLog 29295 RMD160 c6f5e5731aae3c31d52781e92f12c15e36c81039 SHA1 d26d54e903de00bdfccd252235deefb50483e810 SHA256 e0b6fb9ef702e5436c1b387ad19b64bdfe7ceece6c5624a95e80f582a1708209
-MD5 6bcf104cb7c0444445940f1f8908bf16 ChangeLog 29295
-RMD160 c6f5e5731aae3c31d52781e92f12c15e36c81039 ChangeLog 29295
-SHA256 e0b6fb9ef702e5436c1b387ad19b64bdfe7ceece6c5624a95e80f582a1708209 ChangeLog 29295
+MISC ChangeLog 29441 RMD160 2e9e5c2eb68a4ed07bcb847206c0a5a994c5cc8c SHA1 70517297df3ab1e78ccc5f2f2de3772b1ba33a5b SHA256 3227cfe19303c0c29faf0ba117695e6ad0ea6307510501148d107e60295aa929
+MD5 e70c1dbdfe0558fdfce10b5f87f85e77 ChangeLog 29441
+RMD160 2e9e5c2eb68a4ed07bcb847206c0a5a994c5cc8c ChangeLog 29441
+SHA256 3227cfe19303c0c29faf0ba117695e6ad0ea6307510501148d107e60295aa929 ChangeLog 29441
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 4f4fce98a00fc5d449f2002fa736cadb files/digest-glib-1.2.10-r5 503
-RMD160 d4cae8d9da2f5567dcb4de47ab5ac6b062557d85 files/digest-glib-1.2.10-r5 503
-SHA256 08375bd7cdab2e84d1bab06468359d6492a66cfff5926e8879e4f718147c94a8 files/digest-glib-1.2.10-r5 503
+MD5 1fb7281f8badb7db87bf60c5890b51bb files/digest-glib-1.2.10-r5 512
+RMD160 8d3fdacd29aba8db754f81e57d22d128cf9bbffc files/digest-glib-1.2.10-r5 512
+SHA256 1d80ba3d1ca026e567efab88874d27b2bfbcb81c165a94f87387a3bd7fb2ca73 files/digest-glib-1.2.10-r5 512
 MD5 0df06eb2ed92ba9f4d2c76d5848b9d31 files/digest-glib-2.10.3 241
 RMD160 315111941f64e8af6d32867de75539300af2fd64 files/digest-glib-2.10.3 241
 SHA256 d26cfbb6a042eef4f64ad487901b9f1ac518d1b68ae6d9210dc4c360d296b122 files/digest-glib-2.10.3 241

diff --git a/dev-libs/glib/files/digest-glib-1.2.10-r5 b/dev-libs/glib/files/digest-glib-1.2.10-r5
index 1d9a8d751047919a56c2ee24e58e117cb9af7252..9387e1f3054027b12b81436967507c15bacb4bdb 100644 (file)
--- a/dev-libs/glib/files/digest-glib-1.2.10-r5
+++ b/dev-libs/glib/files/digest-glib-1.2.10-r5
@@ -1,6 +1,6 @@
-MD5 76ddfaee351b80646a866cbc6870e709 glib-1.2.10-as-needed.patch.bz2 9154
-RMD160 b2b27f306b2ae2391acfaf1a4fe3dc29cb11c84e glib-1.2.10-as-needed.patch.bz2 9154
-SHA256 1b936f7bfad4320e0af0b6b8bebfe7aac81e2be816300262d396bffa094b871f glib-1.2.10-as-needed.patch.bz2 9154
+MD5 15c8f07d9dd0f13846b58e191eec4fc2 glib-1.2.10-r1-as-needed.patch.bz2 9099
+RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d glib-1.2.10-r1-as-needed.patch.bz2 9099
+SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 glib-1.2.10-r1-as-needed.patch.bz2 9099
 MD5 6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz 421480
 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 glib-1.2.10.tar.gz 421480
 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f glib-1.2.10.tar.gz 421480

diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index f191641968f1bbe7a65b387a1bcee199d984a848..87c8919528fd9053e43ba4e565f67040fb5a484c 100644 (file)
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.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-libs/glib/glib-1.2.10-r5.ebuild,v 1.50 2007/02/11 16:45:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.51 2007/03/03 15:59:55 falco Exp $
 
 WANT_AUTOMAKE="1.4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
         ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
-        mirror://gentoo/glib-1.2.10-as-needed.patch.bz2"
+        mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
@@ -30,7 +30,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${P}-gcc34-fix.patch
 
        # Fix for -Wl,--as-needed (bug #133818)
-       epatch "${DISTDIR}"/glib-1.2.10-as-needed.patch.bz2
+       epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
 
        use ppc64 && use hardened && replace-flags -O[2-3] -O1
        append-ldflags $(dlopen_lib)