Put under video herd. Cleanup of old ebuilds. Use autotools eclass (thus no more requiring -fPIC as there was a libtoolize problem).

(Portage version: 2.0.53_rc7)

11 files changed, 19 insertions, 225 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index 9fb6966faffe..a11dd093f252 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmpeg2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.42 2005/07/10 20:56:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.43 2005/10/31 16:34:05 flameeyes Exp $
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
+  -libmpeg2-0.2.1.ebuild, -libmpeg2-0.3.1.ebuild,
+  -libmpeg2-0.3.2_pre20030625.ebuild, -libmpeg2-0.4.0.ebuild,
+  libmpeg2-0.4.0b.ebuild:
+  Put under video herd. Cleanup of old ebuilds. Use autotools eclass (thus no
+  more requiring -fPIC as there was a libtoolize problem).
 
   10 Jul 2005; Sven Wegener <swegener@gentoo.org> libmpeg2-0.3.1.ebuild,
   libmpeg2-0.3.2_pre20030625.ebuild:
diff --git a/media-libs/libmpeg2/files/digest-libmpeg2-0.2.1 b/media-libs/libmpeg2/files/digest-libmpeg2-0.2.1
deleted file mode 100644
index bde394abcc7d..000000000000
--- a/media-libs/libmpeg2/files/digest-libmpeg2-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f63e94ed74b0b5f2d6e32baba2963b4a mpeg2dec-0.2.1.tar.gz 270412
diff --git a/media-libs/libmpeg2/files/digest-libmpeg2-0.3.1 b/media-libs/libmpeg2/files/digest-libmpeg2-0.3.1
deleted file mode 100644
index 16e7d1c2ce1e..000000000000
--- a/media-libs/libmpeg2/files/digest-libmpeg2-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9f899d232eee5e7282c9c96ffde8016 mpeg2dec-0.3.1.tar.gz 325459
diff --git a/media-libs/libmpeg2/files/digest-libmpeg2-0.3.2_pre20030625 b/media-libs/libmpeg2/files/digest-libmpeg2-0.3.2_pre20030625
deleted file mode 100644
index 92e0cef05089..000000000000
--- a/media-libs/libmpeg2/files/digest-libmpeg2-0.3.2_pre20030625
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc2d9e18bb90a558d1653f03bffa00b8 mpeg2dec-cvs-20030625.tar.gz 338973
diff --git a/media-libs/libmpeg2/files/digest-libmpeg2-0.4.0 b/media-libs/libmpeg2/files/digest-libmpeg2-0.4.0
deleted file mode 100644
index fe0ae4378795..000000000000
--- a/media-libs/libmpeg2/files/digest-libmpeg2-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49a70fef1b0f710ed7e64ed32ee82d4d mpeg2dec-0.4.0.tar.gz 473690
diff --git a/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild
deleted file mode 100644
index e4dfa2cfcd13..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild,v 1.14 2005/03/21 06:58:07 mr_bones_ Exp $
-
-inherit libtool flag-o-matic
-
-MY_P="${P/libmpeg2/mpeg2dec}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="sdl X"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-	filter-flags "-maltivec -mabi=altivec"
-	# get rid of the -mcpu
-	sed -i \
-		-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-		configure \
-		|| die "sed failed"
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	use sdl || myconf="${myconf} --disable-sdl"
-
-	use X && myconf="${myconf} --with-x" \
-	      || myconf="${myconf} --without-x"
-
-	econf --enable-shared \
-		${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild
deleted file mode 100644
index 6347956abe13..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild,v 1.11 2005/07/10 20:56:15 swegener Exp $
-
-IUSE="sdl X"
-
-inherit libtool flag-o-matic
-
-MY_P="${P/libmpeg2/mpeg2dec}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~alpha amd64"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-filter-flags "-maltivec -mabi=altivec -fPIC"
-[ $ARCH = alpha ] && append-flags -fPIC
-
-src_unpack() {
-	unpack ${A}
-
-	# get rid of the -mcpu
-	cd ${S} ; cp configure configure.orig
-	sed -e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-		configure.orig > configure
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl"
-
-	use X && myconf="${myconf} --with-x" \
-	      || myconf="${myconf} --without-x"
-
-	econf --enable-shared \
-		${myconf} || die "./configure failed"
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild b/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild
deleted file mode 100644
index 8568f409109a..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild,v 1.8 2005/07/10 20:56:15 swegener Exp $
-
-IUSE="sdl X"
-
-inherit libtool flag-o-matic
-
-S="${WORKDIR}/mpeg2dec-0.3.2-cvs"
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-SRC_URI="mirror://gentoo/mpeg2dec-cvs-20030625.tar.gz"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~alpha amd64"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-filter-flags "-maltivec -mabi=altivec -fPIC"
-[ $ARCH = alpha ] && append-flags -fPIC
-
-src_unpack() {
-	unpack ${A}
-
-	# get rid of the -mcpu
-	cd ${S} ; cp configure configure.orig
-	sed -e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-		configure.orig > configure
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl"
-
-	use X && myconf="${myconf} --with-x" \
-	      || myconf="${myconf} --without-x"
-
-	econf --enable-shared \
-		${myconf} || die "./configure failed"
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild
deleted file mode 100644
index 6d488e2475b7..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild,v 1.4 2005/03/21 06:58:07 mr_bones_ Exp $
-
-inherit libtool flag-o-matic
-
-MY_P="${P/libmpeg2/mpeg2dec}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="sdl X"
-
-RDEPEND="sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	[ $ARCH = alpha ] && append-flags -fPIC
-	unpack ${A}
-
-	# get rid of the -mcpu
-	cd ${S}
-	sed -i \
-		-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-			configure || die "sed configure failed"
-}
-
-src_compile() {
-	elibtoolize
-	econf \
-		--enable-shared \
-		`use_enable sdl` \
-		`use_with X x` \
-			|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 4dafb6317c4e..1a8591506179 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.24 2005/07/02 13:37:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.25 2005/10/31 16:34:05 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 MY_P="${P/libmpeg2/mpeg2dec}"
 DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="sdl X"
 
-DEPEND="virtual/libc
-	sdl? ( media-libs/libsdl )
+DEPEND="sdl? ( media-libs/libsdl )
 	X? ( virtual/x11 )"
 
 S="${WORKDIR}/${MY_P/b/}"
@@ -26,10 +25,6 @@ src_unpack() {
 
 	use alpha && append-flags -fPIC
 
-	# Resolves bug 73224.
-	# <slarti@gentoo.org> Dec 2004
-	use amd64 && append-flags -fPIC
-
 	# Fix a compilation-error with gcc 3.4. Bug #51964.
 	epatch "${FILESDIR}/gcc34-inline-fix-${PV}.diff"
 	epatch "${FILESDIR}/altivec-fix-${PV}.diff"
@@ -38,8 +33,9 @@ src_unpack() {
 		-e '/-mcpu/d' \
 		configure.in \
 		|| die "sed configure failed"
-	aclocal && automake && libtoolize --copy --force && autoconf \
-		|| die "autotools failed"
+	
+	eautoreconf
+	elibtoolize
 }
 
 src_compile() {
diff --git a/media-libs/libmpeg2/metadata.xml b/media-libs/libmpeg2/metadata.xml
new file mode 100644
index 000000000000..d9df1878d8e2
--- /dev/null
+++ b/media-libs/libmpeg2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>video</herd>
+</pkgmetadata>