old

13 files changed, 32 insertions, 359 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 34b12a4da907..fd98adadf41e 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.31 2003/10/02 15:28:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.32 2003/10/28 19:52:15 vapier Exp $
+
+*DirectFB-0.9.20 (28 Oct 2003)
+
+  28 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #32207.
 
 *DirectFB-0.9.19-r1 (05 Aug 2003)
 
diff --git a/dev-libs/DirectFB/DirectFB-0.9.16-r1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.16-r1.ebuild
deleted file mode 100644
index c9e81eed9ef4..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.16-r1.ebuild,v 1.8 2003/09/06 22:29:24 msterret Exp $
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="jpeg gif png truetype mpeg mmx sse"
-
-DEPEND=">=sys-apps/sed-4
-	dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mpeg? ( media-libs/libmpeg3 )
-	truetype? ( >=media-libs/freetype-2.0.1 )"
-PDEPEND="=dev-libs/DirectFB-extra-${PV}*"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
-		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-		configure
-}
-
-src_compile() {
-	local myconf=""
-
-	# Bug in the ./configure script that breaks if you
-	# have --enable-mmx
-	use mmx \
-		&& myconf="${myconf} --enable-mmx" \
-		|| myconf="${myconf} --disable-mmx"
-
-	use sse \
-		&& myconf="${myconf} --enable-sse" \
-		|| myconf="${myconf} --disable-sse"
-
-	use mpeg \
-		&& myconf="${myconf} --enable-libmpeg3" \
-		|| myconf="${myconf} --disable-libmpeg3"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use png \
-		&& myconf="${myconf} --enable-png" \
-		|| myconf="${myconf} --disable-png"
-
-	use gif \
-		&& myconf="${myconf} --enable-gif" \
-		|| myconf="${myconf} --disable-gif"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-
-	econf ${myconf} || die
-
-	use mpeg && ( \
-		cd ${S}/interfaces/IDirectFBVideoProvider
-		cp idirectfbvideoprovider_libmpeg3.c ${T}
-
-		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			${T}/idirectfbvideoprovider_libmpeg3.c > \
-				idirectfbvideoprovider_libmpeg3.c
-		cd ${S}
-	)
-
-	# add extra -lstdc++ so libpng/libflash link correctly
-	make LDFLAGS="${LDFLAGS} -lstdc++" || die
-}
-
-src_install() {
-	insinto /etc
-	doins fb.modes
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-	dohtml -r docs/html
-}
diff --git a/dev-libs/DirectFB/DirectFB-0.9.16.ebuild b/dev-libs/DirectFB/DirectFB-0.9.16.ebuild
deleted file mode 100644
index cfca25c2abe1..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.16.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.16.ebuild,v 1.7 2003/09/06 22:29:24 msterret Exp $
-
-DESCRIPTION="thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="gif quicktime mpeg png truetype flash jpeg mmx sse sdl"
-
-DEPEND="dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mpeg? ( media-libs/libmpeg3 )
-	flash? ( >=media-libs/libflash-0.4.10 )
-	truetype? ( >=media-libs/freetype-2.0.1 )
-	quicktime? ( virtual/quicktime )"
-#	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp configure configure.orig
-	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
-		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-		configure.orig > configure
-}
-
-src_compile() {
-	local myconf=""
-
-	# Bug in the ./configure script that breaks if you
-	# have --enable-mmx
-	use mmx \
-		&& myconf="${myconf} --enable-mmx" \
-		|| myconf="${myconf} --disable-mmx"
-
-	use sse \
-		&& myconf="${myconf} --enable-sse" \
-		|| myconf="${myconf} --disable-sse"
-
-# Still do not work currently
-#	use avi	\
-#		&& myconf="${myconf} --enable-avifile" \
-#		|| myconf="${myconf} --disable-avifile"
-	myconf="${myconf} --disable-avifile"
-
-	use mpeg \
-		&& myconf="${myconf} --enable-libmpeg3" \
-		|| myconf="${myconf} --disable-libmpeg3"
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl"
-
-	use flash \
-		&& myconf="${myconf} --enable-flash" \
-		|| myconf="${myconf} --disable-flash"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use png \
-		&& myconf="${myconf} --enable-png" \
-		|| myconf="${myconf} --disable-png"
-
-	use gif \
-		&& myconf="${myconf} --enable-gif" \
-		|| myconf="${myconf} --disable-gif"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-	# fix gcc3.x linking with libflash
-	cp configure configure.old
-	sed -e 's:-lflash:-lflash -lstdc++:' configure.old > configure
-	econf ${myconf}
-
-	use mpeg && ( \
-		cd ${S}/interfaces/IDirectFBVideoProvider
-		cp idirectfbvideoprovider_libmpeg3.c \
-			idirectfbvideoprovider_libmpeg3.c.orig
-
-		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			idirectfbvideoprovider_libmpeg3.c.orig > \
-				idirectfbvideoprovider_libmpeg3.c
-		cd ${S}
-	)
-
-	# add extra -lstdc++ so libpng/libflash link correctly
-	make LDFLAGS="${LDFLAGS} -lstdc++" || die
-}
-
-src_install() {
-	insinto /etc
-	doins fb.modes
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-	dohtml -r docs/html
-}
diff --git a/dev-libs/DirectFB/DirectFB-0.9.17.ebuild b/dev-libs/DirectFB/DirectFB-0.9.17.ebuild
deleted file mode 100644
index 549280efa274..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.17.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.17.ebuild,v 1.5 2003/09/06 22:29:24 msterret Exp $
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="jpeg gif png truetype mpeg mmx sse"
-
-DEPEND="dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mpeg? ( media-libs/libmpeg3 )
-	truetype? ( >=media-libs/freetype-2.0.1 )"
-
-src_unpack() {
-	unpack ${A}
-#	cd ${S}
-#	cp configure ${T}
-#	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
-#		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-#		${T}/configure > configure
-}
-
-src_compile() {
-	econf \
-		`use_enable mmx` \
-		`use_enable sse` \
-		`use_enable mpeg libmpeg3` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable gif` \
-		`use_enable truetype freetype` \
-		 || die
-
-	use mpeg && { \
-		cd ${S}/interfaces/IDirectFBVideoProvider
-		cp idirectfbvideoprovider_libmpeg3.c ${T}
-
-		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			${T}/idirectfbvideoprovider_libmpeg3.c > \
-				idirectfbvideoprovider_libmpeg3.c
-		cd ${S}
-	}
-
-	# add extra -lstdc++ so libpng/libflash link correctly
-	make LDFLAGS="${LDFLAGS} -lstdc++" || die
-}
-
-src_install() {
-	insinto /etc
-	doins fb.modes
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-	dohtml -r docs/html
-}
diff --git a/dev-libs/DirectFB/DirectFB-0.9.18.ebuild b/dev-libs/DirectFB/DirectFB-0.9.18.ebuild
deleted file mode 100644
index 4be32d77c298..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.18.ebuild,v 1.5 2003/09/06 22:29:24 msterret Exp $
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa"
-IUSE="jpeg gif png truetype mpeg mmx sse"
-
-DEPEND="dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mpeg? ( media-libs/libmpeg3 )
-	truetype? ( >=media-libs/freetype-2.0.1 )"
-
-src_unpack() {
-	unpack ${A}
-#	cd ${S}
-#	cp configure ${T}
-#	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
-#		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-#		${T}/configure > configure
-}
-
-src_compile() {
-	econf \
-		`use_enable mmx` \
-		`use_enable sse` \
-		`use_enable mpeg libmpeg3` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable gif` \
-		`use_enable truetype freetype` \
-		 || die
-
-	use mpeg && { \
-		cd ${S}/interfaces/IDirectFBVideoProvider
-		cp idirectfbvideoprovider_libmpeg3.c ${T}
-
-		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			${T}/idirectfbvideoprovider_libmpeg3.c > \
-				idirectfbvideoprovider_libmpeg3.c
-		cd ${S}
-	}
-
-	# add extra -lstdc++ so libpng/libflash link correctly
-	make LDFLAGS="${LDFLAGS} -lstdc++" || die
-}
-
-src_install() {
-	insinto /etc
-	doins fb.modes
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-	dohtml -r docs/html
-}
diff --git a/dev-libs/DirectFB/DirectFB-0.9.19.ebuild b/dev-libs/DirectFB/DirectFB-0.9.20.ebuild
index 1402847c5a25..02be5812f465 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.19.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.20.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.19.ebuild,v 1.3 2003/09/06 22:29:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.20.ebuild,v 1.1 2003/10/28 19:52:15 vapier Exp $
+
+IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 matrox neomagic nsc nvidia radeon savage tdfx"
 
 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
 HOMEPAGE="http://www.directfb.org/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
 IUSE="jpeg gif png truetype mpeg mmx sse"
 
 DEPEND="dev-lang/perl
@@ -18,17 +20,23 @@ DEPEND="dev-lang/perl
 	mpeg? ( media-libs/libmpeg3 )
 	truetype? ( >=media-libs/freetype-2.0.1 )"
 
-src_unpack() {
-	unpack ${A}
-#	cd ${S}
-#	cp configure ${T}
-#	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
-#		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-#		${T}/configure > configure
+pkg_setup() {
+	if [ -z "${VIDEO_CARDS}" ] ; then
+		ewarn "All video drivers will be built since you did not specify"
+		ewarn "via the VIDEO_CARDS variable what video card you use."
+		einfo "DirectFB supports: ${IUSE_VIDEO_CARDS} all none"
+	fi
 }
 
 src_compile() {
-	econf \
+	local vidcards
+	[ -z "${VIDEO_CARDS}" ] \
+		&& vidcards="all" \
+		|| vidcards="${VIDEO_CARDS// /,}"
+
+	local mycppflags
+	use mpeg && mycppflags="-I/usr/include/libmpeg3"
+	econf CPPFLAGS="${mycppflags}" \
 		`use_enable mmx` \
 		`use_enable sse` \
 		`use_enable mpeg libmpeg3` \
@@ -36,20 +44,16 @@ src_compile() {
 		`use_enable png` \
 		`use_enable gif` \
 		`use_enable truetype freetype` \
-		 || die
-
-	use mpeg && { \
-		cd ${S}/interfaces/IDirectFBVideoProvider
-		cp idirectfbvideoprovider_libmpeg3.c ${T}
+		--with-gfxdrivers="${vidcards}" \
+		|| die
 
-		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			${T}/idirectfbvideoprovider_libmpeg3.c > \
-				idirectfbvideoprovider_libmpeg3.c
-		cd ${S}
-	}
+	use mpeg && \
+		sed -i \
+			s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
+			${S}/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
 
 	# add extra -lstdc++ so libpng/libflash link correctly
-	make LDFLAGS="${LDFLAGS} -lstdc++" || die
+	make CPPFLAGS="${mycppflags}" LDFLAGS="${LDFLAGS} -lstdc++" || die
 }
 
 src_install() {
diff --git a/dev-libs/DirectFB/files/DirectFB-gentoo-patch b/dev-libs/DirectFB/files/DirectFB-gentoo-patch
deleted file mode 100644
index 31b7b7ae3bfc..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-gentoo-patch
+++ /dev/null
@@ -1,8 +0,0 @@
-98c98
-< LIBMPEG3_LIBS = 
----
-> LIBMPEG3_LIBS = /usr/lib
-477c477
-< libidirectfbvideoprovider_libmpeg3.so: idirectfbvideoprovider_libmpeg3.o $(LIBMPEG3_DIR)/$(shell uname --machine)/libmpeg3.a
----
-> libidirectfbvideoprovider_libmpeg3.so: idirectfbvideoprovider_libmpeg3.o $(LIBMPEG3_LIBS)/libmpeg3.a
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.16 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.16
deleted file mode 100644
index 16749e960d87..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a33720caed3f179d4f558821b2fff91 DirectFB-0.9.16.tar.gz 915045
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.16-r1 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.16-r1
deleted file mode 100644
index 16749e960d87..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a33720caed3f179d4f558821b2fff91 DirectFB-0.9.16.tar.gz 915045
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.17 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.17
deleted file mode 100644
index 96fe9e33b3ce..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d373fa1d604ab5ea4e8fdcb875876cfd DirectFB-0.9.17.tar.gz 946039
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.18 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.18
deleted file mode 100644
index 761a7bd9f860..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c90296dcf7fea2865baef5351e7003c5 DirectFB-0.9.18.tar.gz 1113655
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.19 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.19
deleted file mode 100644
index 76103097d029..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8af7f3b5d2c3cc2cb7aba4662ec0b73f DirectFB-0.9.19.tar.gz 1148437
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.20 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.20
new file mode 100644
index 000000000000..439811397232
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.20
@@ -0,0 +1 @@
+MD5 e42e8ae43f0ad873643f73cc0a9ae7d0 DirectFB-0.9.20.tar.gz 1307323