ppc KEYWORDS and misc fixes

author: Seemant Kulleen <seemant@gentoo.org> 2002-07-16 11:36:53 +0000
committer: Seemant Kulleen <seemant@gentoo.org> 2002-07-16 11:36:53 +0000
commit: 511e33e9b8ac87b1f15a19ed318c3cab31f3d050 (patch)
tree: fed6d42b9ed74a42d51f9c784bdc9b264d113851
parent: added new licenses to list (diff)
download: gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.tar.gz
gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.tar.bz2
gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.zip
152 files changed, 331 insertions, 2254 deletions
diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
index 49300bfce6a3..4d58cb019165 100644
--- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-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-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.5 2002/07/13 16:31:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.6 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP"
@@ -8,6 +8,8 @@ SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 
 SLOT="1.2"
+KEYWORDS="x86 ppc"
+LICENSE="GPL"
 
 DEPEND="nls? ( sys-devel/gettext )
 	sys-devel/autoconf
@@ -15,7 +17,9 @@ DEPEND="nls? ( sys-devel/gettext )
 	=x11-libs/gtk+-1.2*
 	>=media-libs/mpeg-lib-1.3.1
 	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1 >=dev-perl/Parse-RecDescent-1.80 >=dev-perl/gtk-perl-0.7004 )
+	perl? ( >=dev-perl/PDL-2.2.1 
+		>=dev-perl/Parse-RecDescent-1.80 
+		>=dev-perl/gtk-perl-0.7004 )
 	python? ( >=dev-lang/python-2.0 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
diff --git a/media-gfx/gimp/gimp-1.3.7-r1.ebuild b/media-gfx/gimp/gimp-1.3.7-r1.ebuild
index f866b2b37bdf..f8a602220219 100644
--- a/media-gfx/gimp/gimp-1.3.7-r1.ebuild
+++ b/media-gfx/gimp/gimp-1.3.7-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-gfx/gimp/gimp-1.3.7-r1.ebuild,v 1.1 2002/06/02 18:14:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.7-r1.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 
 # Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
@@ -16,6 +16,8 @@ DESCRIPTION="Development series of Gimp"
 SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 SLOT="1.4"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 #libglade
 RDEPEND=">=x11-libs/gtk+-2.0.0
diff --git a/media-gfx/imagemagick/imagemagick-5.4.6.ebuild b/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
index 6f288d6489b0..9afc11f78d0e 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.6.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-gfx/imagemagick/imagemagick-5.4.6.ebuild,v 1.1 2002/06/29 14:38:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.6.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 inherit perl-module
 
@@ -12,6 +12,7 @@ SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.imagemagick.org/"
 SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86 ppc"
 
 DEPEND="X? ( virtual/x11
 	>=app-text/dgs-0.5.9.1 )
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.8 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.8
deleted file mode 100644
index d53f0d86d97c..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10785bf9a87e0f45ad445e34a8529a3d sane-backends-1.0.8.tar.gz 2169657
diff --git a/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild
index e97faf40d170..ed8b91662320 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.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-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild,v 1.2 2002/07/05 17:12:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.mostang.com/sane/"
@@ -16,8 +16,9 @@ DEPEND=">=media-libs/jpeg-6b
 
 SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-$PV/$P.tar.gz"
 S=${WORKDIR}/${P}
-SLOT=""
+SLOT="0"
 LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.8.ebuild b/media-gfx/sane-backends/sane-backends-1.0.8.ebuild
deleted file mode 100644
index 9a51273ad18e..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.8.ebuild
+++ /dev/null
@@ -1,48 +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-gfx/sane-backends/sane-backends-1.0.8.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.mostang.com/sane/"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-$PV/$P.tar.gz"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	#only generate the .ps and not the fonts 
-	cp ${S}/doc/Makefile.in ${S}/doc/Makefile.in.orig
-	sed -e 's:dvips sane.dvi -o sane.ps:dvips sane.dvi -o -M0 sane.ps:' \
-		${S}/doc/Makefile.in.orig > ${S}/doc/Makefile.in
-}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} || die
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	docinto backend
-	cd backend
-	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
-}
-
-
-pkg_postinst() {
-	
-	echo "SANE_CONFIG_DIR=/etc/sane.d" > /etc/env.d/30sane
-
-}
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
index 9179d12ced78..7c8da7d25fe5 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
@@ -1,14 +1,17 @@
 # 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-gfx/sane-frontends/sane-frontends-1.0.8.ebuild,v 1.3 2002/07/11 06:30:28 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Scanner Access Now Easy"
 HOMEPAGE="http://www.mostang.com/sane/"
+SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-${PV}/${P}.tar.gz"
 
 DEPEND=">=media-gfx/sane-backends-1.0.8"
 
-SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-${PV}/${P}.tar.gz"
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 src_compile() {
 	./configure \
diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 242f7f268cc1..911e76490ce7 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.3 2002/07/08 17:03:00 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.4 2002/07/16 11:36:46 seemant Exp $
+
+*xsane-0.86-r1 (16 Jul 2002)
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> xsane-0.86-r1.ebuild
+  files/digest-xsane-0.86-r1 :
+
+  Added ppc to KEYWORDS, because it works, and USE dependent nls, jpeg,
+  tiff, png supports.
 
 *xsane-0.86 (11 June 2002)
   07 July 2002; Owen Stampflee <owen@gentoo.org> xsane-0.86.ebuild :
diff --git a/media-gfx/xsane/files/digest-xsane-0.77-r1 b/media-gfx/xsane/files/digest-xsane-0.77-r1
deleted file mode 100644
index 8d7ea8b7530c..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.77-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d0902bd81d49bd523c15ffbb72d98aa xsane-0.77.tar.gz 1235878
diff --git a/media-gfx/xsane/files/digest-xsane-0.86 b/media-gfx/xsane/files/digest-xsane-0.86-r1
index 43b011f6822d..43b011f6822d 100644
--- a/media-gfx/xsane/files/digest-xsane-0.86
+++ b/media-gfx/xsane/files/digest-xsane-0.86-r1
diff --git a/media-gfx/xsane/xsane-0.77-r1.ebuild b/media-gfx/xsane/xsane-0.77-r1.ebuild
deleted file mode 100644
index 3e6311224129..000000000000
--- a/media-gfx/xsane/xsane-0.77-r1.ebuild
+++ /dev/null
@@ -1,24 +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-gfx/xsane/xsane-0.77-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="XSane is a graphical scanning frontend"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.xsane.org"
-
-DEPEND="media-gfx/sane-backends media-gfx/gimp"
-
-src_compile() {
-
-	./configure --prefix=/usr --mandir=/usr/man --host=${CHOST} || die
-	make || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr/ mandir=${D}/usr/man install || die
-	dodoc xsane.[A-Z]*
-	dohtml -r doc
-}
diff --git a/media-gfx/xsane/xsane-0.86.ebuild b/media-gfx/xsane/xsane-0.86-r1.ebuild
index ddf7c457544a..1c9c2981b9bc 100644
--- a/media-gfx/xsane/xsane-0.86.ebuild
+++ b/media-gfx/xsane/xsane-0.86-r1.ebuild
@@ -9,16 +9,28 @@ HOMEPAGE="http://www.xsane.org"
 
 DEPEND="media-gfx/sane-backends"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDs="x86 ppc"
+
 src_compile() {
 
-	./configure --prefix=/usr --mandir=/usr/man --host=${CHOST} || die
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	use jpeg || myconf="${myconf} --disable-jpeg"
+	use png || myconf="${myconf} --disable-png"
+	use tiff || myconf="${myconf} --disable-tiff"
+
+	econf \
+		--prefix=/usr \
+		${myconf} || die
 	make || die
 
 }
 
 src_install () {
 
-	make prefix=${D}/usr/ mandir=${D}/usr/man install || die
+	einstall || die
 	dodoc xsane.[A-Z]*
 	dohtml -r doc
 	
diff --git a/media-gfx/xv/files/digest-xv-3.10a b/media-gfx/xv/files/digest-xv-3.10a
deleted file mode 100644
index f6f83423ac38..000000000000
--- a/media-gfx/xv/files/digest-xv-3.10a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r1 b/media-gfx/xv/files/digest-xv-3.10a-r1
deleted file mode 100644
index 48d744cce2ec..000000000000
--- a/media-gfx/xv/files/digest-xv-3.10a-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
-MD5 c8cbe14db6e2104ed4eb5330cdaba420 xv-3.10a-png-1.2d.tar.gz 20971
diff --git a/media-gfx/xv/xv-3.10a-r1.ebuild b/media-gfx/xv/xv-3.10a-r1.ebuild
deleted file mode 100644
index 53bfea5fffbc..000000000000
--- a/media-gfx/xv/xv-3.10a-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-gfx/xv/xv-3.10a-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An interactive image manipulation program for X which can
-deal with a wide variety of image formats"
-SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-
-DEPEND="virtual/x11
-	png? ( media-libs/jpeg
-		media-libs/tiff
-		media-libs/libpng
-		>=sys-libs/zlib-1.1.4 )"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-naz-gentoo.patch
-}
-
-src_compile() {
-	
-	make || die
-}
-
-src_install () {
-	
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	
-	make \
-		DESTDIR=${D} \
-		BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
-		install || die
-
-	 dodoc README INSTALL CHANGELOG BUGS IDEAS
-}
diff --git a/media-gfx/xv/xv-3.10a-r2.ebuild b/media-gfx/xv/xv-3.10a-r2.ebuild
index b42324ad1c1a..9ba7b6674883 100644
--- a/media-gfx/xv/xv-3.10a-r2.ebuild
+++ b/media-gfx/xv/xv-3.10a-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-gfx/xv/xv-3.10a-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r2.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An interactive image manipulation program for X which can
@@ -17,6 +17,10 @@ DEPEND="virtual/x11
 
 PATCHDIR=${WORKDIR}/patches
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	unpack ${A}
 	
diff --git a/media-gfx/xv/xv-3.10a.ebuild b/media-gfx/xv/xv-3.10a.ebuild
deleted file mode 100644
index 63b44574fb40..000000000000
--- a/media-gfx/xv/xv-3.10a.ebuild
+++ /dev/null
@@ -1,45 +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-gfx/xv/xv-3.10a.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
-S=${WORKDIR}/${P}
-DESCRIPTION="xv - image viewer for X"
-SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-DEPEND="virtual/x11
-		  virtual/glibc
-		>=media-libs/tiff-3.5.6_beta1
-		>=media-libs/jpeg-6b
-		>=sys-libs/zlib-1.1.3"
-
-#RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv Makefile Makefile.orig
-
-
-	sed -e "s:^CCOPTS.*:CCOPTS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	# I know very little about make but somehow I was able to riddle out how to
-	# fix this makefile so it not unly understood DESTDIR but makes it's own
-	# dirs to. I fail to understand why people can't seem to do that. Do they
-	# want packagers to have a hard time with thier source trees?
-	patch -p1 < ${FILESDIR}/xv.diff
-}
-
-src_compile() {
-
-#	try emake
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc README INSTALL CHANGELOG BUGS IDEAS
-}
-
diff --git a/media-libs/aalib/aalib-1.4_rc4-r1.ebuild b/media-libs/aalib/aalib-1.4_rc4-r1.ebuild
deleted file mode 100644
index 61820c0631a2..000000000000
--- a/media-libs/aalib/aalib-1.4_rc4-r1.ebuild
+++ /dev/null
@@ -1,73 +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-libs/aalib/aalib-1.4_rc4-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${PN}-1.4.0
-DESCRIPTION="A ASCI-Graphics Library"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-HOMEPAGE="http://www.ta.jcu.cz/aa/"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	slang? ( >=sys-libs/slang-1.4.2 )
-	X?     ( virtual/x11 )
-	gpm?   ( sys-libs/gpm )"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	slang? ( >=sys-libs/slang-1.4.2 )
-	X?     ( virtual/x11 )
-	gpm?   ( sys-libs/gpm )"
-
-
-src_unpack() {
-
-	unpack ${A}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
-	touch *
-
-        #crude libtool version fix
-        cp -f `which libtool` ${S}
-        touch ${S}/*
-}
-
-src_compile() {
-
-	local myconf
-	if [ "`use slang`" ]
-	then
-		myconf="--with-slang-driver=yes"
-	else
-		myconf="--with-slang-driver=no"
-	fi
-	
-	if [ "`use X`" ]
-	then
-		myconf="${myconf} --with-x11-driver=yes"
-	else
-		myconf="${myconf} --with-x11-driver=no"
-	fi
-	
-	if [ -z "`use gpm`" ]
-	then
-		myconf="${myconf} --with-gpm-mouse=no"
-	fi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=${D}/usr/share/man \
-		--host=${CHOST} \
-		${myconf} || die
-		
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README*
-}
-
diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
index 6e78ee24b46c..e4090763b57b 100644
--- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc4-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-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.1 2002/06/21 14:06:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 inherit libtool
 
@@ -15,8 +15,9 @@ DEPEND=">=sys-libs/ncurses-5.1
 	X?	 ( virtual/x11 )
 	gpm?   ( sys-libs/gpm )"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 
diff --git a/media-libs/aalib/files/digest-aalib-1.4_rc4-r1 b/media-libs/aalib/files/digest-aalib-1.4_rc4-r1
deleted file mode 100644
index cd2e710484f3..000000000000
--- a/media-libs/aalib/files/digest-aalib-1.4_rc4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5aa8e9eae07b7441298b5c30490f6a6 aalib-1.4rc4.tar.gz 390812
diff --git a/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild b/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
index be530a6d3cf1..fb9bb4d4ab4e 100644
--- a/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
@@ -1,6 +1,6 @@
 # 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-libs/alsa-lib/alsa-lib-0.5.10b.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Linux Sound Architecture / Library"
@@ -10,6 +10,10 @@ HOMEPAGE="http://www.alsa-project.org/"
 DEPEND="virtual/glibc virtual/alsa"
 RDEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {                           
 
   ./configure --host=${CHOST} --prefix=/usr || die
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild
index fcb06072d986..1b069c327b87 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild
@@ -1,6 +1,6 @@
 # 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-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.0.1_beta10.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 ######################## Begin version munge #########################
 #This alsa version appends a alphabetic character to the beta version.
@@ -31,13 +31,15 @@ MYP="${PN}-${MYPV}"
 ######################## End version Munge ##########################
 
 S=${WORKDIR}/${MYP}
-
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-
 SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MYP}.tar.bz2"
-
 HOMEPAGE="http://www.alsa-project.org/"
 
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc 
 	=media-sound/alsa-driver-0.9.0_beta10"
 
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild
index 69992fe3fb59..c4a99240bc2e 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.0_rc1.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -11,6 +11,10 @@ S=${WORKDIR}/${P/_rc/rc}
 DEPEND="virtual/glibc 
 	~media-sound/alsa-driver-0.9.0_rc1"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {                           
 	./configure \
 		--host=${CHOST} \
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
index b4d39cb2c8f3..80fff5022ac9 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
@@ -1,16 +1,21 @@
 # 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-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
 
-SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${P/_rc/rc}.tar.bz2"
-S=${WORKDIR}/${P/_rc/rc}
+SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
 
 DEPEND="virtual/glibc 
 	~media-sound/alsa-driver-0.9.0_rc2"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {                           
 	./configure \
 		--host=${CHOST} \
diff --git a/media-libs/audiofile/audiofile-0.2.1.ebuild b/media-libs/audiofile/audiofile-0.2.1.ebuild
deleted file mode 100644
index 4d98e63faf63..000000000000
--- a/media-libs/audiofile/audiofile-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +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-libs/audiofile/audiofile-0.2.1.ebuild,v 1.5 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An elegant API for accessing audio files"
-SRC_URI="ftp://oss.sgi.com/projects/audiofile/download/${P}.tar.gz"
-HOMEPAGE="http://oss.sgi.com/projects/audiofile/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS COPYING* ChangeLog README TODO
-	dodoc NEWS NOTES
-}
-
-
-
-
-
-
-
diff --git a/media-libs/audiofile/audiofile-0.2.2.ebuild b/media-libs/audiofile/audiofile-0.2.2.ebuild
deleted file mode 100644
index 49e449617ece..000000000000
--- a/media-libs/audiofile/audiofile-0.2.2.ebuild
+++ /dev/null
@@ -1,30 +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-libs/audiofile/audiofile-0.2.2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An elegant API for accessing audio files"
-SRC_URI="ftp://oss.sgi.com/projects/audiofile/download/${P}.tar.gz"
-HOMEPAGE="http://oss.sgi.com/projects/audiofile/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS COPYING* ChangeLog README TODO
-	dodoc NEWS NOTES
-}
-
-
-
-
-
-
-
diff --git a/media-libs/audiofile/audiofile-0.2.3-r1.ebuild b/media-libs/audiofile/audiofile-0.2.3-r1.ebuild
index 9b5984a25000..e0dc7233cfa7 100644
--- a/media-libs/audiofile/audiofile-0.2.3-r1.ebuild
+++ b/media-libs/audiofile/audiofile-0.2.3-r1.ebuild
@@ -1,6 +1,8 @@
 # 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-libs/audiofile/audiofile-0.2.3-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.3-r1.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
+
+inherit libtool
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An elegant API for accessing audio files"
@@ -9,9 +11,13 @@ HOMEPAGE="http://oss.sgi.com/projects/audiofile/"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 src_compile() {
-	#libtoolize to fix "relink bug"
-	libtoolize --force --copy
+
+	elibtoolize
 
 	./configure --host=${CHOST} \
 		--prefix=/usr || die
diff --git a/media-libs/audiofile/audiofile-0.2.3.ebuild b/media-libs/audiofile/audiofile-0.2.3.ebuild
deleted file mode 100644
index 90a75d63091b..000000000000
--- a/media-libs/audiofile/audiofile-0.2.3.ebuild
+++ /dev/null
@@ -1,30 +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-libs/audiofile/audiofile-0.2.3.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An elegant API for accessing audio files"
-SRC_URI="ftp://oss.sgi.com/projects/audiofile/download/${P}.tar.gz"
-HOMEPAGE="http://oss.sgi.com/projects/audiofile/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS COPYING* ChangeLog README TODO
-	dodoc NEWS NOTES
-}
-
-
-
-
-
-
-
diff --git a/media-libs/audiofile/files/digest-audiofile-0.2.1 b/media-libs/audiofile/files/digest-audiofile-0.2.1
deleted file mode 100644
index 257d6bd636d2..000000000000
--- a/media-libs/audiofile/files/digest-audiofile-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0a9205ac868350ab9aee78f1d282aa5 audiofile-0.2.1.tar.gz 243637
diff --git a/media-libs/audiofile/files/digest-audiofile-0.2.2 b/media-libs/audiofile/files/digest-audiofile-0.2.2
deleted file mode 100644
index 5e325fc82b00..000000000000
--- a/media-libs/audiofile/files/digest-audiofile-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a088be2b91f7effaaa3197548c8926a audiofile-0.2.2.tar.gz 257623
diff --git a/media-libs/audiofile/files/digest-audiofile-0.2.3 b/media-libs/audiofile/files/digest-audiofile-0.2.3
deleted file mode 100644
index 46bc333ee24e..000000000000
--- a/media-libs/audiofile/files/digest-audiofile-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 73f420be03e3f4591008fd5ead6d284d audiofile-0.2.3.tar.gz 332223
diff --git a/media-libs/divx4linux/divx4linux-20011025.ebuild b/media-libs/divx4linux/divx4linux-20011025.ebuild
index e7b3b600458c..1fcb6e74c726 100644
--- a/media-libs/divx4linux/divx4linux-20011025.ebuild
+++ b/media-libs/divx4linux/divx4linux-20011025.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-libs/divx4linux/divx4linux-20011025.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20011025.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Binary release of DivX Codec 4.0"
@@ -9,6 +9,9 @@ HOMEPAGE="http://www.divx.com/"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="DIVX"
+KEYWORDS="x86"
 
 src_install () {
 	
diff --git a/media-libs/divx4linux/divx4linux-20020304.ebuild b/media-libs/divx4linux/divx4linux-20020304.ebuild
index e4b03bf96f32..8c0adc06994b 100644
--- a/media-libs/divx4linux/divx4linux-20020304.ebuild
+++ b/media-libs/divx4linux/divx4linux-20020304.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-libs/divx4linux/divx4linux-20020304.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20020304.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
 OLD_VER=20011025
 S="${WORKDIR}/${PN}-${PV}"
@@ -13,6 +13,8 @@ HOMEPAGE="http://www.divx.com/"
 DEPEND="virtual/glibc"
 
 SLOT="0"
+LICENSE="DIVX"
+KEYWORDS="x86"
 
 src_install() {
 	
diff --git a/media-libs/divx4linux/divx4linux-20020418.ebuild b/media-libs/divx4linux/divx4linux-20020418.ebuild
index 91d4d6ff003e..2bfa075235b7 100644
--- a/media-libs/divx4linux/divx4linux-20020418.ebuild
+++ b/media-libs/divx4linux/divx4linux-20020418.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-libs/divx4linux/divx4linux-20020418.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20020418.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
 DXVER=501
 S="${WORKDIR}/${PN}-${PV}"
@@ -11,6 +11,9 @@ HOMEPAGE="http://www.divx.com/"
 DEPEND="virtual/glibc"
 
 SLOT="0"
+LICENSE="DIVX"
+KEYWORDS="x86 ppc"
+
 
 # Make sure Portage does _NOT_ strip symbols.  Need both lines for
 # Portage 1.8.9+
diff --git a/media-libs/fnlib/fnlib-0.5-r1.ebuild b/media-libs/fnlib/fnlib-0.5-r1.ebuild
index 7fe22262c2b7..dfe1d006ba33 100644
--- a/media-libs/fnlib/fnlib-0.5-r1.ebuild
+++ b/media-libs/fnlib/fnlib-0.5-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-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Font Library"
@@ -8,6 +8,10 @@ SRC_URI="ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/libs/${P}.t
 
 DEPEND="virtual/glibc >=media-libs/imlib-1.9.8.1"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	./configure \
diff --git a/media-libs/freetype/files/digest-freetype-2.0.5-r1 b/media-libs/freetype/files/digest-freetype-2.0.5-r1
deleted file mode 100644
index a173f862811e..000000000000
--- a/media-libs/freetype/files/digest-freetype-2.0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4a3f9f42667a71045050f80b5229642 freetype-2.0.5.tar.bz2 559191
diff --git a/media-libs/freetype/files/digest-freetype-2.0.8 b/media-libs/freetype/files/digest-freetype-2.0.8
deleted file mode 100644
index 1cf414f99216..000000000000
--- a/media-libs/freetype/files/digest-freetype-2.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a98e04c8a4e70ebfc10587406e1f6922 freetype-2.0.8.tar.bz2 614800
diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r3.ebuild
index bf571d924d99..cfa81687d36b 100644
--- a/media-libs/freetype/freetype-1.3.1-r3.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -23,6 +23,8 @@ SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${A1}
 HOMEPAGE="http://www.freetype.org/"
 
 SLOT="1"
+LICENSE="FTL"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc
         nls? ( sys-devel/gettext )"
diff --git a/media-libs/freetype/freetype-2.0.5-r1.ebuild b/media-libs/freetype/freetype-2.0.5-r1.ebuild
deleted file mode 100644
index 510b5768679b..000000000000
--- a/media-libs/freetype/freetype-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,31 +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-libs/freetype/freetype-2.0.5-r1.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TTF-Library"
-SRC_URI="http://download.sourceforge.net/freetype/${P}.tar.bz2"
-HOMEPAGE="http://www.freetype.org/"
-
-SLOT="2"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/freetype-2-hinting.patch
-}
-
-src_compile() {
-	make CFG="--host=${CHOST} --prefix=/usr" || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ChangeLog README 
-	dodoc docs/{BUILD,CHANGES,*.txt,PATENTS,readme.vms,todo}
-}
diff --git a/media-libs/freetype/freetype-2.0.8.ebuild b/media-libs/freetype/freetype-2.0.8.ebuild
deleted file mode 100644
index 4ddef068da05..000000000000
--- a/media-libs/freetype/freetype-2.0.8.ebuild
+++ /dev/null
@@ -1,36 +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-libs/freetype/freetype-2.0.8.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A high-quality and portable font engine"
-SRC_URI="mirror://sourceforge/freetype/${P}.tar.bz2"
-HOMEPAGE="http://www.freetype.org/"
-
-SLOT="2"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	# Enable hinting for truetype fonts
-	cd ${S}/include/freetype/config
-	cp ftoption.h ftoption.h.orig
-	sed -e 's:#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER:#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER:' \
-		ftoption.h.orig > ftoption.h
-	cd ${S}
-}
-
-src_compile() {
-	make CFG="--host=${CHOST} --prefix=/usr" || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ChangeLog README 
-	dodoc docs/{BUILD,CHANGES,*.txt,PATENTS,readme.vms,todo}
-}
diff --git a/media-libs/freetype/freetype-2.0.9.ebuild b/media-libs/freetype/freetype-2.0.9.ebuild
index b21b3d2cf419..cc6816889313 100644
--- a/media-libs/freetype/freetype-2.0.9.ebuild
+++ b/media-libs/freetype/freetype-2.0.9.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-libs/freetype/freetype-2.0.9.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.9.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,6 +9,8 @@ SRC_URI="mirror://sourceforge/freetype/${P}.tar.bz2"
 HOMEPAGE="http://www.freetype.org/"
 
 SLOT="2"
+LICENSE="FTL | GPL-2"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc"
 
diff --git a/media-libs/freetype/freetype-2.1.0.ebuild b/media-libs/freetype/freetype-2.1.0.ebuild
index 405eea221ab0..151bbe3b10ab 100644
--- a/media-libs/freetype/freetype-2.1.0.ebuild
+++ b/media-libs/freetype/freetype-2.1.0.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-libs/freetype/freetype-2.1.0.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.0.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,6 +9,8 @@ SRC_URI="mirror://sourceforge/freetype/${P}.tar.bz2"
 HOMEPAGE="http://www.freetype.org/"
 
 SLOT="2"
+LICENSE="FTL | GPL-2"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.18.0 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.18.0
deleted file mode 100644
index 2f78192bf7d5..000000000000
--- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.18.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fad98874f3b254fbd7a8e0cc0b2d19b5 gdk-pixbuf-0.18.0.tar.gz 546229
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild
index b50dc66ee159..2b05e9b33b23 100644
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild
+++ b/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-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-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild,v 1.1 2002/06/24 02:13:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 inherit virtualx libtool
 
@@ -18,6 +18,8 @@ DEPEND=">=media-libs/imlib-1.9.14-r1
 # gdk-pixbuf (the GnomeCanvasPixbuf library )
 
 SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0.ebuild
deleted file mode 100644
index 3e9a9b2e47e1..000000000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0.ebuild
+++ /dev/null
@@ -1,59 +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-libs/gdk-pixbuf/gdk-pixbuf-0.18.0.ebuild,v 1.1 2002/06/19 09:12:56 stroke Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Image Library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
-DEPEND=">=media-libs/imlib-1.9.14-r1
-	media-libs/jpeg
-	media-libs/tiff
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libpng-1.2.1
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-# We need gnome-libs here, else gnome support do not get compiled into
-# gdk-pixbuf (the GnomeCanvasPixbuf library )
-
-SLOT="0"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cp ${S}/demo/Makefile.in ${S}/demo/Makefile.in.orig
-	sed -e 's:LDADD = :LDADD = $(LIBJPEG) $(LIBTIFF) $(LIBPNG) :' \
-		${S}/demo/Makefile.in.orig > ${S}/demo/Makefile.in
-}
-
-src_compile() {
-
-	#update libtool, else we get the "relink bug"
-	libtoolize --copy --force
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11/gdk-pixbuf || die
-
-	#build needs to be able to
-	#connect to an X display.
-	Xemake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/gdk-pixbuf \
-		install || die
-
-	#fix permissions on the loaders
-	chmod a+rx ${D}/usr/lib/gdk-pixbuf/loaders
-	chmod a+r ${D}/usr/lib/gdk-pixbuf/loaders/*
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
-}
-
diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index a8a0fb237f57..7fd8e2efe274 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild
@@ -1,7 +1,7 @@
 ## Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Updated by AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.5 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.6 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="giflib"
@@ -12,6 +12,10 @@ HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
 
 DEPEND="X? ( virtual/x11 )"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	local myconf
diff --git a/media-libs/gle/files/digest-gle-3.0.1-r1 b/media-libs/gle/files/digest-gle-3.0.1-r1
deleted file mode 100644
index 04a949246c78..000000000000
--- a/media-libs/gle/files/digest-gle-3.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c335223b9c4a076426129f3ff4e9c939 gle-3.0.1.tar.gz 705509
diff --git a/media-libs/gle/gle-3.0.1-r1.ebuild b/media-libs/gle/gle-3.0.1-r1.ebuild
deleted file mode 100644
index 91fdca685034..000000000000
--- a/media-libs/gle/gle-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,30 +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-libs/gle/gle-3.0.1-r1.ebuild,v 1.8 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GL extrusion library"
-SRC_URI="http://www.linas.org/gle/gle-3.0.1.tar.gz"
-HOMEPAGE="http://www.linas.org/gle"
-
-DEPEND="virtual/glibc
-        virtual/opengl
-	virtual/glu
-        virtual/glut
-        virtual/x11"
-
-src_compile() {
-
-	try ./configure --with-x --prefix=/usr --mandir=/usr/share/man
-	try make
-}
-
-src_install () {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man install
-    dodoc AUTHORS COPYING ChangeLog NEWS README
-    docinto html
-    dodoc public_html/*.{gif,jpg,html}
-}
-
-
diff --git a/media-libs/gle/gle-3.0.1-r2.ebuild b/media-libs/gle/gle-3.0.1-r2.ebuild
index 936e9eebbc0d..1c616f9b01a8 100644
--- a/media-libs/gle/gle-3.0.1-r2.ebuild
+++ b/media-libs/gle/gle-3.0.1-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-libs/gle/gle-3.0.1-r2.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GL extrusion library"
@@ -13,6 +13,10 @@ DEPEND="virtual/glibc
 	virtual/glut
     virtual/x11"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	./configure --with-x \
diff --git a/media-libs/glut/files/digest-glut-3.7-r1 b/media-libs/glut/files/digest-glut-3.7-r1
deleted file mode 100644
index eac6d9d7389b..000000000000
--- a/media-libs/glut/files/digest-glut-3.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8b431192f616cfaee12624a74e0bb128 MesaLib-4.0.1.tar.bz2 1563232
-MD5 1d7600019f9da28dd65022c024c67dd8 MesaDemos-4.0.1.tar.bz2 870767
diff --git a/media-libs/glut/glut-3.7-r1.ebuild b/media-libs/glut/glut-3.7-r1.ebuild
deleted file mode 100644
index 9321f6d99a18..000000000000
--- a/media-libs/glut/glut-3.7-r1.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-libs/glut/glut-3.7-r1.ebuild,v 1.10 2002/07/11 06:30:38 drobbins Exp $
-
-MESA_VER="4.0.1"
-S=${WORKDIR}/Mesa-${MESA_VER}
-DESCRIPTION=""
-SRC_URI="mirror://sourceforge/mesa3d/MesaLib-${MESA_VER}.tar.bz2
-	mirror://sourceforge/mesa3d/MesaDemos-${MESA_VER}.tar.bz2"
-HOMEPAGE="http://www.opengl.org/developers/documentation/glut/"
-
-DEPEND="virtual/glibc
-	virtual/opengl"
-	
-
-PROVIDE="virtual/glut"
-
-src_compile() {
-
-	./configure || die
-
-	cd ${S}/src-glut
-			
-	emake || die
-}
-
-src_install() {
-
-	insinto /usr/lib
-	doins ${S}/src-glut/libglut.la
-	dolib.so ${S}/src-glut/.libs/libglut.so.${PV}.0
-	dosym libglut.so.${PV}.0 /usr/lib/libglut.so
-	insinto /usr/include/GL
-	doins ${S}/include/GL/glut*
-
-	dodoc ${S}/docs/COPYRIGHT
-}
-
diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild
index 8e4a3b0b4111..986effb15abe 100644
--- a/media-libs/glut/glut-3.7-r2.ebuild
+++ b/media-libs/glut/glut-3.7-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-libs/glut/glut-3.7-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 MESA_VER="4.0.1"
 S=${WORKDIR}/Mesa-${MESA_VER}
@@ -12,10 +12,13 @@ HOMEPAGE="http://www.opengl.org/developers/documentation/glut/"
 DEPEND="virtual/glibc
 	virtual/opengl
 	virtual/glu"
-	
 
 PROVIDE="virtual/glut"
 
+SLOT="0"
+LICENSE="X11 | GPL-2"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	./configure || die
@@ -39,6 +42,6 @@ src_install() {
 	insinto /usr/include/GL
 	doins ${S}/include/GL/glut*
 
-	dodoc ${S}/docs/COPYRIGHT
+	dodoc ${S}/docs/COPY*
 }
 
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2 b/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2
deleted file mode 100644
index 72c7aeafef6d..000000000000
--- a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48444a1eb634c034c05388e8e2bb5024 id3lib-3.8.0pre2.tar.gz 680219
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r1 b/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r1
deleted file mode 100644
index 72c7aeafef6d..000000000000
--- a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48444a1eb634c034c05388e8e2bb5024 id3lib-3.8.0pre2.tar.gz 680219
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r2 b/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r2
deleted file mode 100644
index 72c7aeafef6d..000000000000
--- a/media-libs/id3lib/files/digest-id3lib-3.8.0_pre2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48444a1eb634c034c05388e8e2bb5024 id3lib-3.8.0pre2.tar.gz 680219
diff --git a/media-libs/id3lib/id3lib-3.8.0_pre2-r1.ebuild b/media-libs/id3lib/id3lib-3.8.0_pre2-r1.ebuild
deleted file mode 100644
index 14b4e134f8d0..000000000000
--- a/media-libs/id3lib/id3lib-3.8.0_pre2-r1.ebuild
+++ /dev/null
@@ -1,44 +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-libs/id3lib/id3lib-3.8.0_pre2-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-A=${PN}-3.8.0pre2.tar.gz
-S=${WORKDIR}/${PN}-3.8.0pre2
-DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/id3lib/${A}"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-
-	unpack ${A}
-
-	if [ "`gcc --version | cut -f1 -d.`" -eq 3 ] ||
-	   ([ -n "${CXX}" ] && [ "`${CXX} --version | cut -f1 -d.`" -eq 3 ])
-	then
-		cd ${S}
-		# Patch for compilation with gcc-3.0.x thanks to Dirk Jagdmann (doj),
-		# and me (fixed the const char** in utils.cpp)
-		#
-		# Azarah - 5 May 2002
-		patch -p1 <${FILESDIR}/${P}-gcc3.patch || die
-	fi
-}
-
-src_compile() {
-
-	./configure --host=${CHOST} --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL README THANKS TODO
-#	some example programs to be placed in docs dir.
-	make clean
-	cp -a examples ${D}/usr/share/doc/${PF}/examples
-}
-
diff --git a/media-libs/id3lib/id3lib-3.8.0_pre2-r2.ebuild b/media-libs/id3lib/id3lib-3.8.0_pre2-r2.ebuild
deleted file mode 100644
index 54d3803271e1..000000000000
--- a/media-libs/id3lib/id3lib-3.8.0_pre2-r2.ebuild
+++ /dev/null
@@ -1,47 +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-libs/id3lib/id3lib-3.8.0_pre2-r2.ebuild,v 1.1 2002/06/04 13:15:03 lostlogic Exp $
-
-A=${PN}-3.8.0pre2.tar.gz
-S=${WORKDIR}/${PN}-3.8.0pre2
-DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/id3lib/${A}"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-LICENSE=GPL
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	if [ "`gcc --version | cut -f1 -d.`" -eq 3 ] ||
-	   ([ -n "${CXX}" ] && [ "`${CXX} --version | cut -f1 -d.`" -eq 3 ]) ||
-	   [ "`gcc --version|grep gcc|cut -f1 -d.|cut -f3 -d\ `" -eq 3 ]
-	then
-		cd ${S}
-		# Patch for compilation with gcc-3.0.x thanks to Dirk Jagdmann (doj),
-		# and me (fixed the const char** in utils.cpp)
-		#
-		# Azarah - 5 May 2002
-		patch -p1 <${FILESDIR}/${P}-gcc3.patch || die
-	fi
-}
-
-src_compile() {
-
-	CPPFLAGS="-Wno-deprecated" ./configure --host=${CHOST} --includedir="" --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL README THANKS TODO
-#	some example programs to be placed in docs dir.
-	make clean
-	cp -a examples ${D}/usr/share/doc/${PF}/examples
-}
-
diff --git a/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild b/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild
index 93626d7135c5..0fab06293aad 100644
--- a/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild
@@ -1,13 +1,16 @@
 # 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-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild,v 1.1 2002/06/07 03:25:45 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
-A=${PN}-3.8.0pre2.tar.gz
-S=${WORKDIR}/${PN}-3.8.0pre2
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/id3lib/${A}"
+SRC_URI="mirror://sourceforge/id3lib/${MY_P}.tar.gz"
 HOMEPAGE="http://id3lib.sourceforge.net/"
-LICENSE=GPL
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}"
@@ -32,9 +35,9 @@ src_unpack() {
 src_compile() {
 
 	CPPFLAGS="${CPPFLAGS} -Wno-deprecated" \
-		 ./configure \
-		 --host=${CHOST} \
-		 --prefix=/usr || die
+		./configure \
+			--host=${CHOST} \
+			--prefix=/usr || die
 
 	emake || die
 }
diff --git a/media-libs/id3lib/id3lib-3.8.0_pre2.ebuild b/media-libs/id3lib/id3lib-3.8.0_pre2.ebuild
deleted file mode 100644
index a46628cd6329..000000000000
--- a/media-libs/id3lib/id3lib-3.8.0_pre2.ebuild
+++ /dev/null
@@ -1,28 +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-libs/id3lib/id3lib-3.8.0_pre2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-A=${PN}-3.8.0pre2.tar.gz
-S=${WORKDIR}/${PN}-3.8.0pre2
-DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/id3lib/${A}"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	./configure --host=${CHOST} --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL README THANKS TODO
-#	some example programs to be placed in docs dir.
-	make clean
-	cp -a examples ${D}/usr/share/doc/${PF}/examples
-}
-
diff --git a/media-libs/imlib/files/digest-imlib-1.9.13-r2 b/media-libs/imlib/files/digest-imlib-1.9.13-r2
deleted file mode 100644
index d40c6d3416e5..000000000000
--- a/media-libs/imlib/files/digest-imlib-1.9.13-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ab3f6ea596f731d54c18385bcc3525f imlib-1.9.13.tar.gz 752512
diff --git a/media-libs/imlib/files/digest-imlib-1.9.14 b/media-libs/imlib/files/digest-imlib-1.9.14
deleted file mode 100644
index d08237fcf000..000000000000
--- a/media-libs/imlib/files/digest-imlib-1.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fa54011e4e1db532d7eadae3ced6a8c imlib-1.9.14.tar.gz 748591
diff --git a/media-libs/imlib/imlib-1.9.13-r2.ebuild b/media-libs/imlib/imlib-1.9.13-r2.ebuild
deleted file mode 100644
index 277b7066ad85..000000000000
--- a/media-libs/imlib/imlib-1.9.13-r2.ebuild
+++ /dev/null
@@ -1,47 +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-libs/imlib/imlib-1.9.13-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Imlib is a general Image loading and rendering library."
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 http://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*
-	>=media-libs/tiff-3.5.5
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )"
-
-src_compile() {
-	
-	#update libtool to fix "relink" bug
-	libtoolize --copy --force
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/imlib || die
-		
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/imlib \
-		install || die
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING* ChangeLog README
-	dodoc NEWS
-	dohtml -r doc
-}
-
diff --git a/media-libs/imlib/imlib-1.9.14-r1.ebuild b/media-libs/imlib/imlib-1.9.14-r1.ebuild
index 011308ad99ff..0b6c1da36273 100644
--- a/media-libs/imlib/imlib-1.9.14-r1.ebuild
+++ b/media-libs/imlib/imlib-1.9.14-r1.ebuild
@@ -1,6 +1,8 @@
 # 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-libs/imlib/imlib-1.9.14-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.14-r1.ebuild,v 1.3 2002/07/16 11:36:47 seemant Exp $
+
+inherit libtool
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Imlib is a general Image loading and rendering library."
@@ -16,10 +18,13 @@ DEPEND="virtual/x11
 	>=media-libs/libpng-1.2.1
 	 >=media-libs/jpeg-6b"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 	
-	#update libtool to fix "relink" bug
-	libtoolize --copy --force
+	elibtoolize
 
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/media-libs/imlib/imlib-1.9.14.ebuild b/media-libs/imlib/imlib-1.9.14.ebuild
deleted file mode 100644
index 9672f228cf37..000000000000
--- a/media-libs/imlib/imlib-1.9.14.ebuild
+++ /dev/null
@@ -1,46 +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-libs/imlib/imlib-1.9.14.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Imlib is a general Image loading and rendering library."
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 http://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*
-	>=media-libs/tiff-3.5.5
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.2.1
-	 >=media-libs/jpeg-6b"
-
-src_compile() {
-	
-	#update libtool to fix "relink" bug
-	libtoolize --copy --force
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/imlib || die
-		
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/imlib \
-		install || die
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING* ChangeLog README
-	dodoc NEWS
-	dohtml -r doc
-}
diff --git a/media-libs/jpeg/jpeg-6b-r2.ebuild b/media-libs/jpeg/jpeg-6b-r2.ebuild
index e2a7d027d679..cb2bbc904538 100644
--- a/media-libs/jpeg/jpeg-6b-r2.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r2.ebuild
@@ -1,25 +1,36 @@
 # 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-libs/jpeg/jpeg-6b-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r2.ebuild,v 1.4 2002/07/16 11:36:47 seemant Exp $
 
-A=jpegsrc.v6b.tar.gz
+MY_P=${PN}src.v${PV}
 S=${WORKDIR}/${P}
 DESCRIPTION="libjpeg"
-SRC_URI="ftp://ftp.uu.net/graphics/jpeg/${A}"
-#SRC_URI="http://mirror/${A}"
+SRC_URI="ftp://ftp.uu.net/graphics/jpeg/${MY_P}.tar.gz"
 HOMEPAGE="http://www.ijg.org/"
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
-    try ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --enable-static
-    try make
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-shared \
+		--enable-static || die
+
+	make || die
 }
 
 src_install() {
 
-    dodir /usr/{include,lib,bin,share/man/man1}
-    try make install prefix=${D}/usr mandir=${D}/usr/share/man/man1
+	dodir /usr/{include,lib,bin,share/man/man1}
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man/man1 \
+		install || die
 
 	dodoc README change.log structure.doc
 }
diff --git a/media-libs/lcms/files/digest-lcms-1.06 b/media-libs/lcms/files/digest-lcms-1.06
deleted file mode 100644
index 79994dfa5e94..000000000000
--- a/media-libs/lcms/files/digest-lcms-1.06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e0a3642b42628b1fc40c1702a5e71e0 lcms-1.06.tar.gz 644116
diff --git a/media-libs/lcms/lcms-1.06.ebuild b/media-libs/lcms/lcms-1.06.ebuild
deleted file mode 100644
index de0c3c33d453..000000000000
--- a/media-libs/lcms/lcms-1.06.ebuild
+++ /dev/null
@@ -1,40 +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-libs/lcms/lcms-1.06.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="lcms deals with color management stuff"
-SRC_URI="http://www.littlecms.com/${A}"
-HOMEPAGE="http://www.littlecms.com/index.htm"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    cd ${D}/usr/include/lcms
-    cp lcms.h lcms.orig
-    sed -e "s:#define VERSION.*::" \
-        -e "s:#define PACKAGE.*::" \
-        lcms.orig > lcms.h
-    rm lcms.orig
-
-    cd ${S}/profiles
-    dodir /usr/share/lcms/profiles
-    cp *.icm ${D}/usr/share/lcms/profiles
-    cd ${S}
-
-    dodoc AUTHORS COPYING ChangeLog README*
-    docinto txt
-    dodoc doc/*.txt
-
-}
-
diff --git a/media-libs/lcms/lcms-1.08.ebuild b/media-libs/lcms/lcms-1.08.ebuild
index e5aaf79a3cae..c60c5a74052b 100644
--- a/media-libs/lcms/lcms-1.08.ebuild
+++ b/media-libs/lcms/lcms-1.08.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-libs/lcms/lcms-1.08.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.08.ebuild,v 1.3 2002/07/16 11:36:47 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A lightweight, speed optimized color management engine"
@@ -11,11 +11,15 @@ DEPEND="tiff? ( media-libs/tiff )
 	jpeg? ( media-libs/jpeg
 		sys-libs/zlib )"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	make || die
 
-	( use tiff && use jpeg ) && make tifficc
+	( use tiff && use jpeg ) && make tifficc || die
 }
 
 src_install () {
diff --git a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r2 b/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r2
deleted file mode 100644
index 6df6b2961e2f..000000000000
--- a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3dba62f026ed6b30c61f572f6d65631 libart_lgpl-2.3.8.tar.bz2 205615
diff --git a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r3 b/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r3
deleted file mode 100644
index 6df6b2961e2f..000000000000
--- a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.8-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3dba62f026ed6b30c61f572f6d65631 libart_lgpl-2.3.8.tar.bz2 205615
diff --git a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.9 b/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.9
deleted file mode 100644
index 2b06b51f5594..000000000000
--- a/media-libs/libart_lgpl/files/digest-libart_lgpl-2.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0453ceffd05e6a528455de8ac7890ab3 libart_lgpl-2.3.9.tar.bz2 211417
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.10.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.10.ebuild
index b59fa7d2afa0..fd5e1098e4c7 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.10.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.10.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-libs/libart_lgpl/libart_lgpl-2.3.10.ebuild,v 1.1 2002/07/02 17:36:39 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.10.ebuild,v 1.2 2002/07/16 11:36:47 seemant Exp $
 
 inherit gnome2
 
@@ -8,8 +8,10 @@ S=${WORKDIR}/${P}
 DESCRIPTION="a LGPL version of libart"
 SRC_URI="mirror://gnome/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.levien.org/libart"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="x86 ppc"
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND} dev-util/pkgconfig"
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.8-r2.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.8-r2.ebuild
deleted file mode 100644
index ee3e92d0096c..000000000000
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.8-r2.ebuild
+++ /dev/null
@@ -1,48 +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-libs/libart_lgpl/libart_lgpl-2.3.8-r2.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a LGPL version of libart"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.levien.org/libart"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} dev-util/pkgconfig"
-
-src_compile() {
-	local myconf
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-			--sysconfdir=/etc \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --enable-debug=yes || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README 
-}
-
-
-
-
-
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.8-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.8-r3.ebuild
deleted file mode 100644
index 7d2db8dbf67e..000000000000
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.8-r3.ebuild
+++ /dev/null
@@ -1,22 +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-libs/libart_lgpl/libart_lgpl-2.3.8-r3.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a LGPL version of libart"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.levien.org/libart"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-
-
-
-
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.9.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.9.ebuild
deleted file mode 100644
index ca985cecb390..000000000000
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.9.ebuild
+++ /dev/null
@@ -1,19 +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-libs/libart_lgpl/libart_lgpl-2.3.9.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a LGPL version of libart"
-SRC_URI="mirror://gnome/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.levien.org/libart"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.4 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.4
deleted file mode 100644
index 2943d3c0e998..000000000000
--- a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e673579fc377f2240d993a558a048be libcdaudio-0.99.4.tar.gz 161900
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.4.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.4.ebuild
deleted file mode 100644
index a9a027d77d10..000000000000
--- a/media-libs/libcdaudio/libcdaudio-0.99.4.ebuild
+++ /dev/null
@@ -1,20 +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-libs/libcdaudio/libcdaudio-0.99.4.ebuild,v 1.6 2002/07/11 06:30:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a library of cd audio related routines"
-SRC_URI="ftp://cdcd.undergrid.net/libcdaudio/${P}.tar.gz"
-HOMEPAGE="http://cdcd.undergrid.net/"
-DEPEND="virtual/glibc"
-
-src_compile() {
-	export CFLAGS="`echo $CFLAGS | sed -e 's:-march=[a-z0-9]*::'`"
-	./configure --prefix=/usr --host=${CHOST} --enable-threads || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangLog NEWS README README.BeOS README.OSF1 TODO
-}
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild
index 3d221ddca646..ad8717ad3f9a 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.6.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-libs/libcdaudio/libcdaudio-0.99.6.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild,v 1.4 2002/07/16 11:36:47 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a library of cd audio related routines"
@@ -8,6 +8,10 @@ SRC_URI="http://download.sourceforge.net/libcdaudio/${P}.tar.gz"
 HOMEPAGE="http://libcdaudio.sourceforge.net/"
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
     #export CFLAGS="`echo $CFLAGS | sed -e 's:-march=[a-z0-9]*::'`"
     ./configure --prefix=/usr --host=${CHOST} --enable-threads || die
diff --git a/media-libs/libmikmod/libmikmod-3.1.10.ebuild b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
index b0e42475daa7..57709a9326da 100644
--- a/media-libs/libmikmod/libmikmod-3.1.10.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
@@ -1,6 +1,6 @@
 # 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-libs/libmikmod/libmikmod-3.1.10.ebuild,v 1.4 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10.ebuild,v 1.5 2002/07/16 11:36:48 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -13,6 +13,9 @@ DEPEND="virtual/glibc
 	alsa? ( >=media-libs/alsa-lib-0.5.9 )
 	esd? ( >=media-sound/esound-0.2.19 )"
 
+SLOT="0"
+LICENSE="LGPL-2.1 | LGPL-2"
+KEYWORDS="x86 ppc"
 
 src_compile() {
 
diff --git a/media-libs/libmng/files/digest-libmng-1.0.1 b/media-libs/libmng/files/digest-libmng-1.0.1
deleted file mode 100644
index ddcad4c07cfb..000000000000
--- a/media-libs/libmng/files/digest-libmng-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abfb685a0acf670a627889268ac5aa33 libmng-1.0.1.tar.gz 497853
diff --git a/media-libs/libmng/libmng-1.0.1.ebuild b/media-libs/libmng/libmng-1.0.1.ebuild
deleted file mode 100644
index 10f82cfe7d8d..000000000000
--- a/media-libs/libmng/libmng-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +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-libs/libmng/libmng-1.0.1.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
-SRC_URI="http://download.sourceforge.net/libmng/${P}.tar.gz"
-HOMEPAGE="http://www.libmng.com/"
-
-DEPEND="virtual/glibc >=media-libs/jpeg-6b >=sys-libs/zlib-1.1.3 >=media-libs/lcms-1.0.6"
-
-src_compile() {
-    ./configure --prefix=/usr --with-lcms=/usr --host=${CHOST} || die
-    make || die
-}
-
-src_install () {
-    make prefix=${D}/usr install || die
-    dodoc Changes LICENSE README*
-    dodoc doc/doc.readme doc/libmng.txt doc/*.png
-    doman doc/man/*
-}
-
-
diff --git a/media-libs/libmng/libmng-1.0.3.ebuild b/media-libs/libmng/libmng-1.0.3.ebuild
index 28da8e3b41ad..05dca27c76d2 100644
--- a/media-libs/libmng/libmng-1.0.3.ebuild
+++ b/media-libs/libmng/libmng-1.0.3.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-libs/libmng/libmng-1.0.3.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.3.ebuild,v 1.3 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
@@ -11,6 +11,10 @@ DEPEND=">=media-libs/jpeg-6b
 	>=sys-libs/zlib-1.1.3
 	>=media-libs/lcms-1.0.8"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 
 	unpack ${A}
diff --git a/media-libs/libogg/files/digest-libogg-1.0_beta4 b/media-libs/libogg/files/digest-libogg-1.0_beta4
deleted file mode 100644
index 99ff988655ee..000000000000
--- a/media-libs/libogg/files/digest-libogg-1.0_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ffd9d6c02f824e50345920bd07366e9 libogg-1.0beta4.tar.gz 162129
diff --git a/media-libs/libogg/files/digest-libogg-1.0_rc1 b/media-libs/libogg/files/digest-libogg-1.0_rc1
deleted file mode 100644
index 8d4cf4a15c8b..000000000000
--- a/media-libs/libogg/files/digest-libogg-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe25d090de826bc6f364240412cf1998 libogg-1.0rc1.tar.gz 163327
diff --git a/media-libs/libogg/files/digest-libogg-1.0_rc2 b/media-libs/libogg/files/digest-libogg-1.0_rc2
deleted file mode 100644
index f816c26be1e4..000000000000
--- a/media-libs/libogg/files/digest-libogg-1.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 327733122fe0fb67da7e6632d23feb30 libogg-1.0rc2.tar.gz 162189
diff --git a/media-libs/libogg/files/digest-libogg-1.0_rc3 b/media-libs/libogg/files/digest-libogg-1.0_rc3
deleted file mode 100644
index 9e151af59529..000000000000
--- a/media-libs/libogg/files/digest-libogg-1.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6425cd5659aa7595b30f2c024d1b8eab libogg-1.0rc3.tar.gz 207366
diff --git a/media-libs/libogg/libogg-1.0_beta4.ebuild b/media-libs/libogg/libogg-1.0_beta4.ebuild
deleted file mode 100644
index c6a2c423c3e2..000000000000
--- a/media-libs/libogg/libogg-1.0_beta4.ebuild
+++ /dev/null
@@ -1,30 +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-libs/libogg/libogg-1.0_beta4.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-A=libogg-1.0beta4.tar.gz
-S=${WORKDIR}/libogg-1.0beta4
-DESCRIPTION="the Ogg media file format library"
-SRC_URI="http://www.vorbis.com/files/beta4/unix/${A}"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-}
-
-src_install () {
-    
-    try make DESTDIR=${D} install
-    
-    # remove the docs installed by make install, since I'll install
-    # them in portage package doc directory
-    echo "Removing docs installed by make install"
-    rm -rf ${D}/usr/share/doc
-    dodoc AUTHORS CHANGES COPYING README
-    docinto html
-    dodoc doc/*.{html,png}
-}
diff --git a/media-libs/libogg/libogg-1.0_rc1.ebuild b/media-libs/libogg/libogg-1.0_rc1.ebuild
deleted file mode 100644
index 0efd33b7d5c6..000000000000
--- a/media-libs/libogg/libogg-1.0_rc1.ebuild
+++ /dev/null
@@ -1,30 +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-libs/libogg/libogg-1.0_rc1.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-A=libogg-1.0rc1.tar.gz
-S=${WORKDIR}/libogg-1.0rc1
-DESCRIPTION="the Ogg media file format library"
-SRC_URI="http://www.vorbis.com/files/rc1/unix/${A}"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-}
-
-src_install () {
-    
-    try make DESTDIR=${D} install
-    
-    # remove the docs installed by make install, since I'll install
-    # them in portage package doc directory
-    echo "Removing docs installed by make install"
-    rm -rf ${D}/usr/share/doc
-    dodoc AUTHORS CHANGES COPYING README
-    docinto html
-    dodoc doc/*.{html,png}
-}
diff --git a/media-libs/libogg/libogg-1.0_rc2.ebuild b/media-libs/libogg/libogg-1.0_rc2.ebuild
deleted file mode 100644
index c75074b703a1..000000000000
--- a/media-libs/libogg/libogg-1.0_rc2.ebuild
+++ /dev/null
@@ -1,30 +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-libs/libogg/libogg-1.0_rc2.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
-
-A=libogg-1.0rc2.tar.gz
-S=${WORKDIR}/libogg-1.0rc2
-DESCRIPTION="the Ogg media file format library"
-SRC_URI="http://www.vorbis.com/files/rc2/unix/${A}"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-}
-
-src_install () {
-    
-    try make DESTDIR=${D} install
-    
-    # remove the docs installed by make install, since I'll install
-    # them in portage package doc directory
-    echo "Removing docs installed by make install"
-    rm -rf ${D}/usr/share/doc
-    dodoc AUTHORS CHANGES COPYING README
-    docinto html
-    dodoc doc/*.{html,png}
-}
diff --git a/media-libs/libogg/libogg-1.0_rc3-r1.ebuild b/media-libs/libogg/libogg-1.0_rc3-r1.ebuild
index 6666e63e928d..667844c5560e 100644
--- a/media-libs/libogg/libogg-1.0_rc3-r1.ebuild
+++ b/media-libs/libogg/libogg-1.0_rc3-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-libs/libogg/libogg-1.0_rc3-r1.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.0_rc3-r1.ebuild,v 1.3 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/libogg-1.0rc3
 DESCRIPTION="the Ogg media file format library"
@@ -9,6 +9,10 @@ HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 	./configure --prefix=/usr --host=${CHOST} || die
 
diff --git a/media-libs/libogg/libogg-1.0_rc3.ebuild b/media-libs/libogg/libogg-1.0_rc3.ebuild
deleted file mode 100644
index c7fee41149ab..000000000000
--- a/media-libs/libogg/libogg-1.0_rc3.ebuild
+++ /dev/null
@@ -1,30 +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-libs/libogg/libogg-1.0_rc3.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-S=${WORKDIR}/libogg-1.0rc3
-DESCRIPTION="the Ogg media file format library"
-SRC_URI="http://www.vorbis.com/files/rc3/unix/${PN}-1.0rc3.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-    
-	# remove the docs installed by make install, since I'll install
-	# them in portage package doc directory
-	echo "Removing docs installed by make install"
-	rm -rf ${D}/usr/share/doc
-
-	dodoc AUTHORS CHANGES COPYING README
-	docinto html
-	dodoc doc/*.{html,png}
-}
-
diff --git a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild b/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
index 32cbc9602e68..b77f0c33dcf2 100644
--- a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4-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-libs/libsdl/libsdl-1.2.4-r2.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4-r2.ebuild,v 1.4 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/SDL-${PV}
 DESCRIPTION="Simple Direct Media Layer"
@@ -21,7 +21,9 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	dev-lang/nasm"
 
+SLOT="0"
 LICENSE="LGPL"
+KEYWORDS="x86 ppc"
 
 src_compile() {
 	local myconf
diff --git a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
index b749534d9d39..a8c3c3601716 100644
--- a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4.20020601.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-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.3 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/SDL12
 DESCRIPTION="Simple Direct Media Layer"
@@ -21,7 +21,9 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	dev-lang/nasm"
 
+SLOT="0"
 LICENSE="LGPL"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 
diff --git a/media-libs/libungif/libungif-4.1.0-r1.ebuild b/media-libs/libungif/libungif-4.1.0-r1.ebuild
index bc23423055c4..9463ec884287 100644
--- a/media-libs/libungif/libungif-4.1.0-r1.ebuild
+++ b/media-libs/libungif/libungif-4.1.0-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-libs/libungif/libungif-4.1.0-r1.ebuild,v 1.4 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0-r1.ebuild,v 1.5 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A library for reading and writing gif images without LZW compression"
@@ -8,7 +8,11 @@ SRC_URI="ftp://prtr-13.ucsc.edu/pub/libungif/${P}.tar.gz"
 HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
 
 DEPEND="X? ( virtual/x11 )"
-	
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	local myconf
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.0_rc3 b/media-libs/libvorbis/files/digest-libvorbis-1.0_rc3
deleted file mode 100644
index fb3214b1f79c..000000000000
--- a/media-libs/libvorbis/files/digest-libvorbis-1.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3a0ce7718f698326504c76562315df2 libvorbis-1.0rc3.tar.gz 563834
diff --git a/media-libs/libvorbis/libvorbis-1.0_rc3-r1.ebuild b/media-libs/libvorbis/libvorbis-1.0_rc3-r1.ebuild
index 89e04b1a6972..84ad987b16f5 100644
--- a/media-libs/libvorbis/libvorbis-1.0_rc3-r1.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0_rc3-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-libs/libvorbis/libvorbis-1.0_rc3-r1.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0_rc3-r1.ebuild,v 1.4 2002/07/16 11:36:48 seemant Exp $
 
 
 S=${WORKDIR}/${PN}-1.0rc3
@@ -10,6 +10,10 @@ HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
 
 DEPEND=">=media-libs/libogg-1.0_rc2"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 	export CFLAGS="${CFLAGS/-march=*/}"
 
diff --git a/media-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild b/media-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild
index b1c7c4160dce..12927f0bb89f 100644
--- a/media-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild
@@ -1,16 +1,21 @@
 # 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-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0_rc3-r2.ebuild,v 1.3 2002/07/16 11:36:48 seemant Exp $
 
 inherit libtool
 
-S=${WORKDIR}/${PN}-1.0rc3
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="the Ogg Vorbis sound file format library"
-SRC_URI="http://www.vorbis.com/files/rc3/unix/${PN}-1.0rc3.tar.gz"
+SRC_URI="http://www.vorbis.com/files/rc3/unix/${MY_P}.tar.gz"
 HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
 
 DEPEND=">=media-libs/libogg-1.0_rc2"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/media-libs/libvorbis/libvorbis-1.0_rc3.ebuild b/media-libs/libvorbis/libvorbis-1.0_rc3.ebuild
deleted file mode 100644
index 2c9a8e851204..000000000000
--- a/media-libs/libvorbis/libvorbis-1.0_rc3.ebuild
+++ /dev/null
@@ -1,38 +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-libs/libvorbis/libvorbis-1.0_rc3.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-
-S=${WORKDIR}/${PN}-1.0rc3
-DESCRIPTION="the Ogg Vorbis sound file format library"
-SRC_URI="http://www.vorbis.com/files/rc3/unix/${PN}-1.0rc3.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-DEPEND=">=media-libs/libogg-1.0_rc2"
-
-src_compile() {
-	export CFLAGS="${CFLAGS/-march=*/}"
-
-	./configure --prefix=/usr --host=${CHOST} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	echo "Removing docs installed by make install"
-	rm -rf ${D}/usr/share/doc
-
-	dodoc AUTHORS COPYING README todo.txt
-	docinto txt
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.{html,png}
-	docinto html/vorbisenc
-	dodoc doc/vorbisenc/*.{css,html}
-	docinto html/vorbisfile
-	dodoc doc/vorbisfile/*.{css,html}
-}
-
-
diff --git a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild b/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
index e5ff9c6ef5f7..4544bef78aa3 100644
--- a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
+++ b/media-libs/mpeg-lib/mpeg-lib-1.3.1-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-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.6 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.7 2002/07/16 11:36:48 seemant Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}
@@ -10,6 +10,10 @@ HOMEPAGE="http://"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
 	./configure --prefix=/usr --host=${CHOST} --disable-dither || die
diff --git a/media-libs/netpbm/files/digest-netpbm-9.12 b/media-libs/netpbm/files/digest-netpbm-9.12
deleted file mode 100644
index 84ecd0cc69ac..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6de9fb5133763d30f1ae707b4b115cfe netpbm-9.12.tgz 2057293
diff --git a/media-libs/netpbm/files/digest-netpbm-9.12-r1 b/media-libs/netpbm/files/digest-netpbm-9.12-r1
deleted file mode 100644
index 84ecd0cc69ac..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-9.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6de9fb5133763d30f1ae707b4b115cfe netpbm-9.12.tgz 2057293
diff --git a/media-libs/netpbm/netpbm-9.12-r1.ebuild b/media-libs/netpbm/netpbm-9.12-r1.ebuild
deleted file mode 100644
index daba5948f573..000000000000
--- a/media-libs/netpbm/netpbm-9.12-r1.ebuild
+++ /dev/null
@@ -1,33 +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-libs/netpbm/netpbm-9.12-r1.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
-
-A=${P}.tgz
-S=${WORKDIR}/${P}
-DESCRIPTION="a set of utilities for converting to/from the netpbm (and related) formats"
-SRC_URI="http://download.sourceforge.net/netpbm/${A}"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.5"
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-    cp ${FILESDIR}/${PV}/Makefile.config .
-}
-
-src_compile() {
-    try make CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-    try make INSTALL_PREFIX="${D}/usr/" install
-    insinto /usr/include/pbm
-    doins pnm/{pam,pnm}.h ppm/{ppm,pgm,pbm}.h
-    doins pbmplus.h shopt/shopt.h
-    dodoc COPYRIGHT.PATENT GPL_LICENSE.txt HISTORY \
-          Netpbm.programming README README.CONFOCAL README.DJGPP \
-          README.JPEG README.VMS netpbm.lsm
-}
diff --git a/media-libs/netpbm/netpbm-9.12-r2.ebuild b/media-libs/netpbm/netpbm-9.12-r2.ebuild
index 45ec1dad0035..b621474c7954 100644
--- a/media-libs/netpbm/netpbm-9.12-r2.ebuild
+++ b/media-libs/netpbm/netpbm-9.12-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-libs/netpbm/netpbm-9.12-r2.ebuild,v 1.5 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r2.ebuild,v 1.6 2002/07/16 11:36:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
@@ -11,6 +11,10 @@ DEPEND=">=media-libs/jpeg-6b
 	>=media-libs/tiff-3.5.5
 	>=media-libs/libpng-1.2.1"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
     unpack ${A}
     cd ${S}
diff --git a/media-libs/netpbm/netpbm-9.12.ebuild b/media-libs/netpbm/netpbm-9.12.ebuild
deleted file mode 100644
index bb36ebc42c11..000000000000
--- a/media-libs/netpbm/netpbm-9.12.ebuild
+++ /dev/null
@@ -1,30 +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-libs/netpbm/netpbm-9.12.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
-
-A=${P}.tgz
-S=${WORKDIR}/${P}
-DESCRIPTION="a set of utilities for converting to/from the netpbm (and related) formats"
-SRC_URI="http://download.sourceforge.net/netpbm/${A}"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.5"
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-    cp ${FILESDIR}/${PV}/Makefile.config .
-}
-
-src_compile() {
-    try make CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-    try make INSTALL_PREFIX="${D}/usr/" install
-    dodoc COPYRIGHT.PATENT GPL_LICENSE.txt HISTORY \
-          Netpbm.programming README README.CONFOCAL README.DJGPP \
-          README.JPEG README.VMS netpbm.lsm
-}
diff --git a/media-libs/t1lib/files/digest-t1lib-1.0.1-r2 b/media-libs/t1lib/files/digest-t1lib-1.0.1-r2
deleted file mode 100644
index 9cb811f33f1a..000000000000
--- a/media-libs/t1lib/files/digest-t1lib-1.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e09289172db215810e8c8d2e8867de3 t1lib-1.0.1.tar.gz 928924
diff --git a/media-libs/t1lib/files/digest-t1lib-1.1.1 b/media-libs/t1lib/files/digest-t1lib-1.1.1
deleted file mode 100644
index 6ed4bb5640aa..000000000000
--- a/media-libs/t1lib/files/digest-t1lib-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e42a9b9f3bff3f16c0d445304788afbe t1lib-1.1.1.tar.gz 1442934
diff --git a/media-libs/t1lib/files/digest-t1lib-1.3 b/media-libs/t1lib/files/digest-t1lib-1.3
deleted file mode 100644
index 5c7cfffbf279..000000000000
--- a/media-libs/t1lib/files/digest-t1lib-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37c1876661cec5b3a17ddd52f2bf71c2 t1lib-1.3.tar.gz 1528553
diff --git a/media-libs/t1lib/t1lib-1.0.1-r2.ebuild b/media-libs/t1lib/t1lib-1.0.1-r2.ebuild
deleted file mode 100644
index d4d2d9cd4f62..000000000000
--- a/media-libs/t1lib/t1lib-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,62 +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-libs/t1lib/t1lib-1.0.1-r2.ebuild,v 1.4 2002/07/11 06:30:40 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/T1-${PV}
-DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
-SRC_URI="ftp://ftp.neuroinformatik.ruhr-uni-bochum.de/pub/software/t1lib/${A}"
-HOMEPAGE="http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html"
-
-DEPEND="virtual/glibc
-	tetex? ( >=app-text/tetex-1.0.7 )
-	X? ( virtual/x11 )"
-
-src_compile() {
-
-  local myconf
-  if [ "`use X`" ]
-  then
-    myconf="--with-x"
-  else
-    myconf="--without-x"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/usr --datadir=/etc ${myconf}
-
-  if [ "`use tetex`" ]
-  then
-     try make
-  else
-     try make without_doc
-  fi
-
-}
-
-src_install() {
-
-  cd lib
-  insinto /usr/include
-  doins t1lib.h
-
-  if [ "`use X`" ]
-  then
-
-    doins t1libx.h
-    dolib .libs/libt1x.{la,a,so.1.0.1}
-    dosym libt1x.so.1.0.1 /usr/lib/libt1x.so.1
-    dosym libt1x.so.1.0.1 /usr/lib/libt1x.so
-  fi
-  dolib .libs/libt1.{la,a,so.1.0.1}
-  dosym libt1.so.1.0.1 /usr/lib/libt1.so.1
-  dosym libt1.so.1.0.1 /usr/lib/libt1.so
-  insinto /etc/t1lib
-  doins t1lib.config
-
-  cd ..
-  dodoc Changes LGPL LICENSE README*
-
-}
-
-
-
diff --git a/media-libs/t1lib/t1lib-1.1.1.ebuild b/media-libs/t1lib/t1lib-1.1.1.ebuild
deleted file mode 100644
index eca81d7a0ae1..000000000000
--- a/media-libs/t1lib/t1lib-1.1.1.ebuild
+++ /dev/null
@@ -1,62 +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-libs/t1lib/t1lib-1.1.1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/T1-${PV}
-DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
-SRC_URI="ftp://ftp.neuroinformatik.ruhr-uni-bochum.de/pub/software/t1lib/${A}"
-HOMEPAGE="http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html"
-
-DEPEND="virtual/glibc
-	tetex? ( >=app-text/tetex-1.0.7 )
-	X? ( virtual/x11 )"
-
-src_compile() {
-
-  local myconf
-  if [ "`use X`" ]
-  then
-    myconf="--with-x"
-  else
-    myconf="--without-x"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/usr --datadir=/etc ${myconf}
-
-  if [ "`use tetex`" ]
-  then
-     try make
-  else
-     try make without_doc
-  fi
-
-}
-
-src_install() {
-
-  cd lib
-  insinto /usr/include
-  doins t1lib.h
-
-  if [ "`use X`" ]
-  then
-
-    doins t1libx.h
-    dolib .libs/libt1x.{la,a,so.1.1.1}
-    dosym libt1x.so.1.1.1 /usr/lib/libt1x.so.1
-    dosym libt1x.so.1.1.1 /usr/lib/libt1x.so
-  fi
-  dolib .libs/libt1.{la,a,so.1.1.1}
-  dosym libt1.so.1.1.1 /usr/lib/libt1.so.1
-  dosym libt1.so.1.1.1 /usr/lib/libt1.so
-  insinto /etc/t1lib
-  doins t1lib.config
-
-  cd ..
-  dodoc Changes LGPL LICENSE README*
-
-}
-
-
-
diff --git a/media-libs/t1lib/t1lib-1.3.1.ebuild b/media-libs/t1lib/t1lib-1.3.1.ebuild
index 72e5003aaee8..22399b5c61cb 100644
--- a/media-libs/t1lib/t1lib-1.3.1.ebuild
+++ b/media-libs/t1lib/t1lib-1.3.1.ebuild
@@ -11,6 +11,10 @@ HOMEPAGE="http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1l
 DEPEND="X? ( virtual/x11 )
 	tetex? ( >=app-text/tetex-1.0.7 )"
 
+SLOT="0"
+LICENSE="LGPL-2 GPL-2"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	unpack "${P}.tar.gz"
 
diff --git a/media-libs/t1lib/t1lib-1.3.ebuild b/media-libs/t1lib/t1lib-1.3.ebuild
deleted file mode 100644
index d52236e0450e..000000000000
--- a/media-libs/t1lib/t1lib-1.3.ebuild
+++ /dev/null
@@ -1,56 +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-libs/t1lib/t1lib-1.3.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/T1Lib-${PV}
-DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
-HOMEPAGE="http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html"
-
-DEPEND="X? ( virtual/x11 )
-	tetex? ( >=app-text/tetex-1.0.7 )"
-
-src_compile() {
-
-	local myconf
-	local myopt
-
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
-	
-	use tetex \
-		|| myopt="without_doc"
-	
-	./configure  \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--datadir=/etc \
-		${myconf} || die
-	
-	emake ${myopt} || die
-}
-
-src_install() {
-
-	cd lib
-	insinto /usr/include
-	doins t1lib.h
-
-	use X && ( \
-		doins t1libx.h
-		dolib .libs/libt1x.{la,a,so.1.3.0}
-		dosym libt1x.so.1.3.0 /usr/lib/libt1x.so.1
-		dosym libt1x.so.1.3.0 /usr/lib/libt1x.so
-	)
-
-	dolib .libs/libt1.{la,a,so.1.3.0}
-	dosym libt1.so.1.3.0 /usr/lib/libt1.so.1
-	dosym libt1.so.1.3.0 /usr/lib/libt1.so
-	insinto /etc/t1lib
-	doins t1lib.config
-
-	cd ..
-	dodoc Changes LGPL LICENSE README*
-
-}
diff --git a/media-libs/tiff/files/digest-tiff-3.5.7 b/media-libs/tiff/files/digest-tiff-3.5.7
deleted file mode 100644
index 83cf7f85cd29..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82243b5ae9b7c9e492aeebc501680990 tiff-v3.5.7.tar.gz 951139
diff --git a/media-libs/tiff/tiff-3.5.7-r1.ebuild b/media-libs/tiff/tiff-3.5.7-r1.ebuild
index 2432080d1a88..2bda755a8f8a 100644
--- a/media-libs/tiff/tiff-3.5.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.5.7-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-libs/tiff/tiff-3.5.7-r1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r1.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $
 
 MY_P=${P/tiff-/tiff-v}
 S=${WORKDIR}/${MY_P}
@@ -11,6 +11,9 @@ HOMEPAGE="http://www.libtiff.org/"
 DEPEND=">=media-libs/jpeg-6b 
 	>=sys-libs/zlib-1.1.3-r2"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/tiff/tiff-3.5.7.ebuild b/media-libs/tiff/tiff-3.5.7.ebuild
deleted file mode 100644
index 841f219c7e00..000000000000
--- a/media-libs/tiff/tiff-3.5.7.ebuild
+++ /dev/null
@@ -1,34 +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-libs/tiff/tiff-3.5.7.ebuild,v 1.4 2002/07/11 06:30:40 drobbins Exp $
-
-MY_P=${P/tiff-/tiff-v}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="libtiff"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b 
-	>=sys-libs/zlib-1.1.3-r2"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
-	dodir /usr/share/doc/${PF}/html
-	make INSTALL="/bin/sh ${S}/port/install.sh" install || die
-	prepalldocs
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/win32codecs/win32codecs-0.60-r1.ebuild b/media-libs/win32codecs/win32codecs-0.60-r1.ebuild
index fe6bbc558838..acd635b3e214 100644
--- a/media-libs/win32codecs/win32codecs-0.60-r1.ebuild
+++ b/media-libs/win32codecs/win32codecs-0.60-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-libs/win32codecs/win32codecs-0.60-r1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-0.60-r1.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $
 
 S=${WORKDIR}/w32codec-${PV}
 DESCRIPTION="Win32 binary codecs for MPlayer and maybe avifile as well"
@@ -10,6 +10,7 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 DEPEND=""
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="x86 ppc"
 
 src_install() {
 
diff --git a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild b/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
index 8d91ee33dbe6..17ee045766fe 100644
--- a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild,v 1.3 2002/06/17 18:50:57 lostlogic Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $ 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
 
 LICENSE="GPL"
 SLOT="0"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 
diff --git a/media-libs/xine-lib/xine-lib-0.9.11.ebuild b/media-libs/xine-lib/xine-lib-0.9.11.ebuild
index 3db5d00ae596..0267bb2462d7 100644
--- a/media-libs/xine-lib/xine-lib-0.9.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.11.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.11.ebuild,v 1.2 2002/06/21 01:21:22 lostlogic Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.11.ebuild,v 1.3 2002/07/16 11:36:53 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}a.tar.gz"
 
 DEPEND="X? ( virtual/x11 )
 	avi? ( >=media-libs/win32codecs-0.50 
@@ -16,12 +17,13 @@ DEPEND="X? ( virtual/x11 )
 	alsa? ( media-libs/alsa-lib )
 	aalib? ( media-libs/aalib )
 	oggvorbis? ( media-libs/libvorbis )"
+
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
-SRC_URI="http://xine.sourceforge.net/files/${P}a.tar.gz"
 SLOT="0"
-S=${WORKDIR}/${A/.tar.gz/}
+LICENSE="GPL"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/media-libs/xine-lib/xine-lib-0.9.12.ebuild b/media-libs/xine-lib/xine-lib-0.9.12.ebuild
index 0baa7ffed2d5..04a82492507e 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12.ebuild,v 1.3 2002/06/23 18:32:39 lostlogic Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12.ebuild,v 1.4 2002/07/16 11:36:53 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="X? ( virtual/x11 )
 	avi? ( >=media-libs/win32codecs-0.50 
@@ -21,9 +22,9 @@ DEPEND="X? ( virtual/x11 )
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
-SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
 SLOT="0"
-S=${WORKDIR}/${P}
+LICENSE="GPL"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild b/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild
deleted file mode 100644
index 4b0ee139f68d..000000000000
--- a/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild
+++ /dev/null
@@ -1,57 +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-sound/alsa-driver/alsa-driver-0.5.11.ebuild,v 1.6 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Advanced Linux Sound Architecture modules"
-SRC_URI="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${PV}.tar.bz2"
-HOMEPAGE="http://www.alsa-project.org"
-
-#virtual/glibc should depend on specific kernel headers
-DEPEND="sys-devel/autoconf virtual/glibc"
-PROVIDE="virtual/alsa"
-KV=""
-
-pkg_setup() {
-	KV=`readlink /usr/src/linux`
-	if [ $? -ne 0 ] ; then
-		echo 
-		echo "/usr/src/linux symlink does not exist; cannot continue."
-		echo
-		die
-	else
-		#alsa-driver will compile modules for the kernel pointed to by /usr/src/linux
-		KV=${KV/linux-/}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp configure.in configure.in.orig
-	sed -e 's/-m.86//g' configure.in.orig > configure.in
-	autoconf
-}
-
-src_compile() {
-	try ./configure --with-kernel="${ROOT}usr/src/linux-${KV}" --with-isapnp=yes --with-sequencer=yes --with-oss=yes --with-cards=all
-	try emake
-}
-
-src_install () {
-	#point this to the kernel headers in the future, not the kernel sources
-	insinto /usr/include/linux
-	cd ${S}/include
-	doins asound.h asoundid.h asequencer.h ainstr_*.h
-	dodoc INSTALL FAQ
-	dodir /lib/modules/${KV}/misc
-	cp ${S}/modules/*.o ${D}/lib/modules/${KV}/misc
-	dodir /etc/modutils
-	insinto /etc/modutils
-	doins ${FILESDIR}/alsa
-	#this is the new modular modules system (from Debian) :)
-}
-
-pkg_postinst() {
-	/usr/sbin/update-modules || return 0
-}
diff --git a/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild b/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
index 6114424b56fa..f7e1586342ae 100644
--- a/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
@@ -1,6 +1,6 @@
 # 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-sound/alsa-driver/alsa-driver-0.5.12a.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild,v 1.6 2002/07/16 11:36:53 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Linux Sound Architecture modules"
@@ -11,6 +11,10 @@ HOMEPAGE="http://www.alsa-project.org"
 DEPEND="sys-devel/autoconf virtual/glibc"
 PROVIDE="virtual/alsa"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 setkv() {
 	KV=""
 	KV=`readlink /usr/src/linux`
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.0_beta10.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.0_beta10.ebuild
deleted file mode 100644
index cc414e1c9685..000000000000
--- a/media-sound/alsa-driver/alsa-driver-0.9.0_beta10.ebuild
+++ /dev/null
@@ -1,74 +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-sound/alsa-driver/alsa-driver-0.9.0_beta10.ebuild,v 1.4 2002/07/11 06:30:40 drobbins Exp $
-
-# By default, drivers for all supported cards will be compiled.
-# If you want to only compile for specific card(s), set ALSA_CARDS
-# environment variable accordingly
-[ x${ALSA_CARDS} = x ] && ALSA_CARDS=all
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}-${MYPV}"
-KV=""
-
-S=${WORKDIR}/${MYP}
-
-DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
-
-SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${MYP}.tar.bz2"
-
-HOMEPAGE="http://www.alsa-project.org"
-
-#virtual/glibc should depend on specific kernel headers
-DEPEND="sys-devel/autoconf virtual/glibc"
-PROVIDE="virtual/alsa"
-
-pkg_setup() {
-	KV=`readlink /usr/src/linux`
-	if [ $? -ne 0 ] ; then
-		echo 
-		echo "/usr/src/linux symlink does not exist; cannot continue."
-		echo
-		die
-	else
-		#alsa-driver will compile modules for the kernel pointed to by /usr/src/linux
-		KV=${KV/linux-/}
-	fi
-}
-
-src_compile() {
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-kernel="${ROOT}usr/src/linux-${KV}" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-oss=yes \
-		--with-cards=${ALSA_CARDS} \
-		|| die "./configure failed"
-	
-	emake || die "Parallel Make Failed"
-
-}
-
-src_install () {
-	
-	insinto /usr/include/sound
-	cd ${S}/include
-	doins *.h
-	cd ${S}
-	dodoc CARDS-STATUS COPYING FAQ INSTALL README WARNING TODO
-	dodir /lib/modules/${KV}/misc
-	cp ${S}/modules/*.o ${D}/lib/modules/${KV}/misc
-	insinto /etc/modules.d
-	doins ${FILESDIR}/alsa
-	insinto /etc/init.d
-	doins ${S}/utils/alsasound
-
-}
-
-pkg_postinst () {
-	/usr/sbin/update-modules || return 0
-}
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild
index bf0d4e6eb0b6..315f6e6adf74 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.0_rc1-r7.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -21,6 +21,10 @@ DEPEND="sys-devel/autoconf
 RDEPEND="${DEPEND}"
 PROVIDE="virtual/alsa"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_unpack() {
 	# Some *broken* Gentoo packages install stuff in /etc/rc.d/init.d
 	# instead of /etc/init.d.  However, this causes alsa's installer
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
index 80fcf1dbc109..c0f4d095d563 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild,v 1.3 2002/07/12 04:44:53 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -21,6 +21,11 @@ DEPEND="sys-devel/autoconf
 RDEPEND="${DEPEND}"
 PROVIDE="virtual/alsa"
 
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	# Some *broken* Gentoo packages install stuff in /etc/rc.d/init.d
 	# instead of /etc/init.d.  However, this causes alsa's installer
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11 b/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11
deleted file mode 100644
index 0c5833cd7782..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff807499928379c4274a307855b9eeeb alsa-driver-0.5.11.tar.bz2 904757
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-0.9.0_beta10 b/media-sound/alsa-driver/files/digest-alsa-driver-0.9.0_beta10
deleted file mode 100644
index a4bec47d1748..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-0.9.0_beta10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3e9fde5c551a19652c07da54f878379 alsa-driver-0.9.0beta10.tar.bz2 1039578
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
index ed7d4e066350..7e64f391c142 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
@@ -1,26 +1,30 @@
 # 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-sound/cdparanoia/cdparanoia-3.9.8.ebuild,v 1.6 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild,v 1.7 2002/07/16 11:36:53 seemant Exp $
 
-A=${PN}-III-alpha9.8.src.tgz
-S=${WORKDIR}/${PN}-III-alpha9.8
+MY_PA=${PN}-III-alpha9.8
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="an advanced CDDA reader with error correction"
-SRC_URI="http://www.xiph.org/paranoia/download/${A}"
+SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 HOMEPAGE="http://www.xiph.org/paranoia/index.html"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_compile() {
 
-    ./configure --prefix=/usr || die
+	./configure --prefix=/usr || die
 	#the configure script doesn't recognize i686-pc-linux-gnu
 	#--host=${CHOST}
-    make OPT="$CFLAGS" || die
+	make OPT="$CFLAGS" || die
 }
 
 src_install () {
-    cd ${S}
-    dodir /usr/bin /usr/lib /usr/share/man/man1 /usr/include
-    make prefix=${D}/usr MANDIR=${D}/usr/share/man install || die
-    dodoc FAQ.txt GPL README
+	cd ${S}
+	dodir /usr/bin /usr/lib /usr/share/man/man1 /usr/include
+	make prefix=${D}/usr MANDIR=${D}/usr/share/man install || die
+	dodoc FAQ.txt GPL README
 }
diff --git a/media-sound/esound/esound-0.2.28-r1.ebuild b/media-sound/esound/esound-0.2.28-r1.ebuild
index e631a14b20d8..be2d19b342e9 100644
--- a/media-sound/esound/esound-0.2.28-r1.ebuild
+++ b/media-sound/esound/esound-0.2.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.28-r1.ebuild,v 1.2 2002/07/15 10:35:49 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.28-r1.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $
 
 inherit libtool
 
@@ -11,7 +11,7 @@ ftp://download.sourceforge.net/pub/mirrors/gnome/stable/sources/esound/${P}.tar.
 HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc
 	>=media-libs/audiofile-0.1.9
diff --git a/media-sound/lame/files/digest-lame-3.91 b/media-sound/lame/files/digest-lame-3.91
deleted file mode 100644
index c1a94637184f..000000000000
--- a/media-sound/lame/files/digest-lame-3.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c09562caa789c946403f6f9661592ee5 lame-3.91.tar.gz 873212
diff --git a/media-sound/lame/lame-3.91.ebuild b/media-sound/lame/lame-3.91.ebuild
deleted file mode 100644
index baf001facefd..000000000000
--- a/media-sound/lame/lame-3.91.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-sound/lame/lame-3.91.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/lame-${PV}
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="http://download.sourceforge.net/lame/${P}.tar.gz"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc
-	dev-lang/nasm
-	>=sys-libs/ncurses-5.2
-	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
-	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/lame-3.91-gcc3.diff || die
-
-}
-
-src_compile() {
-
-	local myconf=""
-	if [ "`use oggvorbis`" ] ; then
-	#	myconf="--with-vorbis"
-		myconf="--without-vorbis"
-	else
-		myconf="--without-vorbis"
-	fi
-	if [ "`use gtk`" ] ; then
-		myconf="$myconf --enable-mp3x"
-	fi
-	if [ "$DEBUG" ] ; then
-		myconf="$myconf --enable-debug=yes"
-	else
-		myconf="$myconf --enable-debug=no"
-	fi
-	
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-nasm \
-		--enable-mp3rtp \
-		--enable-extopt=full \
-		$myconf || die
-		
-	emake || die
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		pkghtmldir=${D}/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-	dohtml -r ./
-}
-
diff --git a/media-sound/lame/lame-3.92.ebuild b/media-sound/lame/lame-3.92.ebuild
index 4967a0ed8131..73a6cc532886 100644
--- a/media-sound/lame/lame-3.92.ebuild
+++ b/media-sound/lame/lame-3.92.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-sound/lame/lame-3.92.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.92.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $
 
 S=${WORKDIR}/lame-${PV}
 DESCRIPTION="LAME Ain't an Mp3 Encoder"
@@ -18,6 +18,11 @@ RDEPEND="virtual/glibc
 	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	unpack ${A}
 #	cd ${S}
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59r b/media-sound/mpg123/files/digest-mpg123-0.59r
deleted file mode 100644
index d1abfcacbafc..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59r
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95df59ad1651dd2346d49fafc83747e7 mpg123-0.59r.tar.gz 159028
diff --git a/media-sound/mpg123/mpg123-0.59r-r1.ebuild b/media-sound/mpg123/mpg123-0.59r-r1.ebuild
index f754bea15adc..e1d3ec917903 100644
--- a/media-sound/mpg123/mpg123-0.59r-r1.ebuild
+++ b/media-sound/mpg123/mpg123-0.59r-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-sound/mpg123/mpg123-0.59r-r1.ebuild,v 1.5 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r-r1.ebuild,v 1.6 2002/07/16 11:36:53 seemant Exp $
 
 S=${WORKDIR}/${P}
 
@@ -10,6 +10,10 @@ HOMEPAGE="http://www.mpg123.de/"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_unpack () {
 	unpack ${A}
 	cd ${S}
diff --git a/media-sound/mpg123/mpg123-0.59r.ebuild b/media-sound/mpg123/mpg123-0.59r.ebuild
deleted file mode 100644
index 6a10cc1c2eff..000000000000
--- a/media-sound/mpg123/mpg123-0.59r.ebuild
+++ /dev/null
@@ -1,33 +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-sound/mpg123/mpg123-0.59r.ebuild,v 1.7 2002/07/11 06:30:41 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Real Time mp3 player"
-SRC_URI="http://www.mpg123.de/mpg123/${P}.tar.gz"
-HOMEPAGE="http://www.mpg123.de/"
-
-DEPEND="virtual/glibc"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -m486:${CFLAGS}:" Makefile.orig > Makefile
-}
-
-src_compile() {
-
-	make linux-i486 || die
-
-}
-
-src_install () {
-
-	into /usr
-	dobin mpg123
-	doman mpg123.1
-	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
-
-
-}
diff --git a/media-sound/ripperx/ripperx-2.3.ebuild b/media-sound/ripperx/ripperx-2.3.ebuild
index 6e1ad93aa4e7..27483cba856f 100644
--- a/media-sound/ripperx/ripperx-2.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.3.ebuild
@@ -1,17 +1,21 @@
 # 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-sound/ripperx/ripperx-2.3.ebuild,v 1.3 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ripperx/ripperx-2.3.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $
 
-PN=ripperX
-A=${PN}-${PV}.tar.gz
-S=${WORKDIR}/${PN}-${PV}
+MY_P=${P/x/X}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="RipperX is a program to rip CD and enconde mp3s"
 HOMEPAGE="http://ripperx.sf.net/"
-SRC_URI="http://telia.dl.sourceforge.net/ripperx/${A}"
+SRC_URI="http://telia.dl.sourceforge.net/ripperx/${MY_P}.tar.gz"
 DEPEND="=x11-libs/gtk+-1.2*
-		media-sound/lame
-		media-sound/cdparanoia
-		media-libs/id3lib"
+	media-sound/lame
+	media-sound/cdparanoia
+	media-libs/id3lib"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 
 src_unpack () {
 	unpack ${A}
@@ -35,4 +39,6 @@ src_install () {
 	ripperX_plugin-cdparanoia ripperX_plugin-encode ripperX_plugin-gogo \
 	ripperX_plugin-l3enc ripperX_plugin-lame ripperX_plugin-mp3enc \
 	ripperX_plugin-oggenc ripperX_plugin-xingmp3enc ripperX_plugin_tester
+
+	dodoc README AUTHORS COPYING BUGS CHANGES FAQ TODO
 }
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r10 b/media-sound/xmms/files/digest-xmms-1.2.7-r10
deleted file mode 100644
index 52a743c50769..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
-MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r8 b/media-sound/xmms/files/digest-xmms-1.2.7-r8
deleted file mode 100644
index 52a743c50769..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
-MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/xmms-1.2.7-r10.ebuild b/media-sound/xmms/xmms-1.2.7-r10.ebuild
deleted file mode 100644
index 06513a17eec2..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r10.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r7.ebuild,v 1.2 2002/05/31 14:34:51 seemant Exp
-
-PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-XMMS_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
-	avi?( http://www.openface.ca/~nephtes/plover-${PN}${PLO_VER}.tar.gz )"
-MMX_URI="http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz"
-use mmx || use 3dnow \
-	&& SOURCE_HTTP="${XMMS_URI} ${MMX_URI}" \
-	|| SOURCE_HTTP="${XMMS_URI}"
-SRC_URI="${SOURCE_HTTP}"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-panel-1.4.1 
-			  <gnome-base/gnome-panel-1.5.0 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
-	# and libstdcxx.
-	use avi && ( \
-		patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-	)
-	
-	# The following code prevents a correct unpack on PPC, so let's
-	# exclude the code on that platform. Olivier Reisch <doctomoe@gentoo.org>
-	if [ ${ARCH} != "ppc" ]
-	then
-	# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
-	( use mmx || use 3dnow ) && \
-		cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die
-	fi
-
-# This is for the Plover patch
-#	use avi	&& (\
-#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-#		sed -e "s:avifile-config:avifile-config0.7:g" \
-#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-#		patch -p1 <plover-xmms${PLO_VER}.diff || die
-#	)
-}
-
-src_compile() {
-	local myopts
-
-	use gnome \
-		&& myopts="${myopts} --with-gnome" \
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow \
-		&& myopts="${myopts} --enable-3dnow" \
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd \
-		&& myopts="${myopts} --enable-esd" \
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl \
-		&& myopts="${myopts} --enable-opengl" \
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis \
-		&& myopts="${myopts} --with-ogg --with-vorbis" \
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml \
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls \
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     sysdir=${D}/usr/share/applets/Multimedia \
-	     GNOME_SYSCONFDIR=${D}/etc \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Multimedia
-		doins xmms/xmms.desktop
-		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
-			/usr/share/gnome/apps/Multimedia/xmms.desktop
-	) || ( \
-		rm ${D}/usr/share/man/man1/gnomexmms*
-	)
-}
-
diff --git a/media-sound/xmms/xmms-1.2.7-r11.ebuild b/media-sound/xmms/xmms-1.2.7-r11.ebuild
index 59f3885706e7..388079ae3965 100644
--- a/media-sound/xmms/xmms-1.2.7-r11.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r11.ebuild
@@ -16,6 +16,10 @@ use mmx || use 3dnow \
 SRC_URI="${SOURCE_HTTP}"
 HOMEPAGE="http://www.xmms.org/"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
 RDEPEND="app-arch/unzip
 	=x11-libs/gtk+-1.2*
 	>=media-libs/libmikmod-3.1.9
diff --git a/media-sound/xmms/xmms-1.2.7-r8.ebuild b/media-sound/xmms/xmms-1.2.7-r8.ebuild
deleted file mode 100644
index 4331c8c6c588..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r7.ebuild,v 1.2 2002/05/31 14:34:51 seemant Exp
-
-PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-XMMS_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
-	avi?( http://www.openface.ca/~nephtes/plover-${PN}${PLO_VER}.tar.gz )"
-MMX_URI="http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz"
-use mmx || use 3dnow \
-	&& SOURCE_HTTP="${XMMS_URI} ${MMX_URI}" \
-	|| SOURCE_HTTP="${XMMS_URI}"
-SRC_URI="${SOURCE_HTTP}"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
-	# and libstdcxx.
-	use avi && ( \
-		patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-	)
-	
-	# The following code prevents a correct unpack on PPC, so let's
-	# exclude the code on that platform. Olivier Reisch <doctomoe@gentoo.org>
-	if [ ${ARCH} != "ppc" ]
-	then
-	# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
-	( use mmx || use 3dnow ) && \
-		cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die
-	fi
-
-# This is for the Plover patch
-#	use avi	&& (\
-#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-#		sed -e "s:avifile-config:avifile-config0.7:g" \
-#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-#		patch -p1 <plover-xmms${PLO_VER}.diff || die
-#	)
-}
-
-src_compile() {
-	local myopts
-
-	use gnome \
-		&& myopts="${myopts} --with-gnome" \
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow \
-		&& myopts="${myopts} --enable-3dnow" \
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd \
-		&& myopts="${myopts} --enable-esd" \
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl \
-		&& myopts="${myopts} --enable-opengl" \
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis \
-		&& myopts="${myopts} --with-ogg --with-vorbis" \
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml \
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls \
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     sysdir=${D}/usr/share/applets/Multimedia \
-	     GNOME_SYSCONFDIR=${D}/etc \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/gnome/apps/Multimedia
-		doins xmms/xmms.desktop
-		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
-			/usr/share/gnome/apps/Multimedia/xmms.desktop
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-0.60-r6.ebuild b/media-video/mplayer/mplayer-0.60-r6.ebuild
index 63a60aaa60b0..294c48bb5fb0 100644
--- a/media-video/mplayer/mplayer-0.60-r6.ebuild
+++ b/media-video/mplayer/mplayer-0.60-r6.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/mplayer/mplayer-0.60-r6.ebuild,v 1.6 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.60-r6.ebuild,v 1.7 2002/07/16 11:36:53 seemant Exp $
 
 # Handle PREversions as well
 MY_PV=${PV/_/}
@@ -37,7 +37,8 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 SLOT="0"
-
+LICENSE="GPL"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild b/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild
index af6563e7795f..7be0b2d86782 100644
--- a/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-0.90_pre5-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/mplayer/mplayer-0.90_pre5-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $
 
 # Handle PREversions as well
 MY_PV=${PV/_/}
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 
 src_unpack() {
diff --git a/media-video/mplayer/mplayer-0.90_pre5.ebuild b/media-video/mplayer/mplayer-0.90_pre5.ebuild
index cb65b60a34e6..caf12f7e46ae 100644
--- a/media-video/mplayer/mplayer-0.90_pre5.ebuild
+++ b/media-video/mplayer/mplayer-0.90_pre5.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/mplayer/mplayer-0.90_pre5.ebuild,v 1.4 2002/07/11 06:30:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre5.ebuild,v 1.5 2002/07/16 11:36:53 seemant Exp $
 
 # Handle PREversions as well
 MY_PV=${PV/_/}
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
 
 
 src_unpack() {
diff --git a/media-video/xanim/files/digest-xanim-2.80.1-r1 b/media-video/xanim/files/digest-xanim-2.80.1-r1
deleted file mode 100644
index a4cbe18a6501..000000000000
--- a/media-video/xanim/files/digest-xanim-2.80.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
-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/files/digest-xanim-2.80.1-r2 b/media-video/xanim/files/digest-xanim-2.80.1-r2
deleted file mode 100644
index b9437042d810..000000000000
--- a/media-video/xanim/files/digest-xanim-2.80.1-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
-MD5 a61c6cfdf34d395de2d7b747bfedebed xa1.0_cyuv_sparcELF.o.Z 1277
-MD5 2648138325bfacdfc2c35b5954422c3b xa2.0_cvid_sparcELF.o.Z 4730
-MD5 0f7db79cc5d8605e70c79e2c633e5a99 xa2.0_iv32_sparcELF.o.Z 48813
-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/files/digest-xanim-2.80.1-r3 b/media-video/xanim/files/digest-xanim-2.80.1-r3
deleted file mode 100644
index 1bdd42c49b25..000000000000
--- a/media-video/xanim/files/digest-xanim-2.80.1-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
-MD5 a61c6cfdf34d395de2d7b747bfedebed xa1.0_cyuv_sparcELF.o.Z 1277
-MD5 2648138325bfacdfc2c35b5954422c3b xa2.0_cvid_sparcELF.o.Z 4730
-MD5 0f7db79cc5d8605e70c79e2c633e5a99 xa2.0_iv32_sparcELF.o.Z 48813
-MD5 45b318b6598b29c3477e14976b14bab6 xa1.0_cyuv_linuxPPC.o.Z 1513
-MD5 066b6934377ae2bd1225a924c430240c xa2.0_cvid_linuxPPC.o.Z 5192
-MD5 043341640efe45455f7d5c997b0fb55e xa2.0_iv32_linuxPPC.o.Z 56163
-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/xanim-2.80.1-r1.ebuild b/media-video/xanim/xanim-2.80.1-r1.ebuild
deleted file mode 100644
index 2ee105129d55..000000000000
--- a/media-video/xanim/xanim-2.80.1-r1.ebuild
+++ /dev/null
@@ -1,45 +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/xanim-2.80.1-r1.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-A="xanim2801.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
-   xa2.1_iv32_linuxELFg21.o.gz"
-S=${WORKDIR}/xanim2801
-DESCRIPTION="XAnim"
-SRC_URI="ftp://xanim.va.pubnix.com/xanim2801.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://xanim.va.pubnix.com"
-
-DEPEND="virtual/glibc virtual/x11 >=sys-libs/zlib-1.1.3"
-
-src_unpack() {
-  unpack xanim2801.tar.gz
-  mkdir ${S}/mods
-  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
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-}
-src_compile() {
-
-    try make
-
-}
-
-src_install () {
-
-    into /usr
-    dobin xanim
-    newman docs/xanim.man xanim.1
-    insinto /usr/lib/xanim/mods
-    doins mods/*
-    dodoc README
-    dodoc docs/README.* docs/*.readme docs/*.doc
-}
-
diff --git a/media-video/xanim/xanim-2.80.1-r2.ebuild b/media-video/xanim/xanim-2.80.1-r2.ebuild
deleted file mode 100644
index 48d15231d2f2..000000000000
--- a/media-video/xanim/xanim-2.80.1-r2.ebuild
+++ /dev/null
@@ -1,84 +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/xanim-2.80.1-r2.ebuild,v 1.2 2002/07/11 06:30:42 drobbins Exp $
-
-_XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
-_XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
-_XA_IV32_SPARC=xa2.0_iv32_sparcELF.o
-_XA_SPARC_EXT=.Z
-
-_XA_CYUV_I386=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_I386=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_I386=xa2.1_iv32_linuxELFg21.o
-_XA_I386_EXT=.gz
-
-case $ARCH in
-	sparc*)
-			_XA_CYUV=$_XA_CYUV_SPARC
-			_XA_CVID=$_XA_CVID_SPARC
-			_XA_IV32=$_XA_IV32_SPARC
-			_XA_EXT=$_XA_SPARC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	*)
-			_XA_CYUV=$_XA_CYUV_I386
-			_XA_CVID=$_XA_CVID_I386
-			_XA_IV32=$_XA_IV32_I386
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-esac
-			
-A="xanim2801.tar.gz \
-	${_XA_CYUV_SPARC}${_XA_SPARC_EXT} ${_XA_CVID_SPARC}${_XA_SPARC_EXT} \
-	${_XA_IV32_SPARC}${_XA_SPARC_EXT} \
-	${_XA_CYUV_I386}${_XA_I386_EXT} ${_XA_CVID_I386}${_XA_I386_EXT} \
-	${_XA_IV32_I386}${_XA_I386_EXT}"
-S=${WORKDIR}/xanim2801
-DESCRIPTION="XAnim"
-SRC_URI="ftp://xanim.va.pubnix.com/xanim2801.tar.gz
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_I386}${_XA_I386_EXT}"
-HOMEPAGE="http://xanim.va.pubnix.com"
-
-DEPEND="virtual/glibc virtual/x11 >=sys-libs/zlib-1.1.3"
-
-if [ `expr $ARCH : 'sparc' ` -eq 5 ]
-then
-	RDEPEND="app-arch/ncompress"
-fi
-
-src_unpack() {
-  unpack xanim2801.tar.gz
-  mkdir ${S}/mods
-  cd ${S}/mods
-  cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-}
-
-src_compile() {
-
-    try make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-			XA_CYUV_LIB=mods/${_XA_IV32}
-
-}
-
-src_install () {
-
-    into /usr
-    dobin xanim
-    newman docs/xanim.man xanim.1
-    insinto /usr/lib/xanim/mods
-    doins mods/*
-    dodoc README
-    dodoc docs/README.* docs/*.readme docs/*.doc
-}
diff --git a/media-video/xanim/xanim-2.80.1-r3.ebuild b/media-video/xanim/xanim-2.80.1-r3.ebuild
deleted file mode 100644
index ce6b1593d1ef..000000000000
--- a/media-video/xanim/xanim-2.80.1-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id: xanim-2.80.1-r3.ebuild,v 1.4 2002/07/11 06:30:42 drobbins Exp $
-
-_XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
-_XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
-_XA_IV32_SPARC=xa2.0_iv32_sparcELF.o
-_XA_SPARC_EXT=.Z
-
-_XA_CYUV_I386=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_I386=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_I386=xa2.1_iv32_linuxELFg21.o
-_XA_I386_EXT=.gz
-
-_XA_CYUV_PPC=xa1.0_cyuv_linuxPPC.o
-_XA_CVID_PPC=xa2.0_cvid_linuxPPC.o
-_XA_IV32_PPC=xa2.0_iv32_linuxPPC.o
-_XA_PPC_EXT=.Z
-
-case $ARCH in
-	sparc*)
-			_XA_CYUV=$_XA_CYUV_SPARC
-			_XA_CVID=$_XA_CVID_SPARC
-			_XA_IV32=$_XA_IV32_SPARC
-			_XA_EXT=$_XA_SPARC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	ppc)
-			_XA_CYUV=$_XA_CYUV_PPC
-			_XA_CVID=$_XA_CVID_PPC
-			_XA_IV32=$_XA_IV32_PPC
-			_XA_EXT=$_XA_PPC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	*)
-			_XA_CYUV=$_XA_CYUV_I386
-			_XA_CVID=$_XA_CVID_I386
-			_XA_IV32=$_XA_IV32_I386
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-esac
-			
-A="xanim2801.tar.gz \
-	${_XA_CYUV_SPARC}${_XA_SPARC_EXT} ${_XA_CVID_SPARC}${_XA_SPARC_EXT} \
-	${_XA_IV32_SPARC}${_XA_SPARC_EXT} \
-	${_XA_CYUV_I386}${_XA_I386_EXT} ${_XA_CVID_I386}${_XA_I386_EXT} \
-	${_XA_IV32_I386}${_XA_I386_EXT} \
-	${_XA_CYUV_PPC}${_XA_PPC_EXT} ${_XA_CVID_PPC}${_XA_PPC_EXT} \
-	${_XA_IV32_PPC}${_XA_PPC_EXT}"
-S=${WORKDIR}/xanim2801
-DESCRIPTION="XAnim"
-SRC_URI="ftp://xanim.va.pubnix.com/xanim2801.tar.gz
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_I386}${_XA_I386_EXT}"
-HOMEPAGE="http://xanim.va.pubnix.com"
-
-case $ARCH in 
-  sparc)
-	ARCHDEPS="app-arch/ncompress"
-	;;
-  sparc64)
-	ARCHDEPS="app-arch/ncompress"
-	;;
-  ppc)
-	ARCHDEPS="app-arch/ncompress"
-	;;
-  *)
-	ARCHDEPS=""
-	;;
-esac
-
-DEPEND="virtual/glibc virtual/x11 >=sys-libs/zlib-1.1.3 ${ARCHDEPS}"
-  	
-src_unpack() {
-  unpack xanim2801.tar.gz
-  mkdir ${S}/mods
-  cd ${S}/mods
-  cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-}
-
-src_compile() {
-
-    try make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-			XA_CYUV_LIB=mods/${_XA_IV32}
-
-}
-
-src_install () {
-
-    into /usr
-    dobin xanim
-    newman docs/xanim.man xanim.1
-    insinto /usr/lib/xanim/mods
-    doins mods/*
-    dodoc README
-    dodoc docs/README.* docs/*.readme docs/*.doc
-}
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 77030124930a..cfe6fb64ecfe 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Revision: 1.1 $
+# $Revision: 1.2 $
 
 LICENSE="XAnim"
-SLOT=""
+SLOT="0"
+KEYWORDS="x86 ppc"
 
 _XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
 _XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
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
index e947d3d67de0..8d3c5c9c889b 100644
--- a/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2002/06/17 18:50:57 lostlogic Exp $ 
+# $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/"
@@ -16,6 +16,7 @@ RDEPEND="${DEPEND}"
 
 LICENSE="GPL"
 SLOT="0"
+KEYWORDS="x86 ppc"
 
 SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
 S=${WORKDIR}/${P}
diff --git a/media-video/xine-ui/xine-ui-0.9.11.ebuild b/media-video/xine-ui/xine-ui-0.9.11.ebuild
index a854557347d4..85af19e5ea87 100644
--- a/media-video/xine-ui/xine-ui-0.9.11.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2002/06/21 14:09:33 seemant Exp $ 
+# $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/"
@@ -17,6 +17,7 @@ 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}
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 e8c0318d53a0..f553e97f1e0a 100644
--- a/media-video/xine-ui/xine-ui-0.9.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2002/06/24 05:48:59 lostlogic Exp $ 
+# $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 $ 
 
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -18,6 +18,7 @@ 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}
author	Seemant Kulleen <seemant@gentoo.org>	2002-07-16 11:36:53 +0000
committer	Seemant Kulleen <seemant@gentoo.org>	2002-07-16 11:36:53 +0000
commit	511e33e9b8ac87b1f15a19ed318c3cab31f3d050 (patch)
tree	fed6d42b9ed74a42d51f9c784bdc9b264d113851
parent	added new licenses to list (diff)
download	gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.tar.gz gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.tar.bz2 gentoo-2-511e33e9b8ac87b1f15a19ed318c3cab31f3d050.zip