new ebuild for new GTK+DirectFB tarball

4 files changed, 30 insertions, 14 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index b9b3335c1c27..3eea2254eb22 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,11 +1,21 @@
 # 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.17 2002/06/17 13:22:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.18 2002/07/03 17:17:48 seemant Exp $
+
+*gtk+-2.0.5-r1 (03 Jul 2002)
+
+  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5-r1.ebuild
+  files/digest-gtk+-2.0.5-r1 :
+
+  The DirectFB tarball was replaced on the directfb.org server with one that
+  has bugfixes in it.  No need for paranoia, the directfb folks have
+  verified it for us.  Thanks to: gentoo@tuurlijk.eu.org (Tuurlijk!) in bug
+  #4451 for spotting it.
 
 *gtk+-2.0.5 (17 Jun 2002)
 
   17 Jun 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5.ebuild
-  files/digest-2.0.5 :
+  files/digest-gtk+-2.0.5 :
 
   Version bump for both regular GTK+2 and GTK+DirectFB
 
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.3 b/x11-libs/gtk+/files/digest-gtk+-2.0.3
deleted file mode 100644
index 6be360be4b5e..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ede2b96a3de02b5e2c29de741529b358 gtk+-2.0.3.tar.bz2 5833023
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.5-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.5-r1
new file mode 100644
index 000000000000..6c0692bd1a58
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.5-r1
@@ -0,0 +1,2 @@
+MD5 dfa52595e76fd389c4d42c60412317e8 gtk+-2.0.5.tar.bz2 6017061
+MD5 22bd84da31a9abf89c685c953832056e gtk+-directfb-2.0.5.tar.gz 8483687
diff --git a/x11-libs/gtk+/gtk+-2.0.3.ebuild b/x11-libs/gtk+/gtk+-2.0.5-r1.ebuild
index 9947df7742aa..8f4e01e18887 100644
--- a/x11-libs/gtk+/gtk+-2.0.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.5-r1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Spider  <spider@gentoo.org>
 # Maintainer: Spider <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.3.ebuild,v 1.1 2002/05/28 08:52:12 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.5-r1.ebuild,v 1.1 2002/07/03 17:17:48 seemant Exp $
+
+inherit libtool
 
 SLOT="2"
 
@@ -14,29 +16,32 @@ CFLAGS="${CFLAGS} -g"
 CXXFLAGS="${CXXFLAGS} -g"
 
 
-S=${WORKDIR}/${P}
+use directfb && MY_P=gtk+-directfb-${PV} || MY_P=${P}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
+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/glib-2.0.4
 	>=dev-libs/atk-1.0.2
-	>=x11-libs/pango-1.0.2
+	>=x11-libs/pango-1.0.3
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
+	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() {
-	# seems things broke here.. odd readding to test
-	#  commented out to commit mainline gtk+
-	#	libtoolize --copy --force
-	local myconf
+	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"
@@ -52,7 +57,7 @@ src_compile() {
 # enable debug since glib fails if we disable it
 
 # gtk+ isn't multithread friendly due to some obscure code generation bug
-	make || die
+#	make || die
 }
 
 src_install() {