Remove libtool patch; the bug it was working around is fixed; bug #165524

Package-Manager: portage-2.1.2-r9

5 files changed, 26 insertions, 63 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 3f4d8e588baf..81f4670bbf74 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.87 2007/02/07 14:26:40 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.88 2007/02/16 16:57:45 dang Exp $
+
+  16 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  -files/gtkhtml-3.0.7-libtool.patch, gtkhtml-3.0.10.ebuild,
+  gtkhtml-3.0.10-r1.ebuild:
+  Remove libtool patch; the bug it was working around is fixed; bug #165524
 
 *gtkhtml-3.12.3 (07 Feb 2007)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index f8aed41ac570..ecd9a53e148a 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -5,10 +5,6 @@ AUX gtkhtml-3.0.10-no-extern-cluealigned.diff 423 RMD160 9d1018a40aabae678306c0a
 MD5 ccd71f8847f9cd60a587dd91fa691341 files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
 RMD160 9d1018a40aabae678306c0a62421d2102c9d8c29 files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
 SHA256 d618e6c7b1fe7bd49a344c8de8b34aee49dbbbd2ea667b2d30bb8d0bfe7aed2c files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
-AUX gtkhtml-3.0.7-libtool.patch 656 RMD160 7bf8f1f217fd16ca2bbb5dabff27107a98a5f2bd SHA1 934191489a5c0882c86a9fb56209ab99acb9d19a SHA256 4986d483b44d00453e9b0e22201af765929399f6013f1819471f0e002479bbfc
-MD5 c802878860f7a2692df330e54e635c0c files/gtkhtml-3.0.7-libtool.patch 656
-RMD160 7bf8f1f217fd16ca2bbb5dabff27107a98a5f2bd files/gtkhtml-3.0.7-libtool.patch 656
-SHA256 4986d483b44d00453e9b0e22201af765929399f6013f1819471f0e002479bbfc files/gtkhtml-3.0.7-libtool.patch 656
 AUX gtkhtml-3.2-i18n.patch 1411 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 SHA1 d7f9050512d63a3a1ac4be2a3bbcdf553ca5088f SHA256 45c7763730b3a886ba6dd4b69d20cb83dcc5c918385971e48905e7ad6e8849f7
 MD5 b954bf799749526cc35e4d73e5ebbaba files/gtkhtml-3.2-i18n.patch 1411
 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 files/gtkhtml-3.2-i18n.patch 1411
@@ -37,14 +33,14 @@ EBUILD gtkhtml-2.6.3.ebuild 1117 RMD160 7b0470f564512003367e3a1288ed5b4e195f3f34
 MD5 8c73ae5c73ef27af296c2d4bfb0b5a06 gtkhtml-2.6.3.ebuild 1117
 RMD160 7b0470f564512003367e3a1288ed5b4e195f3f34 gtkhtml-2.6.3.ebuild 1117
 SHA256 484d6fda793944593c211951cf7951d7b3e4f1b5314b16af66381ba06a814d88 gtkhtml-2.6.3.ebuild 1117
-EBUILD gtkhtml-3.0.10-r1.ebuild 1216 RMD160 f004f8e5de44a03576184573a0ed6a41e35d9a9d SHA1 768d9ef76c65dcd7de707e1cbac819ba2ff6437a SHA256 3917432f0ecc6be0d9eddba8211cedef623ee37c5f10dd89298b2d3ae9d81ff3
-MD5 c8ca35f866ac80896c8692fd77557009 gtkhtml-3.0.10-r1.ebuild 1216
-RMD160 f004f8e5de44a03576184573a0ed6a41e35d9a9d gtkhtml-3.0.10-r1.ebuild 1216
-SHA256 3917432f0ecc6be0d9eddba8211cedef623ee37c5f10dd89298b2d3ae9d81ff3 gtkhtml-3.0.10-r1.ebuild 1216
-EBUILD gtkhtml-3.0.10.ebuild 1120 RMD160 0c5ed71f5fd4551e9796eb46e6487219f1ddcf44 SHA1 0bf18a32c05030d2fe9d560df978cffed8c01b8c SHA256 2a8aed2c242b8ebc10ef8a20663c4f61db0aecd5b00808bd2fd93a39a5a6755d
-MD5 076591720c419377c9922b04c13c83e9 gtkhtml-3.0.10.ebuild 1120
-RMD160 0c5ed71f5fd4551e9796eb46e6487219f1ddcf44 gtkhtml-3.0.10.ebuild 1120
-SHA256 2a8aed2c242b8ebc10ef8a20663c4f61db0aecd5b00808bd2fd93a39a5a6755d gtkhtml-3.0.10.ebuild 1120
+EBUILD gtkhtml-3.0.10-r1.ebuild 1067 RMD160 179024b6bf9d3f5f6e25cd67b4bcd4b0c80a7fac SHA1 fdb4ea1d803e1904231701ea927923ba277fb7fc SHA256 05a7fd9b3a2f9917898265ace4ede0172b2e088864da83fc0f8614cd88493f1d
+MD5 012ebef143ebdafff0fadefeb64bbcce gtkhtml-3.0.10-r1.ebuild 1067
+RMD160 179024b6bf9d3f5f6e25cd67b4bcd4b0c80a7fac gtkhtml-3.0.10-r1.ebuild 1067
+SHA256 05a7fd9b3a2f9917898265ace4ede0172b2e088864da83fc0f8614cd88493f1d gtkhtml-3.0.10-r1.ebuild 1067
+EBUILD gtkhtml-3.0.10.ebuild 971 RMD160 4027287ddd2713b857cdaabdd67d2b2b90afae0c SHA1 243872f41d9a162f4a145b1b5d93920c1069b47c SHA256 aee81be496cb9a7cfb0f1ef06f09c8dead20e36dd655e9d416efae076fa489b0
+MD5 40220797734b6266f781ceaf7a7aa7de gtkhtml-3.0.10.ebuild 971
+RMD160 4027287ddd2713b857cdaabdd67d2b2b90afae0c gtkhtml-3.0.10.ebuild 971
+SHA256 aee81be496cb9a7cfb0f1ef06f09c8dead20e36dd655e9d416efae076fa489b0 gtkhtml-3.0.10.ebuild 971
 EBUILD gtkhtml-3.10.2.ebuild 879 RMD160 05ff1d9ba7ac9cb9ccf01cdfceaf184310458fbc SHA1 33e5bf2a2abc9a66f66c172341fbdaccef4858ed SHA256 671d4079b8ee2cd5c9d360f92261e2d6cf4e294ead765b71d09ef1b5e38a6d4d
 MD5 9aa71fbfb1409d3ab788f8c959caaa6d gtkhtml-3.10.2.ebuild 879
 RMD160 05ff1d9ba7ac9cb9ccf01cdfceaf184310458fbc gtkhtml-3.10.2.ebuild 879
@@ -69,10 +65,10 @@ EBUILD gtkhtml-3.6.2.ebuild 1104 RMD160 148e40628cd9d43821c16548fbc5db35d9a779fd
 MD5 3f1312e751219f8dfebad10d169ed80d gtkhtml-3.6.2.ebuild 1104
 RMD160 148e40628cd9d43821c16548fbc5db35d9a779fd gtkhtml-3.6.2.ebuild 1104
 SHA256 cae4af4de7418d92cddfddf22c3385351b407f2423d7aae6c8e046151b601026 gtkhtml-3.6.2.ebuild 1104
-MISC ChangeLog 12761 RMD160 8e3f2c1e754f42c1537193ea4672225bfa5ca7ab SHA1 5c9bd0bd0b58eec9b40691bb1896d060ae73ee12 SHA256 e04b857d8794b4799bdf30582069479d38009e1cecfd3df6988918861b961c05
-MD5 6807b6cee733657753d7f91f69f57152 ChangeLog 12761
-RMD160 8e3f2c1e754f42c1537193ea4672225bfa5ca7ab ChangeLog 12761
-SHA256 e04b857d8794b4799bdf30582069479d38009e1cecfd3df6988918861b961c05 ChangeLog 12761
+MISC ChangeLog 12978 RMD160 1fc4e3335ab36caafd0bef385323bc107af8d5a8 SHA1 d10f4db803eb1f07f9fc825c6fcb2ad54db21626 SHA256 918ec1c5fa8fdaea8109e381f5e328e41bda040570fc2867aa6af8b72b8d7c55
+MD5 d7e874bacb3944ec2c0b7e616cf85794 ChangeLog 12978
+RMD160 1fc4e3335ab36caafd0bef385323bc107af8d5a8 ChangeLog 12978
+SHA256 918ec1c5fa8fdaea8109e381f5e328e41bda040570fc2867aa6af8b72b8d7c55 ChangeLog 12978
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -105,9 +101,9 @@ MD5 593de6d403fd8164b7b05d437b129019 files/digest-gtkhtml-3.6.2 247
 RMD160 8c9f57dc83543afadcd9841b9cab8f4b45a725b8 files/digest-gtkhtml-3.6.2 247
 SHA256 b61839611a0d72760e25c475b2d41598fdf167d50b10e08ee1aaefb946d10b18 files/digest-gtkhtml-3.6.2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyeGWkeYb6olFHJcRAl4WAKDyMbALiqR5v2CKYecnvFGIaJgFngCeM8Fa
-7ih0QHC29uAKb8yZSrm0cLc=
-=qTrh
+iD8DBQFF1eKFomPajV0RnrERAgl3AJsEfJ9rnp/45Sc/1qPh3InyIU5fzQCcDa9J
+vQo/FIdr+R28zWqMFVwQSOY=
+=iV1l
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch
deleted file mode 100644
index 4839a3f1f2ab..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libtool~	2003-07-11 10:21:31.000000000 +0100
-+++ libtool	2003-07-11 10:22:33.000000000 +0100
-@@ -1859,7 +1859,7 @@
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
- 	    tmp_libs=
- 	    # PKGW 
--	    dependency_libs=
-+	    #dependency_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
- 	      case "$tmp_libs " in
-@@ -1976,7 +1976,7 @@
- 
- 	  tmp_libs=
- 	  #PKGW
--	  dependency_libs=
-+	  #dependency_libs=
- 	  for deplib in $dependency_libs; do
- 	    case $deplib in
- 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
index 45471c2b8877..b1c31059c94e 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.2 2007/02/16 16:57:45 dang Exp $
 
 inherit gnome2 eutils
 
@@ -41,12 +41,3 @@ src_unpack() {
 	# bug 54244, patch for cjk input methods
 	epatch ${FILESDIR}/${PN}-fix_preedit.patch
 }
-
-src_compile() {
-	gnome2_src_configure
-
-	EPATCH_OPTS="${S}/libtool"
-	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
-
-	emake || die "make failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
index ccf54992486d..a76d804df545 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.2 2007/02/16 16:57:45 dang Exp $
 
 inherit gnome2 eutils
 
@@ -37,12 +37,3 @@ src_unpack() {
 	# bug 101970
 	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
 }
-
-src_compile() {
-	gnome2_src_configure
-
-	EPATCH_OPTS="${S}/libtool"
-	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
-
-	emake || die "make failed"
-}