updated the new version, left the patches intact

13 files changed, 151 insertions, 21 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index fface9a3d891..4b85d4df4cca 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.47 2003/01/16 15:26:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.48 2003/02/04 06:01:48 spider Exp $
+
+
+
+*gtk+-2.2.1 (04 Feb 2003)
+
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+-2.2.1.ebuild :
+  bumped version
+
 
   16 Jan 2003; foser <foser@gentoo.org> gtk+-2.2.0.ebuild :
   Added some info about rebuilding gtk theme engines after an emerge
@@ -21,6 +29,10 @@
 
 *gtk+-2.2.0 (22 Dec 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
+
   22 Dec 2002; foser <foser@gentoo.org> gtk+-2.2.0.ebuild :
   New version
 
@@ -34,11 +46,17 @@
 
 *gtk+-2.0.9 (20 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   20 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.9.ebuild :
   New version, mainly fixes a bug which made metacity crash
 
 *gtk-2.0.8-r1 (15 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   15 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.8-r1.ebuild
   files/digest-gtk+-2.0.8-r1 :
 
@@ -46,6 +64,9 @@
 
 *gtk+-2.1.2 (12 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   29 Nov 2002; Jon Nall <nall@gentoo.org> gtk+-2.1.2.ebuild :
   added ~ppc to KEYWORDS
 
@@ -54,6 +75,9 @@
 
 *gtk+-2.0.8 (09 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   12 Nov 2002; L. Boshell <leonardop@gentoo.org> : Removed directfb dep
   since it wasn't being used.
 
@@ -66,6 +90,9 @@
   
 *gtk+-2.0.7-r1 (05 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   09 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.7-r1 :
   Added sgmltools-lite dep, to fix documentation problems
 
@@ -74,6 +101,9 @@
 
 *gtk+-2.0.7 (04 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   04  Nov 2002; Spider <spider@gentoo.org> gtk+-2.0.4.ebuild 
   files/digest-gtk+-2.0.4: added the latest stable release, bugfixes and nothing
   more. Ripped out the directfb (wow, it survived more than 10 days! )
@@ -81,11 +111,17 @@
   
 *gtk+-2.1.1 (27 Oct 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   27 Oct 2002; foser <foser@gentoo.org> gtk+-2.1.1.ebuild :
   gnome 2.1
 
 *gtk+-2.0.6-r3 (21 Oct 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   21 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.6-r3.ebuild
   files/digest-gtk+-2.0.6-r3 :
 
@@ -93,15 +129,25 @@
 
 *gtk+-2.0.6-r2 (10 Oct 2002)
   
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   10 Oct 2002; foser <foser@gentoo.org> gtk+-2.0.6-r2.ebuild :
   Bumped revision to get the safety replacement added in r1 spread  
 
 *gtk+-1.2.10-r9 (26 Sep 2002)
+  
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   26 Sep 2002; Spider <spider@gentoo.org> gtk+-1.2.10-r9.ebuild :
   This build enables minimal debugging for all users, this will fix some unexpected crashes in amongst other things xchat.
 
 *gtk+-2.0.6-r1 (04 Jul 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   08 Oct 2002; foser <foser@gentoo.org> gtk+-2.0.6-r1.ebuild :
   Replace -O3 with -O2 to be on the safe side (bug 8762)
 
@@ -112,6 +158,9 @@
 
 *gtk+-2.0.6 (04 Jul 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
+  changed all DEBUG to DEBUGBUILD
+
   04 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gtk+-2.0.6.ebuild:
 
   New version.
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.1 b/x11-libs/gtk+/files/digest-gtk+-2.2.1
new file mode 100644
index 000000000000..4674a66630c4
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.2.1
@@ -0,0 +1 @@
+MD5 dfd5755fddb26a46c96bfaa813280ac4 gtk+-2.2.1.tar.bz2 6515939
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
index 3771da038ebe..1c0ab2ecc0a9 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild,v 1.15 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild,v 1.16 2003/02/04 06:01:48 spider Exp $
 
 IUSE="nls"
 
@@ -37,7 +37,7 @@ src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 
-	if [ "${DEBUG}" ]
+	if [ "${DEBUGBUILD}" ]
 	then
 		myconf="${myconf} --enable-debug=yes"
 	else
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
index db798f9d92a5..d401212754be 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild,v 1.6 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild,v 1.7 2003/02/04 06:01:48 spider Exp $
 
 IUSE="nls"
 
@@ -37,7 +37,7 @@ src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 
-	if [ "${DEBUG}" ]
+	if [ "${DEBUGBUILD}" ]
 	then
 		myconf="${myconf} --enable-debug=yes"
 	else
diff --git a/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild b/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild
index 60662dd9a7f7..a2927c0ea989 100644
--- a/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild,v 1.4 2003/01/05 05:16:56 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild,v 1.5 2003/02/04 06:01:48 spider Exp $
 
 IUSE="tiff doc jpeg directfb"
 
@@ -52,7 +52,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild
index d363ce5b027e..91a35706b32d 100644
--- a/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild,v 1.4 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild,v 1.5 2003/02/04 06:01:48 spider Exp $
 
 IUSE="tiff doc jpeg"
 
@@ -47,7 +47,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild
index 9b3260d6266a..ad0cf50b5632 100644
--- a/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild,v 1.4 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild,v 1.5 2003/02/04 06:01:48 spider Exp $
 
 inherit libtool flag-o-matic
 
@@ -49,7 +49,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.0.8.ebuild b/x11-libs/gtk+/gtk+-2.0.8.ebuild
index 2243854d04d0..d0f195ecbefa 100644
--- a/x11-libs/gtk+/gtk+-2.0.8.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8.ebuild,v 1.7 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8.ebuild,v 1.8 2003/02/04 06:01:48 spider Exp $
 
 IUSE="tiff doc jpeg"
 
@@ -40,7 +40,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.0.9.ebuild b/x11-libs/gtk+/gtk+-2.0.9.ebuild
index 6e7f7c67126a..e52a763483bf 100644
--- a/x11-libs/gtk+/gtk+-2.0.9.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.9.ebuild,v 1.7 2003/01/01 18:58:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.9.ebuild,v 1.8 2003/02/04 06:01:48 spider Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -48,7 +48,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.1.2.ebuild b/x11-libs/gtk+/gtk+-2.1.2.ebuild
index 3d6e99e46370..0cbb82416e60 100644
--- a/x11-libs/gtk+/gtk+-2.1.2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.1.2.ebuild,v 1.6 2002/12/06 23:11:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.1.2.ebuild,v 1.7 2003/02/04 06:01:48 spider Exp $
 
 IUSE="tiff doc jpeg directfb"
 
@@ -47,7 +47,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild
index 4637bff010e0..8296669c8ff6 100644
--- a/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild,v 1.1 2003/01/31 02:46:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild,v 1.2 2003/02/04 06:01:48 spider Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -47,7 +47,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.2.0.ebuild b/x11-libs/gtk+/gtk+-2.2.0.ebuild
index 47ca1bcec03b..df1b9f7a9744 100644
--- a/x11-libs/gtk+/gtk+-2.2.0.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0.ebuild,v 1.7 2003/01/18 12:39:40 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0.ebuild,v 1.8 2003/02/04 06:01:48 spider Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -45,7 +45,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 		
diff --git a/x11-libs/gtk+/gtk+-2.2.1.ebuild b/x11-libs/gtk+/gtk+-2.2.1.ebuild
new file mode 100644
index 000000000000..31deb4f7396b
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.2.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.1 2003/02/04 06:01:48 spider Exp $
+
+inherit eutils libtool flag-o-matic
+
+IUSE="tiff doc jpeg"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Gimp ToolKit + "
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+HOMEPAGE="http://www.gtk.org/"
+LICENSE="LGPL-2.1"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.2.0
+	>=dev-libs/atk-1.2.0
+	>=x11-libs/pango-1.0.1
+	>=media-libs/libpng-1.2.1
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+#		app-text/sgmltools-lite )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Turn of --export-symbols-regex for now, since it removes
+	# the wrong symbols
+	cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
+	# should speed up metacity
+	cd ${S}; epatch ${FILESDIR}/gtk+-wm.patch
+}
+
+src_compile() {
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+	
+	local myconf=""
+	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
+	use jpeg ||  myconf="${myconf} --without-libjpeg"
+	use tiff ||  myconf="${myconf} --without-libtiff"
+	if [ -n "$DEBUGBUILD" ]; then
+		myconf="${myconf}  --enable-debug"
+	fi
+		
+	econf --with-gdktarget=x11 ${myconf} || die
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	make || die
+}
+
+src_install() {
+	dodir /etc/gtk-2.0
+
+	make DESTDIR=${D} \
+		prefix=/usr \
+		sysconfdir=/etc \
+		infodir=/usr/share/info \
+		mandir=/usr/share/man \
+		install || die
+
+	dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README*
+}
+
+pkg_postinst() {
+	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
+	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
+
+	einfo "For your gtk themes to work correctly after an update," 
+	einfo "you might have to rebuild your theme engines."
+	einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)"
+}