new release, mark 2.6.2 x86 cleanup

5 files changed, 33 insertions, 43 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d7c61b3551f3..c551b02c59ad 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,39 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 de74b35fc2ec173149d04a3d3f843521 gtk+-2.6.1-r1.ebuild 3180
-MD5 55a0240fe45beae9e83402b8bd3f8cbf gtk+-2.6.1-r2.ebuild 3279
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 db49b476d800c643e57ce06255a0d3d0 gtk+-1.2.10-r11.ebuild 1792
-MD5 a11bfb75b31050c67a24735ceab9aa27 ChangeLog 21994
-MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139
-MD5 5cd9f55453a87e4895ef1b92dcc93fa9 gtk+-2.4.14.ebuild 2919
-MD5 5ce4df58f7703526e731a195a2af1d60 gtk+-2.6.2.ebuild 3028
+MD5 68c4560521dc4ec722df0b0de77d5597 gtk+-2.6.4.ebuild 2900
 MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120
+MD5 5cd9f55453a87e4895ef1b92dcc93fa9 gtk+-2.4.14.ebuild 2919
+MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 55a0240fe45beae9e83402b8bd3f8cbf gtk+-2.6.1-r2.ebuild 3279
+MD5 a11bfb75b31050c67a24735ceab9aa27 ChangeLog 21994
+MD5 1ba36336b0153b6c6747f5929071b6e1 gtk+-2.6.2.ebuild 3039
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+MD5 de74b35fc2ec173149d04a3d3f843521 gtk+-2.6.1-r1.ebuild 3180
+MD5 b56b88c0586a987cf38f9cf8b4c04688 files/digest-gtk+-2.6.2 208
+MD5 8a7a24c42bd4bf63cad1ba4f5266dbec files/digest-gtk+-2.6.4 139
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
-MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
-MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293
 MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
+MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
 MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r1 208
-MD5 a81714da3cedcf01f370878a82f4ba8d files/gtk+-2.6.1-gtk_dialog.patch 627
 MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r2 208
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
+MD5 a81714da3cedcf01f370878a82f4ba8d files/gtk+-2.6.1-gtk_dialog.patch 627
+MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
+MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
+MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 b56b88c0586a987cf38f9cf8b4c04688 files/digest-gtk+-2.6.2 208
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCD2XbugEuf3OQ0akRAjcEAJ9v+lhmntXBYOcRf7ls95DI+GnZvgCfadOW
-fFH50t9tTjyqXIECjyLbRmI=
-=tUpF
------END PGP SIGNATURE-----
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1 b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1
deleted file mode 100644
index 3b2b31081039..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 146ed9d12c9506fcf8745ddb2c22530a gtk+-2.6.1.tar.bz2 11070668
-MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
-MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.4 b/x11-libs/gtk+/files/digest-gtk+-2.6.4
new file mode 100644
index 000000000000..462edcd5e422
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.4
@@ -0,0 +1,2 @@
+MD5 4749fce7b082b784a71a076aa586dc25 gtk+-2.6.4.tar.bz2 11222426
+MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
diff --git a/x11-libs/gtk+/gtk+-2.6.2.ebuild b/x11-libs/gtk+/gtk+-2.6.2.ebuild
index d1f5a617727e..b4ad43dd7b0f 100644
--- a/x11-libs/gtk+/gtk+-2.6.2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.2.ebuild,v 1.1 2005/02/05 06:56:32 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.2.ebuild,v 1.2 2005/03/02 21:53:19 foser Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE="doc tiff jpeg static"
 
 RDEPEND="virtual/x11
@@ -35,6 +35,8 @@ src_unpack() {
 
 	unpack ${A}
 
+	epunt_cxx
+
 	cd ${S}
 	# Turn of --export-symbols-regex for now, since it removes
 	# the wrong symbols
diff --git a/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.4.ebuild
index c46f1c420589..b13c1eb2f90b 100644
--- a/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild,v 1.2 2005/01/22 17:47:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.4.ebuild,v 1.1 2005/03/02 21:53:19 foser Exp $
 
-inherit libtool flag-o-matic eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -35,18 +35,14 @@ src_unpack() {
 
 	unpack ${A}
 
+	epunt_cxx
+
 	cd ${S}
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-#	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
 	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch
-	# fix empty filechooser combo (http://bugzilla.gnome.org/show_bug.cgi?id=164290)
-	cd ${S}/gtk
-	epatch ${FILESDIR}/${P}-empty_default_combo.patch
 
 	cd ${S}
 	# use an arch-specific config directory so that 32bit and 64bit versions
@@ -55,6 +51,7 @@ src_unpack() {
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
 	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+
 	# patch for ppc64 (#64359)
 	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 	use ppc64 && append-flags -mminimal-toc