moved 3.83 to stable, and version bump in ~arches

6 files changed, 134 insertions, 9 deletions

diff --git a/media-video/xawtv/ChangeLog b/media-video/xawtv/ChangeLog
index 24175316e7db..f7d0cec7a292 100644
--- a/media-video/xawtv/ChangeLog
+++ b/media-video/xawtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/xawtv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.18 2003/02/12 07:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.19 2003/03/09 13:32:37 seemant Exp $
+
+*xawtv-3.85 (09 Mar 2003)
+
+  09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.85.ebuild:
+  version bump, thanks to: Chayim I. Kirshen <ckirshen@gnupower.net> in bug
+  #17037; also, webcam stuff is only installed if /home/httpd exists, otherwise
+  not: closes bug #16875 by David Bryson <mutex@kerneli.org>
 
 *xawtv-3.83 (02 Feb 2003)
 
diff --git a/media-video/xawtv/files/digest-xawtv-3.81 b/media-video/xawtv/files/digest-xawtv-3.81
deleted file mode 100644
index 427afc45d8e8..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.81
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34660b6cc870cfe58ece9dc428b899a1 xawtv_3.81.tar.gz 532170
-MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
-MD5 13a6d70ce058f3576f1d047dd2c20364 xaw-deinterlace-3.76-0.1.0.diff 15039
diff --git a/media-video/xawtv/files/digest-xawtv-3.82 b/media-video/xawtv/files/digest-xawtv-3.82
deleted file mode 100644
index 48f640452f1f..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.82
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 803153b6dcce0d786a4772cd8343974a xawtv_3.82.tar.gz 531823
-MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
-MD5 13a6d70ce058f3576f1d047dd2c20364 xaw-deinterlace-3.76-0.1.0.diff 15039
diff --git a/media-video/xawtv/files/digest-xawtv-3.85 b/media-video/xawtv/files/digest-xawtv-3.85
new file mode 100644
index 000000000000..e72c6192252e
--- /dev/null
+++ b/media-video/xawtv/files/digest-xawtv-3.85
@@ -0,0 +1,3 @@
+MD5 7ef19068bbc27b3a8e0b92a3d7ab437f xawtv_3.85.tar.gz 687759
+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-video/xawtv/xawtv-3.83.ebuild b/media-video/xawtv/xawtv-3.83.ebuild
index c199c729c2cc..3bfdbfe2aa01 100644
--- a/media-video/xawtv/xawtv-3.83.ebuild
+++ b/media-video/xawtv/xawtv-3.83.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/xawtv/xawtv-3.83.ebuild,v 1.3 2003/02/13 13:37:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.83.ebuild,v 1.4 2003/03/09 13:32:37 seemant Exp $
 
 IUSE="aalib motif alsa opengl nls"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://bytesex.org/xawtv/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=media-libs/jpeg-6b
diff --git a/media-video/xawtv/xawtv-3.85.ebuild b/media-video/xawtv/xawtv-3.85.ebuild
new file mode 100644
index 000000000000..db50f4b5f2d4
--- /dev/null
+++ b/media-video/xawtv/xawtv-3.85.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.85.ebuild,v 1.1 2003/03/09 13:32:37 seemant Exp $
+
+inherit eutils
+
+IUSE="aalib motif alsa opengl nls"
+
+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"
+SRC_URI="http://bytesex.org/xawtv/${PN}_${PV}.tar.gz
+	http://bytesex.org/xawtv/${MY_FONT}.tar.bz2
+	http://cvs.gentoo.org/~seemant/${MY_PATCH}
+	mirror://gentoo/${MY_PATCH}"
+HOMEPAGE="http://bytesex.org/xawtv/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	media-libs/xpm
+	media-libs/zvbi
+	virtual/x11
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	motif? ( virtual/motif
+		app-text/recode )
+	opengl? ( virtual/opengl )
+	quicktime? ( media-libs/libquicktime )"
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${MY_PATCH}
+
+	use mmx || \
+		ssed -i "s:#define MMX::" libng/plugins/linear_blend.c
+
+	unpack ${MY_FONT}.tar.bz2
+	cd ${S}/${MY_FONT}
+	epatch ${FILESDIR}/${MY_FONT}-gentoo.diff
+}
+
+src_compile() {
+	local myconf
+	use motif \
+		&& myconf="--enable-motif" \
+		|| myconf="--disable-motif"
+
+	use aalib \
+		&& myconf="${myconf} --enable-aa" \
+		|| myconf="${myconf} --disable-aa"
+
+	use quicktime \
+		&& myconf="${myconf} --enable-quicktime" \
+		|| myconf="${myconf} --disable-quicktime"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+
+	use opengl \
+		&& myconf="${myconf} --enable-gl" \
+		|| myconf="${myconf} --disable-gl"
+
+	econf \
+		--with-x \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--enable-zvbi \
+		${myconf} || die
+
+	make || die
+
+	cd ${MY_FONT}
+	make || die
+}
+
+src_install() {
+	cd ${S}
+	einstall \
+		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 ${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
+}