Revbump introducing new luise driver (for amd64/x86 only), added ~ppc and fixed the plugin_mpd code

Package-Manager: portage-2.1.2.7

7 files changed, 495 insertions, 25 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 87efe88f8707..6be03a171920 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.25 2007/04/30 19:10:56 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.26 2007/06/04 18:13:56 rbu Exp $
+
+*lcd4linux-0.10.1_rc2-r1 (04 Jun 2007)
+
+  04 Jun 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/lcd4linux-0.10.1_rc2-mpd.patch,
+  +files/lcd4linux-0.10.1_rc2-warnings.patch, metadata.xml,
+  -lcd4linux-0.10.1_rc2.ebuild, +lcd4linux-0.10.1_rc2-r1.ebuild:
+  Revbump introducing new luise driver (for amd64/x86 only), added ~ppc and
+  fixed the plugin_mpd code.
 
 *lcd4linux-0.10.1_rc2 (30 Apr 2007)
 
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 045094db1a15..4cc4e95d2a21 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -21,6 +21,14 @@ AUX lcd4linux-0.10.0.initd 673 RMD160 4bce8d704ae7f778e9a1f1f16424f48de9d74298 S
 MD5 8c196ffcefae20fa33f2b5bc0827079e files/lcd4linux-0.10.0.initd 673
 RMD160 4bce8d704ae7f778e9a1f1f16424f48de9d74298 files/lcd4linux-0.10.0.initd 673
 SHA256 a122192b1834391a8fc4d5a33a18114e150cde193f96d1dfae8b2d6ea2953df4 files/lcd4linux-0.10.0.initd 673
+AUX lcd4linux-0.10.1_rc2-mpd.patch 9230 RMD160 98e6e7e36d06888566e65e2e12e2fef120520ecb SHA1 ede43c6bb493cf4512628bc6a7d0e3f09da6b092 SHA256 ee1294d4c53086b998f1ff3fa90987b5a58baa589850b77edab755ef836b1583
+MD5 7fd57b85fef3d432fdf0d1ebb68c7e93 files/lcd4linux-0.10.1_rc2-mpd.patch 9230
+RMD160 98e6e7e36d06888566e65e2e12e2fef120520ecb files/lcd4linux-0.10.1_rc2-mpd.patch 9230
+SHA256 ee1294d4c53086b998f1ff3fa90987b5a58baa589850b77edab755ef836b1583 files/lcd4linux-0.10.1_rc2-mpd.patch 9230
+AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 RMD160 e344704288d650d5ef7f334fb3ce2d3a5029e334 SHA1 fb4c9bba8b854e2d2a53ae222e6e2c554ec12ac8 SHA256 8960a45af139e2f2d226474c9d5f099ca70605bb72815b03d9ad72222be7b8d5
+MD5 9f5b0e06a0bef13382685b3e1272630c files/lcd4linux-0.10.1_rc2-warnings.patch 2229
+RMD160 e344704288d650d5ef7f334fb3ce2d3a5029e334 files/lcd4linux-0.10.1_rc2-warnings.patch 2229
+SHA256 8960a45af139e2f2d226474c9d5f099ca70605bb72815b03d9ad72222be7b8d5 files/lcd4linux-0.10.1_rc2-warnings.patch 2229
 AUX lcd4linux-0.10.1_rc2.initd 661 RMD160 e5b51ce6bb1e750d4480d564b04f7c3c50b060c3 SHA1 672b36d6593f7d9f586db0e55d4310ef6fa7ed3d SHA256 87351cb7d48cfbbf94da3432113debd5a74c5c87802c39af64b2fe61eb7f79b1
 MD5 252690b2dd7096ffffb985762d387441 files/lcd4linux-0.10.1_rc2.initd 661
 RMD160 e5b51ce6bb1e750d4480d564b04f7c3c50b060c3 files/lcd4linux-0.10.1_rc2.initd 661
@@ -36,35 +44,35 @@ EBUILD lcd4linux-0.10.0-r1.ebuild 4813 RMD160 2da8b14f62ea162564b9156b4e93bab260
 MD5 09c1545c61a4b48ef9cb6cade4d70547 lcd4linux-0.10.0-r1.ebuild 4813
 RMD160 2da8b14f62ea162564b9156b4e93bab26026c8cb lcd4linux-0.10.0-r1.ebuild 4813
 SHA256 349a4fbe1a783710ed00edcec7e2c7c5acd9d2b8ac6cc3a0f8b9e772669ecf45 lcd4linux-0.10.0-r1.ebuild 4813
-EBUILD lcd4linux-0.10.1_rc2.ebuild 5065 RMD160 511deb1f27ffdc905d5d0e6f5410bb52ba20dcb7 SHA1 dabef75d8d62233451c8b3e640adc9c91d5d3dc2 SHA256 671aceeb7da49de1f6541b99c4a3d2c88775a6d772944cd3162061d2c9c7ad7c
-MD5 e7fab1a7707ed2f9e01c69c6333b6456 lcd4linux-0.10.1_rc2.ebuild 5065
-RMD160 511deb1f27ffdc905d5d0e6f5410bb52ba20dcb7 lcd4linux-0.10.1_rc2.ebuild 5065
-SHA256 671aceeb7da49de1f6541b99c4a3d2c88775a6d772944cd3162061d2c9c7ad7c lcd4linux-0.10.1_rc2.ebuild 5065
+EBUILD lcd4linux-0.10.1_rc2-r1.ebuild 5167 RMD160 00299cca123e5a2d5ff7ba2de234494e905481d1 SHA1 1dd2490007e7ec818ba2f2ca02d1b31ffe9b2e30 SHA256 5da4ad7a75a6f8a908b7003bfaa773273b48347904ea96821ebcd329bb785df7
+MD5 8076c159a625e5a186ad9807c6fd5b80 lcd4linux-0.10.1_rc2-r1.ebuild 5167
+RMD160 00299cca123e5a2d5ff7ba2de234494e905481d1 lcd4linux-0.10.1_rc2-r1.ebuild 5167
+SHA256 5da4ad7a75a6f8a908b7003bfaa773273b48347904ea96821ebcd329bb785df7 lcd4linux-0.10.1_rc2-r1.ebuild 5167
 EBUILD lcd4linux-0.9.11.ebuild 1595 RMD160 0b3242de520bfb55da8a4449cd6d763a5421e27f SHA1 1e8ac030489ff68ba95ab8755a68d4d470a2d36a SHA256 4cc86a3b8cff9bf3159e5be4d2f60bf253ba88e8b68d2e18f62de808561972a4
 MD5 4bd6a99c5ba204df69ff59638ad2898b lcd4linux-0.9.11.ebuild 1595
 RMD160 0b3242de520bfb55da8a4449cd6d763a5421e27f lcd4linux-0.9.11.ebuild 1595
 SHA256 4cc86a3b8cff9bf3159e5be4d2f60bf253ba88e8b68d2e18f62de808561972a4 lcd4linux-0.9.11.ebuild 1595
-MISC ChangeLog 4693 RMD160 d39f6ea7d37e6341e9b6d36a94cd8889a88c37a6 SHA1 7675d60c7d65e27f7fb598ef098a10b610fd89cb SHA256 bdcfac1ab014c553340daaa6e6f41c5a868e126a14ba558cd738f6b5793fabe1
-MD5 134cf36ffe4025a4d8c1a3d94c89c229 ChangeLog 4693
-RMD160 d39f6ea7d37e6341e9b6d36a94cd8889a88c37a6 ChangeLog 4693
-SHA256 bdcfac1ab014c553340daaa6e6f41c5a868e126a14ba558cd738f6b5793fabe1 ChangeLog 4693
-MISC metadata.xml 249 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac SHA1 48461481dfc5a9d1f5b4726a5e9882a2fb966ede SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11
-MD5 5c2a70625109d5bd093ae8d0588931f1 metadata.xml 249
-RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac metadata.xml 249
-SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11 metadata.xml 249
+MISC ChangeLog 5053 RMD160 67449e08fbc570de7787afc0ff2a3d3d53d4170f SHA1 6aa7f700e024f978c7da77502511578283eaf098 SHA256 c7efa45078e328fc308e877977ff4ef1ba6ac32a51f0e705ab1c2bc72e2d87b9
+MD5 3561136133f2f520c31f6cdd2f48acc3 ChangeLog 5053
+RMD160 67449e08fbc570de7787afc0ff2a3d3d53d4170f ChangeLog 5053
+SHA256 c7efa45078e328fc308e877977ff4ef1ba6ac32a51f0e705ab1c2bc72e2d87b9 ChangeLog 5053
+MISC metadata.xml 530 RMD160 749ec2d7c99d780352d9f8fb5d0e04a6907cbcf6 SHA1 a8b06d1b7a9453333d15ab742389ea57409ce08b SHA256 22ed2ee4cc5c40bc1566f1e7a22b130dc55868973a359f7b1d02b110f0cd739c
+MD5 28f7b708c40e4d97d08cf8a9aa25bde5 metadata.xml 530
+RMD160 749ec2d7c99d780352d9f8fb5d0e04a6907cbcf6 metadata.xml 530
+SHA256 22ed2ee4cc5c40bc1566f1e7a22b130dc55868973a359f7b1d02b110f0cd739c metadata.xml 530
 MD5 0b746369033d8d0fffea2ec67f83ad4e files/digest-lcd4linux-0.10.0-r1 250
 RMD160 018c8b34815a32a9902122a5e67b6acbc2e3e41a files/digest-lcd4linux-0.10.0-r1 250
 SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/digest-lcd4linux-0.10.0-r1 250
-MD5 0be8ed6082cd0a6930f19ad3904aaf42 files/digest-lcd4linux-0.10.1_rc2 262
-RMD160 1ad0a7a63e2a7a53bff7c5c4c6f5e6c5aadf1d81 files/digest-lcd4linux-0.10.1_rc2 262
-SHA256 4558de3184bd69773851f12af4e853565267dbf4246cfc98f04f50d797623f90 files/digest-lcd4linux-0.10.1_rc2 262
+MD5 0be8ed6082cd0a6930f19ad3904aaf42 files/digest-lcd4linux-0.10.1_rc2-r1 262
+RMD160 1ad0a7a63e2a7a53bff7c5c4c6f5e6c5aadf1d81 files/digest-lcd4linux-0.10.1_rc2-r1 262
+SHA256 4558de3184bd69773851f12af4e853565267dbf4246cfc98f04f50d797623f90 files/digest-lcd4linux-0.10.1_rc2-r1 262
 MD5 13ed5c0953ded79c7f0bec71639165d3 files/digest-lcd4linux-0.9.11 250
 RMD160 eda6875e2399a5a0dbd6e524ad54dc9eff4d64a5 files/digest-lcd4linux-0.9.11 250
 SHA256 35fd2911bf35973aa9b05f59c3b40d7637d4d89eb9ce4630fab451816619ce9d files/digest-lcd4linux-0.9.11 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGNj9HyZx3L/ph1soRAiOmAJwOlTYPRlpqAmus2H3gZgXyT5/TugCgo2TI
-djN9+SBlr2cVffAR3Lqpfy4=
-=hTYr
+iD8DBQFGZFZqyZx3L/ph1soRAhE8AKCB6R8soYltaWu33Sa1b+krxX9fNwCfQP1Z
+UrK+/KQ0tfCkWnZMhbv/sfA=
+=+ewd
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc2 b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc2-r1
index fb0122326135..fb0122326135 100644
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc2
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc2-r1
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
new file mode 100644
index 000000000000..c3fa8ac36350
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
@@ -0,0 +1,374 @@
+Patch for >=lcd4linux-0.10.1_rc2-r1
+
+Fixes memory and other bugs in plugin_mpd
+
+Accepted upstream
+
+Index: plugin_mpd.c
+===================================================================
+--- plugin_mpd.c	(Revision 801)
++++ plugin_mpd.c	(Arbeitskopie)
+@@ -4,6 +4,7 @@
+  * mpd informations
+  *
+  * Copyright (C) 2006 Stefan Kuhne <sk-privat@gmx.net>
++ * Copyright (C) 2007 Robert Buchholz <rbu@gentoo.org>
+  * Copyright (C) 2006 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+  *
+  * This file is part of LCD4Linux.
+@@ -81,8 +82,8 @@
+ 
+     iport = strtol(port, &test, 10);
+ 
+-    if (iport < 0 || *test != '\0') {
+-	fprintf(stderr, "MPD_PORT \"%s\" is not a positive integer\n", port);
++    if ((iport < 0) || (*test != '\0')) {
++	error("[MPD] MPD_PORT \"%s\" is not a positive integer\n", port);
+ 	exit(EXIT_FAILURE);
+     }
+ 
+@@ -94,17 +95,16 @@
+     mpd_sendCommandListEnd(mpd.conn);
+ 
+     if ((mpd.status = mpd_getStatus(mpd.conn)) == NULL) {
+-	fprintf(stderr, "%s\n", mpd.conn->errorStr);
++	error("[MPD] error when getting status: %s\n", mpd.conn->errorStr);
+ 	mpd_closeConnection(mpd.conn);
+-    }
+-
+-    if (mpd.status->error) {
+-	printf("error: %s\n", mpd.status->error);
+-    }
+-
+-    if (mpd.conn->error) {
+-	fprintf(stderr, "%s\n", mpd.conn->errorStr);
++	mpd.conn = NULL;
++    } else if (mpd.status->error) {
++	info("[MPD] status error when connecting: %s\n", mpd.status->error);
++    } else if (mpd.conn->error) {
++	error("[MPD] error when connecting: %s\n", mpd.conn->errorStr);
++	mpd_freeStatus(mpd.status);
+ 	mpd_closeConnection(mpd.conn);
++	mpd.conn = NULL;
+     }
+ 
+     return mpd;
+@@ -114,14 +114,15 @@
+ static void disconnect(struct Pointer mpd)
+ {
+     if (mpd.conn->error) {
+-	fprintf(stderr, "%s\n", mpd.conn->errorStr);
++	error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
++	mpd_freeStatus(mpd.status);
+ 	mpd_closeConnection(mpd.conn);
++	return;
+     }
+ 
+     mpd_finishCommand(mpd.conn);
+     if (mpd.conn->error) {
+-	fprintf(stderr, "%s\n", mpd.conn->errorStr);
+-	mpd_closeConnection(mpd.conn);
++	error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
+     }
+ 
+     mpd_freeStatus(mpd.status);
+@@ -132,8 +133,12 @@
+ 
+ static void artist(RESULT * result, RESULT * query)
+ {
+-    char *value = " ";
++    char *value = NULL;
+     struct Pointer mpd = connect();
++    if (mpd.conn == NULL) {
++	SetResult(&result, R_STRING, " ");
++	return;
++    }
+ 
+     mpd_nextListOkCommand(mpd.conn);
+ 
+@@ -145,9 +150,10 @@
+ 	    continue;
+ 	}
+ 
+-	if (song->artist) {
++	if (!value && song->artist) {
++	    /* we found our first song */
+ 	    value = strdup(song->artist);
+-	    //add comment
++	    /* add comment */
+ 	    if (query) {
+ 		char *myarg;
+ 		myarg = strdup(R2S(query));
+@@ -160,8 +166,8 @@
+ 
+     disconnect(mpd);
+ 
+-    /* store result */
+-    SetResult(&result, R_STRING, value);
++    /* store result, value must not be NULL */
++    SetResult(&result, R_STRING, value ? value : " ");
+ 
+     free(value);
+ }
+@@ -169,8 +175,12 @@
+ 
+ static void title(RESULT * result)
+ {
+-    char *value = " ";
++    char *value = NULL;
+     struct Pointer mpd = connect();
++    if (mpd.conn == NULL) {
++	SetResult(&result, R_STRING, " ");
++	return;
++    }
+ 
+     mpd_nextListOkCommand(mpd.conn);
+ 
+@@ -182,7 +192,7 @@
+ 	    continue;
+ 	}
+ 
+-	if (song->title) {
++	if (!value && song->title) {
+ 	    value = strdup(song->title);
+ 	}
+ 	mpd_freeInfoEntity(mpd.entity);
+@@ -190,8 +200,8 @@
+ 
+     disconnect(mpd);
+ 
+-    /* store result */
+-    SetResult(&result, R_STRING, value);
++    /* store result, value must not be NULL  */
++    SetResult(&result, R_STRING, value ? value : " ");
+ 
+     free(value);
+ }
+@@ -199,8 +209,12 @@
+ 
+ static void album(RESULT * result)
+ {
+-    char *value = " ";
++    char *value = NULL;
+     struct Pointer mpd = connect();
++    if (mpd.conn == NULL) {
++	SetResult(&result, R_STRING, " ");
++	return;
++    }
+ 
+     mpd_nextListOkCommand(mpd.conn);
+ 
+@@ -212,7 +226,7 @@
+ 	    continue;
+ 	}
+ 
+-	if (song->album) {
++	if (!value && song->album) {
+ 	    value = strdup(song->album);
+ 	}
+ 	mpd_freeInfoEntity(mpd.entity);
+@@ -220,8 +234,8 @@
+ 
+     disconnect(mpd);
+ 
+-    /* store result */
+-    SetResult(&result, R_STRING, value);
++    /* store result, value must not be NULL */
++    SetResult(&result, R_STRING, value ? value : " ");
+ 
+     free(value);
+ }
+@@ -236,7 +250,7 @@
+ void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
+ 		    void *userdata)
+ {
+-    printf("Error %i: '%s'\n", errorid, msg);
++    info("[MPD] caught error %i: '%s'\n", errorid, msg);
+ }
+ 
+ static int mpd_get(int function)
+@@ -278,95 +292,89 @@
+ 
+ static void elapsedTime(RESULT * result)
+ {
+-    char *value = " ";
++    char myTime[6] = " ";
+ 
+-    int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
++    const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
+ 
+-    if (playTime != -1) {
+-	char myTime[6];
+-	memset(myTime, 0, 6);
+-	int minutes = (int) (playTime / 60);
+-	int seconds = (int) (playTime % 60);
++    if ((playTime >= 0) && (playTime < 6000)) {
++	const int minutes = (int) (playTime / 60);
++	const int seconds = (int) (playTime % 60);
+ 	sprintf(myTime, "%02d:%02d", minutes, seconds);
++    } else if (playTime >= 6000) {
++	strcpy(myTime, "LONG");
++    }
+ 
+-	value = strdup(myTime);
+-    }
+-    // store result     
+-    SetResult(&result, R_STRING, value);
++    /* store result */
++    SetResult(&result, R_STRING, myTime);
+ }
+ 
+ static void elapsedTimeSec(RESULT * result)
+ {
+-    int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
++    const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
+     double d = 0.0;
+ 
+     if (playTime != -1)
+ 	d = playTime;
+ 
+-    // store result     
++    /* store result */
+     SetResult(&result, R_NUMBER, &d);
+ }
+ 
+ static void totalTime(RESULT * result)
+ {
+-    char *value = " ";
++    char myTime[6] = "ERROR";
+ 
+-    int totTime = mpd_get(_mpd_status_get_total_song_time);
+-    if (totTime != -1) {
+-	char myTime[6];
+-	memset(myTime, 0, 6);
+-	int minutes = (int) (totTime / 60);
+-	int seconds = (int) (totTime % 60);
++    const int totTime = mpd_get(_mpd_status_get_total_song_time);
++    if ((totTime >= 0) && (totTime < 6000)) {
++	const int minutes = (int) (totTime / 60);
++	const int seconds = (int) (totTime % 60);
+ 	sprintf(myTime, "%02d:%02d", minutes, seconds);
++    } else if (totTime >= 6000) {
++	strcpy(myTime, "LONG");
++    }
+ 
+-	value = strdup(myTime);
+-    } else
+-	value = strdup("ERROR");
+-    // store result     
+-    SetResult(&result, R_STRING, value);
++    /* store result */
++    SetResult(&result, R_STRING, myTime);
+ }
+ 
+ static void totalTimeSec(RESULT * result)
+ {
+-    int totTime = mpd_get(_mpd_status_get_total_song_time);
++    const int totTime = mpd_get(_mpd_status_get_total_song_time);
+     double d = 0.0;
+ 
+     if (totTime != -1)
+ 	d = totTime;
+ 
+-    // store result     
++    /* store result */
+     SetResult(&result, R_NUMBER, &d);
+ }
+ 
+ static void bitRate(RESULT * result)
+ {
+-    char *value = "";
++    char rateStr[4];
+ 
+-    int rate = mpd_get(_mpd_status_get_bitrate);
++    const int rate = mpd_get(_mpd_status_get_bitrate);
+ 
+-    if (rate != -1) {
+-	char rateStr[4];
+-	memset(rateStr, 0, 4);
++    if ((rate >= 0) && (rate < 1000)) {
+ 	sprintf(rateStr, "%03d", rate);
++    }
+ 
+-	value = strdup(rateStr);
+-    }
+-    // store result     
+-    SetResult(&result, R_STRING, value);
++    /* store result */
++    SetResult(&result, R_STRING, rateStr);
+ }
+ 
+ static void getRepeat(RESULT * result)
+ {
+     char *value = " ";
+ 
+-    int rep = mpd_get(_mpd_player_get_repeat);
++    const int rep = mpd_get(_mpd_player_get_repeat);
+ 
+     if (rep != -1) {
+ 	if (rep)
+-	    value = strdup("REP");
+-	// else value = strdup("   ");          
++	    value = "REP";
++	/* else value = strdup("   "); */
+     }
+-    // store result     
++    /* store result */
+     SetResult(&result, R_STRING, value);
+ }
+ 
+@@ -375,26 +383,26 @@
+ {
+     char *value = " ";
+ 
+-    int ran = mpd_get(_mpd_player_get_random);
++    const int ran = mpd_get(_mpd_player_get_random);
+ 
+     if (ran != -1) {
+ 	if (ran)
+ 	    value = strdup("RND");
+-	// else value = strdup("   ");          
++	/* else value = strdup("   "); */
+     }
+-    // store result     
++    /* store result */
+     SetResult(&result, R_STRING, value);
+ }
+ 
+ static void getRepRand(RESULT * result)
+ {
+-    char *value = " ";
++    char str[9] = " ";
+ 
+-    int ran = mpd_get(_mpd_player_get_random);
+-    int rep = mpd_get(_mpd_player_get_repeat);
++    const int ran = mpd_get(_mpd_player_get_random);
++    const int rep = mpd_get(_mpd_player_get_repeat);
+ 
+     if (ran != -1 && rep != -1) {
+-	char str[9];
++
+ 	if (rep)
+ 	    sprintf(str, "REP/");
+ 	else
+@@ -403,17 +411,16 @@
+ 	    sprintf(str, "%sRND", str);
+ 	else
+ 	    sprintf(str, "%s---", str);
+-	value = strdup(str);
+     }
+-    // store result     
+-    SetResult(&result, R_STRING, value);
++    /* store result */
++    SetResult(&result, R_STRING, str);
+ }
+ 
+ int plugin_init_mpd(void)
+ {
+     /* Check for File */
+     if (mpd_get(_mpd_dummy) != 1) {
+-	error("Error: Cannot connect to MPD! Is MPD started?");
++	error("[MPD] Error: Cannot connect to MPD! Is MPD started?");
+ 	return -1;
+     }
+ 
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
new file mode 100644
index 000000000000..58791ee91ff7
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
@@ -0,0 +1,64 @@
+Index: ./plugin_kvv.c
+===================================================================
+--- ./plugin_kvv.c (revision 771)
++++ ./plugin_kvv.c (revision 797)
+@@ -414,5 +414,5 @@
+ 
+ 	if (count > 0) {
+-	    char *input, *cookie, *name, *value;
++	    char *input, *cookie, *name = NULL, *value = NULL;
+ 	    int input_len, cookie_len, name_len, value_len;
+ 
+Index: ./plugin_mpd.c
+===================================================================
+--- ./plugin_mpd.c (revision 786)
++++ ./plugin_mpd.c (revision 797)
+@@ -65,5 +65,10 @@
+     int iport;
+     char *test;
+-    struct Pointer mpd;
++
++    struct Pointer mpd = {
++	.conn = NULL,
++	.status = NULL,
++	.entity = NULL
++    };
+ 
+     if ((test = getenv("MPD_HOST"))) {
+@@ -229,5 +234,6 @@
+ #define _mpd_player_get_random			005
+ 
+-void error_callback(MpdObj * mi, int errorid, char *msg, void *userdata)
++void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
++		    void *userdata)
+ {
+     printf("Error %i: '%s'\n", errorid, msg);
+Index: ./drv_Image.c
+===================================================================
+--- ./drv_Image.c (revision 771)
++++ ./drv_Image.c (revision 797)
+@@ -115,5 +115,5 @@
+     if (bitbuf == NULL) {
+ 	if ((bitbuf = malloc(xsize * ysize * sizeof(*bitbuf))) == NULL) {
+-	    error("%s: malloc(%d) failed: %s", Name, (int) xsize * ysize * sizeof(*bitbuf), strerror(errno));
++	    error("%s: malloc() failed: %s", Name, strerror(errno));
+ 	    return -1;
+ 	}
+@@ -122,5 +122,5 @@
+     if (rowbuf == NULL) {
+ 	if ((rowbuf = malloc(3 * xsize * sizeof(*rowbuf))) == NULL) {
+-	    error("Raster: malloc(%d) failed: %s", (int) 3 * xsize * sizeof(*rowbuf), strerror(errno));
++	    error("Raster: malloc() failed: %s", strerror(errno));
+ 	    return -1;
+ 	}
+Index: ./plugin_i2c_sensors.c
+===================================================================
+--- ./plugin_i2c_sensors.c (revision 771)
++++ ./plugin_i2c_sensors.c (revision 797)
+@@ -297,5 +297,5 @@
+ 	    strcat(path_cfg, "/");
+ 	}
+-	debug("using i2c sensors at %s (from %s)", path, cfg_source());
++	debug("using i2c sensors at %s (from %s)", path_cfg, cfg_source());
+ 	path = realloc(path, strlen(path_cfg) + 1);
+ 	strcpy(path, path_cfg);
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild
index a2a049b20b70..68e88fa9bed0 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-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/lcd4linux/lcd4linux-0.10.1_rc2.ebuild,v 1.1 2007/04/30 19:10:56 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild,v 1.1 2007/06/04 18:13:56 rbu Exp $
 
 inherit eutils multilib
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 IUSE="mysql python iconv mpd"
 
@@ -23,7 +23,7 @@ IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
 		mtxorb milfordbpk noritake null picolcd
 		png ppm routerboard serdisplib simplelcd
 		t6963 trefon usbhub usblcd wincor
-		X)
+		X luise)
 
 # Iterate through the array and add the lcd_devices_* that we support
 NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
@@ -46,6 +46,7 @@ DEPEND="
 	lcd_devices_trefon?   ( dev-libs/libusb )
 	lcd_devices_usbhub?   ( dev-libs/libusb )
 	lcd_devices_usblcd?   ( dev-libs/libusb )
+	lcd_devices_luise?    ( dev-libs/luise-bin )
 	lcd_devices_ncurses?  ( sys-libs/ncurses )
 	lcd_devices_noritake? ( media-libs/gd )
 	lcd_devices_t6963?    ( media-libs/gd )
@@ -63,6 +64,14 @@ pkg_setup() {
 	echo
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-warnings.patch"
+	epatch "${FILESDIR}/${P}-mpd.patch"
+}
+
 src_compile() {
 	# This array contains the driver names required by configure --with-drivers=
 	# The positions must be the same as the corresponding use_expand flags
@@ -72,8 +81,7 @@ src_compile() {
 		MatrixOrbital MilfordInstruments Noritake NULL picoLCD
 		PNG PPM RouterBoard serdisplib SimpleLCD
 		T6963 Trefon USBHUB USBLCD WincorNixdorf
-		X11)
-	# We're missing 'LUIse' as libluise is not open source. Contacted their upstream about it.
+		X11 LUIse)
 
 	local myconf myp
 
@@ -81,7 +89,7 @@ src_compile() {
 	if [ -n "$LCD4LINUX_PLUGINS" ]; then
 		myp="$LCD4LINUX_PLUGINS"
 	else
-		myp="all"
+		myp="all,!xmms"
 	fi
 	use iconv || myp="${myp},!iconv"
 	use mpd || myp="${myp},!mpd"
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index ad12036a061b..7aec24b573db 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -6,4 +6,11 @@
 		<email>rbu@gentoo.org</email>
 		<name>Robert Buchholz</name>
 	</maintainer>
+	<longdescription lang="en">
+		LCD4Linux is a small program that grabs information from the
+		kernel and some subsystems and displays it on an external liquid
+		crystal display.
+		It is fully configurable and supports many data sources,
+		displays and plugins.
+	</longdescription>
 </pkgmetadata>