Version bump and compilation fix

Package-Manager: portage-2.1.2.9

8 files changed, 88 insertions, 55 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/Manifest b/app-misc/lcd-stuff/Manifest
index 9a41750e45cd..0faccbb1f2a9 100644
--- a/app-misc/lcd-stuff/Manifest
+++ b/app-misc/lcd-stuff/Manifest
@@ -9,41 +9,42 @@ AUX lcd-stuff-0.1.2-r1.initd 662 RMD160 b0f99f087c927e3cefb85ca6cd94aff3aa17682d
 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-0.1.3-socket-h.patch 920 RMD160 9baadb9fd966b076f14982a6cedc75dbadb33eb0 SHA1 38efa461fd4b6c21938705162c0b436afa17bd9d SHA256 6e4f2d6686f7cc85022655756c522c0a3001fce1a8c62c8aed53ce6cb32725fe
+MD5 e2075a8d1b64aecc353f58f69d8343a2 files/lcd-stuff-0.1.3-socket-h.patch 920
+RMD160 9baadb9fd966b076f14982a6cedc75dbadb33eb0 files/lcd-stuff-0.1.3-socket-h.patch 920
+SHA256 6e4f2d6686f7cc85022655756c522c0a3001fce1a8c62c8aed53ce6cb32725fe files/lcd-stuff-0.1.3-socket-h.patch 920
 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
 DIST lcd-stuff-0.1.2.tar.bz2 117031 RMD160 91b464463f5adfe9d8609facb3d1190625011107 SHA1 1cc66dd5054b00098b5fb499076747801830fdf7 SHA256 793c1de326f0f0124bb586f2e183435aef9d6cf808fa11f9c84bcd3c67df5aae
-EBUILD lcd-stuff-0.1.2-r1.ebuild 1481 RMD160 0a97242cebc527a0543fdb6be88e230c9725fa93 SHA1 8f668f5d90df90a793459c1487702c2f80a4a0b2 SHA256 2e79b2a9b2a79424b4148a00d280e86cb7186684a7dde0ae1ef4421c81c5296f
-MD5 5d75f6d78cdbb6d092ce9d532f2f2e5c lcd-stuff-0.1.2-r1.ebuild 1481
-RMD160 0a97242cebc527a0543fdb6be88e230c9725fa93 lcd-stuff-0.1.2-r1.ebuild 1481
-SHA256 2e79b2a9b2a79424b4148a00d280e86cb7186684a7dde0ae1ef4421c81c5296f lcd-stuff-0.1.2-r1.ebuild 1481
-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 1542 RMD160 91e992c606b754a6d05fdc3a301c9ad6f12cc53b SHA1 314e481bc309a4637c618d5039ede24bf1d8ab97 SHA256 34309eae5642ecdab5d6e1c33f9d829eafd0a017d54f06e3ee297ebcf709ef31
-MD5 57da1b877cd30a02a856b9a58b1fa964 ChangeLog 1542
-RMD160 91e992c606b754a6d05fdc3a301c9ad6f12cc53b ChangeLog 1542
-SHA256 34309eae5642ecdab5d6e1c33f9d829eafd0a017d54f06e3ee297ebcf709ef31 ChangeLog 1542
+DIST lcd-stuff-0.1.3.tar.bz2 122465 RMD160 4671fadd4b377f4d7b5ebfb9980458cffd1c523c SHA1 2c9b709657a087b875aac8d4621f44fb3e6f5b13 SHA256 159908c9b967dbd3f52560d40ed4b4032a7034b2275f00c5e2f28111db5ca7b7
+EBUILD lcd-stuff-0.1.2-r1.ebuild 1526 RMD160 28e071c31b907fabecdb44e97fcbad94cff2a029 SHA1 b7f7b1893bc0dab6c580fc963608ae2773c4c979 SHA256 58d3443e76119f32cacac00c41e86f9d80cbc1350e51198b26d995989ec9c421
+MD5 1511b862dd55c0c65e6941641d15c5c5 lcd-stuff-0.1.2-r1.ebuild 1526
+RMD160 28e071c31b907fabecdb44e97fcbad94cff2a029 lcd-stuff-0.1.2-r1.ebuild 1526
+SHA256 58d3443e76119f32cacac00c41e86f9d80cbc1350e51198b26d995989ec9c421 lcd-stuff-0.1.2-r1.ebuild 1526
+EBUILD lcd-stuff-0.1.3.ebuild 1490 RMD160 f66075e0746f879987d06f41a28e13603c9efa4d SHA1 e57721c439122f42c598e7a12f46d5ef22486b6f SHA256 c9c487228a90f78e33e73ff9a40e31e90556fa7f30b8141d6052b1418302d21e
+MD5 444ff093fc2e89e4cbacac47187d4249 lcd-stuff-0.1.3.ebuild 1490
+RMD160 f66075e0746f879987d06f41a28e13603c9efa4d lcd-stuff-0.1.3.ebuild 1490
+SHA256 c9c487228a90f78e33e73ff9a40e31e90556fa7f30b8141d6052b1418302d21e lcd-stuff-0.1.3.ebuild 1490
+MISC ChangeLog 2014 RMD160 7f28476f0009fcfc02077f9f98670f2f1279b715 SHA1 782f42b533e26a9a5776c0f37197b256170151c7 SHA256 8cace338d3e5abed7f25c9bdcdb0eeec05d7f21271c70a409ead2d739ef96de9
+MD5 c135f9d1d12c3c78e642994484ca1567 ChangeLog 2014
+RMD160 7f28476f0009fcfc02077f9f98670f2f1279b715 ChangeLog 2014
+SHA256 8cace338d3e5abed7f25c9bdcdb0eeec05d7f21271c70a409ead2d739ef96de9 ChangeLog 2014
 MISC metadata.xml 757 RMD160 5d8d03f589ddd14c7150991c2ae8c5f1420418cd SHA1 2576ace710341167e50f61f35d013c93c86fa6f7 SHA256 09a13ff2fec99fd49760f6b1579b49c8c7c5caf630b8dbd9ee54dd210a34c305
 MD5 3ef974215d40df7eb25570d23236c806 metadata.xml 757
 RMD160 5d8d03f589ddd14c7150991c2ae8c5f1420418cd metadata.xml 757
 SHA256 09a13ff2fec99fd49760f6b1579b49c8c7c5caf630b8dbd9ee54dd210a34c305 metadata.xml 757
-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
+MD5 4d45f16e3fe6e888e0f7a793f86edd0f files/digest-lcd-stuff-0.1.3 250
+RMD160 6e4dd82dba19e5ac8dc1f8e913886dc162034a38 files/digest-lcd-stuff-0.1.3 250
+SHA256 96cb9e066c42f5fe04a25068909b76b38be1b14f2a91941b13a70259a3a7b554 files/digest-lcd-stuff-0.1.3 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGdU03KhnDs22gwa8RAm/uAJ9S2M2Rkm0ypznj6HDqoXEm0NOLRACgztSt
-fk2iKADK9iI5Xpx1Z9joe2g=
-=FeIn
+iD8DBQFGuirWyZx3L/ph1soRAkBbAKCfDCK6IRAtsyygG6Xk/MSsr5mPawCfQ1Bd
+1B08EQnHmi2DkMFymYfUkM4=
+=mNsf
 -----END PGP SIGNATURE-----
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
 }