Introducing LCD_DEVICES, move of config file, code should compile on non-x86 again...
authorRobert Buchholz <rbu@gentoo.org>
Sun, 18 Feb 2007 23:02:56 +0000 (23:02 +0000)
committerRobert Buchholz <rbu@gentoo.org>
Sun, 18 Feb 2007 23:02:56 +0000 (23:02 +0000)
Package-Manager: portage-2.1.2-r9

app-misc/lcd4linux/ChangeLog
app-misc/lcd4linux/Manifest
app-misc/lcd4linux/files/digest-lcd4linux-0.10.0-r1 [moved from app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 with 100% similarity]
app-misc/lcd4linux/files/lcd4linux-0.10.0-no-x86-asm.patch [new file with mode: 0644]
app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch [new file with mode: 0644]
app-misc/lcd4linux/files/lcd4linux-0.10.0.initd [new file with mode: 0644]
app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild [new file with mode: 0644]
app-misc/lcd4linux/lcd4linux-0.10.0.ebuild [deleted file]
app-misc/lcd4linux/metadata.xml

index 774e6512f53d1e3c1d342a87db5a9503ba378932..f694c320ada50f28a1aa9bffab88d10628583be0 100644 (file)
@@ -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.21 2007/01/07 01:51:37 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.22 2007/02/18 23:02:56 rbu Exp $
+
+*lcd4linux-0.10.0-r1 (18 Feb 2007)
+
+  18 Feb 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/lcd4linux-0.10.0-no-x86-asm.patch,
+  +files/lcd4linux-0.10.0-null-driver.patch, +files/lcd4linux-0.10.0.initd,
+  metadata.xml, -lcd4linux-0.10.0.ebuild, +lcd4linux-0.10.0-r1.ebuild:
+  Introducing LCD_DEVICES, move of config file, code should compile on non-x86
+  again, new init-script and other fixes
 
   07 Jan 2007; Robert Buchholz <rbu@gentoo.org> lcd4linux-0.10.0.ebuild:
   uses elog, whitespace fix
index 665aa96d13434754d035e786df722a2b9ff865a4..7c8cc337b55f319e05d11dda3fb16a17deb722e6 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lcd4linux-0.10.0-gcc4-compat.patch 1062 RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e SHA1 00486e55acb1c7e8bf223ec812cd41f90463f5fe SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a
 MD5 ee1bd63f943879b8a0d38273fc12922d files/lcd4linux-0.10.0-gcc4-compat.patch 1062
 RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e files/lcd4linux-0.10.0-gcc4-compat.patch 1062
@@ -6,31 +9,50 @@ AUX lcd4linux-0.10.0-kernel2.6.19.patch 412 RMD160 abf01325ffa51e0dbeb3b044c8c59
 MD5 caf89e4008f3326f1b5528e2ca4752fb files/lcd4linux-0.10.0-kernel2.6.19.patch 412
 RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea files/lcd4linux-0.10.0-kernel2.6.19.patch 412
 SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 files/lcd4linux-0.10.0-kernel2.6.19.patch 412
+AUX lcd4linux-0.10.0-no-x86-asm.patch 1533 RMD160 1fafd500673445cef40b94e5feac54f2979ec132 SHA1 47ebdaa777e3d8522ce6611e11d29c7f01c04849 SHA256 410862d5955f735827cdbd146a85b483623a5d1c07e700d8dcc1ebadb5bbf340
+MD5 83432994c873b72077a030a214e8a575 files/lcd4linux-0.10.0-no-x86-asm.patch 1533
+RMD160 1fafd500673445cef40b94e5feac54f2979ec132 files/lcd4linux-0.10.0-no-x86-asm.patch 1533
+SHA256 410862d5955f735827cdbd146a85b483623a5d1c07e700d8dcc1ebadb5bbf340 files/lcd4linux-0.10.0-no-x86-asm.patch 1533
+AUX lcd4linux-0.10.0-null-driver.patch 260 RMD160 c6612e8c0329477d1f7efaa412ffdda1ca5733be SHA1 3daaf7a32a893874ec7c767077778b0b02a7a052 SHA256 06fd19970dc811935e010ae4d7465a17ab6fc033b0a4d1beba977256b89c7676
+MD5 ea68fd2c5f6deb5473ac925f9e0735d7 files/lcd4linux-0.10.0-null-driver.patch 260
+RMD160 c6612e8c0329477d1f7efaa412ffdda1ca5733be files/lcd4linux-0.10.0-null-driver.patch 260
+SHA256 06fd19970dc811935e010ae4d7465a17ab6fc033b0a4d1beba977256b89c7676 files/lcd4linux-0.10.0-null-driver.patch 260
+AUX lcd4linux-0.10.0.initd 673 RMD160 4bce8d704ae7f778e9a1f1f16424f48de9d74298 SHA1 5e50656b1bf35e6901a7334ab6f1b034e432d7df SHA256 a122192b1834391a8fc4d5a33a18114e150cde193f96d1dfae8b2d6ea2953df4
+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.9.11-modular-x.patch 511 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 SHA1 62b23be4a3a9c84709b1f5e35fa382cab17bc5e5 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10
 MD5 6ede29698c02eb80e3d9561bfa951681 files/lcd4linux-0.9.11-modular-x.patch 511
 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 files/lcd4linux-0.9.11-modular-x.patch 511
 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10 files/lcd4linux-0.9.11-modular-x.patch 511
 DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
 DIST lcd4linux-0.9.11.tar.gz 218557 RMD160 55257d7c5951938ce7a1b878935139e436514ef0 SHA1 9dec2d2b8d236adba59d531f1167fab295f0c1b0 SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627
-EBUILD lcd4linux-0.10.0.ebuild 2993 RMD160 b95aa9d7c7198dec82090d4cf2927530bea95191 SHA1 d786cc714c8456248e44dfd1453fd32d141da9d1 SHA256 89af2968728bf25f874591890244fe7a16d2c89498e9f5f5ada1473e96df0f26
-MD5 f0fc400bc48d95b81bdf561c810c3112 lcd4linux-0.10.0.ebuild 2993
-RMD160 b95aa9d7c7198dec82090d4cf2927530bea95191 lcd4linux-0.10.0.ebuild 2993
-SHA256 89af2968728bf25f874591890244fe7a16d2c89498e9f5f5ada1473e96df0f26 lcd4linux-0.10.0.ebuild 2993
+EBUILD lcd4linux-0.10.0-r1.ebuild 4815 RMD160 fb846db4c5b4c127afb0874d3b8bd9c76ec4d150 SHA1 5c5361f7418c823637fb04c446ae5e7e390c0b8e SHA256 554f018e5d822818571593af4cee1d021580f2d2b025902e6f70264c094b13c8
+MD5 bfd7337804ad43482de6ca4a33c6c16c lcd4linux-0.10.0-r1.ebuild 4815
+RMD160 fb846db4c5b4c127afb0874d3b8bd9c76ec4d150 lcd4linux-0.10.0-r1.ebuild 4815
+SHA256 554f018e5d822818571593af4cee1d021580f2d2b025902e6f70264c094b13c8 lcd4linux-0.10.0-r1.ebuild 4815
 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 3694 RMD160 04724f4d047900334703b116c3e2fa841e279a70 SHA1 e761bc24db264b0bac69814ac943c0e38aea1a21 SHA256 27ef296247bd6bb414d95e8ba91964cfdeb003b3e1dc7e825fed12c4e671f27f
-MD5 6ae7bad39e25cb47880756a811da6a14 ChangeLog 3694
-RMD160 04724f4d047900334703b116c3e2fa841e279a70 ChangeLog 3694
-SHA256 27ef296247bd6bb414d95e8ba91964cfdeb003b3e1dc7e825fed12c4e671f27f ChangeLog 3694
-MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
-MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
-RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
-SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata.xml 250
-MD5 0b746369033d8d0fffea2ec67f83ad4e files/digest-lcd4linux-0.10.0 250
-RMD160 018c8b34815a32a9902122a5e67b6acbc2e3e41a files/digest-lcd4linux-0.10.0 250
-SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/digest-lcd4linux-0.10.0 250
+MISC ChangeLog 4090 RMD160 6ad51cb8a36bd1ac41f2a8e111d30ce6dca6b1a5 SHA1 dd22f8008d99bf5aab47f9c9ce71669f4f15e7ec SHA256 cc333e5ccebc543d641c2c0e5fef679b4bccc995e78d6d4b5e62989eedc5b991
+MD5 1fbff418d52d9071993e578e426e54de ChangeLog 4090
+RMD160 6ad51cb8a36bd1ac41f2a8e111d30ce6dca6b1a5 ChangeLog 4090
+SHA256 cc333e5ccebc543d641c2c0e5fef679b4bccc995e78d6d4b5e62989eedc5b991 ChangeLog 4090
+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
+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 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)
+
+iD8DBQFF2NsoyZx3L/ph1soRAscEAJ0YG7e9LqRmFysligVKTCLtAcilOACgmLS1
+OuqEoJzvDeXUf/iiHvAKYeM=
+=JnqZ
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-no-x86-asm.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-no-x86-asm.patch
new file mode 100644 (file)
index 0000000..cef3d2c
--- /dev/null
@@ -0,0 +1,34 @@
+Upstream patch\r
+\r
+"Fixing bug #1494773 (compiles only on i368/amd64 machines) by providing a dummy implementation for other archs "\r
+See http://sourceforge.net/tracker/index.php?func=detail&aid=1494773&group_id=1310&atid=101310\r
+\r
+===================================================================\r
+--- ./udelay.h (revision 600)\r
++++ ./udelay.h (revision 712)\r
+@@ -1,3 +1,3 @@\r
+-/* $Id: lcd4linux-0.10.0-no-x86-asm.patch,v 1.1 2007/02/18 23:02:56 rbu Exp $\r
++/* $Id: lcd4linux-0.10.0-no-x86-asm.patch,v 1.1 2007/02/18 23:02:56 rbu Exp $\r
+  *\r
+  * short delays \r
+@@ -24,4 +24,7 @@\r
+  *\r
+  * $Log: not supported by cvs2svn $\r
++ * Revision 1.12  2006/09/13 20:07:59  entropy\r
++ * Fixing bug #1494773 (compiles only on i368/amd64 machines) by providing a dummy implementation for other archs\r
++ *\r
+  * Revision 1.11  2005/12/12 09:08:08  reinelt\r
+  * finally removed old udelay code path; read timing values from config\r
+@@ -80,5 +83,12 @@\r
+ static inline void rep_nop(void)\r
+ {\r
++# if defined(__i386) || defined(__i386__) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)\r
++    /* intel or amd64 arch, the "rep" and "nop" opcodes are available */\r
+     __asm__ __volatile__("rep; nop");\r
++# else\r
++    /* other Arch, maybe add core cooldown code here, too. */\r
++    do {\r
++    } while (0);\r
++# endif\r
+ }\r
\r
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch
new file mode 100644 (file)
index 0000000..f9be4e6
--- /dev/null
@@ -0,0 +1,10 @@
+--- configure.orig     2007-01-16 03:58:31.000000000 +0100
++++ configure  2007-01-16 03:59:10.000000000 +0100
+@@ -6132,6 +6132,7 @@
+ if test "$NULL" = "yes"; then
+    DRIVERS="$DRIVERS drv_NULL.o"
++   TEXT="yes"
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_NULL 1
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd b/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd
new file mode 100644 (file)
index 0000000..02a051b
--- /dev/null
@@ -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/lcd4linux/files/lcd4linux-0.10.0.initd,v 1.1 2007/02/18 23:02:56 rbu Exp $
+
+PIDFILE=/var/run/lcd4linux.pid
+DAEMON=/usr/bin/lcd4linux
+
+depend() {
+       use net
+}
+
+start() {
+       ebegin "Starting lcd4linux"
+       start-stop-daemon --start --quiet --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON}
+       eend $? "Failed to start lcd4linux. Did you remember to set up /etc/lcd4linux.conf?"
+}
+
+stop() {
+       ebegin "Stopping lcd4linux"
+       start-stop-daemon --stop --quiet --oknodo --exec ${DAEMON} --pidfile ${PIDFILE}
+       eend $?
+}
+
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild
new file mode 100644 (file)
index 0000000..9c9ad96
--- /dev/null
@@ -0,0 +1,157 @@
+# 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.0-r1.ebuild,v 1.1 2007/02/18 23:02:56 rbu Exp $
+
+inherit eutils
+
+DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
+HOMEPAGE="http://ssl.bulix.org/projects/${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="mysql"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
+               hd44780 lcdlinux lcdterm m50530 mtxorb
+               milfordbpk noritake null png ppm
+               routerboard serdisplib simplelcd t6963 trefon
+               usblcd X)
+
+# 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
+
+DEPEND="
+       mysql? ( virtual/mysql )
+
+       lcd_devices_bwct?     ( dev-libs/libusb )
+       lcd_devices_trefon?   ( dev-libs/libusb )
+       lcd_devices_usblcd?   ( dev-libs/libusb )
+       lcd_devices_ncurses?  ( sys-libs/ncurses )
+       lcd_devices_noritake? ( media-libs/gd )
+       lcd_devices_t6963?    ( media-libs/gd )
+       lcd_devices_png?      ( media-libs/libpng media-libs/gd )
+       lcd_devices_X?        ( x11-libs/libX11  media-libs/gd )
+       lcd_devices_serdisplib? ( dev-libs/serdisplib  media-libs/gd )"
+#      python support is b0rked, waiting for upstream release to fix
+#      python? ( dev-lang/python )
+
+
+pkg_setup() {
+       elog "If you wish to compile only specific plugins, please use"
+       elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
+       elog "apm cpuinfo diskstats dvb exec i2c_sensors imon isdn loadavg meminfo netdev pop3 ppp proc_stat sample seti statfs uname uptime wireless"
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/${P}-kernel2.6.19.patch"
+       epatch "${FILESDIR}/${P}-gcc4-compat.patch"
+       epatch "${FILESDIR}/${P}-null-driver.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
+       local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
+               HD44780 LCDLinux LCDTerm M50530 MatrixOrbital
+               MilfordInstruments Noritake NULL PNG PPM
+               RouterBoard serdisplib SimpleLCD T6963 Trefon
+               USBLCD X11)
+
+       local myconf myp
+
+       # need to grab upstream's *.m4 and fix python building
+       # they didn't have python properly set up originally.
+       #myconf="${myconf} $(use_with python)"
+       myconf="${myconf} --without-python"
+
+
+       # plugins
+       if [ -n "$LCD4LINUX_PLUGINS" ]; then
+               myp="$LCD4LINUX_PLUGINS"
+               use mysql || myp="${myp},!mysql"
+               myp="${myp},!python"
+               #use python || myp="${myp},!python"
+               elog "Active plugins (overridden): ${myp}"
+       else
+               myp="all"
+               use mysql || myp="${myp},!mysql"
+               #use python || myp="${myp},!python"
+               myp="${myp},!python"
+               elog "Active plugins: ${myp}"
+       fi
+
+       # Generate comma separated list of drivers
+       local COMMA_DRIVERS
+       local FIRST_DRIVER
+       local index=0
+       local driver
+
+       while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+               if use "lcd_devices_${IUSE_LCD_DEVICES[$index]}" ; then
+                       driver=${DEVICE_DRIVERS[$index]}
+                       if [ -z ${COMMA_DRIVERS} ] ; then
+                               # First in the list
+                               COMMA_DRIVERS="${driver}"
+                               FIRST_DRIVER="${driver}"
+                       else
+                               # Second, third, ... include a comma at the front
+                               COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
+                       fi
+               fi
+               let "index = ${index} + 1"
+       done
+
+       # activate at least one driver
+       if [ -z ${COMMA_DRIVERS} ] ; then
+               COMMA_DRIVERS="NULL"
+       fi
+
+       # avoid package brokenness
+       use lcd_devices_X && myconf="${myconf} --x-libraries=/usr/lib --x-include=/usr/include"
+       use lcd_devices_X || myconf="${myconf} --without-x"
+
+       econf \
+               --sysconfdir=/etc/lcd4linux \
+               --with-drivers="${COMMA_DRIVERS}" \
+               --with-plugins="${myp}" \
+               ${myconf} \
+               || die "econf failed"
+
+       sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
+
+       emake || die "make failed"
+}
+
+src_install() {
+       # upstream's makefile acts weird, and tries to recompile stuff
+       dobin lcd4linux
+
+       dodoc README* NEWS TODO CREDITS FAQ AUTHORS ChangeLog
+
+       newinitd "${FILESDIR}/${P}.initd" ${PN}
+
+       insinto /etc
+       insopts -o root -g root -m 0600
+       newins lcd4linux.conf.sample lcd4linux.conf
+}
+
+pkg_postinst() {
+       if use lcd_devices_lcdlinux; then
+               ewarn "To actually use the lcd-linux devices, you will need to install the lcd-linux kernel module."
+               ewarn "You can either do that yourself, see http://lcd-linux.sf.net or "
+               ewarn "checkout http://overlays.gentoo.org/dev/jokey/browser/trunk and emerge app-misc/lcd-linux"
+       fi
+       ewarn "If you are upgrading, please note that the default config file was moved to /etc/lcd4linux.conf"
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
deleted file mode 100644 (file)
index 51fa6ab..0000000
+++ /dev/null
@@ -1,118 +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/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.7 2007/01/07 01:51:37 rbu Exp $
-
-inherit eutils
-
-DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/"
-SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# contains x86 asm, upstream is working on a portable version
-KEYWORDS="~x86"
-IUSE="kde png serdisp X usb mysql python"
-
-DEPEND="png? ( media-libs/libpng
-       media-libs/gd )
-       X? ( x11-libs/libX11 )
-       usb? ( dev-libs/libusb )
-       serdisp? ( dev-libs/serdisplib )
-       mysql? ( virtual/mysql )"
-#              python? ( dev-lang/python )
-# mpd is needed soon
-# python is broken
-
-pkg_preinst() {
-       elog "If you wish to compile only specific drivers or plugins, please use"
-       elog "the LCD4LINUX_PLUGINS and LCD4LINUX_DRIVERS environment variables."
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}/${P}-kernel2.6.19.patch"
-       epatch "${FILESDIR}/${P}-gcc4-compat.patch"
-}
-
-src_compile() {
-       local myconf myp myd
-
-       # need to grab upstream's *.m4 and fix python building
-       # they didn't have python properly set up originally.
-       #myconf="${myconf} $(use_with python)"
-       myconf="${myconf} --without-python"
-
-       # plugins
-       if [ -n "$LCD4LINUX_PLUGINS" ]; then
-               myp="$LCD4LINUX_PLUGINS"
-               elog "Active plugins (overridden): ${myp}"
-       else
-               myp="all"
-               use mysql || myp="${myp},!mysql"
-               #use python || myp="${myp},!python"
-               myp="${myp},!python"
-               elog "Active plugins: ${myp}"
-       fi
-
-       # drivers
-       if [ -n "$LCD4LINUX_DRIVERS" ]; then
-               myd="$LCD4LINUX_DRIVERS"
-               elog "Active drivers (overridden): ${myd}"
-       else
-               myd="all"
-               use serdisp || myd="${myd},!serdisplib"
-               use usb     || myd="${myd},!USBLCD"
-               use png     || myd="${myd},!PNG"
-               use X       || myd="${myd},!X11"
-               elog "Active drivers: ${myd}"
-       fi
-
-       # avoid package brokenness
-       use X && myconf="${myconf} --x-libraries=/usr/lib --x-include=/usr/include"
-       use X || myconf="${myconf} --without-x"
-
-       econf \
-               --sysconfdir=/etc/lcd4linux \
-               --with-drivers="${myd}" \
-               --with-plugins="${myp}" \
-               ${myconf} \
-               || die "econf failed"
-
-       sed -i.orig -e 's,-L -lX11, -lX11 ,g' Makefile || die "sed fixup failed"
-
-       emake || die
-}
-
-src_install() {
-       # upstream's makefile acts weird, and tries to recompile stuff
-       into /usr
-       dobin lcd4linux
-
-       dodoc README* NEWS TODO CREDITS FAQ AUTHORS ChangeLog
-
-       #newconfd ${FILESDIR}/${PN}.confd ${PN}
-       #newinitd ${FILESDIR}/${PN}.initd ${PN}
-
-       dodir /etc/lcd4linux
-
-       if use X || use kde; then
-               insinto /usr/share/pixmaps
-               doins lcd4linux.xpm
-       fi
-       use X && touch ${D}/etc/lcd4linux/lcd4X11.conf
-
-       if use kde ; then
-               insinto /usr/share/applnk/apps/System
-               doins lcd4linux.kdelnk
-               insinto /etc/lcd4linux
-               insopts -o root -g root -m 0600
-               doins lcd4kde.conf
-       fi
-
-       insinto /etc/lcd4linux
-       insopts -o root -g root -m 0600
-       newins lcd4linux.conf.sample lcd4linux.conf
-}
index dce4644a99be47dac22e07093e8bcdf71c2240fe..ad12036a061b21d23224eb132f8ff95407c331c2 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>lcd</herd>
        <maintainer>
-               <email>rob@thetruth.de</email>
+               <email>rbu@gentoo.org</email>
                <name>Robert Buchholz</name>
        </maintainer>
 </pkgmetadata>