Dont make use of the deprecated oggvorbis useflag any longer, see #94254.

Package-Manager: portage-2.0.51.22-r1

9 files changed, 27 insertions, 203 deletions

diff --git a/media-sound/mpfc/ChangeLog b/media-sound/mpfc/ChangeLog
index d0c5d392414a..64d55b53eec8 100644
--- a/media-sound/mpfc/ChangeLog
+++ b/media-sound/mpfc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpfc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.7 2004/12/19 05:58:35 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.8 2005/05/28 13:19:01 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -mpfc-1.3.2.ebuild,
+  -mpfc-1.3.3.ebuild, -mpfc-1.3.4.ebuild, mpfc-1.3.5.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> mpfc-1.3.5.ebuild:
   Stable amd64, sparc, x86.
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 5708b7d6c787..15bc489e88f1 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a1f2f68f89e23dd362a34eaa2057af95 ChangeLog 996
+MD5 e8f1a1721f0a0743758901fce1bab9f5 mpfc-1.3.5.ebuild 1209
+MD5 b732324a260298fab9de62a917bcb675 ChangeLog 1205
 MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 ea4dab5fca354cc5864e6e523841def9 mpfc-1.3.2.ebuild 1259
-MD5 1b6a83434ff3223fd75f050eb4c67ee1 mpfc-1.3.3.ebuild 1262
-MD5 1af44bbe897ad4a6b237fd296b7e12ff mpfc-1.3.4.ebuild 1262
-MD5 55c8c7280cb1e6617575a7f3207b0cc4 mpfc-1.3.5.ebuild 1261
-MD5 7efeab71fe6d7846f773eee95fa30adf files/digest-mpfc-1.3.2 62
-MD5 112f0ac39530bcdfb993d794c4b87fa2 files/digest-mpfc-1.3.3 62
-MD5 7f3e2b95f5b5ab963577ff27af8c9051 files/digest-mpfc-1.3.4 62
 MD5 c0c7b69cf8c28de749eb8f5f3866c91a files/digest-mpfc-1.3.5 62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBxRipArHZZzCEUG0RAsfiAJ9KDRNuq5sZ0kLCmc35EGWDJm4VUACggDW0
-x1b3NaPNLWM03+jkiFbj/lI=
-=PobA
+iD8DBQFCmG/c06ebR+OMO78RAjbXAJ9xEiJOYBmmZl6ZstTm9ZgSeVKwpACfWa05
+cmvH0hiGuSIJTqJXZKMTwwA=
+=rf24
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.2 b/media-sound/mpfc/files/digest-mpfc-1.3.2
deleted file mode 100644
index 8389e018071c..000000000000
--- a/media-sound/mpfc/files/digest-mpfc-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad63bb7f96a12bb62435ca04e2f456b5 mpfc-1.3.2.tar.gz 663081
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.3 b/media-sound/mpfc/files/digest-mpfc-1.3.3
deleted file mode 100644
index bb5b2cf18798..000000000000
--- a/media-sound/mpfc/files/digest-mpfc-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 397796c97e5aac2bf26fa05d75564b40 mpfc-1.3.3.tar.gz 676336
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.4 b/media-sound/mpfc/files/digest-mpfc-1.3.4
deleted file mode 100644
index 5616c0645c8e..000000000000
--- a/media-sound/mpfc/files/digest-mpfc-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fdda690f2e59372d0100f4b07fcd77de mpfc-1.3.4.tar.gz 684756
diff --git a/media-sound/mpfc/mpfc-1.3.2.ebuild b/media-sound/mpfc/mpfc-1.3.2.ebuild
deleted file mode 100644
index 93233f4e3510..000000000000
--- a/media-sound/mpfc/mpfc-1.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.2.ebuild,v 1.3 2004/10/17 09:55:31 dholm Exp $
-
-IUSE="alsa oss esd mad oggvorbis gpm"
-
-inherit eutils
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )
-	gpm? ( >=sys-libs/gpm-1.19.3 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-
-	# $(get_libdir) fixes
-	cd ${S}
-	find . -name 'Makefile.in' |
-		xargs grep ^libdir |
-		cut -f1 -d: |
-		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable esd) \
-		$(use_enable mad mp3) \
-		$(use_enable oggvorbis ogg) \
-		$(use_enable gpm) \
-		--sysconfdir=/etc"
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins mpfcrc
-}
diff --git a/media-sound/mpfc/mpfc-1.3.3.ebuild b/media-sound/mpfc/mpfc-1.3.3.ebuild
deleted file mode 100644
index f1e83fc77657..000000000000
--- a/media-sound/mpfc/mpfc-1.3.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.3.ebuild,v 1.1 2004/10/24 23:24:03 pkdawson Exp $
-
-IUSE="alsa oss esd mad oggvorbis gpm"
-
-inherit eutils
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )
-	gpm? ( >=sys-libs/gpm-1.19.3 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-
-	# $(get_libdir) fixes
-	cd ${S}
-	find . -name 'Makefile.in' |
-		xargs grep ^libdir |
-		cut -f1 -d: |
-		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable esd) \
-		$(use_enable mad mp3) \
-		$(use_enable oggvorbis ogg) \
-		$(use_enable gpm) \
-		--sysconfdir=/etc"
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins mpfcrc
-}
diff --git a/media-sound/mpfc/mpfc-1.3.4.ebuild b/media-sound/mpfc/mpfc-1.3.4.ebuild
deleted file mode 100644
index 4b888c0da137..000000000000
--- a/media-sound/mpfc/mpfc-1.3.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.4.ebuild,v 1.1 2004/10/25 22:25:00 pkdawson Exp $
-
-IUSE="alsa oss esd mad oggvorbis gpm"
-
-inherit eutils
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )
-	gpm? ( >=sys-libs/gpm-1.19.3 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-
-	# $(get_libdir) fixes
-	cd ${S}
-	find . -name 'Makefile.in' |
-		xargs grep ^libdir |
-		cut -f1 -d: |
-		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable esd) \
-		$(use_enable mad mp3) \
-		$(use_enable oggvorbis ogg) \
-		$(use_enable gpm) \
-		--sysconfdir=/etc"
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins mpfcrc
-}
diff --git a/media-sound/mpfc/mpfc-1.3.5.ebuild b/media-sound/mpfc/mpfc-1.3.5.ebuild
index 9481c92cac70..230acf11361d 100644
--- a/media-sound/mpfc/mpfc-1.3.5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.5.ebuild
@@ -1,28 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.2 2004/12/19 05:58:35 eradicator Exp $
-
-IUSE="alsa oss esd mad oggvorbis gpm"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.3 2005/05/28 13:19:01 luckyduck Exp $
 
 inherit eutils
 
 DESCRIPTION="Music Player For Console"
 HOMEPAGE="http://mpfc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 sparc ~ppc x86"
+IUSE="alsa esd gpm mad ogg oss"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
 	esd? ( >=media-sound/esound-0.2.22 )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
 	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )
-	gpm? ( >=sys-libs/gpm-1.19.3 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed"
+	ogg? ( media-libs/libogg
+		media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,20 +32,21 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="
+	econf \
 		$(use_enable alsa) \
-		$(use_enable oss) \
 		$(use_enable esd) \
-		$(use_enable mad mp3) \
-		$(use_enable oggvorbis ogg) \
 		$(use_enable gpm) \
-		--sysconfdir=/etc"
-	econf ${myconf} || die
+		$(use_enable mad mp3) \
+		$(use_enable ogg) \
+		$(use_enable oss) \
+		--sysconfdir=/etc \
+		|| die "configure failed"
+
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	insinto /etc
 	doins mpfcrc