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

(Portage version: 2.0.51.22-r1)

9 files changed, 40 insertions, 292 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 5b28ade8dac0..6d45fe2766ff 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.56 2005/05/22 17:24:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.57 2005/05/28 12:36:00 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -mpd-0.11.4.ebuild,
+  -mpd-0.11.4-r1.ebuild, -mpd-0.11.4-r2.ebuild, mpd-0.11.5.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   22 May 2005; Guy Martin <gmsoft@gentoo.org> mpd-0.11.5.ebuild:
   Stable on hppa.
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 8fe6619187d2..758e03d3f9eb 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,11 +1,5 @@
-MD5 65579235fa0ba588b9fd5dc2a7ca7f20 ChangeLog 8838
+MD5 eb777742442269bb6bac48483b381124 mpd-0.11.5.ebuild 2911
+MD5 745fa5b0ffa68a6cc972e0c1047fc4e3 ChangeLog 9054
 MD5 74c25ed47224b9d121ba2f3c7e73defe metadata.xml 217
-MD5 b5c1597139467b11f93023360327c327 mpd-0.11.4-r1.ebuild 2457
-MD5 f6579ea96d9eea72802fe573b750fea4 mpd-0.11.4-r2.ebuild 2662
-MD5 be29322e9ef93c85929ea30b851f5aa5 mpd-0.11.4.ebuild 2848
-MD5 7496122a46606ac3fd2abc2a26c0b3d1 mpd-0.11.5.ebuild 2873
-MD5 59c974273bb1408f7c525f068a3bf6d5 files/digest-mpd-0.11.4 63
-MD5 59c974273bb1408f7c525f068a3bf6d5 files/digest-mpd-0.11.4-r1 63
-MD5 59c974273bb1408f7c525f068a3bf6d5 files/digest-mpd-0.11.4-r2 63
 MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5 63
 MD5 37f1c56ef509392e0a3cdca333804c31 files/mpd.rc6 894
diff --git a/media-sound/mpd/files/digest-mpd-0.11.4 b/media-sound/mpd/files/digest-mpd-0.11.4
deleted file mode 100644
index 79b28230df37..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.11.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e38bbb31e07920bac90f5c6f3825aa8e mpd-0.11.4.tar.gz 1120087
diff --git a/media-sound/mpd/files/digest-mpd-0.11.4-r1 b/media-sound/mpd/files/digest-mpd-0.11.4-r1
deleted file mode 100644
index 79b28230df37..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.11.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e38bbb31e07920bac90f5c6f3825aa8e mpd-0.11.4.tar.gz 1120087
diff --git a/media-sound/mpd/files/digest-mpd-0.11.4-r2 b/media-sound/mpd/files/digest-mpd-0.11.4-r2
deleted file mode 100644
index 79b28230df37..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.11.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e38bbb31e07920bac90f5c6f3825aa8e mpd-0.11.4.tar.gz 1120087
diff --git a/media-sound/mpd/mpd-0.11.4-r1.ebuild b/media-sound/mpd/mpd-0.11.4-r1.ebuild
deleted file mode 100644
index 587809fc1792..000000000000
--- a/media-sound/mpd/mpd-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.4-r1.ebuild,v 1.6 2005/02/14 02:05:34 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa"
-
-inherit eutils
-
-DESCRIPTION="Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~ppc sparc x86"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	!media-sound/mpd-svn"
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.rc6 mpd
-
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-}
-
-pkg_preinst() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-	einfo "please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
-	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather then all available IPs."
-}
diff --git a/media-sound/mpd/mpd-0.11.4-r2.ebuild b/media-sound/mpd/mpd-0.11.4-r2.ebuild
deleted file mode 100644
index 54c9ad6c55d3..000000000000
--- a/media-sound/mpd/mpd-0.11.4-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.4-r2.ebuild,v 1.6 2005/02/14 02:07:57 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa"
-
-inherit eutils
-
-DESCRIPTION="Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc sparc x86"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	!media-sound/mpd-svn"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.rc6 mpd
-
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	dodir /usr/share/mpd/
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-}
-
-pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-	einfo "please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
-	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather then all available IPs."
-}
diff --git a/media-sound/mpd/mpd-0.11.4.ebuild b/media-sound/mpd/mpd-0.11.4.ebuild
deleted file mode 100644
index 390fc9782be6..000000000000
--- a/media-sound/mpd/mpd-0.11.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.4.ebuild,v 1.6 2005/02/14 02:07:57 ticho Exp $
-
-inherit eutils
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac droproot mikmod alsa"
-
-DESCRIPTION="Music Player Daemon (mpd)"
-SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
-HOMEPAGE="http://www.musicpd.org"
-
-KEYWORDS="x86 amd64 sparc hppa"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	!media-sound/mpd-svn"
-
-src_compile() {
-	#flip on/off the support, and test.
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.rc6 mpd
-
-	if use droproot; then
-		dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	fi
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-}
-
-pkg_preinst() {
-	if use droproot; then
-		echo "adding user"
-		enewuser mpd '' '' '' audio || die "problem adding user mpd"
-	fi
-}
-
-pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-	einfo "please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
-	einfo
-	einfo "There have been a few changes to the default config as of late for security reason."
-	einfo "If the use flag droproot is enabled, mpd runs as user mpd rather then root; this will be a default"
-	einfo "in later versions, rather then enabled via use flag."
-	einfo
-	einfo "Also, the default config now binds the daemon strictly to localhost, rather then all available IPs."
-}
diff --git a/media-sound/mpd/mpd-0.11.5.ebuild b/media-sound/mpd/mpd-0.11.5.ebuild
index 78fa7df13a72..73d161e96ce2 100644
--- a/media-sound/mpd/mpd-0.11.5.ebuild
+++ b/media-sound/mpd/mpd-0.11.5.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5.ebuild,v 1.6 2005/05/22 17:24:18 gmsoft Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5.ebuild,v 1.7 2005/05/28 12:36:00 luckyduck Exp $
 
 inherit eutils
 
@@ -10,48 +8,53 @@ DESCRIPTION="Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
 SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE="aac alsa audiofile flac ipv6 mad mikmod ogg unicode"
 
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
+DEPEND=">=media-libs/libao-0.8.4
+	!media-sound/mpd-svn
+	sys-libs/zlib
 	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-libs/alsa-lib )
 	audiofile? ( media-libs/audiofile )
 	flac? ( >=media-libs/flac-1.1.0 )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
 	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	!media-sound/mpd-svn"
+	ogg? ( media-libs/libogg
+		media-libs/libvorbis )"
 
 pkg_setup() {
 	enewuser mpd '' '' '' audio || die "problem adding user mpd"
 }
 
 src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
+	econf \
+		$(use_enable aac) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable ogg) \
+		$(use_enable ogg oggtest) \
+		$(use_enable ogg vorbistest) \
+		|| die "could not configure"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make install DESTDIR=${D} || die "make install failed"
+
 	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
+	dodoc ChangeLog INSTALL README TODO UPGRADING
 	dodoc doc/COMMANDS doc/mpdconf.example
 
 	insinto /etc
@@ -86,7 +89,9 @@ src_install() {
 pkg_postinst() {
 	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
 	einfo "please refer to the FAQ"
-	einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are having problems."
+	einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are having"
+	einfo "problems."
 	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather then all available IPs."
+	einfo "The default config now binds the daemon strictly to localhost,"
+	einfo "rather then all available IPs."
 }