repoman'd

22 files changed, 85 insertions, 396 deletions

diff --git a/media-libs/libirman/libirman-0.4.2.ebuild b/media-libs/libirman/libirman-0.4.2.ebuild
index b1d96d3f0c4c..e7187f33a02a 100644
--- a/media-libs/libirman/libirman-0.4.2.ebuild
+++ b/media-libs/libirman/libirman-0.4.2.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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/libirman/libirman-0.4.2.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2.ebuild,v 1.3 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Libirman is a library for Irman control of Unix software."
 SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.gz"
 HOMEPAGE="http://www.evation.com/libirman/libirman.html"
 
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 src_compile() {
-	./configure --prefix=/usr --sysconfdir=/etc --host=${CHOST}
-	assert "configure failed"
+	econf || die
 	emake || die "emake failed"
 }
 
 src_install () {
-	# create include dir
-	mkdir -p ${D}/usr/include
-	# standard-ish make install
+	dodir /usr/include
+
 	make \
 		prefix=${D}/usr \
 		sysconfdir=${D}/etc \
 		LIRC_DRIVER_DEVICE=${D}/dev/lirc \
-		install
-	assert "make install failed"
-	# install the test programs
+		install || die
+
 	dobin test_func test_io test_name
-	# install extra docs
 	dodoc COPYING* NEWS README* TECHNICAL TODO
 }
diff --git a/media-libs/libmikmod/libmikmod-3.1.10.ebuild b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
index 57709a9326da..1ec3f96185ce 100644
--- a/media-libs/libmikmod/libmikmod-3.1.10.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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/libmikmod/libmikmod-3.1.10.ebuild,v 1.5 2002/07/16 11:36:48 seemant Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10.ebuild,v 1.6 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A library to play a wide range of module formats"
 SRC_URI="http://www.mikmod.org/files/libmikmod/${P}.tar.gz"
+HOMEPAGE="http://www.mikmod.org/"
 
-
-DEPEND="virtual/glibc
-	>=media-libs/audiofile-0.2.3
+DEPEND=">=media-libs/audiofile-0.2.3
 	alsa? ( >=media-libs/alsa-lib-0.5.9 )
 	esd? ( >=media-sound/esound-0.2.19 )"
 
@@ -26,14 +24,7 @@ src_compile() {
 	[ -z `use alsa` ] || myconf="${myconf} --enable-alsa"
 	[ -z `use oss` ]  || myconf="${myconf} --enable-oss"
 
-	einfo Enabling: ${myconf}
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myconf} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/media-libs/libmng/libmng-1.0.3.ebuild b/media-libs/libmng/libmng-1.0.3.ebuild
index 05dca27c76d2..27329a734ae4 100644
--- a/media-libs/libmng/libmng-1.0.3.ebuild
+++ b/media-libs/libmng/libmng-1.0.3.ebuild
@@ -1,20 +1,20 @@
 # 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.3 2002/07/16 11:36:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.3.ebuild,v 1.4 2002/07/22 15:42:48 seemant 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=">=media-libs/jpeg-6b 
-	>=sys-libs/zlib-1.1.3
-	>=media-libs/lcms-1.0.8"
-
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc"
 
+DEPEND=">=media-libs/jpeg-6b 
+	>=sys-libs/zlib-1.1.3
+	>=media-libs/lcms-1.0.8"
+
 src_unpack() {
 
 	unpack ${A}
@@ -35,5 +35,5 @@ src_install () {
 	dodoc Changes LICENSE README*
 	dodoc doc/doc.readme doc/libmng.txt
 	doman doc/man/*
-	dohtml doc/*.png
+	dohtml -r doc
 }
diff --git a/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild b/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild
index b9ee6b199216..9351ecf56305 100644
--- a/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild
+++ b/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# 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/libmovtar/libmovtar-0.1.3-r1.ebuild,v 1.1 2002/07/08 14:33:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild,v 1.2 2002/07/22 15:42:48 seemant Exp $
 
 inherit libtool
 
@@ -13,9 +13,8 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND="virtual/glibc
+DEPEND="=dev-libs/glib-1.2*
 	>=media-libs/jpeg-6b
-	=dev-libs/glib-1.2*
 	>=media-libs/libsdl-1.2.2
 	mmx? ( media-libs/jpeg-mmx )"
 
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5
deleted file mode 100644
index 5ee560c931c5..000000000000
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1800adbd17cb6cdca2e11858cb25649a libmpeg3-1.5.tar.gz 203235
diff --git a/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild
index 25acdf949fa5..40964991aa58 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild
@@ -1,12 +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/libmpeg3/libmpeg3-1.5-r1.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild,v 1.4 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="An mpeg library for linux"
 SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 RDEPEND="sys-libs/zlib 
 	media-libs/jpeg"
 
@@ -46,6 +50,6 @@ src_install () {
 	
 	dolib.a ${CHOST%%-*}/libmpeg3.a
 	
-	dohtml docs/*.html
+	dohtml -r docs
 
 }
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.ebuild
deleted file mode 100644
index 587979f727ed..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.5.ebuild
+++ /dev/null
@@ -1,45 +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/libmpeg3/libmpeg3-1.5.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="An mpeg library for linux"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-
-RDEPEND="sys-libs/zlib 
-	media-libs/jpeg"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-src_compile() {
-	
-	cp Makefile Makefile.orig
-
-	sed 's:cp $(UTILS) /usr/bin:cp $(UTILS) ${D}/usr/bin:' \
-		Makefile.orig > Makefile
-	
-	export CFLAGS=${CFLAGS}
-	make ${myconf} || die
-}
-
-src_install () {
-	
-	dodir /usr/bin
-	make install || die
-	
-	dolib.a ${CHOST%%-*}/libmpeg3.a
-	
-	insinto /usr/include/libmpeg3/${CHOST%%-*}
-	doins *.{h,inc}
-
-	insinto /usr/include/libmpeg3/audio
-	doins audio/*.h
-
-	insinto /usr/include/libmpeg3/video
-	doins video/*.h
-
-	dohtml docs/*.html
-
-}
diff --git a/media-libs/libpng/files/digest-libpng-1.2.3-r1 b/media-libs/libpng/files/digest-libpng-1.2.3-r1
deleted file mode 100644
index 15d3e5144e9d..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d002712d5486554f047a17c321a5e4d libpng-1.2.3.tar.gz 502413
diff --git a/media-libs/libpng/libpng-1.2.3-r1.ebuild b/media-libs/libpng/libpng-1.2.3-r1.ebuild
deleted file mode 100644
index 8d52f7e5be98..000000000000
--- a/media-libs/libpng/libpng-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,50 +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/libpng/libpng-1.2.3-r1.ebuild,v 1.2 2002/07/16 05:15:27 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libpng"
-SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
-HOMEPAGE="http://www.libpng.org/"
-SLOT="1.2"
-LICENSE="as-is"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
-		-e "s/-O3/${CFLAGS}/" \
-		-e "s:prefix=/usr/local:prefix=/usr:" \
-			scripts/makefile.linux > Makefile
-
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	dodir /usr/share/man
-	make \
-		DESTDIR=${D} \
-		MANPATH=/usr/share/man \
-		install || die
-	
-#	rm ${D}/usr/lib/libpng.so
-#	rm ${D}/usr/lib/libpng.a
-#	rm ${D}/usr/include/png.h
-#	rm ${D}/usr/include/pngconf.h
-	
-	doman *.[35]
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
-
-pkg_postinst() {
-
-	# compensate for an upstream screwup
-
-	if [ -f /usr/lib/libpng.so.3.1.2.1 ]
-	then
-		rm -f /usr/lib/libpng.so.3.1.2.1
-	fi
-}
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.4-r2 b/media-libs/libsdl/files/digest-libsdl-1.2.4-r2
deleted file mode 100644
index d7cf1782b39d..000000000000
--- a/media-libs/libsdl/files/digest-libsdl-1.2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 116c083aad99faae691c6ca8dcdf406d SDL-1.2.4.tar.gz 1806163
diff --git a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild b/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
deleted file mode 100644
index b77f0c33dcf2..000000000000
--- a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,97 +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/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"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-HOMEPAGE="http://www.libsdl.org/"
-
-RDEPEND=">=media-libs/audiofile-0.1.9
-	X? ( virtual/x11 )
-	esd? ( >=media-sound/esound-0.2.19 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	nas? ( media-libs/nas )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	opengl? ( virtual/opengl )
-	directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-SLOT="0"
-LICENSE="LGPL"
-KEYWORDS="x86 ppc"
-
-src_compile() {
-	local myconf
-
-	use X \
-		&& myconf="${myconf} --enable-video-x11" \
-		|| myconf="${myconf} --disable-video-x11"
-
-	use xv \
-		&& myconf="${myconf} --enable-video-x11-xv" \
-		|| myconf="${myconf} --disable-video-x11-xv"
-
-	use esd \
-		&& myconf="--enable-esd" \
-		|| myconf="--disable-esd"
-
-	use ggi \
-		&& myconf="${myconf} --enable-video-ggi" \
-		|| myconf="${myconf} --disable-video-ggi"
-
-	use nas \
-		&& myconf="${myconf} --enable-nas" \
-		|| myconf="${myconf} --disable-nas"
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use arts \
-		&& myconf="${myconf} --enable-arts" \
-		|| myconf="${myconf} --disable-arts"
-	
-	use svga \
-		&& myconf="${myconf} --enable-video-svga" \
-		|| myconf="${myconf} --disable-video-svga"
-
-	use aalib \
-		&& myconf="${myconf} --enable-video-aalib" \
-		|| myconf="${myconf} --disable-video-aalib"
-
-	use fbcon \
-		&& myconf="${myconf} --enable-video-fbcon" \
-		|| myconf="${myconf} --disable-video-fbcon"
-
-	use opengl \
-		&& myconf="${myconf} --enable-video-opengl" \
-		|| myconf="${myconf} --disable-video-opengl"
-
-	use directfb \
-		&& myconf="${myconf} --enable-video-directfb" \
-		|| myconf="${myconf} --disable-video-directfb"
-
-	./configure \
-		--host=${CHOST} \
-		--enable-input-events \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	preplib /usr
-	dodoc BUGS COPYING CREDITS README* TODO WhatsNew
-	dohtml -r ./
-}
diff --git a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
index a8c3c3601716..e4bc6be95852 100644
--- a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
@@ -1,12 +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/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.3 2002/07/16 11:36:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.4 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/SDL12
 DESCRIPTION="Simple Direct Media Layer"
 SRC_URI="http://www.libsdl.org/release/${P}.tar.bz2"
 HOMEPAGE="http://www.libsdl.org/"
 
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 ppc"
+
 RDEPEND=">=media-libs/audiofile-0.1.9
 	X? ( virtual/x11 )
 	esd? ( >=media-sound/esound-0.2.19 )
@@ -21,10 +25,6 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	dev-lang/nasm"
 
-SLOT="0"
-LICENSE="LGPL"
-KEYWORDS="x86 ppc"
-
 src_unpack() {
 
 	unpack ${A}
diff --git a/media-libs/libsidplay/libsidplay-1.36.54.ebuild b/media-libs/libsidplay/libsidplay-1.36.54.ebuild
index b2bebcc160da..14c72777a27a 100644
--- a/media-libs/libsidplay/libsidplay-1.36.54.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.54.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.54.ebuild,v 1.1 2002/07/18 19:02:59 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.54.ebuild,v 1.2 2002/07/22 15:42:48 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="C64 SID player library"
 HOMEPAGE="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html"
 SRC_URI="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/${P}.tgz"
-LICENSE="GPL-2"
+
 SLOT="1"
+LICENSE="GPL-2"
 KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
-	#make || die
 }
 
 src_install () {
diff --git a/media-libs/libsndfile/libsndfile-0.0.28.ebuild b/media-libs/libsndfile/libsndfile-0.0.28.ebuild
index 9b2d5db92b35..939f19194004 100644
--- a/media-libs/libsndfile/libsndfile-0.0.28.ebuild
+++ b/media-libs/libsndfile/libsndfile-0.0.28.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-0.0.28.ebuild,v 1.1 2002/05/24 07:05:41 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-0.0.28.ebuild,v 1.2 2002/07/22 15:42:48 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A C library for reading and writing files containing sampled sound"
 HOMEPAGE="http://www.zipworld.com.au/~erikd/libsndfile/"
+SRC_URI="http://www.zipworld.com.au/~erikd/libsndfile/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="LGPL-2.1"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
-SRC_URI="http://www.zipworld.com.au/~erikd/libsndfile/${P}.tar.gz"
 
 src_install () {
 
diff --git a/media-libs/libswf/libswf-0.99.ebuild b/media-libs/libswf/libswf-0.99.ebuild
index 71901fd698fe..7d5369b5f1f9 100644
--- a/media-libs/libswf/libswf-0.99.ebuild
+++ b/media-libs/libswf/libswf-0.99.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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/libswf/libswf-0.99.ebuild,v 1.2 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libswf/libswf-0.99.ebuild,v 1.3 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/dist
 DESCRIPTION="A library for flash movies"
 SRC_URI="http://reality.sgi.com/grafica/flash/dist.99.linux.tar.Z"
-HOMEPAGE="http://reality.sgi.com/grafica/flash/"
+HOMEPAGE="ftp://ftp.sgi.com/sgi/graphics/grafica/flash/index.html"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
 src_install () {
 
-  dolib.a libswf.a
-  dobin bin/*
-  insinto /usr/include
-  doins swf.h
-  insinto /usr/share/swf/fonts
-  doins fonts/*
-  insinto /usr/share/swf/psfonts
-  doins psfonts/*
-  docinto html
-  dodoc *.html
+	dolib.a libswf.a
+	dobin bin/*
+	insinto /usr/include
+	doins swf.h
+	insinto /usr/share/swf/fonts
+	doins fonts/*
+	insinto /usr/share/swf/psfonts
+	doins psfonts/*
+	dochtml *.html
 }
-
diff --git a/media-libs/libungif/files/digest-libungif-4.1.0 b/media-libs/libungif/files/digest-libungif-4.1.0
deleted file mode 100644
index caa01f13b521..000000000000
--- a/media-libs/libungif/files/digest-libungif-4.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35427da9b40e06faae0db531c41c7eb6 libungif-4.1.0.tar.gz 301291
diff --git a/media-libs/libungif/libungif-4.1.0-r1.ebuild b/media-libs/libungif/libungif-4.1.0-r1.ebuild
index 9463ec884287..cc8f76e74811 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.5 2002/07/16 11:36:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0-r1.ebuild,v 1.6 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A library for reading and writing gif images without LZW compression"
@@ -20,11 +20,7 @@ src_compile() {
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
     
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/media-libs/libungif/libungif-4.1.0.ebuild b/media-libs/libungif/libungif-4.1.0.ebuild
deleted file mode 100644
index 6485223431da..000000000000
--- a/media-libs/libungif/libungif-4.1.0.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
-# Updated by AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="giflib"
-SRC_URI="ftp://prtr-13.ucsc.edu/pub/libungif/"${A}
-HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
-
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )"
-
-src_compile() {
-
-  local myconf
-  if [ "`use X`" ]
-  then
-    myconf="--with-x"
-  else
-    myconf="--without-x"
-  fi
-
-  ./configure --host=${CHOST} --prefix=/usr $myconf
-
-  make
-}
-
-src_install() {
-
-  make prefix=${D}/usr install
-  if [ "`use gif`" ]
-  then
-    rm -rf ${D}/usr/bin
-  fi
-
-  dodoc AUTHORS BUGS COPYING ChangeLog NEWS ONEWS
-  dodoc UNCOMPRESSED_GIF README TODO
-  dodoc doc/*.txt
-  docinto html
-  dodoc doc/*.html doc/*.png
-}
-
diff --git a/media-libs/libuta/libuta-0.4.1-r1.ebuild b/media-libs/libuta/libuta-0.4.1-r1.ebuild
index eb94d0a55d82..2432ddcd32d5 100644
--- a/media-libs/libuta/libuta-0.4.1-r1.ebuild
+++ b/media-libs/libuta/libuta-0.4.1-r1.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libuta/libuta-0.4.1-r1.ebuild,v 1.4 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libuta/libuta-0.4.1-r1.ebuild,v 1.5 2002/07/22 15:42:48 seemant Exp $
 
 S=${WORKDIR}/${P}
+DESCRIPTION="a GUI library for C++ that uses SDL as its output layer"
 SRC_URI="mirror://sourceforge/libuta/${P}.tar.gz"
 HOMEPAGE="http://libuta.sourceforge.net/"
+
 SLOT="0"
-DEPEND="virtual/glibc
-	>=media-libs/libsdl-1.2.3-r1
-	=media-libs/freetype-1.3*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.0.12
-	( >=dev-libs/libsigc++-1.0.4-r1
-	  <dev-libs/libsigc++-1.1.0 )"
+LICENSE="LGPL-2 GPL-2"
+KEYWORDS="x86"
 
+DEPEND="media-libs/libsdl
+	media-libs/libpng
+	=media-libs/freetype-1.3*
+	=dev-libs/libsigc++-1.0*
+	>=sys-libs/zlib-1.1.4"
 
 src_compile() {
 
-	./configure --host=${CHOST} --prefix=/usr || die
+	econf || die
 	emake || die
 
 }
diff --git a/media-libs/libwmf/files/digest-libwmf-0.2.2 b/media-libs/libwmf/files/digest-libwmf-0.2.2
deleted file mode 100644
index 48e2bbd1d9fa..000000000000
--- a/media-libs/libwmf/files/digest-libwmf-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49fc8a235b09cdb62f0cf03ec514669f libwmf-0.2.2.tar.gz 1635344
diff --git a/media-libs/libwmf/libwmf-0.2.2.ebuild b/media-libs/libwmf/libwmf-0.2.2.ebuild
deleted file mode 100644
index ff3ea855abfe..000000000000
--- a/media-libs/libwmf/libwmf-0.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.2.ebuild,v 1.5 2002/07/11 06:30:39 drobbins Exp $
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="library for converting WMF files"
-SRC_URI="mirror://sourceforge/wvware/libwmf-0.2.2.tar.gz"
-HOMEPAGE="http://www.wvware.com/libwmf.html"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-	>=app-text/ghostscript-6.50 
-	dev-libs/expat
-	dev-libs/libxml2
-	>=media-libs/freetype-2.0.1
-	sys-libs/zlib
-	media-libs/libpng
-	media-libs/jpeg"
-# plotutils are not really supported yet, so looks like that's it
-	
-RDEPEND=""
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-src_compile() {
-	
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-gsfontdir=/usr/share/ghostscript/fonts \
-		--with-fontdir=/usr/share/libwmf/fonts/ \
-		--with-docdir=${D}/usr/share/doc/${PF} || die "./configure failed"
-
-	make || die
-}
-
-src_install () {
-    make \
-        prefix=${D}/usr \
-        mandir=${D}/usr/share/man \
-        infodir=${D}/usr/share/info \
-		fontdir=${D}/usr/share/libwmf/fonts/ \
-        install || die
-}
diff --git a/media-libs/libwmf/libwmf-0.2.6.ebuild b/media-libs/libwmf/libwmf-0.2.6.ebuild
index 753de1c386de..fcc11001aebe 100644
--- a/media-libs/libwmf/libwmf-0.2.6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 20022 Gentoo Technologies, Inc.
+# Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.6.ebuild,v 1.1 2002/07/10 22:06:39 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.6.ebuild,v 1.2 2002/07/22 15:42:48 seemant Exp $
 
 #The configure script finds the 5.50 ghostscript Fontmap file while run.
 #This will probably work, especially since the real one (6.50) in this case
@@ -12,6 +12,10 @@ DESCRIPTION="library for converting WMF files"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 HOMEPAGE="http://www.wvware.com/libwmf.html"
 
+SLOT="0"
+KEYWORDS="x86"
+LICENSE="GPL-2"
+
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.2
 	>=app-text/ghostscript-6.50 
@@ -23,19 +27,9 @@ DEPEND="virtual/glibc
 	media-libs/jpeg"
 # plotutils are not really supported yet, so looks like that's it
 	
-RDEPEND=""
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
 src_compile() {
 	
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+	econf \
 		--with-gsfontdir=/usr/share/ghostscript/fonts \
 		--with-fontdir=/usr/share/libwmf/fonts/ \
 		--with-docdir=${D}/usr/share/doc/${PF} || die "./configure failed"
@@ -44,12 +38,8 @@ src_compile() {
 }
 
 src_install () {
-    make \
-        prefix=${D}/usr \
-        mandir=${D}/usr/share/man \
-        infodir=${D}/usr/share/info \
-		fontdir=${D}/usr/share/libwmf/fonts/ \
-        install || die
+    einstall \
+		fontdir=${D}/usr/share/libwmf/fonts || die
 
 	dodoc README AUTHORS COPYING CREDITS ChangeLog NEWS TODO
 }