Synchronize and loose debug inherit

svn path=/trunk/overlay/; revision=20

5 files changed, 27 insertions, 32 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4063dd1..d03446e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -40,22 +40,22 @@ EBUILD gtk+-1.2.10-r11.ebuild 2195 RMD160 7102968da6cf0876667f950e0c97ffc91f4c49
 MD5 43c2f19d86e3e940cccd9d1b6ad61717 gtk+-1.2.10-r11.ebuild 2195
 RMD160 7102968da6cf0876667f950e0c97ffc91f4c49cc gtk+-1.2.10-r11.ebuild 2195
 SHA256 243efd996cae9c2f21478a5ebbc9e6b310fbe767f1ac64d3f41434a36cc08e41 gtk+-1.2.10-r11.ebuild 2195
-EBUILD gtk+-2.10.6.ebuild 4548 RMD160 a837d9ec3853538050cf0ad160fa470fd7ae35b1 SHA1 cd55910f0da9596ccade9b909e19023ad26c9a59 SHA256 e7b9d54b6dbd873891c1fb35f441add3188e7006dbc5cb1c136702eebd5e3e79
-MD5 1917b562cd0794a98a944381a5fa48d2 gtk+-2.10.6.ebuild 4548
-RMD160 a837d9ec3853538050cf0ad160fa470fd7ae35b1 gtk+-2.10.6.ebuild 4548
-SHA256 e7b9d54b6dbd873891c1fb35f441add3188e7006dbc5cb1c136702eebd5e3e79 gtk+-2.10.6.ebuild 4548
-EBUILD gtk+-2.8.17.ebuild 4122 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b SHA1 7588cdce614b0e1eba06a18069c54c5d2640b3dc SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a
-MD5 73f968e97597246ed8707df58b2af092 gtk+-2.8.17.ebuild 4122
-RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b gtk+-2.8.17.ebuild 4122
-SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a gtk+-2.8.17.ebuild 4122
-EBUILD gtk+-2.8.18.ebuild 4122 RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b SHA1 7588cdce614b0e1eba06a18069c54c5d2640b3dc SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a
-MD5 73f968e97597246ed8707df58b2af092 gtk+-2.8.18.ebuild 4122
-RMD160 e072dde3401a99cb28e8c16f0b22f968acb5630b gtk+-2.8.18.ebuild 4122
-SHA256 4c313b5e5402f3e523c5a0b48a331199a231e8f4c345738298c71bdc6d0ea33a gtk+-2.8.18.ebuild 4122
-EBUILD gtk+-2.8.20-r1.ebuild 4292 RMD160 2dfb697ec9ec6b19775f5052bbcd5a51a663abd9 SHA1 92c1a4c71f54f63f1e71fb8f4672ba2c79a86723 SHA256 5a71ff2e7ea32748fd6733c8e81ea66df136d19fc051da71368ee4790ebc8631
-MD5 2d894f385c204c3e83e077af079d1056 gtk+-2.8.20-r1.ebuild 4292
-RMD160 2dfb697ec9ec6b19775f5052bbcd5a51a663abd9 gtk+-2.8.20-r1.ebuild 4292
-SHA256 5a71ff2e7ea32748fd6733c8e81ea66df136d19fc051da71368ee4790ebc8631 gtk+-2.8.20-r1.ebuild 4292
+EBUILD gtk+-2.10.6.ebuild 4542 RMD160 5beafb2873612c9df52bdd76673ea033032d2c6d SHA1 9fda3ddb81deee3986ffc5f5fa805af9995b2854 SHA256 ebba3790e4b457c346caad26ee96be1e2ca26198a00401b3d99f85bc208217d9
+MD5 40a53d52b7e05553f27b5e5511a6d3aa gtk+-2.10.6.ebuild 4542
+RMD160 5beafb2873612c9df52bdd76673ea033032d2c6d gtk+-2.10.6.ebuild 4542
+SHA256 ebba3790e4b457c346caad26ee96be1e2ca26198a00401b3d99f85bc208217d9 gtk+-2.10.6.ebuild 4542
+EBUILD gtk+-2.8.17.ebuild 4116 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a SHA1 ef6842fba1851bab8bf9e0f9b0c2ee3944f79f97 SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae
+MD5 d837775fe059b430a256182912b5b365 gtk+-2.8.17.ebuild 4116
+RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a gtk+-2.8.17.ebuild 4116
+SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae gtk+-2.8.17.ebuild 4116
+EBUILD gtk+-2.8.18.ebuild 4116 RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a SHA1 ef6842fba1851bab8bf9e0f9b0c2ee3944f79f97 SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae
+MD5 d837775fe059b430a256182912b5b365 gtk+-2.8.18.ebuild 4116
+RMD160 43d730085c1ff6a47b2141e78960bf4bd177cb7a gtk+-2.8.18.ebuild 4116
+SHA256 19406591be0907714d2cc8e584ea223b3c122a8deb348262633d69214ec217ae gtk+-2.8.18.ebuild 4116
+EBUILD gtk+-2.8.20-r1.ebuild 4286 RMD160 15249534bf6a0bb5e655535803c4bba5e37284cc SHA1 b360015b45dc16705bc68251e971260c11d4ae98 SHA256 f92ea4a455c179bc246123894d232be2542f201616238fefa78c2fb9cc4c659a
+MD5 6a450607e995194d117aea212704ba4d gtk+-2.8.20-r1.ebuild 4286
+RMD160 15249534bf6a0bb5e655535803c4bba5e37284cc gtk+-2.8.20-r1.ebuild 4286
+SHA256 f92ea4a455c179bc246123894d232be2542f201616238fefa78c2fb9cc4c659a gtk+-2.8.20-r1.ebuild 4286
 MISC NOTES 82 RMD160 58293858cde627b688c697e076d2d45f005007b2 SHA1 2f0647b873ce5d273d6492ce390a9c882db26046 SHA256 6878454f7bf28d1c462b4e213724c88d89eac6694d3323e0f372d227cdbb5f34
 MD5 61f1935636c8a7927b7a2deecd6ed127 NOTES 82
 RMD160 58293858cde627b688c697e076d2d45f005007b2 NOTES 82
diff --git a/x11-libs/gtk+/gtk+-2.10.6.ebuild b/x11-libs/gtk+/gtk+-2.10.6.ebuild
index e24066f..6fc1e86 100644
--- a/x11-libs/gtk+/gtk+-2.10.6.ebuild
+++ b/x11-libs/gtk+/gtk+-2.10.6.ebuild
@@ -1,15 +1,15 @@
-# 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/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.1 2006/10/07 23:14:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.13 2007/01/05 04:07:43 flameeyes Exp $
 
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
+inherit gnome.org flag-o-matic eutils autotools virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc jpeg tiff xinerama"
 
 RDEPEND="x11-libs/libXrender
@@ -46,11 +46,10 @@ DEPEND="${RDEPEND}
 
 RESTRICT="confcache"
 
-
 pkg_setup() {
-	if ! built_with_use x11-libs/cairo X pdf ; then
-		einfo "Please re-emerge x11-libs/cairo with the X and pdf USE flag set"
-		die "cairo needs the X and pdf flag set"
+	if ! built_with_use x11-libs/cairo X; then
+		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
 	fi
 }
 
@@ -151,13 +150,9 @@ pkg_postinst() {
 		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
 	fi
 
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-
 	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
 		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
 		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC" /usr/lib/gtk-2.0/2.[^1]* ")"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
 	fi
 }
diff --git a/x11-libs/gtk+/gtk+-2.8.17.ebuild b/x11-libs/gtk+/gtk+-2.8.17.ebuild
index f71109e..6cb9081 100644
--- a/x11-libs/gtk+/gtk+-2.8.17.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.17.ebuild,v 1.1 2006/05/01 19:35:55 dang Exp $
 
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
+inherit gnome.org flag-o-matic eutils autotools virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
diff --git a/x11-libs/gtk+/gtk+-2.8.18.ebuild b/x11-libs/gtk+/gtk+-2.8.18.ebuild
index f71109e..6cb9081 100644
--- a/x11-libs/gtk+/gtk+-2.8.18.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.17.ebuild,v 1.1 2006/05/01 19:35:55 dang Exp $
 
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
+inherit gnome.org flag-o-matic eutils autotools virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
diff --git a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
index 4f1f936..1e57b74 100644
--- a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.1 2006/07/18 19:13:57 allanonjl Exp $
 
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
+inherit gnome.org flag-o-matic eutils autotools virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"