Revision bump fixing the libmpd issue (thanks ticho and tove, bug #177587) and init-script/pid (bug #177184)

Package-Manager: portage-2.1.2.2

8 files changed, 159 insertions, 20 deletions

diff --git a/app-misc/lcd-stuff/ChangeLog b/app-misc/lcd-stuff/ChangeLog
index ddd4f8acd1c9..117569c98a89 100644
--- a/app-misc/lcd-stuff/ChangeLog
+++ b/app-misc/lcd-stuff/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/lcd-stuff
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/ChangeLog,v 1.6 2007/05/08 21:32:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/ChangeLog,v 1.7 2007/05/12 11:24:49 rbu Exp $
+
+*lcd-stuff-0.1.2-r1 (12 May 2007)
+
+  12 May 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/lcd-stuff-0.1.2-mpd.patch, +files/lcd-stuff-0.1.2-r1.initd,
+  +files/lcd-stuff-0.1.2.initd, -files/lcd-stuff.initd,
+  lcd-stuff-0.1.2.ebuild, +lcd-stuff-0.1.2-r1.ebuild:
+  Revision bump fixing the libmpd issue (thanks ticho and tove, bug #177587)
+  and init-script/pid (bug #177184)
 
   08 May 2007; Markus Ullmann <jokey@gentoo.org> lcd-stuff-0.1.2.ebuild:
   Stable wrt bug #177184
diff --git a/app-misc/lcd-stuff/Manifest b/app-misc/lcd-stuff/Manifest
index ac7dc1c614cb..adc7d8878fe1 100644
--- a/app-misc/lcd-stuff/Manifest
+++ b/app-misc/lcd-stuff/Manifest
@@ -1,23 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lcd-stuff-0.1.2-mpd.patch 800 RMD160 fc209802cfaa15c95231a0a93965564ce0efe4ed SHA1 4f1b26fff65e3cc72b353dcc1248de24c76dfd84 SHA256 06d967e240224c75740d0aa327572e84ba5ce2f0c5410c7e554cecca6e7f7f24
+MD5 fa30f44639cd82e6b661fa49e6804b6a files/lcd-stuff-0.1.2-mpd.patch 800
+RMD160 fc209802cfaa15c95231a0a93965564ce0efe4ed files/lcd-stuff-0.1.2-mpd.patch 800
+SHA256 06d967e240224c75740d0aa327572e84ba5ce2f0c5410c7e554cecca6e7f7f24 files/lcd-stuff-0.1.2-mpd.patch 800
+AUX lcd-stuff-0.1.2-r1.initd 662 RMD160 b0f99f087c927e3cefb85ca6cd94aff3aa17682d SHA1 39b8dea7e45a7d88f19a191737cefa3841e2065d SHA256 d5b13e2685f490a658fb6c207aab7f9274139b0df92d4961ede487157bbf4959
+MD5 27e7488a06dded019140e30342666dc0 files/lcd-stuff-0.1.2-r1.initd 662
+RMD160 b0f99f087c927e3cefb85ca6cd94aff3aa17682d files/lcd-stuff-0.1.2-r1.initd 662
+SHA256 d5b13e2685f490a658fb6c207aab7f9274139b0df92d4961ede487157bbf4959 files/lcd-stuff-0.1.2-r1.initd 662
+AUX lcd-stuff-0.1.2.initd 659 RMD160 9f9b5a58fd07d15df8bc18a4637cc52f43b25ffc SHA1 3b973663af1c3efc5701cb3ac711eb0705ee5607 SHA256 fd054bb8fdbce9d54e808d6499416a980dbd16f0ba51a3897867250e1b613c77
+MD5 be3c821b4cd3ca5f75942a0c8a18f99d files/lcd-stuff-0.1.2.initd 659
+RMD160 9f9b5a58fd07d15df8bc18a4637cc52f43b25ffc files/lcd-stuff-0.1.2.initd 659
+SHA256 fd054bb8fdbce9d54e808d6499416a980dbd16f0ba51a3897867250e1b613c77 files/lcd-stuff-0.1.2.initd 659
 AUX lcd-stuff.confd 284 RMD160 cc79490105cebcaff6e31220f52f42d8acbd2216 SHA1 1d740ed2f3edc61bf20ce22a26705054963a5165 SHA256 cfeaba2f2cb1043ce35c1d8cb5467681cffedbb89fc38b4f8126d50531527984
 MD5 829d7b155a8bd8b983f874a2434b3be6 files/lcd-stuff.confd 284
 RMD160 cc79490105cebcaff6e31220f52f42d8acbd2216 files/lcd-stuff.confd 284
 SHA256 cfeaba2f2cb1043ce35c1d8cb5467681cffedbb89fc38b4f8126d50531527984 files/lcd-stuff.confd 284
-AUX lcd-stuff.initd 653 RMD160 4da2be05fecb1f60c04e783d4af4270066fae0ca SHA1 2a22f08ad7f08c516ea0e0a981ac78cd7b4f58f1 SHA256 0bb795cbd883fb58b6e3fe3d3ea3cdc8f077734e666658731f1c3e8d5725fb5b
-MD5 f34f8f156318852063d8a7e76e05ff4d files/lcd-stuff.initd 653
-RMD160 4da2be05fecb1f60c04e783d4af4270066fae0ca files/lcd-stuff.initd 653
-SHA256 0bb795cbd883fb58b6e3fe3d3ea3cdc8f077734e666658731f1c3e8d5725fb5b files/lcd-stuff.initd 653
 DIST lcd-stuff-0.1.2.tar.bz2 117031 RMD160 91b464463f5adfe9d8609facb3d1190625011107 SHA1 1cc66dd5054b00098b5fb499076747801830fdf7 SHA256 793c1de326f0f0124bb586f2e183435aef9d6cf808fa11f9c84bcd3c67df5aae
-EBUILD lcd-stuff-0.1.2.ebuild 1381 RMD160 524db258fa56e0f671ef6f0da886b3f7861518a6 SHA1 cef86835e63a3c2d75955f741babfc91c0ff6703 SHA256 228d689023be74e72c3c990db08b09b87c926f4551bd8bb2c1a72d0ee7ba3f4d
-MD5 cecf954b68b33b3c1ce50d3b65c9dd32 lcd-stuff-0.1.2.ebuild 1381
-RMD160 524db258fa56e0f671ef6f0da886b3f7861518a6 lcd-stuff-0.1.2.ebuild 1381
-SHA256 228d689023be74e72c3c990db08b09b87c926f4551bd8bb2c1a72d0ee7ba3f4d lcd-stuff-0.1.2.ebuild 1381
-MISC ChangeLog 947 RMD160 5ff3eb98e84bc5484a0527946e1cf9188b67c019 SHA1 e31afd296e8398385f5d1fa07164dd8b358307c3 SHA256 09c0cdf647770e99277d9a188f1b0c9dc0db190d60a97c7302da480027d2fa18
-MD5 19b1ce3748a607772bfdc9da8e8a6900 ChangeLog 947
-RMD160 5ff3eb98e84bc5484a0527946e1cf9188b67c019 ChangeLog 947
-SHA256 09c0cdf647770e99277d9a188f1b0c9dc0db190d60a97c7302da480027d2fa18 ChangeLog 947
+EBUILD lcd-stuff-0.1.2-r1.ebuild 1479 RMD160 92433496c8fa96518b0e4b14474a08576b5048ef SHA1 092cce4ed12df2268292aa1b4ce9a08a001b508e SHA256 757e21e3721fcc1aafbc27d199c9964cf37e2c46aa6cc6403b60fab7f9afbade
+MD5 1eb4bcfc6b5289009e1d904223bbd224 lcd-stuff-0.1.2-r1.ebuild 1479
+RMD160 92433496c8fa96518b0e4b14474a08576b5048ef lcd-stuff-0.1.2-r1.ebuild 1479
+SHA256 757e21e3721fcc1aafbc27d199c9964cf37e2c46aa6cc6403b60fab7f9afbade lcd-stuff-0.1.2-r1.ebuild 1479
+EBUILD lcd-stuff-0.1.2.ebuild 1379 RMD160 e36b521dabd737f87865ea031db7ecfc862459f4 SHA1 d052195c5c6fce3b1d0996f9ba84f8d79941d091 SHA256 b1de09a209d97e738bf843c7f1354141d36ab7a0ec9d0bb5f98d6d0b611c8261
+MD5 aa60c7fd900952a1c914e298488c5740 lcd-stuff-0.1.2.ebuild 1379
+RMD160 e36b521dabd737f87865ea031db7ecfc862459f4 lcd-stuff-0.1.2.ebuild 1379
+SHA256 b1de09a209d97e738bf843c7f1354141d36ab7a0ec9d0bb5f98d6d0b611c8261 lcd-stuff-0.1.2.ebuild 1379
+MISC ChangeLog 1321 RMD160 ac385f24b52538caa9c6381ec74f4946c4a21f6d SHA1 cc92c1c700e8e1598034af110cce4cf38c4327e0 SHA256 5f78ec0639535c00c240dc7d09d619ea2c82958598dd0ee9188ec57a1aa971c1
+MD5 d7b814ab406ea97258f3e2a7f5f9f74f ChangeLog 1321
+RMD160 ac385f24b52538caa9c6381ec74f4946c4a21f6d ChangeLog 1321
+SHA256 5f78ec0639535c00c240dc7d09d619ea2c82958598dd0ee9188ec57a1aa971c1 ChangeLog 1321
 MISC metadata.xml 757 RMD160 5d8d03f589ddd14c7150991c2ae8c5f1420418cd SHA1 2576ace710341167e50f61f35d013c93c86fa6f7 SHA256 09a13ff2fec99fd49760f6b1579b49c8c7c5caf630b8dbd9ee54dd210a34c305
 MD5 3ef974215d40df7eb25570d23236c806 metadata.xml 757
 RMD160 5d8d03f589ddd14c7150991c2ae8c5f1420418cd metadata.xml 757
@@ -25,10 +37,13 @@ SHA256 09a13ff2fec99fd49760f6b1579b49c8c7c5caf630b8dbd9ee54dd210a34c305 metadata
 MD5 cc7049d703a8ef4a9e7acc3fb5c5da69 files/digest-lcd-stuff-0.1.2 250
 RMD160 64ce2538d3050e13003f370123d8cd177e1e50b1 files/digest-lcd-stuff-0.1.2 250
 SHA256 40a29e96f15401097af1662611b43c84f9c90a2aa38aea03ad588841359aecac files/digest-lcd-stuff-0.1.2 250
+MD5 cc7049d703a8ef4a9e7acc3fb5c5da69 files/digest-lcd-stuff-0.1.2-r1 250
+RMD160 64ce2538d3050e13003f370123d8cd177e1e50b1 files/digest-lcd-stuff-0.1.2-r1 250
+SHA256 40a29e96f15401097af1662611b43c84f9c90a2aa38aea03ad588841359aecac files/digest-lcd-stuff-0.1.2-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGQOxqz974XjDVpbkRAhz0AKC+0VwZFLu5mev97g/6ItUEGyFauwCff6im
-7mox0SnkO5qCAMX2MC00Dac=
-=R9KB
+iD8DBQFGRaQHyZx3L/ph1soRAoGqAJ4mdIn24AuTDCRlkTMOS03xT5m0jwCcCw/W
+XYyKUERO9vn5vej+oibdVFA=
+=vvQq
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2-r1 b/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2-r1
new file mode 100644
index 000000000000..372e7687a209
--- /dev/null
+++ b/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2-r1
@@ -0,0 +1,3 @@
+MD5 9444884954c9dd64f573da7b152f2d7f lcd-stuff-0.1.2.tar.bz2 117031
+RMD160 91b464463f5adfe9d8609facb3d1190625011107 lcd-stuff-0.1.2.tar.bz2 117031
+SHA256 793c1de326f0f0124bb586f2e183435aef9d6cf808fa11f9c84bcd3c67df5aae lcd-stuff-0.1.2.tar.bz2 117031
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch
new file mode 100644
index 000000000000..f8f5cdb9ea36
--- /dev/null
+++ b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch
@@ -0,0 +1,23 @@
+Patch by Andrej Kacian <ticho@gentoo.org> from bug #177587
+
+
+diff -ur lcd-stuff-0.1.2-orig/src/mpd.c lcd-stuff-0.1.2/src/mpd.c
+--- lcd-stuff-0.1.2-orig/src/mpd.c	2007-05-10 23:26:55.000000000 +0200
++++ lcd-stuff-0.1.2/src/mpd.c	2007-05-10 23:27:59.000000000 +0200
+@@ -119,14 +119,13 @@
+             case MPD_DATA_TYPE_PLAYLIST:
+                 g_ptr_array_add(array, g_path_get_basename(data->playlist));
+                 g_free(data->playlist);
++                data->playlist = NULL;
+                 break;
+ 
+             case MPD_DATA_TYPE_DIRECTORY:
+-                g_free(data->directory);
+-                break;
+-
+             case MPD_INFO_ENTITY_TYPE_SONG:
+                 g_free(data->directory);
++                data->directory = NULL;
+                 break;
+ 
+             default:
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd
new file mode 100644
index 000000000000..ed7c264fea44
--- /dev/null
+++ b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd,v 1.1 2007/05/12 11:24:49 rbu Exp $
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+	use LCDd
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
+		/usr/bin/lcd-stuff -- -f 1 -s 1 -r "${REPORTLEVEL}" -a "${ADDRESS}" -p "${TCPPORT}" -c "${CONFIGFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --name "lcd-stuff"
+	eend $?
+}
diff --git a/app-misc/lcd-stuff/files/lcd-stuff.initd b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd
index 1d312babc097..eef3ff3f43e7 100644
--- a/app-misc/lcd-stuff/files/lcd-stuff.initd
+++ b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/files/lcd-stuff.initd,v 1.1 2007/01/13 15:05:37 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd,v 1.1 2007/05/12 11:24:49 rbu Exp $
 
 PIDFILE=/var/run/${SVCNAME}.pid
 
diff --git a/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild b/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..3f89f3faccce
--- /dev/null
+++ b/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild,v 1.1 2007/05/12 11:24:49 rbu Exp $
+
+inherit eutils
+
+DESCRIPTION="lcd-stuff is a client for lcdproc that displays RSS, Weather, MPD and new mail."
+HOMEPAGE="http://lcd-stuff.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2" # and GPL-2 only
+
+RDEPEND="app-misc/lcdproc
+	net-misc/curl
+	dev-libs/glib
+	imap? ( net-libs/libetpan )
+	mpd? ( >=media-libs/libmpd-0.12.0 )
+	mp3? ( media-libs/taglib )
+	xml? ( net-libs/libnxml )
+	rss? ( net-libs/libmrss net-libs/libnxml )"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+IUSE="imap mpd mp3 xml rss"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-mpd.patch"
+}
+
+src_compile() {
+	local XMLRSSLIB="$(use_enable rss mrss)"
+	if use rss ; then
+		# If we want rss, we must also have xml
+		XMLRSSLIB="${XMLRSSLIB} --enable-nxml"
+	else
+		XMLRSSLIB="${XMLRSSLIB} $(use_enable xml nxml)"
+	fi
+
+	econf \
+		$(use_enable imap libetpan) \
+		$(use_enable mpd libmpd) \
+		$(use_enable mp3 taglib_c) \
+		$XMLRSSLIB \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins lcd-stuff.conf
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PF}.initd" ${PN}
+
+	dodoc ChangeLog README
+}
diff --git a/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild b/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild
index 2856c694e835..9488e5d011a7 100644
--- a/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild
+++ b/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild,v 1.5 2007/05/08 21:32:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild,v 1.6 2007/05/12 11:24:49 rbu Exp $
 
 DESCRIPTION="lcd-stuff is a client for lcdproc that displays RSS, Weather, MPD and new mail."
 HOMEPAGE="http://lcd-stuff.berlios.de/"
@@ -50,7 +50,7 @@ src_install()
 	doins lcd-stuff.conf
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newinitd "${FILESDIR}/${PF}.initd" ${PN}
 
 	dodoc ChangeLog README
 }