Changing media-libs/zvbi dependency to USE flag to close bug #26723.

4 files changed, 113 insertions, 2 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 7a47f6486d29..5e7845597f6f 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.6 2003/10/26 03:59:01 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.7 2003/12/05 01:01:14 spyderous Exp $
+
+*xawtv-3.90-r1 (04 Dec 2003)
+
+  04 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xawtv-3.90-r1.ebuild:
+  Changing media-libs/zvbi dependency to USE flag to close bug #26723.
 
   26 Oct 2003; Brad House <brad_mssw@gentoo.org> xawtv-3.90.ebuild:
   take out use_enable mmx for amd64 as it assumes 32bit assembly which is
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index e60b982ede93..f2339c75d4b2 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,12 +1,14 @@
-MD5 a0dec81bebd5d6370c35391a8ffe94bc ChangeLog 6266
+MD5 ac163b1f3194d340787858320bdf7079 ChangeLog 6445
 MD5 4f37cfbf9c5930cd2840b183942c9551 xawtv-3.86-r1.ebuild 2444
 MD5 0d4dc8d0b888cedba21c463bc5cba94c xawtv-3.88.ebuild 2437
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 78d31b717dbd8c504deb63503c602956 xawtv-3.88.1.ebuild 2438
 MD5 4c86e892ad054e121efcd1e5eecc2320 xawtv-3.90.ebuild 2266
+MD5 270a0df7b077720e875ee8da67549893 xawtv-3.90-r1.ebuild 2287
 MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
 MD5 2d7c5b5b3bb0b4ebfe507c800e5b5e21 files/digest-xawtv-3.88 205
 MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
 MD5 309f5000ed37fb2aef346e12a62fbb04 files/digest-xawtv-3.88.1 207
 MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90 205
+MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90-r1 205
diff --git a/media-tv/xawtv/files/digest-xawtv-3.90-r1 b/media-tv/xawtv/files/digest-xawtv-3.90-r1
new file mode 100644
index 000000000000..9e3b4e52178d
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.90-r1
@@ -0,0 +1,3 @@
+MD5 336922af4de3d3f6506f7a5e07c05a4a xawtv_3.90.tar.gz 555935
+MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
+MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-tv/xawtv/xawtv-3.90-r1.ebuild b/media-tv/xawtv/xawtv-3.90-r1.ebuild
new file mode 100644
index 000000000000..9c5dca3ba2ec
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.90-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.90-r1.ebuild,v 1.1 2003/12/05 01:01:15 spyderous Exp $
+
+inherit virtualx
+
+IUSE="aalib motif alsa opengl quicktime lirc mmx zvbi"
+
+MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
+S=${WORKDIR}/${P}
+MY_FONT=tv-fonts-1.0
+DESCRIPTION="TV application for the bttv driver"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://bytesex.org/xawtv/${PN}_${PV}.tar.gz
+	http://bytesex.org/xawtv/${MY_FONT}.tar.bz2
+	mirror://gentoo/${MY_PATCH}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	virtual/x11
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	motif? ( virtual/motif
+		app-text/recode )
+	opengl? ( virtual/opengl )
+	quicktime? ( virtual/quicktime )
+	zvbi? ( media-libs/zvbi )"
+
+src_compile() {
+
+#	mmx enables 32bit assembly which is not valid when compiling 64bit on amd64
+	if [ "${ARCH}" = "x86" ]
+	then
+		myconf="`use_enable mmx`"
+	else
+		myconf=""
+	fi
+
+	econf \
+		--with-x \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--enable-dv \
+		`use_enable motif` \
+		`use_enable quicktime` \
+		`use_enable alsa` \
+		`use_enable lirc` \
+		`use_enable opengl gl`\
+		`use_enable zvbi`\
+		${myconf} \
+		`use_enable aalib aa` || die " xawtv configure failed"
+
+	make || die
+
+	cd ${WORKDIR}/${MY_FONT}
+	DISPLAY="" Xmake || die "tvfonts failed"
+}
+
+src_install() {
+	cd ${S}
+	einstall \
+		libdir=${D}/usr/lib/xawtv \
+		resdir=${D}/etc/X11 || die
+
+	dodoc COPYING Changes README* TODO
+
+	if [ -d /home/httpd ]
+	then
+		exeinto /home/httpd/cgi-bin
+		doexe scripts/webcam.cgi
+		dodoc ${FILESDIR}/webcamrc
+	fi
+
+	if [ -z "`use nls`" ]
+	then
+		rm -f ${D}/usr/share/man/fr
+		rm -f ${D}/usr/share/man/es
+	fi
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv ${D}/usr/share/*.list ${D}/usr/share/${PN}
+	mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
+
+	cd ${WORKDIR}/${MY_FONT}
+	insinto /usr/X11R6/lib/X11/fonts/xawtv
+	doins *.gz fonts.alias
+}
+
+pkg_postinst() {
+
+	ebegin "installing teletype fonts into /usr/X11R6/lib/X11/fonts/xawtv"
+	cd /usr/X11R6/lib/X11/fonts/xawtv
+	mkfontdir
+	eend
+}