fixed xft dep

5 files changed, 8 insertions, 183 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index d4ce164adc6c..027ce3cc7e40 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.45 2003/03/25 22:10:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.46 2003/04/18 01:40:10 foser Exp $
 
 *avifile-0.7.32.20030219 (20 Feb 2003)
 
+  17 Apr 2003; foser <foser@gentoo.org> * :
+  Fixed xft dep to be virtual
+
   20 Feb 2003; Nick Hadaway <raker@gentoo.org>
   avifile-0.7.32.20030219.ebuild,
   files/digest-avifile-0.7.32.20030219 :
diff --git a/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild b/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild
deleted file mode 100644
index d76c2f747a9c..000000000000
--- a/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild,v 1.7 2003/03/25 22:10:28 seemant Exp $
-
-IUSE="static truetype xv sdl oss dvd mmx sse 3dnow zlib oggvorbis X qt"
-
-inherit libtool eutils
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.27"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz
-	mirror://gentoo/20030130.diff.bz2"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20020418
-		>=media-libs/win32codecs-0.90 )
-	>=media-video/ffmpeg-0.4
-	>=media-sound/mad-0.14
-	>=media-libs/xvid-0.9.0
-	>=media-sound/lame-3.90
-	>=media-libs/alsa-lib-0.9.0_rc2
-	>=media-sound/esound-0.2.28
-	>=media-libs/audiofile-0.2.3
-	truetype? ( >=media-libs/freetype-2.1 )
-	xv? ( >=x11-base/xfree-4.2.1 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	dvd? ( >=media-libs/a52dec-0.7 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
-	qt? ( >=x11-libs/qt-3.0.3 )"
-
-src_unpack() {
-        unpack ${MY_P}.tgz
-        cd ${S}
-        epatch ${DISTDIR}/20030130.diff.bz2 || die
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF_2_5=1
-	./autogen.sh
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype2" \
-		|| myconf="${myconf} --disable-freetype2"
-
-	use xv \
-		&& myconf="${myconf} --enable-xv" \
-		|| myconf="${myconf} --disable-xv"
-
-	if [ "$XINERAMA" = "NO" ]; then
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	if [ "$DPMS" = "NO" ]; then
-		myconf="${myconf} --disable-dpms"
-	fi
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-
-	if [ "$V4L" = "NO" ]; then
-		myconf="${myconf} --disable-v4l"
-	fi
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	if [ "$SUN" = "NO" ]; then
-		myconf="${myconf} --disable-sunaudio"
-	fi
-
-	use dvd \
-		&& myconf="${myconf} --enable-a52 --enable-ffmpeg-a52" \
-		|| myconf="${myconf} --disable-a52 --disable-ffmpeg-a52"
-
-	if [ "$SBLIVE" = "NO" ]; then
-		myconf="${myconf} --disable-ac3passthrough"
-	fi
-
-	if [ "$RUNTIME_LAME" = "YES" ]; then
-		myconf="${myconf} --enable-lame-bin"
-	fi
-
-	if [ ! -z $DEBUGBUILD ]; then
-		myconf="${myconf} --enable-loader-out --enable-timing"
-	else
-		myconf="${myconf} --enable-quiet"
-	fi
-
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use zlib \
-		&& myconf="${myconf} --enable-libz" \
-		|| myconf="${myconf} --disable-libz"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-
-	if [ "$MGA" = "NO" ]; then
-		myconf="${myconf} --disable-mga"
-	fi
-
-	if [ "$DMALLOC" = "YES" ]; then
-		myconf="${myconf} --with-dmallocth"
-	fi
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-xft" \
-		|| myconf="${myconf} --without-x --disable-xft"
-	
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS CC CXX
-
-	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
-	# borks, bug #11941.
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	# Fix qt detection
-	cp configure configure.orig
-	sed -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-		< configure.orig > configure
-
-	econf \
-		--enable-samples \
-		--disable-vidix \
-		--with-fpic \
-		--with-gnu-ld \
-		${myconf} || die
-		
-	export CC="gcc"
-	export CXX="g++"
-
-	emake || die
-}
-
-src_install () {
-
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	einstall || die
-
-	cd ${S}
-	dodoc COPYING README
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS
-}
-
diff --git a/media-video/avifile/avifile-0.7.29.20030204.ebuild b/media-video/avifile/avifile-0.7.29.20030204.ebuild
index eda36bfb260d..08fa7c7f7e76 100644
--- a/media-video/avifile/avifile-0.7.29.20030204.ebuild
+++ b/media-video/avifile/avifile-0.7.29.20030204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.29.20030204.ebuild,v 1.11 2003/02/18 07:01:32 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.29.20030204.ebuild,v 1.12 2003/04/18 01:40:10 foser Exp $
 
 IUSE="static truetype xv sdl dvd mmx sse 3dnow zlib oggvorbis X qt alsa
 esd"
@@ -31,7 +31,7 @@ DEPEND=">=media-libs/jpeg-6b
 	dvd? ( >=media-libs/a52dec-0.7 )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
+	X? ( >=x11-base/xfree-4.2.0 virtual/xft )
 	qt? ( >=x11-libs/qt-3.0.3 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	esd? ( >=media-sound/esound-0.2.28 )"
diff --git a/media-video/avifile/avifile-0.7.32.20030219.ebuild b/media-video/avifile/avifile-0.7.32.20030219.ebuild
index 1ff02ccae2cb..ffc94bf91963 100644
--- a/media-video/avifile/avifile-0.7.32.20030219.ebuild
+++ b/media-video/avifile/avifile-0.7.32.20030219.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.32.20030219.ebuild,v 1.1 2003/02/20 07:08:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.32.20030219.ebuild,v 1.2 2003/04/18 01:40:10 foser Exp $
 
 IUSE="static truetype xv sdl dvd mmx sse 3dnow zlib oggvorbis X qt alsa esd"
 
@@ -30,7 +30,7 @@ DEPEND=">=media-libs/jpeg-6b
 	dvd? ( >=media-libs/a52dec-0.7 )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
+	X? ( >=x11-base/xfree-4.2.0 virtual/xft )
 	qt? ( >=x11-libs/qt-3.0.3 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	esd? ( >=media-sound/esound-0.2.28 )"
diff --git a/media-video/avifile/files/digest-avifile-0.7.27.20030122-r1 b/media-video/avifile/files/digest-avifile-0.7.27.20030122-r1
deleted file mode 100644
index ef343723680b..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.27.20030122-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e8431bc88e0f49059077ac7138e7e47d avifile-0.7.27-20030122.tgz 2632461
-MD5 abc1e85823a41a5bb1907b1d990e91a0 20030130.diff.bz2 495245