directfb patched gtk

8 files changed, 25 insertions, 167 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 692bb5b98aa0..140dfa5c29a7 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.35 2002/11/13 00:07:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.36 2002/11/15 22:16:33 seemant Exp $
+
+*gtk-2.0.8-r1 (15 Nov 2002)
+
+  15 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.8-r1.ebuild
+  files/digest-gtk+-2.0.8-r1 :
+
+  DirectFB patched version of it.
 
 *gtk+-2.1.2 (12 Nov 2002)
 
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.6-r1
deleted file mode 100644
index 257c87d6a275..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f9c1b54abea95408155045c661a5adf gtk+-2.0.6.tar.bz2 6118141
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r2 b/x11-libs/gtk+/files/digest-gtk+-2.0.6-r2
deleted file mode 100644
index 257c87d6a275..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f9c1b54abea95408155045c661a5adf gtk+-2.0.6.tar.bz2 6118141
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.7 b/x11-libs/gtk+/files/digest-gtk+-2.0.7
deleted file mode 100644
index 24041ff7750e..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9f641a22400660555094506f298e9b8 gtk+-2.0.7.tar.bz2 6319904
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1
new file mode 100644
index 000000000000..564f70074241
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1
@@ -0,0 +1,2 @@
+MD5 3f2fdc357494b9733175d6a7bbf5d786 gtk+-2.0.8.tar.bz2 6303912
+MD5 e56ff551a5086eb4c63a72a5640b7bf5 gtk+-directfb-2.0.8-gentoo.bz2 128048
diff --git a/x11-libs/gtk+/gtk+-2.0.6-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.6-r1.ebuild
deleted file mode 100644
index a4a7fc6c1387..000000000000
--- a/x11-libs/gtk+/gtk+-2.0.6-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
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.6-r1.ebuild,v 1.7 2002/10/08 14:19:50 foser Exp $
-
-IUSE="tiff doc jpeg directfb"
-
-inherit libtool flag-o-matic
-
-SLOT="2"
-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"
-#	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.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 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	 doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	
-	unpack ${P}.tar.bz2
-	cd ${S}
-#	use directfb && ( \
-#		( bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 \
-#			| patch -p1 ) || die
-#	)
-}
-
-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 jpeg ||  myconf="${myconf} --without-libjpeg"
-	use tiff ||  myconf="${myconf} --without-libtiff"
-	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
-}
-
-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.6-r2.ebuild b/x11-libs/gtk+/gtk+-2.0.6-r2.ebuild
deleted file mode 100644
index eb22b356264a..000000000000
--- a/x11-libs/gtk+/gtk+-2.0.6-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-r2.ebuild,v 1.1 2002/10/10 14:52:49 foser Exp $
-
-IUSE="tiff doc jpeg directfb"
-
-inherit libtool flag-o-matic
-
-SLOT="2"
-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"
-#	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.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 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	 doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	
-	unpack ${P}.tar.bz2
-	cd ${S}
-#	use directfb && ( \
-#		( bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 \
-#			| patch -p1 ) || die
-#	)
-}
-
-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 jpeg ||  myconf="${myconf} --without-libjpeg"
-	use tiff ||  myconf="${myconf} --without-libtiff"
-	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
-}
-
-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.7.ebuild b/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild
index a87660758391..f438432c0520 100644
--- a/x11-libs/gtk+/gtk+-2.0.7.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild
@@ -1,19 +1,20 @@
 # 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.ebuild,v 1.1 2002/11/05 03:49:39 spider Exp $
-
-IUSE="tiff doc jpeg"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild,v 1.1 2002/11/15 22:16:33 seemant Exp $
 
 inherit libtool flag-o-matic
 
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+IUSE="tiff doc jpeg directfb"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2
+	directfb? mirror://gentoo/${PN}-directfb-${PV}-gentoo.bz2"
 HOMEPAGE="http://www.gtk.org/"
+
+SLOT="2"
 LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 
 RDEPEND="virtual/x11
 	>=dev-libs/glib-2.0.7
@@ -21,12 +22,17 @@ RDEPEND="virtual/x11
 	>=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-0.9.13 )"
+	tiff? ( >=media-libs/tiff-3.5.7 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	 doc? ( >=dev-util/gtk-doc-0.9 )"
+	 doc? ( >=dev-util/gtk-doc-0.9 
+		app-text/sgmltools-lite )"
+
+src_unpack() {
+	unpack ${A}
+	patch -p0 < ${PN}-directfb-${PV}-gentoo || die
+}
 
 src_compile() {
 	# see bug 8762