Package-Manager: portage-2.0.51-r15

15 files changed, 60 insertions, 470 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 8d671e5d7e19..b504c342a151 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/xawtv
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.17 2004/08/29 11:21:02 mholzer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.18 2005/01/25 15:25:35 cardoe Exp $
+
+*xawtv-3.94-r1 (25 Jan 2005)
+
+  25 Jan 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch,
+  -xawtv-3.86-r1.ebuild, -xawtv-3.88.1.ebuild, -xawtv-3.90-r1.ebuild,
+  -xawtv-3.91-r1.ebuild, -xawtv-3.93.ebuild, +xawtv-3.94-r1.ebuild:
+  compile fixes to support the latest xorg-x11 ebuilds, bug #75251
 
 *xawtv-3.86-r2 (29 Aug 2004)
 
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 31a3390ab55b..ad8df9e000b5 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,19 +1,22 @@
-MD5 c7b92ada9957d923bf9cbf1ada7d0e33 ChangeLog 7998
-MD5 a10eeba3565be0493064ed9a5276228c xawtv-3.86-r1.ebuild 2417
-MD5 94b2e35265a450ffa762ce6524d9d781 xawtv-3.88.1.ebuild 2412
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c0315270bcfc2ee64aa7b5fef1f1dec xawtv-3.94.ebuild 2271
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 610d7db36ed4e1726690635bb8761765 xawtv-3.90-r1.ebuild 2242
-MD5 b21ca79257e752364ac095ce0e38c600 xawtv-3.91-r1.ebuild 2454
-MD5 34bddea76c4f1b9a6a8034ab9ab2853c xawtv-3.93.ebuild 2271
-MD5 987be53d886e66fc06407bc83358d8e5 xawtv-3.94.ebuild 2272
-MD5 c41537e8db8a89fc249ea6f3f52b3c07 xawtv-3.86-r2.ebuild 2152
-MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r1 205
-MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
+MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151
+MD5 7d3f3c18eaa80d11085d75299db63ae6 ChangeLog 8344
+MD5 d5bd69ad32c96c22dcaf84d86ddf9646 xawtv-3.94-r1.ebuild 2457
+MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
-MD5 309f5000ed37fb2aef346e12a62fbb04 files/digest-xawtv-3.88.1 207
-MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90-r1 205
-MD5 6b6807d0579bb9ff63ab9e2ca88fd1d1 files/digest-xawtv-3.91-r1 205
-MD5 dec8d53e49ebcce640ad0af4813d6335 files/digest-xawtv-3.93 205
-MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94 205
 MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307
-MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
+MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94 205
+MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205
+MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
+MD5 a4a5b193c0bb1d65b4c7137257e2403e files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB9mUI5+pdB4IBr0URAtIHAKCONfX9Zp8zj0wq1SX4aveIH95I3QCgonDL
+P7om5H5OTlMi/83ZgqxujHY=
+=TVdb
+-----END PGP SIGNATURE-----
diff --git a/media-tv/xawtv/files/digest-xawtv-3.88.1 b/media-tv/xawtv/files/digest-xawtv-3.88.1
deleted file mode 100644
index cf27eb820b7c..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.88.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2908b041e6cc4947bd3650e29667f43b xawtv_3.88.1.tar.gz 556277
-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/files/digest-xawtv-3.90-r1 b/media-tv/xawtv/files/digest-xawtv-3.90-r1
deleted file mode 100644
index 9e3b4e52178d..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.90-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-xawtv-3.91-r1 b/media-tv/xawtv/files/digest-xawtv-3.91-r1
deleted file mode 100644
index 1854f500a7c9..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.91-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fe4d6a482cc199fa36065cd1b6ea48a8 xawtv_3.91.tar.gz 557065
-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/files/digest-xawtv-3.93 b/media-tv/xawtv/files/digest-xawtv-3.93
deleted file mode 100644
index 352a185973ae..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.93
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8d2731e6e95f173f41a0ddc875d55804 xawtv-3.93.tar.gz 559208
-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/files/digest-xawtv-3.86-r1 b/media-tv/xawtv/files/digest-xawtv-3.94-r1
index 1f1594482bd5..9c0c2f6265d4 100644
--- a/media-tv/xawtv/files/digest-xawtv-3.86-r1
+++ b/media-tv/xawtv/files/digest-xawtv-3.94-r1
@@ -1,3 +1,3 @@
-MD5 1a87beb0f7c9ccf06b54a6a5d0c003cc xawtv_3.86.tar.gz 549653
+MD5 df768711930605918106c1477327d348 xawtv-3.94.tar.gz 553118
 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/files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch b/media-tv/xawtv/files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch
new file mode 100644
index 000000000000..b4c19d8f5a5b
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch
@@ -0,0 +1,12 @@
+diff -urN xawtv-3.94.orig/Makefile.in xawtv-3.94/Makefile.in
+--- xawtv-3.94.orig/Makefile.in	2004-12-21 15:53:53.260307832 -0800
++++ xawtv-3.94/Makefile.in	2004-12-21 16:04:39.369084368 -0800
+@@ -49,7 +49,7 @@
+ VBI_LIBS	:= @LIBZVBI@
+ GL_LIBS		:= @LIBGL@
+ DV_LIBS		:= @LIBDV@
+-FS_LIBS		:= -L@x_libraries@ @FSLIB@
++FS_LIBS		:= @X_LIBS@ @FSLIB@
+ DLFLAGS		:= @DLFLAGS@
+ 
+ # stuff configure has found
diff --git a/media-tv/xawtv/xawtv-3.86-r1.ebuild b/media-tv/xawtv/xawtv-3.86-r1.ebuild
deleted file mode 100644
index d3347d6af819..000000000000
--- a/media-tv/xawtv/xawtv-3.86-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.86-r1.ebuild,v 1.8 2004/07/14 21:12:28 agriffis Exp $
-
-inherit virtualx
-
-IUSE="aalib alsa mmx motif nls opengl quicktime"
-
-MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
-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"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/ncurses-5.1
-	>=media-libs/jpeg-6b
-	media-libs/libpng
-	media-libs/zvbi
-	virtual/x11
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	motif? ( x11-libs/openmotif
-		app-text/recode )
-	opengl? ( virtual/opengl )
-	quicktime? ( virtual/quicktime )"
-
-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"
-
-	use mmx || \
-		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
-
-	econf \
-		--with-x \
-		--enable-xfree-ext \
-		--enable-xvideo \
-		--enable-zvbi \
-		${myconf} || die "xawtv 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 ! 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
-}
diff --git a/media-tv/xawtv/xawtv-3.86-r2.ebuild b/media-tv/xawtv/xawtv-3.86-r2.ebuild
index 3288239b9c89..1f7d142c3347 100644
--- a/media-tv/xawtv/xawtv-3.86-r2.ebuild
+++ b/media-tv/xawtv/xawtv-3.86-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.86-r2.ebuild,v 1.1 2004/08/29 11:21:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.86-r2.ebuild,v 1.2 2005/01/25 15:25:35 cardoe Exp $
 
 inherit virtualx eutils
 
diff --git a/media-tv/xawtv/xawtv-3.88.1.ebuild b/media-tv/xawtv/xawtv-3.88.1.ebuild
deleted file mode 100644
index 2d63ecda3a0c..000000000000
--- a/media-tv/xawtv/xawtv-3.88.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.88.1.ebuild,v 1.5 2004/07/14 21:12:28 agriffis Exp $
-
-inherit virtualx
-
-IUSE="aalib alsa mmx motif nls opengl quicktime"
-
-MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
-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"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/ncurses-5.1
-	>=media-libs/jpeg-6b
-	media-libs/libpng
-	media-libs/zvbi
-	virtual/x11
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	motif? ( x11-libs/openmotif
-		app-text/recode )
-	opengl? ( virtual/opengl )
-	quicktime? ( virtual/quicktime )"
-
-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"
-
-	use mmx || \
-		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
-
-	econf \
-		--with-x \
-		--enable-xfree-ext \
-		--enable-xvideo \
-		--enable-zvbi \
-		${myconf} || die "xawtv 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 ! 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
-}
diff --git a/media-tv/xawtv/xawtv-3.90-r1.ebuild b/media-tv/xawtv/xawtv-3.90-r1.ebuild
deleted file mode 100644
index 0e9eed55ffb6..000000000000
--- a/media-tv/xawtv/xawtv-3.90-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.8 2004/07/14 21:12:28 agriffis Exp $
-
-inherit virtualx
-
-IUSE="aalib alsa lirc mmx motif nls opengl quicktime zvbi"
-
-MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
-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 ~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? ( x11-libs/openmotif
-		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 ! 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
-}
diff --git a/media-tv/xawtv/xawtv-3.91-r1.ebuild b/media-tv/xawtv/xawtv-3.91-r1.ebuild
deleted file mode 100644
index c9df636ad772..000000000000
--- a/media-tv/xawtv/xawtv-3.91-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.91-r1.ebuild,v 1.6 2004/07/29 02:50:25 morfic Exp $
-
-inherit virtualx gcc eutils
-
-IUSE="aalib alsa lirc mmx motif nls opengl quicktime zvbi"
-
-MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
-MY_FONT=tv-fonts-1.0
-DESCRIPTION="TV application for the bttv driver"
-HOMEPAGE="http://bytesex.org/xawtv/"
-SRC_URI="http://dl.bytesex.org/releases/xawtv/${PN}_${PV}.tar.gz
-	http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2
-	mirror://gentoo/${MY_PATCH}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~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? ( x11-libs/openmotif
-		app-text/recode )
-	opengl? ( virtual/opengl )
-	quicktime? ( virtual/quicktime )
-	zvbi? ( media-libs/zvbi )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-	epatch ${FILESDIR}/xawtv-gcc3.4.patch
-	fi
-}
-
-
-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 /var/www/localhost ]
-	then
-		exeinto /var/www/localhost/cgi-bin
-		doexe scripts/webcam.cgi
-		dodoc ${FILESDIR}/webcamrc
-	fi
-
-	if ! 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
-}
diff --git a/media-tv/xawtv/xawtv-3.93.ebuild b/media-tv/xawtv/xawtv-3.94-r1.ebuild
index efaa9119f303..642db2b92117 100644
--- a/media-tv/xawtv/xawtv-3.93.ebuild
+++ b/media-tv/xawtv/xawtv-3.94-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.93.ebuild,v 1.1 2004/07/29 02:50:25 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94-r1.ebuild,v 1.1 2005/01/25 15:25:35 cardoe Exp $
 
-inherit virtualx
+inherit virtualx eutils
 
 IUSE="aalib alsa lirc mmx motif nls opengl quicktime zvbi"
 
@@ -28,7 +28,17 @@ DEPEND=">=sys-libs/ncurses-5.1
 		app-text/recode )
 	opengl? ( virtual/opengl )
 	quicktime? ( virtual/quicktime )
-	zvbi? ( media-libs/zvbi )"
+	zvbi? ( media-libs/zvbi )
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-allow-xlibs-in-normal-search-path.patch
+	cd ${S}
+	autoreconf
+}
 
 src_compile() {
 
diff --git a/media-tv/xawtv/xawtv-3.94.ebuild b/media-tv/xawtv/xawtv-3.94.ebuild
index 07cb0071a434..f339d1442929 100644
--- a/media-tv/xawtv/xawtv-3.94.ebuild
+++ b/media-tv/xawtv/xawtv-3.94.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94.ebuild,v 1.1 2004/08/29 01:14:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94.ebuild,v 1.2 2005/01/25 15:25:35 cardoe Exp $
 
 inherit virtualx