6 files changed, 25 insertions, 88 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 3eea2254eb22..be929a22c991 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,15 @@
 # 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.18 2002/07/03 17:17:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.19 2002/07/15 11:17:49 seemant Exp $
+
+*gtk+-2.0.5-r2 (15 Jul 2002)
+
+  15 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5-r2.ebuild
+  files/digest-gtk+-2.0.5-r2 :
+
+  directfb enabled GTK is now a patch on our mirrors instead of being a
+  separate tarball.  This makes the behaviour better for portage's server
+  side caching.
 
 *gtk+-2.0.5-r1 (03 Jul 2002)
 
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.3-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.3-r1
deleted file mode 100644
index ecdd4605dea3..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4f00c405b60673895d49c5ae7a34d075 gtk+-directfb-2.0.3.tar.gz 8362857
-MD5 ede2b96a3de02b5e2c29de741529b358 gtk+-2.0.3.tar.bz2 5833023
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.5 b/x11-libs/gtk+/files/digest-gtk+-2.0.5
deleted file mode 100644
index 0cc3d9034f1a..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dfa52595e76fd389c4d42c60412317e8 gtk+-2.0.5.tar.bz2 6017061
-MD5 d30c8ab8c1418351ef545950615ef1e6 gtk+-directfb-2.0.5.tar.gz 8582484
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2 b/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2
new file mode 100644
index 000000000000..79ce02debb1d
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2
@@ -0,0 +1,2 @@
+MD5 dfa52595e76fd389c4d42c60412317e8 gtk+-2.0.5.tar.bz2 6017061
+MD5 712728b5fbba66765fa0a8a23203e469 gtk+-directfb-2.0.5-gentoo.patch.bz2 123221
diff --git a/x11-libs/gtk+/gtk+-2.0.3-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.3-r1.ebuild
deleted file mode 100644
index fbcaac50f2b2..000000000000
--- a/x11-libs/gtk+/gtk+-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.3-r1.ebuild,v 1.4 2002/07/11 06:30:57 drobbins Exp $
-
-inherit libtool
-
-SLOT="2"
-KEYWORDS="x86"
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-use directfb && MY_P=gtk+-directfb-${PV} || MY_P=${P}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Gimp ToolKit + "
-ORIG="ftp://ftp.gtk.org/pub/gtk/v2.0/${MY_P}.tar.bz2"
-DFB="http://directfb.org/download/GTK+-DirectFB/${MY_P}.tar.gz"
-use directfb && SRC_URI=${DFB} || SRC_URI=${ORIG}
-HOMEPAGE="http://www.gtk.org/"
-LICENSE="LGPL-2.1"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.0.3
-	>=dev-libs/atk-1.0.2
-	>=x11-libs/pango-1.0.2
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	directfb? ( dev-libs/DirectFB )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	 doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_compile() {
-	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"
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-gdktarget=x11 \
-		${myconf} \
-		--enable-debug || die
-# enable debug since glib fails if we disable it
-
-# 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* TODO
-}
-
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-}
-
diff --git a/x11-libs/gtk+/gtk+-2.0.5.ebuild b/x11-libs/gtk+/gtk+-2.0.5-r2.ebuild
index 6c953da330dc..109ee1172995 100644
--- a/x11-libs/gtk+/gtk+-2.0.5.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.5.ebuild,v 1.3 2002/07/11 06:30:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.5-r2.ebuild,v 1.1 2002/07/15 11:17:49 seemant Exp $
 
 inherit libtool
 
@@ -15,12 +15,10 @@ CFLAGS="${CFLAGS} -g"
 CXXFLAGS="${CXXFLAGS} -g"
 
 
-use directfb && MY_P=gtk+-directfb-${PV} || MY_P=${P}
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P}
 DESCRIPTION="Gimp ToolKit + "
-ORIG="ftp://ftp.gtk.org/pub/gtk/v2.0/${MY_P}.tar.bz2"
-DFB="http://directfb.org/download/GTK+-DirectFB/${MY_P}.tar.gz"
-use directfb && SRC_URI=${DFB} || SRC_URI=${ORIG}
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2
+	directfb? ( mirror://gentoo//gtk+-directfb-2.0.5-gentoo.patch.bz2 )"
 HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2.1"
 
@@ -37,6 +35,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	 doc? ( >=dev-util/gtk-doc-0.9 )"
 
+src_unpack() {
+	
+	unpack ${P}.tar.bz2
+	use directfb && ( \
+		cd ${S}
+		bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 | patch -p1
+	)
+}
+
 src_compile() {
 	elibtoolize