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

(Portage version: 2.1.2.2)

7 files changed, 128 insertions, 4 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/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
 }