repoman'd

58 files changed, 177 insertions, 1377 deletions

diff --git a/media-video/nvclock/nvclock-0.5.ebuild b/media-video/nvclock/nvclock-0.5.ebuild
index 15f995af0445..c7f3c5fdcf5b 100644
--- a/media-video/nvclock/nvclock-0.5.ebuild
+++ b/media-video/nvclock/nvclock-0.5.ebuild
@@ -19,9 +19,9 @@ KEYWORDS="x86"
 src_compile() {
 	local myconf
 	use gtk && myconf="--enable-gtk"
-	use qt && myconf="$myconf --enable-qt"
+	use qt && myconf="${myconf} --enable-qt"
 	autoconf
-	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man ${myconf} || die
+	econf ${myconf} || die
 	emake || die
 }
 
@@ -29,4 +29,3 @@ src_install() {
 	make prefix=${D} install	
 	dodoc AUTHORS COPYING README	
 }
-
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
deleted file mode 100644
index d03c50ec7e54..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60cb303e5bb2ac424b865f6fa163b989 NVIDIA_GLX-1.0-2880.tar.gz 1527134
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960
deleted file mode 100644
index 45e2d3241d75..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38947e44a19a576c2ab8e648e1f3cf18 NVIDIA_GLX-1.0-2960.tar.gz 1730225
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
deleted file mode 100644
index ee1fd3396f3e..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
-
-NV_V=${PV/1.0./1.0-}
-NV_PACKAGE=NVIDIA_GLX-${NV_V}
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
-	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-HOMEPAGE="http://www.nvidia.com/"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	~media-video/nvidia-kernel-${PV}"
-
-PROVIDE="virtual/opengl"
-
-# Make sure Portage does _NOT_ strip symbols.  Need both lines for
-# Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#clean the dinamic libGL stuff's home to ensure
-	#we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-	fi
-	#make sure we nuke the old nvidia-glx's env.d file
-	if [ -e ${ROOT}/etc/env.d/09nvidia ]
-	then
-		rm -f ${ROOT}/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	#switch to the nvidia implementation
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "Make sure to read documentation in /doc/share/${P}"
-	einfo "before you attempt to tweak your XF86Config file!"
-	einfo
-}
-
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild
index 35d8051f163b..53d468c203a9 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 NV_V=${PV/1.0./1.0-}
 NV_PACKAGE=NVIDIA_GLX-${NV_V}
@@ -22,6 +22,9 @@ PROVIDE="virtual/opengl"
 DEBUG="yes"
 RESTRICT="nostrip"
 
+SLOT="0"
+LICENSE="NVIDIA"
+KEYWORDS="x86 -ppc -sparc -sparc64"
 
 src_install() {
 	local NV_ROOT="/usr/lib/opengl/nvidia"
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild
deleted file mode 100644
index 17ad578d0b16..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-NV_V=${PV/1.0./1.0-}
-NV_PACKAGE=NVIDIA_GLX-${NV_V}
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
-	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-HOMEPAGE="http://www.nvidia.com/"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	~media-video/nvidia-kernel-${PV}"
-
-PROVIDE="virtual/opengl"
-
-# Make sure Portage does _NOT_ strip symbols.  Need both lines for
-# Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#clean the dinamic libGL stuff's home to ensure
-	#we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-	fi
-	#make sure we nuke the old nvidia-glx's env.d file
-	if [ -e ${ROOT}/etc/env.d/09nvidia ]
-	then
-		rm -f ${ROOT}/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	#switch to the nvidia implementation
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
-
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880-r1
deleted file mode 100644
index 6f0f9ed85425..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20fdf77ca76a13987da691eb4d7fe7c9 NVIDIA_kernel-1.0-2880.tar.gz 406780
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.2880-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.2880-r1.ebuild
deleted file mode 100644
index 26ad999f6333..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.2880-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2880-r1.ebuild,v 1.7 2002/07/11 06:30:42 drobbins Exp $
-
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-
-NV_V=${PV/1.0./1.0-}
-NV_PACKAGE=NVIDIA_kernel-${NV_V}
-S="${WORKDIR}/${NV_PACKAGE}"
-SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
-	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-DEPEND="virtual/linux-sources
-	>=sys-apps/portage-1.9.10"
-
-# Make sure Portage does _NOT_ strip symbols.  Need both lines for
-# Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-
-src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-	make KERNDIR="/usr/src/linux" \
-		clean NVdriver || die
-}
-
-src_install () {
-	# The driver goes into the standard modules location
-	insinto "/lib/modules/${KV}/kernel/video"
-	doins NVdriver
-    
-	# Add the aliases
-	insinto /etc/modules.d
-	doins "${FILESDIR}"/nvidia
-
-	# Docs
-	dodoc ${S}/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Get any stale module unloaded
-		[ -x /sbin/rmmod ]              && /sbin/rmmod NVdriver
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		# Load the module again
-		[ -x /sbin/modprobe ]           && /sbin/modprobe NVdriver
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
-	fi
-
-	einfo
-	einfo "If you are not using devfs, you might want to create nvidia"
-	einfo "device nodes by running /sbin/NVmakedevices.sh"
-	einfo
-	einfo "To load the module automatically at boot up, add"
-	einfo "\"NVdriver\" to your /etc/modules.autoload:"
-	einfo
-}
-
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild
index a5d845845870..9328ca9367e9 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
@@ -19,6 +19,10 @@ DEPEND="virtual/linux-sources
 DEBUG="yes"
 RESTRICT="nostrip"
 
+SLOT="0"
+LICENSE="NVIDIA"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
 src_compile() {
 	# Portage should determine the version of the kernel sources
 	check_KV
diff --git a/media-video/nvtv/files/digest-nvtv-0.3.0 b/media-video/nvtv/files/digest-nvtv-0.3.0
deleted file mode 100644
index ff96fbd745a1..000000000000
--- a/media-video/nvtv/files/digest-nvtv-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b5fb56588e9f54e055a3b81214b6ff5 nvtv-0.3.0.tar.gz 182683
diff --git a/media-video/nvtv/nvtv-0.3.0.ebuild b/media-video/nvtv/nvtv-0.3.0.ebuild
deleted file mode 100644
index d5bb370bf2d9..000000000000
--- a/media-video/nvtv/nvtv-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvtv/nvtv-0.3.0.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
-
-DESCRIPTION="TV-Out for NVidia cards."
-HOMEPAGE="http://sourceforge.net/projects/nv-tv-out"
-LICENSE="GPL-2"
-
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/nv-tv-out/${P}.tar.gz"
-
-DEPEND="sys-apps/pciutils"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	local myconf
-	cd src
-
-	use gtk && myconf="${myconf} --with-gtk" || myconf="${myconf} --without-gtk"
-	use X && myconf="${myconf} --with-x" || myconf="${myconf} --without-x"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	# The CFLAGS don't seem to make it into the Makefile.
-	emake CXFLAGS="${CFLAGS}" || die
-}
-
-src_install () {
-	dobin src/nvtv
-	dosbin src/nvtvd
-
-	dodoc ANNOUNCE BUGS FAQ INSTALL README \
-		doc/USAGE doc/XFREE doc/chips.txt \
-		doc/overview.txt  doc/timing.txt xine/tvxine
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nvtv.start nvtv
-}
diff --git a/media-video/nvtv/nvtv-0.4.0.ebuild b/media-video/nvtv/nvtv-0.4.0.ebuild
index 3402ad9609f9..675495fd2f89 100644
--- a/media-video/nvtv/nvtv-0.4.0.ebuild
+++ b/media-video/nvtv/nvtv-0.4.0.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvtv/nvtv-0.4.0.ebuild,v 1.1 2002/06/04 15:56:50 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvtv/nvtv-0.4.0.ebuild,v 1.2 2002/07/19 11:28:21 seemant Exp $
 
+S=${WORKDIR}/${PN}
 DESCRIPTION="TV-Out for NVidia cards."
 HOMEPAGE="http://sourceforge.net/projects/nv-tv-out"
 SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
-SLOT="0"
 
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="sys-apps/pciutils"
 
-S=${WORKDIR}/${PN}
 
 src_compile() {
 	local myconf
diff --git a/media-video/ogle-gui/files/digest-ogle-gui-0.8.3-r1 b/media-video/ogle-gui/files/digest-ogle-gui-0.8.3-r1
deleted file mode 100644
index d72344ed5853..000000000000
--- a/media-video/ogle-gui/files/digest-ogle-gui-0.8.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e0581059278088bad8d6fe0ae7d5a65 ogle_gui-0.8.3.tar.gz 354405
diff --git a/media-video/ogle-gui/ogle-gui-0.8.3-r1.ebuild b/media-video/ogle-gui/ogle-gui-0.8.3-r1.ebuild
deleted file mode 100644
index e22082c5309b..000000000000
--- a/media-video/ogle-gui/ogle-gui-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/ogle-gui-0.8.3-r1.ebuild,v 1.2 2002/06/21 12:23:57 stroke Exp $
-
-MY_P=${P/-/_}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="GUI interface for the Ogle DVD player"
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${MY_P}.tar.gz"
-HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-
-
-DEPEND=">=media-video/ogle-${PV}
-	=x11-libs/gtk+-1.2*
-	dev-libs/libxml2
-	sys-devel/bison
-	( >=gnome-base/libglade-0.17-r6
-	<gnome-base/libglade-2.0.0 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT=""
-LICENSE="GPL-2"
-
-src_compile() {
-
-	local myconf
-  
-	use nls || myconf="--disable-nls"
-
-	libtoolize --copy --force
-	
-	# libxml2 hack
-	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
-
-	econf ${myconf} || die
-  	emake || die	
-
-}
-
-src_install() {
-	
-	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL NEWS README
-}
diff --git a/media-video/ogle-gui/ogle-gui-0.8.4.ebuild b/media-video/ogle-gui/ogle-gui-0.8.4.ebuild
index a934dc3339aa..16909967ee54 100644
--- a/media-video/ogle-gui/ogle-gui-0.8.4.ebuild
+++ b/media-video/ogle-gui/ogle-gui-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/ogle-gui-0.8.4.ebuild,v 1.1 2002/07/01 08:12:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/ogle-gui-0.8.4.ebuild,v 1.2 2002/07/19 11:28:21 seemant Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}
@@ -18,8 +18,9 @@ DEPEND=">=media-video/ogle-${PV}
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
diff --git a/media-video/ogle/files/digest-ogle-0.8.3 b/media-video/ogle/files/digest-ogle-0.8.3
deleted file mode 100644
index 3b9886e9d8cf..000000000000
--- a/media-video/ogle/files/digest-ogle-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2ada7bc14c2ed6ccc154493e186694f ogle-0.8.3.tar.gz 405249
diff --git a/media-video/ogle/ogle-0.8.3.ebuild b/media-video/ogle/ogle-0.8.3.ebuild
deleted file mode 100644
index 1ee8231c9955..000000000000
--- a/media-video/ogle/ogle-0.8.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.3.ebuild,v 1.3 2002/06/15 18:45:42 danarmak Exp $
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Ogle is a full featured DVD player that supports DVD menus"
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
-HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-
-DEPEND="media-libs/libdvdcss
-	media-libs/jpeg 
-	media-libs/libdvdread 
-	x11-base/xfree
-	>=dev-libs/libxml2-2.4.19
-	>=media-libs/a52dec-0.7.3
-	alsa? ( media-libs/alsa-lib )"
-
-SLOT=""
-LICENSE="GPL-2"
-
-src_compile() {
-
-	# STOP!  If you make any changes, make sure to unmerge all copies
-	# of ogle and ogle-gui from your system and merge ogle-gui using your
-	# new version of ogle... Changes in this package can break ogle-gui
-	# very very easily -- blocke
-
-	local myconf
-	
-	use mmx || myconf="--disable-mmx"
-	use oss || myconf="${myconf} --disable-oss"
-	use alsa || myconf="${myconf} --disable-alsa"
-
-	elibtoolize
-
-	# configure needs access to the updated CFLAGS
-	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml -I/usr/include/libxml2"
-
-	econf ${myconf} || die
-	emake CFLAGS="${CFLAGS}" || die	
-
-}
-
-src_install() {
-	
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO 
-	dodoc doc/liba52.txt
-
-}
-
diff --git a/media-video/ogle/ogle-0.8.4.ebuild b/media-video/ogle/ogle-0.8.4.ebuild
index 517b5a720cf5..3fb937222ffc 100644
--- a/media-video/ogle/ogle-0.8.4.ebuild
+++ b/media-video/ogle/ogle-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.4.ebuild,v 1.2 2002/07/04 02:18:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.4.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 inherit libtool
 
@@ -17,8 +17,9 @@ DEPEND="media-libs/libdvdcss
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
diff --git a/media-video/realplayer/realplayer-8-r2.ebuild b/media-video/realplayer/realplayer-8-r2.ebuild
index 34280e9ac60d..43843f2e8afd 100644
--- a/media-video/realplayer/realplayer-8-r2.ebuild
+++ b/media-video/realplayer/realplayer-8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-8-r2.ebuild,v 1.2 2002/07/10 00:22:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-8-r2.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 S=${WORKDIR}/usr
 DESCRIPTION="Real Player 8 basic"
@@ -13,7 +13,7 @@ RESTRICT="fetch"
 
 LICENSE="realplayer8"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 -ppc -sparc -sparc64"
 
 dyn_fetch() {
 	for y in ${A} 
diff --git a/media-video/rivatv/files/digest-rivatv-0.8.0 b/media-video/rivatv/files/digest-rivatv-0.8.0
deleted file mode 100644
index 91e5decdb748..000000000000
--- a/media-video/rivatv/files/digest-rivatv-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6b86afefa0735fb4948486983949a28 rivatv-0.8.0.tar.gz 87030
diff --git a/media-video/rivatv/rivatv-0.8.0-r1.ebuild b/media-video/rivatv/rivatv-0.8.0-r1.ebuild
index 34d82c5f62e2..eb4d6b6c0457 100644
--- a/media-video/rivatv/rivatv-0.8.0-r1.ebuild
+++ b/media-video/rivatv/rivatv-0.8.0-r1.ebuild
@@ -6,12 +6,14 @@ S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
 HOMEPAGE="http://rivatv.sourceforge.net/"
-LICENSE="GPL-2"
 DEPEND="virtual/x11
 	>=virtual/linux-sources-2.4.17"
 
 RDEPEND="${DEPEND}"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	#cd rivatv/linux/drivers/media/video
diff --git a/media-video/rivatv/rivatv-0.8.0.ebuild b/media-video/rivatv/rivatv-0.8.0.ebuild
deleted file mode 100644
index 4466cb57f10d..000000000000
--- a/media-video/rivatv/rivatv-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/rivatv/rivatv-0.8.0.ebuild,v 1.1 2002/06/07 15:12:59 blauwers Exp $
-
-S=${WORKDIR}/${P/_/-}
-DESCRIPTION="kernel driver for nVidia based cards with video-in"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
-HOMEPAGE="http://rivatv.sourceforge.net/"
-LICENSE="GPL-2"
-DEPEND="virtual/x11
-	>=sys-kernel/linux-sources-2.4.17"
-
-src_compile() {
-	#cd rivatv/linux/drivers/media/video
-	emake KERNEL="/usr/src/linux-${KV}" || die
-}
-
-src_install () {
-	insinto /lib/modules/${KV}/kernel/drivers/media/video
-	doins *.o
-
-	dodoc README
-}
-
-pkg_postinst() {
-	depmod -a
-	einfo "You will need support for videodev, i2c-core, i2c-algo-bit"
-	einfo "for this driver to work, plus your cards' specific modules"
-	einfo "from /lib/modules/${KV}/kernel/drivers/media/video"
-	einfo
-	einfo "To load the module automatically at boot up, add these and"
-	einfo "\"rivatv\" to your /etc/modules.autoload."
-	einfo
-	einfo "Also, see ${HOMEPAGE} for more information."
-	einfo
-	einfo "NOTE: Your kernel must not include framebuffer support."
-}
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
index b3d9d0155fe4..e3bc217f5d24 100644
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
+++ b/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A MPEG Plugin for XMMS"
-SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${A}"
+SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/plugins_input.html"
 
 DEPEND=">=media-sound/xmms-1.2.3
 	>=media-libs/smpeg-0.4.4-r1
 	sdl? ( >=media-libs/libsdl-1.2.2 )"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 
-    cd ${S}
-    local myopts
-    if [ -z "`use sdl`" ];then
-	myopts="${myopts} --disable-sdltest"
-    fi
+	cd ${S}
+	local myconf
+	use sdl || myconf="${myconf} --disable-sdltest"
 	
-    try ./configure ${myopts} --prefix=/usr --host=${CHOST}
-    try make
+	econf ${myconf} || die
+	make || die
 
 }
 
 src_install () {
 
-    cd ${S}
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING README TODO ChangeLog
+	cd ${S}
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING README TODO ChangeLog
 }
-
-
-
diff --git a/media-video/transcode/files/digest-transcode-0.6.0_pre4-r2 b/media-video/transcode/files/digest-transcode-0.6.0_pre4-r2
deleted file mode 100644
index b29010071033..000000000000
--- a/media-video/transcode/files/digest-transcode-0.6.0_pre4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0f9fdf944ed17312f224d3e5ac7d2b1 transcode-0.6.0pre4.tgz 1788981
diff --git a/media-video/transcode/files/digest-transcode-0.6.0_pre5-r1 b/media-video/transcode/files/digest-transcode-0.6.0_pre5-r1
deleted file mode 100644
index 0553a057e068..000000000000
--- a/media-video/transcode/files/digest-transcode-0.6.0_pre5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f791b1aac090312459e3e9cec2d1fd6e transcode-0.6.0pre5.tgz 2042189
diff --git a/media-video/transcode/transcode-0.6.0_pre4-r2.ebuild b/media-video/transcode/transcode-0.6.0_pre4-r2.ebuild
deleted file mode 100644
index aba427d74550..000000000000
--- a/media-video/transcode/transcode-0.6.0_pre4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0_pre4-r2.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="video stream processing tool"
-SRC_URI="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/${MY_P}.tgz"
-HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
-
-# Note: transcode can use pretty much any media-related package ever written as
-# a plugin. An exhaustive dep list would make me add about 20-30 packages to 
-# portage. perhaps another time :-)
-
-DEPEND=">=media-libs/a52dec-0.7.3
-	media-libs/libdv
-	media-libs/libsdl
-	=x11-libs/gtk+-1.2*
-	>=media-video/avifile-0.6
-	dvd? ( media-libs/libdvdread )
-	mpeg? ( media-libs/libmpeg3 )
-	encode? ( >=media-sound/lame-3.89 )
-	quicktime? ( media-libs/quicktime4linux )"
-
-src_unpack() {
-	unpack ${A}
-
-	if [ "`gcc --version | cut -f1 -d.`" = "3" ];
-	then
-		patch -p0 < ${FILESDIR}/transcode-0.6.0_pre4.diff
-	fi
-}
-
-src_compile() {
-
-	local myconf
-	
-	use encode \
-		&& myconf="${myconf} --with-lame" \
-		|| myconf="${myconf} --without-lame"
-	
-	use mpeg \
-		&& myconf="${myconf} --with-libmpeg3" \
-		|| myconf="${myconf} --without-libmpeg3"
-	
-	econf ${myconf} || die
-
-	emake all || die
-
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-}
diff --git a/media-video/transcode/transcode-0.6.0_pre5-r1.ebuild b/media-video/transcode/transcode-0.6.0_pre5-r1.ebuild
deleted file mode 100644
index 32e1928e77ec..000000000000
--- a/media-video/transcode/transcode-0.6.0_pre5-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0_pre5-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="video stream processing tool"
-SRC_URI="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/${MY_P}.tgz"
-HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
-
-# Note: transcode can use pretty much any media-related package ever written as
-# a plugin. An exhaustive dep list would make me add about 20-30 packages to 
-# portage. perhaps another time :-)
-
-DEPEND=">=media-libs/a52dec-0.7.3
-	media-libs/libdv
-	media-libs/libsdl
-	dev-lang/nasm
-	=x11-libs/gtk+-1.2*
-	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
-	dvd? ( media-libs/libdvdread )
-	mpeg? ( media-libs/libmpeg3 )
-	encode? ( >=media-sound/lame-3.89 )
-	quicktime? ( media-libs/quicktime4linux )"
-
-src_unpack() {
-	unpack ${A}
-
-	[ -z "${CC}" ] && CC="gcc"
-	if [ "`${CC} --version | cut -f1 -d.`" = "3" ];
-	then
-		patch -p0 < ${FILESDIR}/${P}.diff || die
-	fi
-}
-
-src_compile() {
-
-	# fix invalid paths in .la files of plugins
-	libtoolize --copy --force
-
-	local myconf=""
-
-	use mmx \
-		&& myconf="${myconf} --enable-mmx"
-	use mmx || ( use 3dnow || use sse ) \
-		|| myconf="${myconf} --disable-mmx"
-	# Dont disable mmx if 3dnow or sse are requested.
-
-	use sse \
-		&& myconf="${myconf} --enable-sse" \
-		|| myconf="${myconf} --disable-sse"
-
-	use avi \
-		&& myconf="${myconf} --enable-avifile6" \
-		|| myconf="${myconf} --disable-avifile6"
-
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread" \
-		|| myconf="${myconf} --disable-dvdread"
-	
-	use encode \
-		&& myconf="${myconf} --with-lame" \
-		|| myconf="${myconf} --without-lame"
-	
-	use mpeg \
-		&& myconf="${myconf} --with-libmpeg3" \
-		|| myconf="${myconf} --without-libmpeg3"
-
-	use quicktime \
-		|| myconf="${myconf} --without-qt --without-openqt"
-
-	use X \
-		&& myconf="${myconf} --enable-x" \
-		|| myconf="${myconf} --disable-x"
-	
-	econf ${myconf} || die
-
-	emake all || die
-
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-}
-
diff --git a/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild b/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild
index 113718876f67..55628d35af49 100644
--- a/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild
+++ b/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -12,6 +12,10 @@ HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
 # a plugin. An exhaustive dep list would make me add about 20-30 packages to 
 # portage. perhaps another time :-)
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=media-libs/a52dec-0.7.3
 	media-libs/libdv
 	media-libs/libsdl
@@ -91,5 +95,7 @@ src_install () {
 	make \
 		DESTDIR=${D} \
 		install || die
+	
+	dodoc AUTHORS COPYING ChangeLog README TODO
 }
 
diff --git a/media-video/vcdimager/vcdimager-0.7.12.ebuild b/media-video/vcdimager/vcdimager-0.7.12.ebuild
index 936741bfedd4..651c2c65297a 100644
--- a/media-video/vcdimager/vcdimager-0.7.12.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.12.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.12.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.12.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU VCDimager"
-SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
+SRC_URI="http://www.vcdimager.org/pub/${PN}/${PN}-0.7_UNSTABLE/${P}.tar.gz"
 HOMEPAGE="http://www.vcdimager.org"
+
+SLOT="0"
 LICENSE="GPL"
+KEYWORDS="x86"
 
 # Ideally this would also include help2man, but it's not yet in portage.
 DEPENDS="xml2 ? ( >= dev-libs/libxml2-2.3.8 )"
diff --git a/media-video/vcr/vcr-1.09.ebuild b/media-video/vcr/vcr-1.09.ebuild
index 42a08aea6141..d7e0aaa99ff2 100644
--- a/media-video/vcr/vcr-1.09.ebuild
+++ b/media-video/vcr/vcr-1.09.ebuild
@@ -1,14 +1,17 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcr/vcr-1.09.ebuild,v 1.2 2002/07/19 11:28:21 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="VCR - Linux Console VCR"
 SRC_URI="http://www.stack.nl/~brama/${PN}/src/vcr-1.09.tar.gz"
 HOMEPAGE="http://www.stack.nl/~brama/vcr/"
-KEYWORDS="x86"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND=">=media-video/avifile-0.6"
-SLOT="0"
 
 src_unpack () {
 	   unpack ${P}.tar.gz
diff --git a/media-video/vlc/files/digest-vlc-0.4.1 b/media-video/vlc/files/digest-vlc-0.4.1
deleted file mode 100644
index e54e6c661210..000000000000
--- a/media-video/vlc/files/digest-vlc-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f095eef220ca292aa9bb5df7e1fb9c4 vlc-0.4.1.tar.gz 1329678
diff --git a/media-video/vlc/vlc-0.4.1.ebuild b/media-video/vlc/vlc-0.4.1.ebuild
deleted file mode 100644
index fed6888c7c55..000000000000
--- a/media-video/vlc/vlc-0.4.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.1.ebuild,v 1.1 2002/07/10 00:14:24 raker Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="VideoLAN Client - DVD/video player"
-SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org"
-
-DEPEND="X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	dvd? ( media-libs/libdvdread
-		media-libs/libdvdcss )
-	>=media-libs/libsdl-1.1.8-r1
-	esd? ( >=media-sound/esound-0.2.22 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	kde? ( kde-base/kdelibs )
-	arts? ( kde-base/kdelibs )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	ncurses? ( sys-libs/ncurses )
-	oggvorbis? ( media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	>=media-sound/mad-0.14.2b"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# if qt3 is installed, patch vlc to work with it instead of qt2
-	( use qt || use kde ) && ( \
-	if [ ${QTDIR} = "/usr/qt/3" ]
-	then
-		cp configure.in configure.in.orig
-		sed "s:-lkfile::" \
-			configure.in.orig > configure.in
-
-		cd ${S}/plugins/kde
-		cp kde_interface.h kde_interface.h.orig
-		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
-			kde_interface.h.orig > kde_interface.h
-
-		cp kde_preferences.cpp kde_preferences.cpp.orig
-		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
-			kde_preferences.cpp.orig > kde_preferences.cpp
-	fi
-	)
-}
-
-src_compile(){
-
-	use X \
-		&& myconf="${myconf} --enable-x11 --enable-xvideo" \
-		|| myconf="${myconf} --disable-x11 --disable-xvideo"
-
-	use qt \
-		&& myconf="${myconf} --enable-qt" \
-		|| myconf="${myconf} --disable-qt"
-	
-	use dvd \
-		&& myconf="${myconf} \
-			--enable-dvd \
-			--enable-dvdread \
-			--enable-vcd" \
-		|| myconf="${myconf} --disable-dvd --disable-dvdread --disable-vcd"
-	
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-
-	use ggi \
-		&& myconf="${myconf} --enable-ggi" \
-		|| myconf="${myconf} --disable-ggi"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gtk" \
-		|| myconf="${myconf} --disable-gtk"
-
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		|| myconf="${myconf} --disable-kde"
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-	
-	use 3dfx \
-		&& myconf="${myconf} --enable-glide" \
-		|| myconf="${myconf} --disable-glide"
-
-	use arts \
-		&& myconf="${myconf} --enable-arts" \
-		|| myconf="${myconf} --disable-arts"
-	
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome"
-	
-	use ncurses \
-		&& myconf="${myconf} --enable-ncurses" \
-		|| myconf="${myconf} --disable-ncurses"
-	
-	use directfb \
-		&& myconf="${myconf} --enable-fb" \
-		|| myconf="${myconf} --disable-fb"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	
-	autoconf || die
-	
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--localstatedir=/var/state/vlc \
-		--with-sdl \
-		--disable-a52 \
-		--enable-release \
-		--enable-mad \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
-
-}
diff --git a/media-video/xanim-export/files/digest-xanim-export-2.80.1-r1 b/media-video/xanim-export/files/digest-xanim-export-2.80.1-r1
deleted file mode 100644
index d51e33432d13..000000000000
--- a/media-video/xanim-export/files/digest-xanim-export-2.80.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 aeb4b2379d7b5ae8a04431d5c7f86e22 xanim_exporting_edition.tar.gz 985946
-MD5 a158a6eff799cf6769625ea90889cf71 xa1.0_cyuv_linuxELFg21.o.gz 1141
-MD5 e72191744dbf09ad7c522904cb95ecfd xa2.0_cvid_linuxELFg21.o.gz 3689
-MD5 f10efd80c7ea22d1c7ea4962b6c09cdf xa2.1_iv32_linuxELFg21.o.gz 29291
diff --git a/media-video/xanim-export/files/digest-xanim-export-2.80.1-r2 b/media-video/xanim-export/files/digest-xanim-export-2.80.1-r2
deleted file mode 100644
index d51e33432d13..000000000000
--- a/media-video/xanim-export/files/digest-xanim-export-2.80.1-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 aeb4b2379d7b5ae8a04431d5c7f86e22 xanim_exporting_edition.tar.gz 985946
-MD5 a158a6eff799cf6769625ea90889cf71 xa1.0_cyuv_linuxELFg21.o.gz 1141
-MD5 e72191744dbf09ad7c522904cb95ecfd xa2.0_cvid_linuxELFg21.o.gz 3689
-MD5 f10efd80c7ea22d1c7ea4962b6c09cdf xa2.1_iv32_linuxELFg21.o.gz 29291
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild
deleted file mode 100644
index df5b31470de9..000000000000
--- a/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-A="xanim_exporting_edition.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
-   xa2.1_iv32_linuxELFg21.o.gz"
-S=${WORKDIR}/xanim_exporting_edition
-DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
-SRC_URI="http://heroine.linuxave.net/xanim_exporting_edition.tar.gz
-	 ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxELFg21.o.gz
-	 ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxELFg21.o.gz
-	 ftp://xanim.va.pubnix.com/modules/xa2.1_iv32_linuxELFg21.o.gz"
-HOMEPAGE="http://heroin.linuxave.net/toys.html"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.7
-	virtual/x11"
-
-src_unpack() {
-  unpack xanim_exporting_edition.tar.gz
-  cd ${S}/mods
-  cp ${DISTDIR}/xa1.0_cyuv_linuxELFg21.o.gz .
-  gunzip xa1.0_cyuv_linuxELFg21.o.gz
-  cp ${DISTDIR}/xa2.0_cvid_linuxELFg21.o.gz .
-  gunzip xa2.0_cvid_linuxELFg21.o.gz
-  cp ${DISTDIR}/xa2.1_iv32_linuxELFg21.o.gz .
-  gunzip xa2.1_iv32_linuxELFg21.o.gz
-  cd ${S}
-  rm xanim
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-#  cp ${FILESDIR}/*.h .
-}
-src_compile() {
-
-    cd ${S}/quicktime
-    try make
-    cd ..
-    try make
-
-}
-
-src_install () {
-
-    into /usr
-    newbin xanim xanim-export
-    insinto /usr/lib/xanim/mods-export
-    doins mods/*
-    dodoc README*
-    dodoc docs/README.* docs/*.readme docs/*.doc
-}
-
-
-
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r2.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r2.ebuild
deleted file mode 100644
index 284bea740923..000000000000
--- a/media-video/xanim-export/xanim-export-2.80.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r2.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-A="xanim_exporting_edition.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
-   xa2.1_iv32_linuxELFg21.o.gz"
-S=${WORKDIR}/xanim_exporting_edition
-DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
-SRC_URI="http://heroine.linuxave.net/xanim_exporting_edition.tar.gz
-	 ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxELFg21.o.gz
-	 ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxELFg21.o.gz
-	 ftp://xanim.va.pubnix.com/modules/xa2.1_iv32_linuxELFg21.o.gz"
-HOMEPAGE="http://heroin.linuxave.net/toys.html"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	virtual/x11"
-
-src_unpack() {
-  unpack xanim_exporting_edition.tar.gz
-  cd ${S}/mods
-  cp ${DISTDIR}/xa1.0_cyuv_linuxELFg21.o.gz .
-  gunzip xa1.0_cyuv_linuxELFg21.o.gz
-  cp ${DISTDIR}/xa2.0_cvid_linuxELFg21.o.gz .
-  gunzip xa2.0_cvid_linuxELFg21.o.gz
-  cp ${DISTDIR}/xa2.1_iv32_linuxELFg21.o.gz .
-  gunzip xa2.1_iv32_linuxELFg21.o.gz
-  cd ${S}
-  rm xanim
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-#  cp ${FILESDIR}/*.h .
-}
-src_compile() {
-
-    cd ${S}/quicktime
-    try make
-    cd ..
-    try make
-
-}
-
-src_install () {
-
-    into /usr
-    newbin xanim xanim-export
-    insinto /usr/lib/xanim/mods-export
-    doins mods/*
-    dodoc README*
-    dodoc docs/README.* docs/*.readme docs/*.doc
-}
-
-
-
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
index a6410d6a10f4..1c4acaa73b24 100644
--- a/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id: xanim-export-2.80.1-r3.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
+
+SLOT="0"
+LICENSE="XAnim"
+KEYWORDS="x86"
 
 _XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
 _XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index cfe6fb64ecfe..cd35fb1017a3 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Revision: 1.2 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 LICENSE="XAnim"
 SLOT="0"
diff --git a/media-video/xawtv/ChangeLog b/media-video/xawtv/ChangeLog
index a27466c94d79..fb3ebf16b874 100644
--- a/media-video/xawtv/ChangeLog
+++ b/media-video/xawtv/ChangeLog
@@ -1,39 +1,39 @@
 # ChangeLog for media-video/xawtv
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.5 2002/07/15 04:59:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.6 2002/07/19 11:28:21 seemant Exp $
 
 *xawtv-3.73-r1 (14 July 2002)
 
-        14 July 2002; Brandon Low <lostlogic@gentoo.org> xawtv-3.73-r1.ebuild:
+  14 July 2002; Brandon Low <lostlogic@gentoo.org> xawtv-3.73-r1.ebuild:
 
-	Add lirc support thanks goes to George Sauthoff, he did great work 
-	preparing the lirc ebuild.
+  Add lirc support thanks goes to George Sauthoff, he did great work 
+  preparing the lirc ebuild.
         
 *xawtv-3.73 (23 April 2002)
 
-        23 April 2002; Bart Verwilst <verwilst@gentoo.org> xawtv-3.73.ebuild:
+  23 April 2002; Bart Verwilst <verwilst@gentoo.org> xawtv-3.73.ebuild:
         
-	New version, removed old versions from the Portage tree
+  New version, removed old versions from the Portage tree
 
 *xawtv-3.65-r1 (30 Mar 2002)
-	11 Apr 2002; Spider <spider@gentoo.org> xawtv-3.65-r2.ebuild :
-	Changed the libpng dependency 
+  11 Apr 2002; Spider <spider@gentoo.org> xawtv-3.65-r2.ebuild :
+  Changed the libpng dependency 
 
 *xawtv-3.65-r1 (30 Mar 2002)
 
-	30 Mar 2002; Aron Griffis <agriffis@gentoo.org> xawtv-3.65-r1.ebuild :
+  30 Mar 2002; Aron Griffis <agriffis@gentoo.org> xawtv-3.65-r1.ebuild :
 
-	Added "use alsa" and corrected installation of fonts.  Now the font
-	installation doesn't violate the sandbox, and mkfontdir is properly run
-	after merge/unmerge.
+  Added "use alsa" and corrected installation of fonts.  Now the font
+  installation doesn't violate the sandbox, and mkfontdir is properly run
+  after merge/unmerge.
 
 *xawtv-3.65 (1 Feb 2002)
 
-	1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
 
-	Added initial ChangeLog which should be updated whenever the package is
-	updated in any way. This changelog is targetted to users. This means that
-	the comments should well explained and written in clean English. The
-	details about writing correct changelogs are explained in the
-	skel.ChangeLog file which you can find in the root directory of the
-	portage repository.
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that
+  the comments should well explained and written in clean English. The
+  details about writing correct changelogs are explained in the
+  skel.ChangeLog file which you can find in the root directory of the
+  portage repository.
diff --git a/media-video/xawtv/files/digest-xawtv-3.73 b/media-video/xawtv/files/digest-xawtv-3.73
deleted file mode 100644
index 0d98328ae85a..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.73
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c9a8b96439a877bccd9463bf3331b538 xawtv_3.73.tar.gz 498974
-MD5 b6749d2289e2c49fca3802b2d47efc2e xaw-deinterlace-0.0.3.diff.bz2 3155
diff --git a/media-video/xawtv/xawtv-3.73-r1.ebuild b/media-video/xawtv/xawtv-3.73-r1.ebuild
index 32efe1e8e180..21ce34c911a0 100644
--- a/media-video/xawtv/xawtv-3.73-r1.ebuild
+++ b/media-video/xawtv/xawtv-3.73-r1.ebuild
@@ -1,79 +1,90 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.73-r1.ebuild,v 1.1 2002/07/15 04:59:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.73-r1.ebuild,v 1.2 2002/07/19 11:28:21 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="TV application for the bttv driver"
 SRC_URI="http://bytesex.org/xawtv/xawtv_3.73.tar.gz
 mirror://sourceforge/xaw-deinterlace/xaw-deinterlace-0.0.3.diff.bz2"
 HOMEPAGE="http://bytesex.org/xawtv/"
+
 SLOT="0"
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.1
-        >=media-libs/jpeg-6b
-        >=media-libs/libpng-1.0.8
-        >=x11-base/xfree-4.0.1
-        motif? ( x11-libs/openmotif )        aalib? ( media-libs/aalib )
-        quicktime? ( media-libs/quicktime4linux )
-        alsa? ( media-libs/alsa-lib )"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.0.8
+	>=x11-base/xfree-4.0.1
+	motif? ( x11-libs/openmotif )	aalib? ( media-libs/aalib )
+	quicktime? ( media-libs/quicktime4linux )
+	alsa? ( media-libs/alsa-lib )"
 
 
 src_unpack() {
 
-        unpack ${PN}_${PV}.tar.gz
-        cd ${S}
-        bzcat ${DISTDIR}/xaw-deinterlace-0.0.3.diff.bz2 | patch -p1
+	unpack ${PN}_${PV}.tar.gz
+	cd ${S}
+	bzcat ${DISTDIR}/xaw-deinterlace-0.0.3.diff.bz2 | patch -p1
 
 }
 
 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"
-
-        touch src/Xawtv.h src/MoTV.h
-
-        ./configure  --prefix=/usr --host=${CHOST} \
-                --enable-jpeg \
-                --enable-xfree-ext \
-                --enable-xvideo \
-                --with-x $myconf || die
+	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"
+
+	touch src/Xawtv.h src/MoTV.h
+
+	econf \
+		--enable-jpeg \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--with-x ${myconf} || die
 
 # Why disable lirc when some people will have it installed now?
-#                --disable-lirc \
+#		--disable-lirc \
 
-        emake || die
+	emake || die
 }
 
 src_install() {
-        fontdir=${D}/usr/X11R6/lib/X11/fonts/misc
-        make install \
-                prefix=${D}/usr \
-                mandir=${D}/usr/share/man \
-                resdir=${D}/etc/X11 \
-                fontdir=$fontdir || die
-        # remove the bogus fonts.dir so it isn't "owned" by this ebuild
-        rm -f $fontdir/fonts.dir
-
-        dodoc COPYING Changes
-        dodoc Programming-FAQ README* TODO
-        dodoc UPDATE_TO_v3.0
-
-        insinto /usr/local/httpd/cgi-bin
-        insopts -m 755
-        doins webcam/webcam.cgi
+	fontdir=${D}/usr/X11R6/lib/X11/fonts/misc
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		resdir=${D}/etc/X11 \
+		fontdir=${fontdir} \
+		install || die
+	# remove the bogus fonts.dir so it isn't "owned" by this ebuild
+	rm -f $fontdir/fonts.dir
+
+	dodoc COPYING Changes
+	dodoc Programming-FAQ README* TODO
+	dodoc UPDATE_TO_v3.0
+
+	insinto /usr/local/httpd/cgi-bin
+	insopts -m 755
+	doins webcam/webcam.cgi
 }
 
 src_postinst() {
-        mkfontdir /usr/X11R6/lib/X11/fonts/misc
+	mkfontdir /usr/X11R6/lib/X11/fonts/misc
 }
 
 src_postrm() {
-        mkfontdir /usr/X11R6/lib/X11/fonts/misc
+	mkfontdir /usr/X11R6/lib/X11/fonts/misc
 }
diff --git a/media-video/xawtv/xawtv-3.73.ebuild b/media-video/xawtv/xawtv-3.73.ebuild
deleted file mode 100644
index 7157b4591acc..000000000000
--- a/media-video/xawtv/xawtv-3.73.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.73.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TV application for the bttv driver"
-SRC_URI="http://bytesex.org/xawtv/xawtv_3.73.tar.gz
-mirror://sourceforge/xaw-deinterlace/xaw-deinterlace-0.0.3.diff.bz2"
-HOMEPAGE="http://bytesex.org/xawtv/"
-SLOT="0"
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.1
-        >=media-libs/jpeg-6b
-        >=media-libs/libpng-1.0.8
-        >=x11-base/xfree-4.0.1
-        motif? ( x11-libs/openmotif )        aalib? ( media-libs/aalib )
-        quicktime? ( media-libs/quicktime4linux )
-        alsa? ( media-libs/alsa-lib )"
-
-
-src_unpack() {
-
-        unpack ${PN}_${PV}.tar.gz
-        cd ${S}
-        bzcat ${DISTDIR}/xaw-deinterlace-0.0.3.diff.bz2 | patch -p1
-
-}
-
-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"
-
-        touch src/Xawtv.h src/MoTV.h
-
-        ./configure  --prefix=/usr --host=${CHOST} \
-                --disable-lirc \
-                --enable-jpeg \
-                --enable-xfree-ext \
-                --enable-xvideo \
-                --with-x $myconf || die
-
-        emake || die
-}
-
-src_install() {
-        fontdir=${D}/usr/X11R6/lib/X11/fonts/misc
-        make install \
-                prefix=${D}/usr \
-                mandir=${D}/usr/share/man \
-                resdir=${D}/etc/X11 \
-                fontdir=$fontdir || die
-        # remove the bogus fonts.dir so it isn't "owned" by this ebuild
-        rm -f $fontdir/fonts.dir
-
-        dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt
-        dodoc Programming-FAQ README* Sound-FAQ TODO
-        dodoc Trouble-Shooting UPDATE_TO_v3.0
-
-        insinto /usr/local/httpd/cgi-bin
-        insopts -m 755
-        doins webcam/webcam.cgi
-}
-
-src_postinst() {
-        mkfontdir /usr/X11R6/lib/X11/fonts/misc
-}
-
-src_postrm() {
-        mkfontdir /usr/X11R6/lib/X11/fonts/misc
-}
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.10-r1 b/media-video/xine-ui/files/digest-xine-ui-0.9.10-r1
deleted file mode 100644
index 017a038eb743..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1811dba3177a40bd704adb6e806c700e xine-ui-0.9.10.tar.gz 2663431
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.11 b/media-video/xine-ui/files/digest-xine-ui-0.9.11
deleted file mode 100644
index 77378f40ba36..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 317fa27be81145935332a6ba003396f3 xine-ui-0.9.11.tar.gz 1257846
diff --git a/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild b/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild
deleted file mode 100644
index 8d3c5c9c889b..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $ 
-
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	media-libs/libpng
-	>=media-libs/xine-lib-${PV}
-	nls? ( sys-devel/gettext )
-	X? ( virtual/x11 )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( gnome-base/ORBit )"
-RDEPEND="${DEPEND}"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use directfb || ( \
-		sed -e "s:dfb::" src/Makefile.in \
-		    > src/Makefile.in.hacked
-		mv src/Makefile.in.hacked src/Makefile.in
-	)
-
-	sed -e "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in \
-	    > src/xitk/Makefile.in.hacked
-	mv src/xitk/Makefile.in.hacked src/xitk/Makefile.in
-
-}
-
-src_compile() {
-
-	# Most of these are not working currently, but are here for completeness
-	local myconf
-	use X      || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls    || myconf="${myconf} --disable-nls"
-  
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.11.ebuild b/media-video/xine-ui/xine-ui-0.9.11.ebuild
deleted file mode 100644
index 85af19e5ea87..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.11.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.11.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $ 
-
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-${PV}
-	X? ( virtual/x11 )
-	aalib? ( media-libs/aalib )
-	gnome? ( gnome-base/ORBit )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use directfb || ( \
-		sed -e "s:dfb::" src/Makefile.in \
-		    > src/Makefile.in.hacked
-		mv src/Makefile.in.hacked src/Makefile.in
-	)
-
-	sed -e "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in \
-	    > src/xitk/Makefile.in.hacked
-	mv src/xitk/Makefile.in.hacked src/xitk/Makefile.in
-
-}
-
-src_compile() {
-
-	# Most of these are not working currently, but are here for completeness
-	local myconf
-	use X      || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls    || myconf="${myconf} --disable-nls"
-  
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.12.ebuild b/media-video/xine-ui/xine-ui-0.9.12.ebuild
index f553e97f1e0a..a058dc2d8032 100644
--- a/media-video/xine-ui/xine-ui-0.9.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.12.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.12.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.12.ebuild,v 1.5 2002/07/19 11:28:21 seemant Exp $ 
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL"
+SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
 
 DEPEND="media-libs/libpng
 	>=media-libs/xine-lib-${PV}
 	X? ( virtual/x11 )
 	aalib? ( media-libs/aalib )
-	directfb? ( media-libs/aalib )
 	gnome? ( gnome-base/ORBit )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )"
+	directfb? ( media-libs/aalib
+		>=dev-libs/DirectFB-0.9.9 )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
@@ -20,8 +21,6 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 src_unpack() {
 
@@ -53,13 +52,7 @@ src_compile() {
 	use X      || myconf="${myconf} --disable-x11 --disable-xv"
 	use nls    || myconf="${myconf} --disable-nls"
   
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/media-video/xmovie/files/digest-xmovie-1.8-r1 b/media-video/xmovie/files/digest-xmovie-1.8-r1
deleted file mode 100644
index 169bced7bd86..000000000000
--- a/media-video/xmovie/files/digest-xmovie-1.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cffbbc1ed8031375a91dce43759c5c65 xmovie-1.8.tar.gz 4692906
diff --git a/media-video/xmovie/files/digest-xmovie-1.8-r2 b/media-video/xmovie/files/digest-xmovie-1.8-r2
deleted file mode 100644
index 169bced7bd86..000000000000
--- a/media-video/xmovie/files/digest-xmovie-1.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cffbbc1ed8031375a91dce43759c5c65 xmovie-1.8.tar.gz 4692906
diff --git a/media-video/xmovie/xmovie-1.8-r1.ebuild b/media-video/xmovie/xmovie-1.8-r1.ebuild
deleted file mode 100644
index 9fb3ef14f2d0..000000000000
--- a/media-video/xmovie/xmovie-1.8-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r1.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A Player for MPEG and Quicktime movies"
-SRC_URI="http://heroinewarrior.com/${A}"
-HOMEPAGE="http://heroines.sourceforge.net/"
-
-DEPEND="virtual/glibc virtual/x11 >=sys-devel/gcc-2.95.2
-	>=dev-lang/nasm-0.98
-	=dev-libs/glib-1.2*
-	>=media-libs/libpng-1.0.7"
-
-RDEPEND="virtual/glibc virtual/x11 >=sys-devel/gcc-2.95.2
-	=dev-libs/glib-1.2*
-	>=media-libs/libpng-1.0.7"
-
-src_compile() {
-    if [ "`use mmx`" ] ; then
-      try ./configure
-    else
-      try ./configure --no-mmx
-    fi
-    try make
-
-}
-
-src_install () {
-
-    into /usr
-    dobin xmovie/`uname -m`/xmovie
-    dodoc README
-    docinto html
-    dodoc docs/index.html
-
-}
-
-
-
diff --git a/media-video/xmovie/xmovie-1.8-r2.ebuild b/media-video/xmovie/xmovie-1.8-r2.ebuild
deleted file mode 100644
index 244f20667edf..000000000000
--- a/media-video/xmovie/xmovie-1.8-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r2.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Player for MPEG and Quicktime movies"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
-HOMEPAGE="http://heroines.sourceforge.net/"
-
-RDEPEND="virtual/glibc
-	virtual/x11
-	>=sys-devel/gcc-2.95.2
-	=dev-libs/glib-1.2*
-	>=media-libs/libpng-1.0.7"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98"
-
-src_compile() {
-	local myconf
-	use mmx || myconf="${myconf} --no-mmx"
-    
-	./configure ${myconf} || die
-	emake || die
-
-}
-
-src_install () {
-
-    into /usr
-    dobin xmovie/`uname -m`/xmovie
-    dodoc README
-    dohtml docs/*.html
-
-}
-
-
-
diff --git a/media-video/xmovie/xmovie-1.8-r3.ebuild b/media-video/xmovie/xmovie-1.8-r3.ebuild
index b3f29d0682a4..3b7916430172 100644
--- a/media-video/xmovie/xmovie-1.8-r3.ebuild
+++ b/media-video/xmovie/xmovie-1.8-r3.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r3.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r3.ebuild,v 1.3 2002/07/19 11:28:21 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Player for MPEG and Quicktime movies"
 SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
 HOMEPAGE="http://heroines.sourceforge.net/"
 
-RDEPEND="virtual/glibc
-	virtual/x11
-	>=sys-devel/gcc-2.95.2
+RDEPEND="virtual/x11
 	=dev-libs/glib-1.2*
 	>=media-libs/libpng-1.2.1"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 	local myconf
 	use mmx || myconf="${myconf} --no-mmx"
@@ -33,6 +35,3 @@ src_install () {
     dohtml docs/*.html
 
 }
-
-
-
diff --git a/media-video/xmps/xmps-0.2.0-r1.ebuild b/media-video/xmps/xmps-0.2.0-r1.ebuild
index cae0c902bfea..12616bdc6d58 100644
--- a/media-video/xmps/xmps-0.2.0-r1.ebuild
+++ b/media-video/xmps/xmps-0.2.0-r1.ebuild
@@ -1,48 +1,46 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r1.ebuild,v 1.4 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r1.ebuild,v 1.5 2002/07/19 11:28:21 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="X Movie Player System"
-SRC_URI="http://xmps.sourceforge.net/sources/${A}"
+SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
 HOMEPAGE="http://xmps.sourceforge.net"
 
-DEPEND=">=media-libs/smpeg-0.4.4-r1 nls? ( sys-devel/gettext )
+DEPEND="=x11-libs/gtk+-1.2*
 	>=dev-lang/nasm-0.98
-        >=dev-libs/popt-1.5
-        =x11-libs/gtk+-1.2*
+	>=dev-libs/popt-1.5
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
 RDEPEND=">=media-libs/smpeg-0.4.4-r1
-        =x11-libs/gtk+-1.2*
-        >=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+	nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
-    local myopts
-    if [ -n "`use gnome`" ] ; then
-	myopts="--enable-gnome"
-    fi
-    if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-    fi
-    try ./configure ${myopts} --host=${CHOST} --prefix=/usr
+    local myconf
+
+    use gnome && myconf="--enable-gnome"
+
+    use nls || myconf="${myconf} --disable-nls"
+
+    econf ${myconf} || die
+
     cp Makefile Makefile.orig
     sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-	Makefile.orig > Makefile
-    try make
+		Makefile.orig > Makefile
+
+    make || die
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr install
+    make prefix=${D}/usr install || die
 
     dodoc AUTHORS ChangeLog COPYING NEWS README TODO
 
 }
-
-
-
diff --git a/media-video/zapping/files/digest-zapping-0.6.1-r1 b/media-video/zapping/files/digest-zapping-0.6.1-r1
deleted file mode 100644
index 18187c2dffd8..000000000000
--- a/media-video/zapping/files/digest-zapping-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3661fa27899c0468242d7a1c8049659a zapping-0.6.1.tar.gz 1223733
diff --git a/media-video/zapping/files/digest-zapping-0.6.2 b/media-video/zapping/files/digest-zapping-0.6.2
deleted file mode 100644
index c00d29b91085..000000000000
--- a/media-video/zapping/files/digest-zapping-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d589bd132d91eb384eaf5bf6c9e76ccc zapping-0.6.2.tar.bz2 1056406
diff --git a/media-video/zapping/zapping-0.6.1-r1.ebuild b/media-video/zapping/zapping-0.6.1-r1.ebuild
deleted file mode 100644
index 90ad35074b70..000000000000
--- a/media-video/zapping/zapping-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/zapping/zapping-0.6.1-r1.ebuild,v 1.6 2002/07/11 06:30:42 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Zapping is a TV- and VBI- viewer for the Gnome environment."
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.gz"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/libglade-0.17-r1
-	=x11-libs/gtk+-1.2*"
-
-src_compile() {
-	./configure --prefix=/usr --infodir=/usr/share/info     \
-		--mandir=/usr/share/man --host=${CHOST} || die
-
-	# Fix problem with new include structure (yes Hallski, I did try your way,
-	# but it breaks it even more :)
-	mv src/Makefile src/Makefile.orig
-	sed -e 's/INCLUDES \= \$(COMMON_INCLUDES)/INCLUDES \= \$(COMMON_INCLUDES) -I\/usr\/include\/libglade-1.0 /' src/Makefile.orig >src/Makefile
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr				\
-	     sysconfdir=${D}/etc			\
-	     infodir=${D}/usr/share/info	\
-	     mandir=${D}/usr/share/man		\
-		 PACKAGE_LIB_DIR=${D}/usr/lib/zapping \
-		 PACKAGE_PIXMAPS_DIR=${D}/usr/share/pixmaps/zapping \
-		 PLUGIN_DEFAULT_DIR=${D}/usr/lib/zapping/plugins \
-	     install || die
-	rm ${D}/usr/bin/zapzilla
-	dosym /usr/bin/zapping /usr/bin/zapzilla
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/media-video/zapping/zapping-0.6.2-r1.ebuild b/media-video/zapping/zapping-0.6.2-r1.ebuild
index 338084ec6a2b..0c938cab9963 100644
--- a/media-video/zapping/zapping-0.6.2-r1.ebuild
+++ b/media-video/zapping/zapping-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/zapping/zapping-0.6.2-r1.ebuild,v 1.3 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/zapping/zapping-0.6.2-r1.ebuild,v 1.4 2002/07/19 11:28:21 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Zapping is a TV- and VBI- viewer for the Gnome environment."
@@ -14,6 +14,7 @@ DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	
diff --git a/media-video/zapping/zapping-0.6.2.ebuild b/media-video/zapping/zapping-0.6.2.ebuild
deleted file mode 100644
index f0a9f4a5f42d..000000000000
--- a/media-video/zapping/zapping-0.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/zapping/zapping-0.6.2.ebuild,v 1.4 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Zapping is a TV- and VBI- viewer for the Gnome environment."
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/libglade-0.17-r1
-	=x11-libs/gtk+-1.2*"
-
-src_compile() {
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man --host=${CHOST} || die
-
-	mv src/Makefile src/Makefile.orig
-	sed -e 's/INCLUDES \= \$(COMMON_INCLUDES)/INCLUDES \= \$(COMMON_INCLUDES) -I\/usr\/include\/libglade-1.0 /' src/Makefile.orig >src/Makefile
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
-		 PACKAGE_LIB_DIR=${D}/usr/lib/zapping \
-		 PACKAGE_PIXMAPS_DIR=${D}/usr/share/pixmaps/zapping \
-		 PLUGIN_DEFAULT_DIR=${D}/usr/lib/zapping/plugins \
-	     install || die
-	rm ${D}/usr/bin/zapzilla
-	dosym /usr/bin/zapping /usr/bin/zapzilla
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}