Removed last 0.11 ebuild from the tree. Added "before xdm" to initscript depends, as suggested by Tom Wesley <tom at tomaw.net>.

Package-Manager: portage-2.1.2-r6

6 files changed, 21 insertions, 178 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index abb08aabcc9f..ab1cfa7e9ccf 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.91 2006/11/15 22:50:26 jer Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.92 2007/02/18 03:35:15 ticho Exp $
+
+  18 Feb 2007; Andrej Kacian <ticho@gentoo.org> files/mpd-0.12.rc6,
+  -files/mpd.rc6, -mpd-0.11.5-r2.ebuild:
+  Removed last 0.11 ebuild from the tree. Added "before xdm" to initscript
+  depends, as suggested by Tom Wesley <tom at tomaw.net>.
 
   15 Nov 2006; Jeroen Roovers <jer@gentoo.org> mpd-0.12.1.ebuild:
   Stable for HPPA (bug #154742).
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 919c35e60d0b..a84dd46851d6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,21 +5,12 @@ AUX mpd-0.12-conf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA
 MD5 14008de3b007a1fd65dd073ca2ab1aa8 files/mpd-0.12-conf.patch 2034
 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f files/mpd-0.12-conf.patch 2034
 SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e files/mpd-0.12-conf.patch 2034
-AUX mpd-0.12.rc6 657 RMD160 f9113bf5ce8afe61c05d35051b961b7932eff468 SHA1 3bc9d54ce48c37b040f7fa3d0a61a762e7840159 SHA256 4a9c111b1211d5e8d6caf559b5af602bb8aa90be65c57f464ddd1b819c98f300
-MD5 08a350c48eab1ac79b29412ebe86c300 files/mpd-0.12.rc6 657
-RMD160 f9113bf5ce8afe61c05d35051b961b7932eff468 files/mpd-0.12.rc6 657
-SHA256 4a9c111b1211d5e8d6caf559b5af602bb8aa90be65c57f464ddd1b819c98f300 files/mpd-0.12.rc6 657
-AUX mpd.rc6 898 RMD160 7c1b966477acfa5a68ccda2207f3a099a3f7380a SHA1 f034a5494b48f6c23d07a1ffe906331a4221bb8c SHA256 aaf555b4156c37dc8d6d8b18abb48b1fa577ab9a2fd46bf712fee03b0d3cbc06
-MD5 18eeb3875218f95e4351130c755f38e6 files/mpd.rc6 898
-RMD160 7c1b966477acfa5a68ccda2207f3a099a3f7380a files/mpd.rc6 898
-SHA256 aaf555b4156c37dc8d6d8b18abb48b1fa577ab9a2fd46bf712fee03b0d3cbc06 files/mpd.rc6 898
-DIST mpd-0.11.5.tar.gz 1127523 RMD160 4a7dd3473110aa1f860fbd7a760da7fdfe2a9ebf SHA1 5661008b3eb799f8d76949a37bc439917dbbb68a SHA256 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
+AUX mpd-0.12.rc6 669 RMD160 2b5ccd3a9cdf02118a1d0e72705b7fec11440709 SHA1 2bedd82e4ff74d044405513a9cd86cb38d0bf02b SHA256 e5193c77e4c66b59112f560a6fd498473ac6712c893af802234b544a4a1dfd04
+MD5 b95313e7320631159117dedfc209d6a2 files/mpd-0.12.rc6 669
+RMD160 2b5ccd3a9cdf02118a1d0e72705b7fec11440709 files/mpd-0.12.rc6 669
+SHA256 e5193c77e4c66b59112f560a6fd498473ac6712c893af802234b544a4a1dfd04 files/mpd-0.12.rc6 669
 DIST mpd-0.12.0.tar.bz2 397497 RMD160 834f7d16a319abf504825066dce065689fd25415 SHA1 2818d9544e2f9124cc2879fce75e7a2c03dafd3c SHA256 89a89a13c8d65d8488887d57cb4b87c6b0cb0d4d31e31cb836c73b1d45dbc5b1
 DIST mpd-0.12.1.tar.bz2 397761 RMD160 3352e60ead352bac0b4776f4b784c9f9505bc9bc SHA1 8b124bfcf4b1b2c23abd40661bd0ad0b33fadbfe SHA256 eefac7e55f86716f1f5fbc1f33688cfc8f1c8cde12b1d76b18f17144ea5285ba
-EBUILD mpd-0.11.5-r2.ebuild 3322 RMD160 b37b21d5e13d3bc89f78a9d6ea086d26ffbff202 SHA1 bad7a3ac7130b8b9eaa7b66ce2126eb2389d6397 SHA256 0fe24d90f0c194e23e63a84656b7c4ea17adaaf6087cfcee2ed982c4f3aebf73
-MD5 9c3806dcc6045597ad9df8abe553fd93 mpd-0.11.5-r2.ebuild 3322
-RMD160 b37b21d5e13d3bc89f78a9d6ea086d26ffbff202 mpd-0.11.5-r2.ebuild 3322
-SHA256 0fe24d90f0c194e23e63a84656b7c4ea17adaaf6087cfcee2ed982c4f3aebf73 mpd-0.11.5-r2.ebuild 3322
 EBUILD mpd-0.12.0.ebuild 3441 RMD160 1be705d6e757b53bf3c6dcbce94da6baed85446d SHA1 39943664e9f8fe85a6e4e71d2c02acef5064375e SHA256 836582d9842b65bb241cb312e6453ab22e364229581210457997dc44ef745a73
 MD5 e70282545f4ada9a40735469c0116583 mpd-0.12.0.ebuild 3441
 RMD160 1be705d6e757b53bf3c6dcbce94da6baed85446d mpd-0.12.0.ebuild 3441
@@ -28,17 +19,14 @@ EBUILD mpd-0.12.1.ebuild 3444 RMD160 73ef43a5828dd6a70da1d25e2e01c3786fc28330 SH
 MD5 8ad2289ce73ac146a1905e5aae2b6a04 mpd-0.12.1.ebuild 3444
 RMD160 73ef43a5828dd6a70da1d25e2e01c3786fc28330 mpd-0.12.1.ebuild 3444
 SHA256 40f8fd1f302d4643cfa1254256d94842b621b2044777a8a4cff8277685e55d8e mpd-0.12.1.ebuild 3444
-MISC ChangeLog 14209 RMD160 2420d0254cf11970ee374d33ddcd39316ee341de SHA1 7af82dde0ad65e3e6d46751ef8b5bd44b2dd202f SHA256 fa2c067cd5e0561066d9244a0bca1a2e7846f204885327865d00a498b78d287e
-MD5 a3ac7d8510328984773a1110de1dec70 ChangeLog 14209
-RMD160 2420d0254cf11970ee374d33ddcd39316ee341de ChangeLog 14209
-SHA256 fa2c067cd5e0561066d9244a0bca1a2e7846f204885327865d00a498b78d287e ChangeLog 14209
+MISC ChangeLog 14454 RMD160 919fc51ea840ca4033a83226c2533f19c459dded SHA1 7632640d0cdfef086f136ce6e00609960f4e3682 SHA256 299b4ff7dbfdd597712482abf560e06433f62266436c2b820bf17edec9b3ba07
+MD5 f91401108c0f317c9953871b9d1abe17 ChangeLog 14454
+RMD160 919fc51ea840ca4033a83226c2533f19c459dded ChangeLog 14454
+SHA256 299b4ff7dbfdd597712482abf560e06433f62266436c2b820bf17edec9b3ba07 ChangeLog 14454
 MISC metadata.xml 252 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d SHA1 3c81d53044fd315d5f10d2c46e3aa078c45d3384 SHA256 86a9454895a5e4e636f9da9f557de3525ed6e606f95ffe92ca1e79c005d3b4b9
 MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d metadata.xml 252
 SHA256 86a9454895a5e4e636f9da9f557de3525ed6e606f95ffe92ca1e79c005d3b4b9 metadata.xml 252
-MD5 e646bf6f79e05a8ef60b06e3e1339682 files/digest-mpd-0.11.5-r2 235
-RMD160 2fc041d417b0f2a560bb9d43e2ce91c693c5ab89 files/digest-mpd-0.11.5-r2 235
-SHA256 5d0d1efbce591ac63c604f838c0e715054e20657044aeb7b9606f75708678ccf files/digest-mpd-0.11.5-r2 235
 MD5 4c7770856a775ed0e1629a1611a66956 files/digest-mpd-0.12.0 235
 RMD160 987169c1acecbcaaf47cbec835afacf3565d6b8c files/digest-mpd-0.12.0 235
 SHA256 5b7c8adfe74ea59598cb464c76e3c5ea2adf5e69ba785494ab2524f4e1a7deda files/digest-mpd-0.12.0 235
@@ -46,9 +34,9 @@ MD5 57188080fc165abdd4cccf308be10c1d files/digest-mpd-0.12.1 235
 RMD160 8e15c4b37c98a733439b81bc3ebe6d442fdcb99d files/digest-mpd-0.12.1 235
 SHA256 4c8759285775ccbac09920b738beac80d7ec87da489e4e3276c7f0dca6ff52e8 files/digest-mpd-0.12.1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFzvhp8bi6rjpTunYRAr+sAJwI///BDAggkBFlqrYH7dHuWq/nhwCgpIQ4
-n0nUNqoVWw1zyNBy3D2QA0s=
-=2HH5
+iD8DBQFF18l9QlM6RnzZP+IRAvNOAJ93ZBwmdAGpIZeirdUgDBEkKukgFQCgxazv
+NBLXT7MAn9OxMBGSZOT/SjM=
+=4UEQ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/digest-mpd-0.11.5-r2 b/media-sound/mpd/files/digest-mpd-0.11.5-r2
deleted file mode 100644
index e0008866aec2..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.11.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a9a1a9d31f00a43838b3752024f7ebe mpd-0.11.5.tar.gz 1127523
-RMD160 4a7dd3473110aa1f860fbd7a760da7fdfe2a9ebf mpd-0.11.5.tar.gz 1127523
-SHA256 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd mpd-0.11.5.tar.gz 1127523
diff --git a/media-sound/mpd/files/mpd-0.12.rc6 b/media-sound/mpd/files/mpd-0.12.rc6
index cb03d0f10c02..d94b3b19c3e9 100755
--- a/media-sound/mpd/files/mpd-0.12.rc6
+++ b/media-sound/mpd/files/mpd-0.12.rc6
@@ -1,11 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd-0.12.rc6,v 1.3 2006/10/03 19:26:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd-0.12.rc6,v 1.4 2007/02/18 03:35:15 ticho Exp $
 
 depend() {
 	need localmount
 	use netmount nfsmount esound pulseaudio
+	before xdm
 } 
 
 checkconfig() {
diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6
deleted file mode 100644
index 01b366f53a94..000000000000
--- a/media-sound/mpd/files/mpd.rc6
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc6,v 1.16 2005/10/24 13:41:23 ticho Exp $
-
-depend() {
-	need localmount
-	use netmount nfsmount
-} 
-
-checkconfig() {
-	if [ -f /etc/conf.d/mpd ]; then
-		eerror "Please remove the /etc/conf.d/mpd file as it is no longer used."
-		eerror "You may configure your mpd settings in /etc/mpd.conf"
-	fi
-
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/bin/mpd --oknodo
-	eend $? 
-}
diff --git a/media-sound/mpd/mpd-0.11.5-r2.ebuild b/media-sound/mpd/mpd-0.11.5-r2.ebuild
deleted file mode 100644
index 913971c4d6f6..000000000000
--- a/media-sound/mpd/mpd-0.11.5-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.13 2006/10/19 22:43:09 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis"
-
-DEPEND=">=media-libs/libao-0.8.4
-	!media-sound/mpd-svn
-	!sys-cluster/mpich2
-	sys-libs/zlib
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	audiofile? ( media-libs/audiofile )
-	flac? ( ~media-libs/flac-1.1.2 )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	vorbis? ( media-libs/libvorbis )"
-
-upgrade_warning() {
-	echo
-	ewarn "This package now correctly uses 'vorbis' USE flag, instead of 'ogg'."
-	ewarn "See http://bugs.gentoo.org/101877 for details."
-	echo
-	ewarn "Home directory of user mpd, as well as default locations in mpd.conf have"
-	ewarn "been changed to /var/lib/mpd, please bear that in mind while updating"
-	ewarn "your mpd.conf file."
-	echo
-}
-
-pkg_setup() {
-	upgrade_warning
-	epause 7
-	enewuser mpd '' '' "/var/lib/mpd" audio || die "problem adding user mpd"
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
-}
-
-src_compile() {
-	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 vorbis ogg) \
-		$(use_enable vorbis oggtest) \
-		$(use_enable vorbis vorbistest) \
-		|| die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	rm -rf "${D}"/usr/share/doc/mpd/
-	dodoc ChangeLog README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.rc6 mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	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 "/var/lib/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/var/lib/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
-	dosed 's:^db_file.*:db_file "/var/lib/mpd/database":' /etc/mpd.conf
-	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state":' /etc/mpd.conf
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	upgrade_warning
-}