1.8.0 to stable

6 files changed, 5 insertions, 172 deletions

diff --git a/media-tv/xawdecode/Manifest b/media-tv/xawdecode/Manifest
index 536e1bfe9444..69166c416df7 100644
--- a/media-tv/xawdecode/Manifest
+++ b/media-tv/xawdecode/Manifest
@@ -1,11 +1,5 @@
-MD5 46881a695f8b6ea86ea361199dd3929f xawdecode-1.8.1.ebuild 2233
-MD5 46881a695f8b6ea86ea361199dd3929f xawdecode-1.8.0.ebuild 2233
-MD5 b56f9360b27cf93b098ff08fa5225033 xawdecode-1.7.5_beta.ebuild 2238
-MD5 c6cf140609957b1a71ba93b0ce8ec86f ChangeLog 1564
-MD5 435d121aa1a724720ba3517b754429b5 xawdecode-1.6.8.ebuild 1657
+MD5 25f339265a9aaa074c9cedbb923d0131 xawdecode-1.8.0.ebuild 2231
+MD5 c907a36849012c88fec188195b6aaa5f ChangeLog 1770
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 6cb9bccf70f873639a4d78ab6ebc301e files/digest-xawdecode-1.7.5_beta 72
 MD5 66af1f2572bcb65fe72df4563d6b9d10 files/xawdecode.desktop 404
-MD5 7ac89f854fed418595b44f2375de9c8f files/digest-xawdecode-1.6.8 67
 MD5 2d1f68c259c3e5cde78d3e8a04134699 files/digest-xawdecode-1.8.0 68
-MD5 8c9ac25ba785fa959627de0c9f2eba70 files/digest-xawdecode-1.8.1 68
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.6.8 b/media-tv/xawdecode/files/digest-xawdecode-1.6.8
deleted file mode 100644
index ac7fa9d57c8f..000000000000
--- a/media-tv/xawdecode/files/digest-xawdecode-1.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c386504d4060fcfd7b0291e287be21f1 xawdecode-1.6.8.tar.gz 519543
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.7.5_beta b/media-tv/xawdecode/files/digest-xawdecode-1.7.5_beta
deleted file mode 100644
index 4170eb21f0df..000000000000
--- a/media-tv/xawdecode/files/digest-xawdecode-1.7.5_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc384d298532bc8446ba1ebc78684e2f xawdecode-1.7.5beta.tar.bz2 469705
diff --git a/media-tv/xawdecode/xawdecode-1.6.8.ebuild b/media-tv/xawdecode/xawdecode-1.6.8.ebuild
deleted file mode 100644
index 2e5dbadfcb73..000000000000
--- a/media-tv/xawdecode/xawdecode-1.6.8.ebuild
+++ /dev/null
@@ -1,72 +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-tv/xawdecode/xawdecode-1.6.8.ebuild,v 1.4 2003/09/08 07:08:41 msterret Exp $
-
-inherit eutils
-
-IUSE="alsa jpeg dga encode"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TV application for the bttv driver allowing decoding"
-HOMEPAGE="http://xawdecode.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xawdecode/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=sys-apps/sed-4.0.5"
-
-RDEPEND="virtual/x11
-	media-libs/divx4linux
-	media-video/avifile
-	encode? ( media-sound/lame )
-	jpeg? ( media-libs/jpeg )
-	alsa? ( media-libs/alsa-lib )"
-
-
-src_compile() {
-	local myconf
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use dga \
-		&& myconf="${myconf} --enable-xfree-ext" \
-		|| myconf="${myconf} --disable-xfree-ext"
-
-
-	# if lame is installed xawdecode will use it (there's no configure-flag)
-	# if lirc is installed it will also be used
-	# the same goes for ffmpeg libraries (not media-video/ffmpeg)
-	#   (don't know how to install them)
-
-	econf ${myconf} || die
-
-	emake PERF_FLAGS2="${CFLAGS}" || die
-}
-
-src_install() {
-
-	sed -i \
-		"s:^SUBDIRS.*:SUBDIRS = alevt src:" Makefile
-
-	insinto /usr/X11R6/lib/X11/fonts/misc
-	doins font/led-fixed.pcf
-
-	einstall \
-		ROOT=${D} || die
-
-	dodoc COPYING ChangeLog
-	dodoc FAQ* README.* lisez-moi*
-	dodoc xawdecoderc.sample
-
-}
-
-pkg_postinst() {
-	einfo "Please note that this ebuild created a suid-binary: /usr/bin/v4l-conf"
-}
diff --git a/media-tv/xawdecode/xawdecode-1.7.5_beta.ebuild b/media-tv/xawdecode/xawdecode-1.7.5_beta.ebuild
deleted file mode 100644
index f368def37fbe..000000000000
--- a/media-tv/xawdecode/xawdecode-1.7.5_beta.ebuild
+++ /dev/null
@@ -1,87 +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-tv/xawdecode/xawdecode-1.7.5_beta.ebuild,v 1.4 2003/09/27 02:35:09 mr_bones_ Exp $
-
-IUSE="alsa jpeg encode ffmpeg xvid lirc"
-
-DESCRIPTION="TV viewer with support for AVI recording and plugins"
-HOMEPAGE="http://xawdecode.sourceforge.net/"
-MY_P=${P/_/}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
-
-RDEPEND="virtual/x11
-	>=media-libs/zvbi-0.2.4
-	x86? ( >=media-libs/divx4linux-20030428 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.6 )
-	!ffmpeg? ( x11-libs/neXtaw x11-libs/Xaw3d )
-	xvid? ( >=media-libs/xvid-0.9.0 )
-	encode? ( >=media-sound/lame-3.93 )
-	jpeg? ( media-libs/jpeg )
-	lirc? ( app-misc/lirc )
-	alsa? ( media-libs/alsa-lib media-sound/alsa-utils )"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_compile() {
-	local myconf
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use lirc \
-		&& myconf="${myconf} --enable-lirc" \
-		|| myconf="${myconf} --disable-lirc"
-
-	use x86 \
-		&& myconf="${myconf} --enable-divx4linux" \
-		|| myconf="${myconf} --disable-divx4linux"
-
-	use ffmpeg \
-		&& myconf="${myconf} --enable-ffmpeg" \
-		|| myconf="${myconf} --disable-ffmpeg"
-
-	use xvid \
-		&& myconf="${myconf} --enable-xvid" \
-		|| myconf="${myconf} --disable-xvid"
-
-	econf ${myconf} || die "Configuration failed."
-
-	emake PERF_FLAGS="${CFLAGS}" || die "Compilation failed."
-	# Or should we keep the optimized flags they suggest?
-	#emake || die "Compilation failed."
-}
-
-src_install() {
-
-	sed -i "/^SUBDIRS=/s:font::" Makefile
-
-	insinto /usr/X11R6/lib/X11/fonts/misc
-	doins font/led-fixed.pcf
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/xawdecode.desktop
-
-	einstall \
-		ROOT=${D} || die "Installation failed."
-
-	dodoc COPYING ChangeLog AUTHORS INSTALL
-	dodoc FAQ* README.* lisez-moi*
-	dodoc xawdecoderc.sample
-	dodoc lircrc.*.sample
-
-}
-
-pkg_postinst() {
-	einfo "Please note that this ebuild created a suid-binary: /usr/bin/xawdecode_v4l-conf"
-}
diff --git a/media-tv/xawdecode/xawdecode-1.8.0.ebuild b/media-tv/xawdecode/xawdecode-1.8.0.ebuild
index dbf275a9ed31..687a73f5e0ab 100644
--- a/media-tv/xawdecode/xawdecode-1.8.0.ebuild
+++ b/media-tv/xawdecode/xawdecode-1.8.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: %
 
 IUSE="alsa jpeg encode ffmpeg xvid lirc xosd"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="TV viewer with support for AVI recording and plugins"
 HOMEPAGE="http://xawdecode.sourceforge.net/"
-S="${WORKDIR}/${P}"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~mips ~arm"
 
 RDEPEND="virtual/x11
 	>=media-libs/zvbi-0.2.4