added directfb support back into gtk

4 files changed, 35 insertions, 35 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 17be025c0717..2460672d7142 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2002/10/10 15:05:53 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.27 2002/10/21 20:26:41 seemant Exp $
+
+*gtk+-2.0.6-r3 (21 Oct 2002)
+
+  21 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.6-r3.ebuild
+  files/digest-gtk+-2.0.6-r3 :
+
+  Added the DirectFB patch (finally!)
 
 *gtk+-2.0.6-r2 (10 Oct 2002)
   
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2 b/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2
deleted file mode 100644
index 79ce02debb1d..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-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+/files/digest-gtk+-2.0.6-r3 b/x11-libs/gtk+/files/digest-gtk+-2.0.6-r3
new file mode 100644
index 000000000000..549216ca2941
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.6-r3
@@ -0,0 +1,2 @@
+MD5 5f9c1b54abea95408155045c661a5adf gtk+-2.0.6.tar.bz2 6118141
+MD5 9aa3c564462049490bff7007e423a019 gtk+-directfb-2.0.6-gentoo.patch.bz2 125787
diff --git a/x11-libs/gtk+/gtk+-2.0.5-r2.ebuild b/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild
index c7f49d26dad1..0004be04469a 100644
--- a/x11-libs/gtk+/gtk+-2.0.5-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild
@@ -1,37 +1,29 @@
 # 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.5-r2.ebuild,v 1.6 2002/10/05 05:39:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild,v 1.1 2002/10/21 20:26:41 seemant Exp $
 
 IUSE="tiff doc jpeg directfb"
 
-inherit libtool
+inherit libtool flag-o-matic
 
 SLOT="2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-# 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"
-
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gimp ToolKit + "
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2
-	directfb? ( mirror://gentoo//${PN}-directfb-${PV}-gentoo.patch.bz2 )"
+	mirror://gentoo//${PN}-directfb-${PV}-gentoo.patch.bz2"
 HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2.1"
 
 RDEPEND="virtual/x11
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/atk-1.0.2
-	>=x11-libs/pango-1.0.3
+	>=dev-libs/glib-2.0.6-r1
+	>=dev-libs/atk-1.0.3-r1
+	>=x11-libs/pango-1.0.4-r1
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	directfb? ( dev-libs/DirectFB )"
+	directfb? ( >=dev-libs/DirectFB-0.9.13 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -41,32 +33,33 @@ src_unpack() {
 	
 	unpack ${P}.tar.bz2
 	cd ${S}
-	use directfb && ( \
-		( bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 \
-			| patch -p1 ) || die
-	)
+	if use directfb
+	then
+		bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 | patch -p1 \
+			|| die
+	fi
 }
 
 src_compile() {
+	# see bug 8762
+	replace-flags "-O3" "-O2"
+
 	elibtoolize
 	
 	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
+	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
+	if [ -n "$DEBUG" ]; 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
+	make || die
 }
 
 src_install() {