Version bump and compilation fix

(Portage version: 2.1.2.9)

7 files changed, 64 insertions, 32 deletions

diff --git a/app-misc/lcd-stuff/ChangeLog b/app-misc/lcd-stuff/ChangeLog
index 93e895bc7480..0696b1b07dfb 100644
--- a/app-misc/lcd-stuff/ChangeLog
+++ b/app-misc/lcd-stuff/ChangeLog
@@ -1,6 +1,19 @@
 # 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.9 2007/06/17 15:03:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/ChangeLog,v 1.10 2007/08/08 20:43:02 rbu Exp $
+
+*lcd-stuff-0.1.3 (08 Aug 2007)
+
+  08 Aug 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/lcd-stuff-0.1.2.initd, +files/lcd-stuff-0.1.3-socket-h.patch,
+  -lcd-stuff-0.1.2.ebuild, lcd-stuff-0.1.2-r1.ebuild,
+  +lcd-stuff-0.1.3.ebuild:
+  Version bump, introducing:
+       * imperial units on the weather screen
+       * mplayer screen to play radio streams
+       * improvements in the mail screen
+    
+    Fix compilation against net-libs/libmrss-0.18.0 for stable 0.1.2-r1
 
   17 Jun 2007; Christoph Mende <angelos@gentoo.org>
   lcd-stuff-0.1.2-r1.ebuild:
diff --git a/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2 b/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2
deleted file mode 100644
index 372e7687a209..000000000000
--- a/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-lcd-stuff-0.1.3 b/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.3
new file mode 100644
index 000000000000..29b61e732bbd
--- /dev/null
+++ b/app-misc/lcd-stuff/files/digest-lcd-stuff-0.1.3
@@ -0,0 +1,3 @@
+MD5 47786274712cadf15652932112696019 lcd-stuff-0.1.3.tar.bz2 122465
+RMD160 4671fadd4b377f4d7b5ebfb9980458cffd1c523c lcd-stuff-0.1.3.tar.bz2 122465
+SHA256 159908c9b967dbd3f52560d40ed4b4032a7034b2275f00c5e2f28111db5ca7b7 lcd-stuff-0.1.3.tar.bz2 122465
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd
deleted file mode 100644
index eef3ff3f43e7..000000000000
--- a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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.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 0 -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-0.1.3-socket-h.patch b/app-misc/lcd-stuff/files/lcd-stuff-0.1.3-socket-h.patch
new file mode 100644
index 000000000000..d717927c756d
--- /dev/null
+++ b/app-misc/lcd-stuff/files/lcd-stuff-0.1.3-socket-h.patch
@@ -0,0 +1,33 @@
+From: Robert Buchholz <rbu@gentoo.org>
+To: lcdproc@lists.omnipotent.net
+Subject: Re: [Lcdproc] [ANNOUNCE] lcd-stuff 0.1.3
+Cc: Bernhard Walle <bernhard.walle@gmx.de>
+Date: Wed, 8 Aug 2007 22:06:33 +0200
+
+When compiling against the latest version of libmrss
+(0.18.0), compilation breaks because mrss.h includes
+sys/socket.h. That header uses SHUT_RDWR as a variable name
+(which has to be undefined), but lcd-stuff's shared/sockets.h
+defines that macro.
+
+The attached patch fixes this on lcd-stuff's side.
+
+Index: lcd-stuff-0.1.3/src/rss.c
+===================================================================
+--- lcd-stuff-0.1.3.orig/src/rss.c
++++ lcd-stuff-0.1.3/src/rss.c
+@@ -24,12 +24,12 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++#include <mrss.h>
++
+ #include <shared/report.h>
+ #include <shared/sockets.h>
+ #include <shared/str.h>
+ 
+-#include <mrss.h>
+-
+ #include "rss.h"
+ #include "main.h"
+ #include "constants.h"
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
index 2fac4cb90889..39b7c43423b7 100644
--- a/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild
+++ b/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.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-r1.ebuild,v 1.3 2007/06/17 15:03:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.2-r1.ebuild,v 1.4 2007/08/08 20:43:02 rbu Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-mpd.patch"
+	epatch "${FILESDIR}/${PN}-0.1.3-socket-h.patch"
 }
 
 src_compile() {
diff --git a/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild b/app-misc/lcd-stuff/lcd-stuff-0.1.3.ebuild
index 9488e5d011a7..d78a981e1d18 100644
--- a/app-misc/lcd-stuff/lcd-stuff-0.1.2.ebuild
+++ b/app-misc/lcd-stuff/lcd-stuff-0.1.3.ebuild
@@ -1,12 +1,14 @@
 # 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.6 2007/05/12 11:24:49 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.3.ebuild,v 1.1 2007/08/08 20:43:02 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"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2" # and GPL-2 only
 
@@ -23,6 +25,13 @@ DEPEND="${DEPEND}
 
 IUSE="imap mpd mp3 xml rss"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-socket-h.patch"
+}
+
 src_compile() {
 	local XMLRSSLIB="$(use_enable rss mrss)"
 	if use rss ; then
@@ -50,7 +59,7 @@ src_install()
 	doins lcd-stuff.conf
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PF}.initd" ${PN}
+	newinitd "${FILESDIR}/${PN}-0.1.2-r1.initd" ${PN}
 
 	dodoc ChangeLog README
 }