Fix init script to set pidfile (bug #367995); revert to old (pre-baselayout2) init scripts for old versions that do not require baselayout2

Package-Manager: portage-2.1.9.48/cvs/Linux x86_64

8 files changed, 83 insertions, 19 deletions

diff --git a/media-sound/squeezeboxserver/ChangeLog b/media-sound/squeezeboxserver/ChangeLog
index e837bd9d6ffa..6c9752e64302 100644
--- a/media-sound/squeezeboxserver/ChangeLog
+++ b/media-sound/squeezeboxserver/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-sound/squeezeboxserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.17 2011/05/14 15:26:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.18 2011/06/05 16:06:47 lavajoe Exp $
+
+*squeezeboxserver-7.5.4-r1 (05 Jun 2011)
+*squeezeboxserver-7.5.3-r1 (05 Jun 2011)
+*squeezeboxserver-7.5.1-r2 (05 Jun 2011)
+
+  05 Jun 2011; Joe Peterson <lavajoe@gentoo.org>
+  -squeezeboxserver-7.5.1-r1.ebuild, +squeezeboxserver-7.5.1-r2.ebuild,
+  -files/build-modules-7.5.1-r1.sh, +files/build-modules-7.5.1.sh,
+  -squeezeboxserver-7.5.3.ebuild, +squeezeboxserver-7.5.3-r1.ebuild,
+  -squeezeboxserver-7.5.4.ebuild, +squeezeboxserver-7.5.4-r1.ebuild,
+  +files/squeezeboxserver.init.d.baselayout1, files/squeezeboxserver.init.d:
+  Fix init script to set pidfile (bug #367995); revert to old (pre-baselayout2)
+  init scripts for old versions that do not require baselayout2
 
 *squeezeboxserver-7.5.4 (14 May 2011)
 
diff --git a/media-sound/squeezeboxserver/Manifest b/media-sound/squeezeboxserver/Manifest
index 724d556c0921..b03333af340e 100644
--- a/media-sound/squeezeboxserver/Manifest
+++ b/media-sound/squeezeboxserver/Manifest
@@ -1,7 +1,7 @@
 AUX Gentoo-detailed-changelog.txt 85 RMD160 efbbea26fc3d3b52d44e14af5167579f3bd1c18c SHA1 bc98023680b8991ee65a9357b86abdf43160b191 SHA256 87cf5296a364f86519b30679963325bcdaa871dd9529c2054158f57b1c853417
 AUX Gentoo-plugins-README.txt 994 RMD160 9307fc3b9488d2b6a74aaa0b0e531132ea5822b2 SHA1 b4a33a10504c0a4813c22a1f392b1d93b9876f2e SHA256 32e8512120e30fcae273300474685547b6daaf21722b65ffc85d0a894a150e73
 AUX avahi-squeezeboxserver.service 330 RMD160 47b5b26f788dfe048f7a40763e45ba3ac9134d7e SHA1 c1cba7d50675c4f890c7b9d55c2c558d3ab1f665 SHA256 a4b16989459ecb02d035b3a120d2c2b6d9d3368c06b7aecf5f0497f1bb1c9e17
-AUX build-modules-7.5.1-r1.sh 1237 RMD160 4e97a7ce8cbb02b42f002877e36de608be7b5ba6 SHA1 8d00cfd0ee1deaa331d0e6cdf0bd12a3f108b8c3 SHA256 30fef2e87c8aad58d36dd7506251a42f0679717da8adf23db78d520199c4ed0b
+AUX build-modules-7.5.1.sh 1234 RMD160 f57c82d89f3a0c385907c6357bd7d19f0f59f918 SHA1 f149f1a2728322e7acc972a34b9937476b724819 SHA256 b1c51e076b892ccc5c963a2dbd1462b5272a064ccb4a9674880cf28745a840bb
 AUX build-modules-7.5.3.sh 1234 RMD160 8ab47f71f064111a26b2172ac83923c9fef1c159 SHA1 75598627a7e251dfec2a62af8fb08ab1607473e4 SHA256 4070fd37f617adbbcfc9280b4c09b920624dee986bb05b2e388e5695856967db
 AUX build-modules-7.5.4.sh 1234 RMD160 47c5ab1346bab4ed20a1f48aeae7af3452d4dc05 SHA1 2f634fb2aa053a9abd6cc8b85fde66432e7f145c SHA256 23c09fa1bd1cbb8e45f6fdaead6a2e53f5f22cfd160d86f7a2f59ec45a2d86c1
 AUX build-modules.sh 17315 RMD160 b6d567cbf22aa2f6895ef1fd6a9da1494933450e SHA1 f603d14f422af0cdd1ba275c0ab0f1bf11887cce SHA256 4db895dea2fa12dbd2365ee613c358d3e5a65a731ac1c1cdef19b2ce4aee7915
@@ -18,15 +18,16 @@ AUX squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch 860 RMD160 3b7a613316
 AUX squeezeboxserver-7.5.4-squeezeslave.patch 642 RMD160 ffe4ab0a063947443af1a6d41f335667676d9993 SHA1 3a08049b09814457aa25b1feb9fc6f132679439d SHA256 60289802b2c874fcfea355c686020d4b3db9ce0de957bfa54a8b85dc7d286e11
 AUX squeezeboxserver-7.5.4-uuid-gentoo.patch 535 RMD160 e5ab55f53ecc96efa02ff5cf5575586f88a38e9e SHA1 6eed76837095f562d0d45e11f01007393feeb161 SHA256 dc4bcad0b1a77ccfdf95d435d0db6356ba5b92fddd4d8563ee8550abf5ec1fab
 AUX squeezeboxserver.conf.d 1106 RMD160 39ca36903c4b67e40b5e24c06bc62057e932bbf1 SHA1 0d84ec59e828d6eec7bdd64f7b414748eb2a558a SHA256 4ac6df07ae3b74d44ae410e0879ea2ad2d948383c32fdd750a443717c8648df0
-AUX squeezeboxserver.init.d 1313 RMD160 c4dd02715ec067f7c0db821864da3c683d76eec1 SHA1 70a9b81727621e7715fa76ede9af7e644997fb45 SHA256 e82e7ac253497aff3340118491fd1aa7e6fb79d8e111a8e0b043f7c47f2e53dd
+AUX squeezeboxserver.init.d 1338 RMD160 0df719a9f8083d32eb817ebbd5496229e49e66f0 SHA1 9e728eaa26f922f650ca5075c5af61fa85849539 SHA256 5b7de1a414eef6b995084e7aa53cb670405fdc0f7bc800d86e8c2eaedd20b807
+AUX squeezeboxserver.init.d.baselayout1 1399 RMD160 a27bdc3b4f776d6de8bb987023f9b7e62742acc0 SHA1 fb53ea60fe5f0bc6bfb1ba6a42b2194ba51a8e49 SHA256 c0f98046331fac9645e6e2313d08ee94ae75365014aebd324217288effb7d7d1
 AUX squeezeboxserver.logrotate.d 422 RMD160 694fdc002fee090f503ec757873b838d73bebb65 SHA1 98606d8dd8323d67a6a45339ec64d793224afbf2 SHA256 0eef63753f1072b20ad0418fc33a47b08412eb901283c7d3a984293f64ae3a8d
 AUX squeezeboxserver.prefs 132 RMD160 194039dc2ef4b0c579ed13096ff6151fbbd27c02 SHA1 242e1211e1432704b5350a7acbb5be8fbcd2a815 SHA256 8f114c520f2eec360c68861159fb0824733748189836781f22513da6050f669e
 DIST SqueezeboxServer-EV-3.8.tar.gz 151268 RMD160 0bb514debdb615b37f5c16164a47c5934aacbdd9 SHA1 a205192861aa5a668592468833d0e99749274aeb SHA256 3be30c896026fe1a873ac16eac9473f80f62c164da88e3815ed6eee56e229345
 DIST squeezeboxserver-7.5.1-noCPAN.tgz 20719890 RMD160 f042feab287da2835905b50b9b08e197c9746d9e SHA1 ff6bdffa4f421d066ef4cce86b8963cb67f3cac2 SHA256 bab313b1bf68c4e4825d821352ce6d59a0eaa883ae487cd273a9cd9b4a5245ff
 DIST squeezeboxserver-7.5.3-noCPAN.tgz 19812897 RMD160 912f0c014378c354afbbe73c6e9efc8eee1e6e54 SHA1 956f872050da455ea639341951b20e7ae2985dc0 SHA256 d813d28c15bad94c000432b6aaaa659375e1981fc405868cba02fee2fef8d6ea
 DIST squeezeboxserver-7.5.4-noCPAN.tgz 19816973 RMD160 7f35225bb820791d865ba842c36bbc9fdb208762 SHA1 4fbc7933a27e604707814ff0767ea312a82192b1 SHA256 cee93ca23b5197037a0c055acb1aac1ae46da3a7777acbb16633924e13c1004a
-EBUILD squeezeboxserver-7.5.1-r1.ebuild 17647 RMD160 144a3561d1c2d681fd6c6f46aac5a2e6f8741a3a SHA1 5ed195694acfdf4ac243591604d16e22ce92db7a SHA256 94277274112ad3296cfb22b6461d2e4fc8640ca4c37837f127b5ee9529999781
-EBUILD squeezeboxserver-7.5.3.ebuild 17778 RMD160 79d33fcb51856dc7dc8a9ffa3b1d5c0b4710467f SHA1 77c17bc78f2c3d3d14be87f935982012f86ea5a7 SHA256 18c1d1c2749683b9f7773b12dcbb599b7649d8bb906bcfb40854d6e3e14f92ed
-EBUILD squeezeboxserver-7.5.4.ebuild 17826 RMD160 91ccfc07dc2ff20acf69f08a42db143d09757e76 SHA1 0dc896e5a3bb85f1a8dfb2dfe6c0b50258cccb02 SHA256 24b597afef902b5853d69ef1a4e5751072917c65050d2af0d76fe5ff6b36688b
-MISC ChangeLog 5852 RMD160 eda9498acafbf2dad2b907b6e19f79f0a9320e00 SHA1 b893c972311160a81fd51e704e7d77950e030589 SHA256 7eda6a80626c36ea4417b9305fc18d13a56224c44851c8a226c5eda0b70da941
+EBUILD squeezeboxserver-7.5.1-r2.ebuild 17687 RMD160 5fb807d2cd8bb37c6fced1a2def63f635f6fead2 SHA1 fb078d1ccbfa8127266132374b6196a284764531 SHA256 d9d51b1a4c47157d578e7e5f6df8e596b688a05a3b1bcbb8b12b5360fe0c6dc1
+EBUILD squeezeboxserver-7.5.3-r1.ebuild 17792 RMD160 bacc0b6845cf40bd0a25edb800ad3a902fdc53c7 SHA1 c14a5c012cbc00ee1693aa6287cd313323bb7f7f SHA256 a0c96222ecb901c21a1cb9233a86facb4bcb5e435630173d8b520b341a44737c
+EBUILD squeezeboxserver-7.5.4-r1.ebuild 17828 RMD160 fd08887706315d143dfb25fd826e664b4250f09b SHA1 30db2723502c068f33cc2d754baa3ae3b11dd2c6 SHA256 5d8463d389e277996122877e7567b384d63db1a06d69dc10355420589cc1697d
+MISC ChangeLog 6524 RMD160 fd818270b084187d5aade4d9ecf17be00e495069 SHA1 5235d4cec69921a7132e7449404e138264c0d338 SHA256 6032f62356da72d5ed8d65a575058b558b7282fc11e72f26966297e286aa65b9
 MISC metadata.xml 882 RMD160 deeff72ea79ab9bcefb7df319070bbab09385c71 SHA1 04b1813b2728609fceac3ab811743a7d4fac7ea0 SHA256 abfc064756a68b29c51dccaa77be5ba64fdfe662aa8a36aa1456a1442a59362a
diff --git a/media-sound/squeezeboxserver/files/build-modules-7.5.1-r1.sh b/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
index a0c0a12b9d49..6da66cdf4cf0 100644..100755
--- a/media-sound/squeezeboxserver/files/build-modules-7.5.1-r1.sh
+++ b/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Id: build-modules-7.5.1-r1.sh,v 1.1 2010/09/19 14:47:03 lavajoe Exp $
+# $Id: build-modules-7.5.1.sh,v 1.3 2011/06/05 16:06:47 lavajoe Exp $
 #
 # This script builds all binary Perl modules required by Squeezebox Server.
 
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
index b95ff07f94db..e7068c8e2f94 100755
--- a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.5 2011/05/14 15:26:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.6 2011/06/05 16:06:47 lavajoe Exp $
 
 # These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezeboxserver.
@@ -25,6 +25,7 @@ start() {
 	cd /
 	start-stop-daemon \
 		--start --exec /usr/sbin/${scname} \
+		--pidfile ${pidfile} \
 		--chuid ${scuser} \
 		--background \
 		-- \
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1 b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1
new file mode 100755
index 000000000000..af30a6466ee1
--- /dev/null
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1,v 1.1 2011/06/05 16:06:47 lavajoe Exp $
+
+# These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
+# user-servicable parts go in /etc/conf.d/squeezeboxserver.
+pidfile=/var/run/squeezeboxserver/squeezeboxserver.pid
+logdir=/var/log/squeezeboxserver
+varlibdir=/var/lib/squeezeboxserver
+cachedir=${varlibdir}/cache
+prefsdir=/etc/squeezeboxserver/prefs
+prefsfile=/etc/squeezeboxserver/squeezeboxserver.prefs
+scuser=squeezeboxserver
+scname=squeezeboxserver
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	ebegin "Starting Squeezebox Server"
+
+	cd /
+	start-stop-daemon \
+		--start --exec /usr/bin/perl /usr/sbin/${scname} \
+		--pidfile ${pidfile} \
+		--startas /usr/sbin/${scname} \
+		--chuid ${scuser} \
+		-- \
+		--quiet --daemon \
+		--pidfile=${pidfile} \
+		--cachedir=${cachedir} \
+		--prefsfile=${prefsfile} \
+		--prefsdir=${prefsdir} \
+		--logdir=${logdir} \
+		--audiodir=${SBS_MUSIC_DIR} \
+		--playlistdir=${SBS_PLAYLISTS_DIR} \
+		${SBS_OPTS}
+
+	eend $? "Failed to start Squeezebox Server"
+}
+
+stop() {
+	ebegin "Stopping Squeezebox Server"
+	start-stop-daemon --oknodo --retry 10 --stop --pidfile ${pidfile}
+	eend $? "Failed to stop Squeezebox Server"
+}
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r1.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r2.ebuild
index af34ecbb76fa..4bcec3cc21f2 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r1.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r1.ebuild,v 1.2 2011/02/24 07:13:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.1-r2.ebuild,v 1.1 2011/06/05 16:06:47 lavajoe Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ SRC_URI="http://downloads.slimdevices.com/${SRC_DIR}/${MY_P}.tgz
 # Note: common-sense currently required due to bundled EV (Gentoo bug#287257)
 DEPEND="
 	!media-sound/squeezecenter
-	virtual/logger
+	!prefix? ( virtual/logger )
 	virtual/mysql
 	>=dev-perl/common-sense-2.01
 	"
@@ -35,7 +35,7 @@ DEPEND="
 # (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
 RDEPEND="
 	dev-perl/File-Which
-	virtual/logger
+	!prefix? ( virtual/logger )
 	virtual/mysql
 	>=dev-lang/perl-5.8.8
 	~dev-perl/Audio-Scan-0.82
@@ -155,7 +155,7 @@ src_prepare() {
 
 	# Copy in the module builder - can't run it from the files directory in case
 	# Portage is mounted 'noexec'.
-	cp "${FILESDIR}/build-modules-${PVR}.sh" "${S}/build-modules.sh"	|| die
+	cp "${FILESDIR}/build-modules-${PV}.sh" "${S}/build-modules.sh"	|| die
 	chmod 555 "${S}/build-modules.sh"			|| die
 }
 
@@ -227,7 +227,7 @@ src_install() {
 
 	# Install init scripts
 	newconfd "${FILESDIR}/squeezeboxserver.conf.d" squeezeboxserver
-	newinitd "${FILESDIR}/squeezeboxserver.init.d" squeezeboxserver
+	newinitd "${FILESDIR}/squeezeboxserver.init.d.baselayout1" squeezeboxserver
 
 	# Install the SQL configuration scripts
 	insinto "${SHAREDIR}/SQL/mysql"
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.3.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.3-r1.ebuild
index a08aa0054a2d..284e7a62c271 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.3.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.3.ebuild,v 1.2 2011/04/24 16:19:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.3-r1.ebuild,v 1.1 2011/06/05 16:06:47 lavajoe Exp $
 
 EAPI="3"
 
@@ -156,7 +156,7 @@ src_prepare() {
 
 	# Copy in the module builder - can't run it from the files directory in case
 	# Portage is mounted 'noexec'.
-	cp "${FILESDIR}/build-modules-${PVR}.sh" "${S}/build-modules.sh"	|| die
+	cp "${FILESDIR}/build-modules-${PV}.sh" "${S}/build-modules.sh"	|| die
 	chmod 555 "${S}/build-modules.sh"			|| die
 }
 
@@ -228,7 +228,7 @@ src_install() {
 
 	# Install init scripts
 	newconfd "${FILESDIR}/squeezeboxserver.conf.d" squeezeboxserver
-	newinitd "${FILESDIR}/squeezeboxserver.init.d" squeezeboxserver
+	newinitd "${FILESDIR}/squeezeboxserver.init.d.baselayout1" squeezeboxserver
 
 	# Install the SQL configuration scripts
 	insinto "${SHAREDIR}/SQL/mysql"
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.4.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.4-r1.ebuild
index e423d4bb3e48..4b3edf676bb8 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.4.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.4.ebuild,v 1.1 2011/05/14 15:26:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.4-r1.ebuild,v 1.1 2011/06/05 16:06:47 lavajoe Exp $
 
 EAPI="3"
 
@@ -157,7 +157,7 @@ src_prepare() {
 
 	# Copy in the module builder - can't run it from the files directory in case
 	# Portage is mounted 'noexec'.
-	cp "${FILESDIR}/build-modules-${PVR}.sh" "${S}/build-modules.sh"	|| die
+	cp "${FILESDIR}/build-modules-${PV}.sh" "${S}/build-modules.sh"	|| die
 	chmod 555 "${S}/build-modules.sh"			|| die
 }