new version and cleanup

6 files changed, 120 insertions, 92 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index b1660d9ade04..4416ab5df0c1 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.74 2003/08/27 17:44:58 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.75 2003/09/07 10:43:52 foser Exp $
+
+*gtk+-2.2.4 (07 Sep 2003)
+
+  07 Sep 2003; foser <foser@gentoo.org> gtk+-2.2.4.ebuild :
+  New bugfix release
 
 *gtk+-2.2.3 (27 Aug 2003)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 304e9d2006e9..a6e981f50fe6 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,23 +1,23 @@
-MD5 8d49204d8baea1f37abd9d9e3ad6fea7 ChangeLog 12585
+MD5 bf1d2761727cccced1804ab233103d7d gtk+-2.2.4.ebuild 2389
+MD5 9f86b5b174549b5348c439235ed161d3 gtk+-2.2.1.ebuild 2324
 MD5 33a5d19d9439db9c54b1dfc15e4e9928 gtk+-1.2.10-r10.ebuild 1848
-MD5 298914999849e7cf9d2013d979ea1d78 gtk+-1.2.10-r9.ebuild 1736
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f9549092daa2d263194c0d175e6a59a0 gtk+-2.2.3.ebuild 2391
 MD5 b42222b8862df5229d4928f490e61ac6 gtk+-2.2.2-r1.ebuild 2525
+MD5 e1a4b2b04950aa0a0f4dd1260a71ef9e ChangeLog 12694
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d9cb8ab454327ffa0a26501e687127cc gtk+-2.2.1-r1.ebuild 2438
-MD5 9f86b5b174549b5348c439235ed161d3 gtk+-2.2.1.ebuild 2324
-MD5 f9549092daa2d263194c0d175e6a59a0 gtk+-2.2.3.ebuild 2391
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 eb031c47250137c58587c61124e7abf9 files/digest-gtk+-2.2.2-r1 64
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r9 138
-MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
-MD5 60abaa583c04f16be6d0703cc9684e45 files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch 757
 MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1 64
-MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1-r1 64
+MD5 ca6735c424b34587bd2067d592068258 files/digest-gtk+-2.2.3 64
+MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4 64
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 60abaa583c04f16be6d0703cc9684e45 files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch 757
+MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
+MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
+MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1-r1 64
+MD5 eb031c47250137c58587c61124e7abf9 files/digest-gtk+-2.2.2-r1 64
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724
 MD5 c63b9c6e57c8c554b32a8e40e46d1291 files/gtk+-2.2.1-scrollfix.patch 504
-MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 ca6735c424b34587bd2067d592068258 files/digest-gtk+-2.2.3 64
diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r9 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r9
deleted file mode 100644
index c7995d372331..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
-MD5 0ae8dcec20e0fa6dbc022d5eb00dc2a3 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.4 b/x11-libs/gtk+/files/digest-gtk+-2.2.4
new file mode 100644
index 000000000000..743189299eaf
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.2.4
@@ -0,0 +1 @@
+MD5 605332199533e73bc6eec481fb4f1671 gtk+-2.2.4.tar.bz2 7189272
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
deleted file mode 100644
index cc30518b614d..000000000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 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.10 2003/08/03 04:49:21 vapier Exp $
-
-DESCRIPTION="The GIMP Toolkit"
-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/gtk+/${P}.tar.gz
-	http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz
-	http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="x86 ppc sparc alpha hppa"
-IUSE="nls debug"
-
-DEPEND="virtual/x11
-	=dev-libs/glib-1.2*
-	nls? ( sys-devel/gettext
-	dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}/..
-	epatch ${DISTDIR}/gtk+-1.2.10-r8-gentoo.diff.bz2
-}
-
-src_compile() {
-	libtoolize --copy --force
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ `use debug` ]
-	then
-		myconf="${myconf} --enable-debug=yes"
-	else
-		myconf="${myconf} --enable-debug=minimum"
-	fi
-
-	econf \
-		--sysconfdir=/etc/X11 \
-		--with-xinput=xfree \
-		--with-x \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING
-	dodoc NEWS* README* TODO
-	docinto docs
-	cd docs
-	dodoc *.txt *.gif text/*
-	dohtml -r html
-
-	#install nice, clean-looking gtk+ style
-	insinto /usr/share/themes/Gentoo/gtk
-	doins ${FILESDIR}/gtkrc
-}
-
-pkg_postinst() {
-	ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
-	ewarn "all themes it seems.  Please remove it manually as it will not due"
-	ewarn "to /env protection."
-	echo ""
-	einfo "The old gtkrc is available through the new Gentoo gtk theme."
-}
diff --git a/x11-libs/gtk+/gtk+-2.2.4.ebuild b/x11-libs/gtk+/gtk+-2.2.4.ebuild
new file mode 100644
index 000000000000..b2a3a3c77c8e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.2.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2003 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.4.ebuild,v 1.1 2003/09/07 10:43:52 foser Exp $
+
+inherit eutils libtool flag-o-matic
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+IUSE="doc tiff jpeg debug"
+
+# virtual/x11
+# Need this specific xfree version to get bugfree xinput support (#20407)
+
+RDEPEND=">=x11-base/xfree-4.3.0-r3
+	>=dev-libs/glib-2.2
+	>=dev-libs/atk-1.2
+	>=x11-libs/pango-1.2
+	>=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 )"
+
+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
+	# beautifying patch for disabled icons
+	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+	# xft/slighthint stuff from RH
+	cd ${S}; epatch ${FILESDIR}/${PN}-2-xftprefs.patch
+
+	autoconf || die
+}
+
+src_compile() {
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		`use_enable debug` \
+		--with-gdktarget=x11 \
+		--with-xinput=xfree \
+		|| 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
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
+
+	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)"
+
+	env-update
+}
+
+pkg_postrm() {
+
+	env-update
+
+}