Included an upstream patch for better g15daemon-1.9 compatibility, dropping 0.5.1...
authorRobert Buchholz <rbu@gentoo.org>
Tue, 20 Mar 2007 23:46:40 +0000 (23:46 +0000)
committerRobert Buchholz <rbu@gentoo.org>
Tue, 20 Mar 2007 23:46:40 +0000 (23:46 +0000)
Package-Manager: portage-2.1.2.2

app-misc/lcdproc/ChangeLog
app-misc/lcdproc/Manifest
app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch [deleted file]
app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch [new file with mode: 0644]
app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4 [moved from app-misc/lcdproc/files/digest-lcdproc-0.5.1-r1 with 100% similarity]
app-misc/lcdproc/lcdproc-0.5.1-r1.ebuild [deleted file]
app-misc/lcdproc/lcdproc-0.5.1-r3.ebuild
app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild [new file with mode: 0644]

index 09413dba78c2bc21512a97f515c75c0326c69c31..e54008e84398b42b5ee2ff4f8af6ce0f1223f031 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.48 2007/01/29 00:19:11 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.49 2007/03/20 23:46:40 rbu Exp $
+
+*lcdproc-0.5.1-r4 (20 Mar 2007)
+
+  20 Mar 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/0.5.1-g15daemon-1.9.patch,
+  -files/0.5.1-LCDd-conf-driver-path.patch, -lcdproc-0.5.1-r1.ebuild,
+  lcdproc-0.5.1-r3.ebuild, +lcdproc-0.5.1-r4.ebuild:
+  Included an upstream patch for better g15daemon-1.9 compatibility, dropping
+  0.5.1-r1 because it does not support LCD_DEVICES
 
 *lcdproc-0.5.1-r3 (29 Jan 2007)
 
index 15ef1b2321a1467fda3f4414f4ec8dbb88ff9848..46cd02503fbdf680a6647471e78ff8431dcb6431 100644 (file)
@@ -9,10 +9,6 @@ AUX 0.4.5-lcdproc.initd 521 RMD160 6b2048ed19d8be4d3f2b12508719dd9c3a832bb1 SHA1
 MD5 f9f136bc1a4f106a922b5e41214b2856 files/0.4.5-lcdproc.initd 521
 RMD160 6b2048ed19d8be4d3f2b12508719dd9c3a832bb1 files/0.4.5-lcdproc.initd 521
 SHA256 03efa750ccbba6a55de0953ca7d9e3193fd59fc87474ffa8c6f2e28da740558f files/0.4.5-lcdproc.initd 521
-AUX 0.5.1-LCDd-conf-driver-path.patch 474 RMD160 60ad8bf504de7de3133358b87614858082526bf3 SHA1 594053c56f1051278bddb222af15bad6d8ca5bc3 SHA256 7dc40858cbc293d5a94e02ae7a234e25b0b13d0ba6510bcaf5ac7ea40be21715
-MD5 b0352809a351abc5f5f6ad21f2c5b70e files/0.5.1-LCDd-conf-driver-path.patch 474
-RMD160 60ad8bf504de7de3133358b87614858082526bf3 files/0.5.1-LCDd-conf-driver-path.patch 474
-SHA256 7dc40858cbc293d5a94e02ae7a234e25b0b13d0ba6510bcaf5ac7ea40be21715 files/0.5.1-LCDd-conf-driver-path.patch 474
 AUX 0.5.1-LCDd.initd 645 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a SHA1 85260492305266e661e022e902914c976782179c SHA256 782142cc26b433bbfe1ac1ae152a8ecf62985e78c03e674f699f76847e6465b6
 MD5 cce5adc33e6e671cede2f8f58337a6ac files/0.5.1-LCDd.initd 645
 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a files/0.5.1-LCDd.initd 645
@@ -21,6 +17,10 @@ AUX 0.5.1-as-needed.patch 2683 RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf S
 MD5 0af610c21e75fe504a3b9cdc3bd56560 files/0.5.1-as-needed.patch 2683
 RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf files/0.5.1-as-needed.patch 2683
 SHA256 1ed27f3dd00031499a80d3d0e2ab35b0b35c2f90a6aa7530913c7f87acae70e0 files/0.5.1-as-needed.patch 2683
+AUX 0.5.1-g15daemon-1.9.patch 2090 RMD160 11f1b7a2848d988a523ee3785f6a9e41a79d6ad1 SHA1 1df6352c62eb60ef89dc0a4baca31262eb22b3b5 SHA256 5a455e15ef0ea17033d98e73933241e9e5de2b9daa00d2fbf59ee2cdf04c7b7c
+MD5 0690e644d92f6d41419cb7d1449d9f23 files/0.5.1-g15daemon-1.9.patch 2090
+RMD160 11f1b7a2848d988a523ee3785f6a9e41a79d6ad1 files/0.5.1-g15daemon-1.9.patch 2090
+SHA256 5a455e15ef0ea17033d98e73933241e9e5de2b9daa00d2fbf59ee2cdf04c7b7c files/0.5.1-g15daemon-1.9.patch 2090
 AUX 0.5.1-lcdproc.initd 480 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a SHA1 b471457107dcea79be328a6856a1111af63debf6 SHA256 0db323adbebad0cac3dc9cb9fa28788546dc9b8b620e4e4f7332f5d98e77409f
 MD5 f7fa34302843a0cd4980466fc3dbda1a files/0.5.1-lcdproc.initd 480
 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a files/0.5.1-lcdproc.initd 480
@@ -39,18 +39,18 @@ EBUILD lcdproc-0.4.5.ebuild 2674 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0
 MD5 ec8742dd9baf6c8a07c99fc99a76ec61 lcdproc-0.4.5.ebuild 2674
 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0 lcdproc-0.4.5.ebuild 2674
 SHA256 e7b9fa8ddb11969844c77546e751169fa04662eb47a6076a274e06bf171e1326 lcdproc-0.4.5.ebuild 2674
-EBUILD lcdproc-0.5.1-r1.ebuild 5974 RMD160 b63bd6a2cf50801bfeb264e9ed393e6c0a406cf5 SHA1 159b90d9595b980af529153e051592b84ac03f55 SHA256 5a9163906cb26564801333b57f8c8c358db0f243895478548b126fa56a1342ad
-MD5 256491474dae47ff4b7af2e93a86f3f9 lcdproc-0.5.1-r1.ebuild 5974
-RMD160 b63bd6a2cf50801bfeb264e9ed393e6c0a406cf5 lcdproc-0.5.1-r1.ebuild 5974
-SHA256 5a9163906cb26564801333b57f8c8c358db0f243895478548b126fa56a1342ad lcdproc-0.5.1-r1.ebuild 5974
-EBUILD lcdproc-0.5.1-r3.ebuild 5590 RMD160 1f4b8ca55f30e8d6a34c61c166e6b0567656ea91 SHA1 266bdaba159a8b905eeb69bc4e9fe0bc5f390a45 SHA256 78122f463aa4d1e9935753e073f9d0e0715b8d68b3b79da62875d8405c8683de
-MD5 648358a322ab0ed746f25dd41221f51e lcdproc-0.5.1-r3.ebuild 5590
-RMD160 1f4b8ca55f30e8d6a34c61c166e6b0567656ea91 lcdproc-0.5.1-r3.ebuild 5590
-SHA256 78122f463aa4d1e9935753e073f9d0e0715b8d68b3b79da62875d8405c8683de lcdproc-0.5.1-r3.ebuild 5590
-MISC ChangeLog 8591 RMD160 322c4e9d573b2a916ed408950cf0435bf2ae2010 SHA1 e2ebe355554bf3d0efe044e4bdba3dca56a0b3b9 SHA256 9f1d846bc2c711ed0c514da2fc04cee86c0f0d2e2d9b8a89df2eed1e1d424300
-MD5 cffc5d562c4d514b321e580a964efdea ChangeLog 8591
-RMD160 322c4e9d573b2a916ed408950cf0435bf2ae2010 ChangeLog 8591
-SHA256 9f1d846bc2c711ed0c514da2fc04cee86c0f0d2e2d9b8a89df2eed1e1d424300 ChangeLog 8591
+EBUILD lcdproc-0.5.1-r3.ebuild 5597 RMD160 5d26cb2572fb3c80ea23d21a6e6d700682b8d431 SHA1 79284ef0f5eac9715cc77c71a2a7382b79b83be8 SHA256 d2385b205a51aaaabc482bc7ca0f3357bedb9b32a6e1851cab6cfe3f79e69acd
+MD5 900ec07c26a722fdc96870d81a649ca4 lcdproc-0.5.1-r3.ebuild 5597
+RMD160 5d26cb2572fb3c80ea23d21a6e6d700682b8d431 lcdproc-0.5.1-r3.ebuild 5597
+SHA256 d2385b205a51aaaabc482bc7ca0f3357bedb9b32a6e1851cab6cfe3f79e69acd lcdproc-0.5.1-r3.ebuild 5597
+EBUILD lcdproc-0.5.1-r4.ebuild 5638 RMD160 b4f4c67890b59b1756a3e83d049227b31ed15561 SHA1 4a52005022ad5c0e617beebcf0551ef252227099 SHA256 6b4d7da32014c63eeeae6e96189facfebb200aa5184fc33bbe5df0072cfd5eca
+MD5 4d31e7fe954b53672afb73659433fde7 lcdproc-0.5.1-r4.ebuild 5638
+RMD160 b4f4c67890b59b1756a3e83d049227b31ed15561 lcdproc-0.5.1-r4.ebuild 5638
+SHA256 6b4d7da32014c63eeeae6e96189facfebb200aa5184fc33bbe5df0072cfd5eca lcdproc-0.5.1-r4.ebuild 5638
+MISC ChangeLog 8961 RMD160 ec6f326d50998a88ee79e52f9a85ed038de5403d SHA1 dbc08b2d8de241b00b4163164f7c9d01589189c0 SHA256 687d1950a8d2aee8811648e01c701dad6cf6709e807d16afa678dbe1ae6dd43d
+MD5 84b16e8daf4c8b765050121d3381ae2b ChangeLog 8961
+RMD160 ec6f326d50998a88ee79e52f9a85ed038de5403d ChangeLog 8961
+SHA256 687d1950a8d2aee8811648e01c701dad6cf6709e807d16afa678dbe1ae6dd43d ChangeLog 8961
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
@@ -58,16 +58,16 @@ SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata
 MD5 dd73d1296a9e0c2b636f440d8ec7108c files/digest-lcdproc-0.4.5 244
 RMD160 8ac61a26eb229cd464fde4a99eae188c66cd7474 files/digest-lcdproc-0.4.5 244
 SHA256 ec3e28b7b2139bc95d6d832b07f789aa55db4f469147309e40a5c06ae587511a files/digest-lcdproc-0.4.5 244
-MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r1 241
-RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r1 241
-SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r1 241
 MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r3 241
 RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r3 241
 SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r3 241
+MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r4 241
+RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r4 241
+SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r4 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFvT2IyZx3L/ph1soRAuwEAJ0WabJcMn1/MOwd2714D/ecmF1EJgCeL5MK
-VybNtQdYaK2XSrEvNukdnog=
-=C1xv
+iD8DBQFGAHJnyZx3L/ph1soRAkSOAJ4jAQ85PgxRL3ZHcnXDAKCPBAzgTQCaAqg3
+h+1zANDMx8/8m68dMThv5+Y=
+=V+dJ
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch b/app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch
deleted file mode 100644 (file)
index 5da934b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch is only used in 0.5.1-r1
-
---- LCDd.conf.orig     2006-09-22 07:26:02.069860250 +0200
-+++ LCDd.conf  2006-09-22 07:26:12.458509500 +0200
-@@ -76,7 +76,7 @@
- #            the driver modules and will thus not be able to
- #            function properly.
- # NOTE: Always place a slash as last character !
--DriverPath=server/drivers/
-+DriverPath=/usr/share/lcdproc/drivers/
- # The "...Key=" lines define what the server does with keypresses that
- # don't go to any client.
diff --git a/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch b/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch
new file mode 100644 (file)
index 0000000..1be3d75
--- /dev/null
@@ -0,0 +1,74 @@
+Upstream patch by Anthony J. Mirabella for >=app-misc/g15daemon-1.9
+
+Included in >=0.5.1-r4
+
+--- ./server/drivers/g15.c     2006/09/30 18:18:23     1.2
++++ ./server/drivers/g15.c     2006/11/12 09:44:16     1.3
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <syslog.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <libg15.h>
+ #include <g15daemon_client.h>
+ #include <libg15render.h>
+@@ -70,6 +71,7 @@
+    p->cellheight = G15_CELL_HEIGHT;
+    p->backlight_state = BACKLIGHT_ON;
+    p->g15screen_fd = 0;
++   p->g15d_ver = g15daemon_version();
+    if((p->g15screen_fd = new_g15_screen(G15_G15RBUF)) < 0)
+    {
+@@ -372,14 +374,35 @@
+ MODULE_EXPORT const char * g15_get_key (Driver *drvthis)
+ {
+       PrivateData *p = drvthis->private_data;
+-      
++      int toread = 0;
+       unsigned int key_state = 0;
+-      
+-      if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
+-        report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);    
+-      recv(p->g15screen_fd, &key_state , sizeof(key_state),0);
++      if ((strncmp("1.2", p->g15d_ver, 3)))
++        {     /* other than g15daemon-1.2 (should be >=1.9) */
++              fd_set fds;
++              struct timeval tv;
++              memset (&tv, 0, sizeof(struct timeval));
++
++              FD_ZERO(&fds);
++              FD_SET(p->g15screen_fd, &fds);
+       
++              toread = select(FD_SETSIZE, &fds, NULL, NULL, &tv);
++        }
++      else
++        {     /* g15daemon-1.2 */
++              if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
++                {
++                      report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);
++                      return NULL;
++                }
++              toread = 1;
++        }
++      
++      if (toread >= 1)
++        read(p->g15screen_fd, &key_state, sizeof(key_state));
++      else
++        return NULL;
++
+       if (key_state & G15_KEY_G1)
+               return "Escape";
+       else if (key_state & G15_KEY_L1)
+--- ./server/drivers/g15.h     2006/09/30 18:18:23     1.2
++++ ./server/drivers/g15.h     2006/11/12 09:44:17     1.3
+@@ -32,6 +32,8 @@
+       int cellwidth, cellheight;
+       /* file descriptor for g15daemon socket */
+       int g15screen_fd;
++      /* g15daemon version for compatibility checks */
++      const char *g15d_ver;
+       /* canvas for LCD contents */
+       g15canvas *canvas;
+       g15canvas *backingstore;
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r1.ebuild
deleted file mode 100644 (file)
index 1c23fb0..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r1.ebuild,v 1.5 2007/01/28 15:18:55 rbu Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
-HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-
-# general use keywords in first line, drivers in line 2
-IUSE="doc debug ldap nfs samba seamless-hbars usb
-       g15 graphlcd irman lirc ncurses svga ula200 xosd"
-
-DEPEND="
-       doc?      ( app-text/xmlto )
-       ldap?     ( net-nds/openldap )
-       usb?      ( dev-libs/libusb )
-
-       graphlcd? ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
-       g15?      ( app-misc/g15daemon  dev-libs/libg15  >=dev-libs/libg15render-1.1.1 )
-       irman?    ( media-libs/libirman )
-       lirc?     ( app-misc/lirc )
-       ncurses?  ( sys-libs/ncurses )
-       svga?     ( media-libs/svgalib )
-       ula200?   ( dev-embedded/libftdi  dev-libs/libusb )
-       xosd?     ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext ) "
-RDEPEND=${DEPEND}
-
-USE_DRIVERS="curses g15 glcdlib irman lirc svga ula200 xosd"
-EXTRA_DRIVERS="bayrad CFontz CFontz633 CFontzPacket CwLnx EyeboxOne \
-       glk hd44780 icp_a106 imon IOWarrior joy lb216 lcdm001 \
-       lcterm MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 \
-       sed1520 serialVFD sli stv5730 t6963 text tyan "
-ALL_DRIVERS="${USE_DRIVERS} ${EXTRA_DRIVERS}"
-
-# compatibility with 0.4-ebuild format
-LCDPROC_DRIVERS=${LCDPROC_DRIVERS//,/ }
-
-# if no drivers or all are set, select the defaults
-has all ${LCDPROC_DRIVERS} \
-       && LCDPROC_DRIVERS="${EXTRA_DRIVERS}"
-[ -z "${LCDPROC_DRIVERS}" ] \
-       && LCDPROC_DRIVERS="${EXTRA_DRIVERS}"
-has none ${LCDPROC_DRIVERS} \
-       && LCDPROC_DRIVERS=""
-
-pkg_setup() {
-       echo
-       einfo "If you are updating from lcdproc-0.4, note that the setup of drivers has changed:"
-       einfo "The drivers ${USE_DRIVERS// /, } are controlled by use flags."
-       einfo "All other drivers are built by default, or in respect to the env variable"
-       einfo "LCDPROC_DRIVERS which can be a space separated list. Example:"
-       einfo "     LCDPROC_DRIVERS=\"text CFontz\" emerge lcdproc"
-       einfo "You can also set this variable in your make.conf."
-       echo
-       einfo "Possible choices for LCDPROC_DRIVERS are:"
-
-       # Nice Output of EXTRA_DRIVERS
-       local LINE="   "
-       local ELEM=0
-       for driver in ${EXTRA_DRIVERS}; do
-               ELEM=$((${ELEM}+1))
-               LINE="${LINE} ${driver}"
-               if [ "${ELEM}" = 8 ]; then
-                       einfo "${LINE}"
-                       ELEM=0
-                       LINE="   "
-               fi
-       done
-       if [ ! "${ELEM}" = 0 ]; then
-               einfo "${LINE}"
-       fi
-
-       einfo "   'all' if you want to include all drivers (default)."
-       einfo "   'none' will not include any extra drivers."
-       echo
-
-       local FILTERED_DRIVERS
-       for driver in ${LCDPROC_DRIVERS}; do
-               if has ${driver} ${EXTRA_DRIVERS} ; then
-                               FILTERED_DRIVERS="${FILTERED_DRIVERS} ${driver}"
-                       else
-                               eerror "The extra driver '${driver}' is not available or has to be enabled by a USE flag."
-                               eerror "Please check your LCDPROC_DRIVERS variable!"
-                               echo
-               fi
-       done
-       LCDPROC_DRIVERS="${FILTERED_DRIVERS}"
-
-       # add use-flag specific drivers to LCDPROC_DRIVERS
-       use graphlcd && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} glcdlib"
-       use g15      && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} g15"
-       use irman    && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} irman"
-       use lirc     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} lirc"
-       use ncurses  && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} curses"
-       use svga     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} svga"
-       use ula200   && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} ula200"
-       use xosd     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} xosd"
-
-       einfo "The following drivers will be built: "
-       echo
-
-       for driver in ${ALL_DRIVERS}; do
-               has ${driver} ${LCDPROC_DRIVERS} && einfo $driver
-               if (! use usb) && (has ${driver} "CFontzPacket CwLnx pyramid"); then
-                       ewarn "${driver} might not compile if you do not enable USE=\"usb\""
-               fi
-       done
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PV}-LCDd-conf-driver-path.patch"
-       epatch "${FILESDIR}/${PV}-as-needed.patch"
-       epatch "${FILESDIR}/${PV}-serialvfd-parallel.patch"
-       eautoreconf
-}
-
-src_compile() {
-       # avoid executable stack as mentioned
-       # in http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
-       append-ldflags -Wl,-z,noexecstack
-
-       # convert space separated LCDPROC_DRIVERS to comma separated COMMA_DRIVERS
-       local COMMA_DRIVERS
-       for driver in ${LCDPROC_DRIVERS}; do
-               if [ -z "${COMMA_DRIVERS}" ] ; then
-                       COMMA_DRIVERS="${driver}"
-               else
-                       COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
-               fi
-       done
-
-       econf \
-               $(use_enable debug) \
-               $(use_enable ldap) \
-               $(use_enable nfs stat-nfs) \
-               $(use_enable samba stat-smbfs ) \
-               $(use_enable seamless-hbars) \
-               $(use_enable usb libusb) \
-               "--enable-drivers=${COMMA_DRIVERS}"  \
-               || die "configure failed"
-
-       emake || die "make failed"
-
-       if use doc; then
-               ebegin "Creating user documentation"
-               cd ${S}/docs/lcdproc-user
-               xmlto html lcdproc-user.docbook
-               eend 0
-               ebegin "Creating dev documentation"
-               cd ${S}/docs/lcdproc-dev
-               xmlto html lcdproc-dev.docbook
-               eend 0
-       fi
-}
-
-src_install() {
-       dosbin server/LCDd
-       dobin clients/lcdexec/lcdexec
-       dobin clients/lcdproc/lcdproc
-       dobin clients/lcdvc/lcdvc
-
-       insinto /usr/share/lcdproc/drivers
-       doins server/drivers/*.so
-
-       insinto /usr/share/lcdproc/clients
-       doins clients/examples/*.pl
-       doins clients/metar/lcdmetar.pl
-
-       insinto /etc
-       doins LCDd.conf
-       doins clients/lcdexec/lcdexec.conf
-       doins clients/lcdproc/lcdproc.conf
-       doins clients/lcdvc/lcdvc.conf
-
-       newinitd "${FILESDIR}/${PV}-LCDd.initd" LCDd
-       newinitd "${FILESDIR}/${PV}-lcdproc.initd" lcdproc
-
-       doman docs/*.1 docs/*.5 docs/*.8
-       dodoc README CREDITS ChangeLog INSTALL TODO
-       dodoc docs/README.* docs/*.txt
-
-       if use doc; then
-               insinto /usr/share/doc/${PF}/lcdproc-user
-               doins docs/lcdproc-user/*.html
-               insinto /usr/share/doc/${PF}/lcdproc-dev
-               doins docs/lcdproc-dev/*.html
-       fi
-}
index 9f394e006b2608002d3615f00f20f256f03f9551..9e8db7051c1d69a9d458972923b5b81d6a021724 100644 (file)
@@ -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/lcdproc/lcdproc-0.5.1-r3.ebuild,v 1.1 2007/01/29 00:19:11 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r3.ebuild,v 1.2 2007/03/20 23:46:40 rbu Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -52,7 +52,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        doc?      ( app-text/xmlto )"
 RDEPEND="${RDEPEND}
-       lcd_devices_g15?      ( app-misc/g15daemon )"
+       lcd_devices_g15?      ( <app-misc/g15daemon-1.9.0 )"
 
 pkg_setup() {
        if [ -n "${LCDPROC_DRIVERS}" ] ; then
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
new file mode 100644 (file)
index 0000000..e5f7709
--- /dev/null
@@ -0,0 +1,187 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild,v 1.1 2007/03/20 23:46:40 rbu Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils autotools multilib
+
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc debug ldap nfs samba seamless-hbars usb lirc irman joystick"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
+       cwlinux eyeboxone g15 graphlcd glk
+       hd44780 icpa106 imon iowarrior
+       lb216 lcdm001 lcterm
+       md8800 ms6931 mtcs16209x mtxorb noritakevfd
+       pyramid sed1330 sed1520 serialvfd sli
+       stv5730 svga t6963 text tyan
+       ula200 xosd)
+
+# Iterate through the array and add the lcd_devices_* that we support
+NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
+index=0
+while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+       IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
+       let "index = ${index} + 1"
+done
+
+RDEPEND="
+       ldap?     ( net-nds/openldap )
+       usb?      ( dev-libs/libusb )
+       lirc?     ( app-misc/lirc )
+       irman?    ( media-libs/libirman )
+
+       lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
+       lcd_devices_g15?      ( dev-libs/libg15  >=dev-libs/libg15render-1.1.1 )
+       lcd_devices_ncurses?   ( sys-libs/ncurses )
+       lcd_devices_svga?     ( media-libs/svgalib )
+       lcd_devices_ula200?   ( dev-embedded/libftdi  dev-libs/libusb )
+       lcd_devices_xosd?     ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
+       lcd_devices_cfontzpacket? ( dev-libs/libusb )
+       lcd_devices_cwlinux?    ( dev-libs/libusb )
+       lcd_devices_pyramid?  ( dev-libs/libusb )"
+DEPEND="${RDEPEND}
+       doc?      ( app-text/xmlto )"
+RDEPEND="${RDEPEND}
+       lcd_devices_g15?      ( app-misc/g15daemon )"
+
+pkg_setup() {
+       if [ -n "${LCDPROC_DRIVERS}" ] ; then
+               ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
+               ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf
+       einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
+
+       epatch "${FILESDIR}/${PV}-as-needed.patch"
+       epatch "${FILESDIR}/${PV}-serialvfd-parallel.patch"
+       epatch "${FILESDIR}/${PV}-nested-functions.patch"
+       epatch "${FILESDIR}/${PV}-g15daemon-1.9.patch"
+       eautoreconf
+}
+
+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
+       local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket
+               CwLnx EyeboxOne g15 glcdlib glk
+               hd44780 icp_a106 imon IOWarrior
+               lb216 lcdm001 lcterm
+               MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD
+               pyramid sed1330 sed1520 serialVFD sli
+               stv5730 svga t6963 text tyan
+               ula200 xosd)
+
+       # Generate comma separated list of drivers
+       COMMA_DRIVERS=""
+       FIRST_DRIVER=""
+       local index=0
+
+       while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+               if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
+                       append-driver "${DEVICE_DRIVERS[${index}]}"
+               fi
+               let "index = ${index} + 1"
+       done
+
+       # Append the not-lcd-drivers (input)
+       use lirc && append-driver "lirc"
+       use irman && append-driver "irman"
+       use joystick && append-driver "joy"
+
+       if [ -z "${COMMA_DRIVERS}" ] ; then
+               ewarn "You are compiling LCDd without support for any LCD drivers at all."
+       else
+               # Patch the config to contain a driver that is actually installed instead of the default
+               elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
+               elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
+               sed -i "44s:curses:${FIRST_DRIVER}:" LCDd.conf
+       fi
+
+       local ENABLEUSB
+       if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid; then
+               ENABLEUSB="--enable-libusb"
+       else
+               ENABLEUSB="$(use_enable usb libusb)"
+       fi
+
+       econf \
+               $(use_enable debug) \
+               $(use_enable ldap) \
+               $(use_enable nfs stat-nfs) \
+               $(use_enable samba stat-smbfs ) \
+               $(use_enable seamless-hbars) \
+               ${ENABLEUSB} \
+               "--enable-drivers=${COMMA_DRIVERS}"  \
+               || die "configure failed"
+
+       emake || die "make failed"
+
+       if use doc; then
+               ebegin "Creating user documentation"
+               cd ${S}/docs/lcdproc-user
+               xmlto html lcdproc-user.docbook
+               eend $?
+
+               ebegin "Creating dev documentation"
+               cd ${S}/docs/lcdproc-dev
+               xmlto html lcdproc-dev.docbook
+               eend $?
+       fi
+}
+
+append-driver() {
+       [[ -z $* ]] && return 0
+       if [ -z "${COMMA_DRIVERS}" ] ; then
+               # First in the list
+               COMMA_DRIVERS="$*"
+               FIRST_DRIVER="$*"
+       else
+               # Second, third, ... include a comma at the front
+               COMMA_DRIVERS="${COMMA_DRIVERS},$*"
+       fi
+       return 0
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       # move example clients installed to /usr/bin
+       rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
+       insinto /usr/share/lcdproc/clients
+       doins clients/examples/*.pl
+       doins clients/metar/
+
+       newinitd "${FILESDIR}/${PV}-LCDd.initd" LCDd
+       newinitd "${FILESDIR}/${PV}-lcdproc.initd" lcdproc
+
+       dodoc README CREDITS ChangeLog INSTALL TODO
+       dodoc docs/README.* docs/*.txt
+
+       if use doc; then
+               insinto /usr/share/doc/${PF}/lcdproc-user
+               doins docs/lcdproc-user/*.html
+               insinto /usr/share/doc/${PF}/lcdproc-dev
+               doins docs/lcdproc-dev/*.html
+       fi
+}
+
+pkg_postinst() {
+       ewarn "IMPORTANT: Please update your /etc/LCDd.conf"
+       ewarn "As of lcdproc-0.5.1-r2, the DriverPath changed from /usr/share/lcdproc to /usr/$(get_libdir)/lcdproc ."
+}