Long awaited version bump and amd64 keyword

Package-Manager: portage-2.1.2-r9

5 files changed, 217 insertions, 15 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index f694c320ada5..d8e5e728cd0b 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2007/02/18 23:02:56 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.23 2007/02/24 23:20:16 rbu Exp $
+
+*lcd4linux-0.10.1_rc1 (24 Feb 2007)
+
+  24 Feb 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/lcd4linux-0.10.1_rc1.initd, +lcd4linux-0.10.1_rc1.ebuild:
+  Long awaited version bump and amd64 keyword
 
 *lcd4linux-0.10.0-r1 (18 Feb 2007)
 
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 7c8cc337b55f..fc22684baff3 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,6 +1,3 @@
------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
@@ -21,24 +18,33 @@ 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_rc1.initd 661 RMD160 666ef6d1b21f3c336768b86f2654ddd5b80a18be SHA1 81d8161368621175d3e4edfe5b66994433b49a35 SHA256 d6316d07ea649201c0a270675ec923da3cee212184b3439a8de3a211ea864ad1
+MD5 b16a83ef3b7ae57cb5a2d8a671944573 files/lcd4linux-0.10.1_rc1.initd 661
+RMD160 666ef6d1b21f3c336768b86f2654ddd5b80a18be files/lcd4linux-0.10.1_rc1.initd 661
+SHA256 d6316d07ea649201c0a270675ec923da3cee212184b3439a8de3a211ea864ad1 files/lcd4linux-0.10.1_rc1.initd 661
 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.10.1-RC1.tar.gz 341984 RMD160 8b720f91dd63bfba7dc53a4eabb1151fdd879785 SHA1 095e99de2bbc2561067329c4ffb04f8aba9310c4 SHA256 e52b3128b5cbde436309dd5a7392f47509310aa353f68fe5e0bd0aaef9b0ee6a
 DIST lcd4linux-0.9.11.tar.gz 218557 RMD160 55257d7c5951938ce7a1b878935139e436514ef0 SHA1 9dec2d2b8d236adba59d531f1167fab295f0c1b0 SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627
 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.10.1_rc1.ebuild 5115 RMD160 bae3294399e5f53319d0dcf5e222d6ec49a5ca57 SHA1 9c7f7225dc26f361450a6bab75b9271ecc5b1958 SHA256 735baf5a7fbbe07e4ddedaf9cc3aff7b12fd220b8e8eae4e488098d1ddb3ee58
+MD5 da5b3c11647839f07a5fe32952055c37 lcd4linux-0.10.1_rc1.ebuild 5115
+RMD160 bae3294399e5f53319d0dcf5e222d6ec49a5ca57 lcd4linux-0.10.1_rc1.ebuild 5115
+SHA256 735baf5a7fbbe07e4ddedaf9cc3aff7b12fd220b8e8eae4e488098d1ddb3ee58 lcd4linux-0.10.1_rc1.ebuild 5115
 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 4090 RMD160 6ad51cb8a36bd1ac41f2a8e111d30ce6dca6b1a5 SHA1 dd22f8008d99bf5aab47f9c9ce71669f4f15e7ec SHA256 cc333e5ccebc543d641c2c0e5fef679b4bccc995e78d6d4b5e62989eedc5b991
-MD5 1fbff418d52d9071993e578e426e54de ChangeLog 4090
-RMD160 6ad51cb8a36bd1ac41f2a8e111d30ce6dca6b1a5 ChangeLog 4090
-SHA256 cc333e5ccebc543d641c2c0e5fef679b4bccc995e78d6d4b5e62989eedc5b991 ChangeLog 4090
+MISC ChangeLog 4289 RMD160 85820a001d906a4259faab61e3ade35b588cef11 SHA1 dd1b028261bab898c90e3a166f75e6ad5a6ce882 SHA256 ea49e0dcdd5279cc6711840f77655562d419973454488b1a75ed2c83ec7ca5ff
+MD5 46ff5c179dc7c1b1771dfe3128730fff ChangeLog 4289
+RMD160 85820a001d906a4259faab61e3ade35b588cef11 ChangeLog 4289
+SHA256 ea49e0dcdd5279cc6711840f77655562d419973454488b1a75ed2c83ec7ca5ff ChangeLog 4289
 MISC metadata.xml 249 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac SHA1 48461481dfc5a9d1f5b4726a5e9882a2fb966ede SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11
 MD5 5c2a70625109d5bd093ae8d0588931f1 metadata.xml 249
 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac metadata.xml 249
@@ -46,13 +52,9 @@ SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11 metadata
 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 e5806b2cf3463e6ad9dea9d6c6495437 files/digest-lcd4linux-0.10.1_rc1 262
+RMD160 9ed778410d176b1deaa2a6f830f1d54959475bd7 files/digest-lcd4linux-0.10.1_rc1 262
+SHA256 12a8983a28803669b022944aedc4a920a83b0a44415916a35af124dc943218a6 files/digest-lcd4linux-0.10.1_rc1 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)
-
-iD8DBQFF2NsoyZx3L/ph1soRAscEAJ0YG7e9LqRmFysligVKTCLtAcilOACgmLS1
-OuqEoJzvDeXUf/iiHvAKYeM=
-=JnqZ
------END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc1 b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc1
new file mode 100644
index 000000000000..d615233dda57
--- /dev/null
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.1_rc1
@@ -0,0 +1,3 @@
+MD5 dbc53fc94ae725ca5944b7a94ed52f8b lcd4linux-0.10.1-RC1.tar.gz 341984
+RMD160 8b720f91dd63bfba7dc53a4eabb1151fdd879785 lcd4linux-0.10.1-RC1.tar.gz 341984
+SHA256 e52b3128b5cbde436309dd5a7392f47509310aa353f68fe5e0bd0aaef9b0ee6a lcd4linux-0.10.1-RC1.tar.gz 341984
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc1.initd b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc1.initd
new file mode 100644
index 000000000000..bea426839471
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc1.initd
@@ -0,0 +1,23 @@
+#!/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.1_rc1.initd,v 1.1 2007/02/24 23:20:16 rbu Exp $
+
+PIDFILE=/var/run/lcd4linux.pid
+DAEMON=/usr/bin/lcd4linux
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting lcd4linux"
+	start-stop-daemon --start --quiet --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.1_rc1.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc1.ebuild
new file mode 100644
index 000000000000..9081af4f14de
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc1.ebuild
@@ -0,0 +1,168 @@
+# 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_rc1.ebuild,v 1.1 2007/02/24 23:20:16 rbu Exp $
+
+inherit eutils multilib
+
+MY_P=${P/_rc/-RC}
+
+DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
+HOMEPAGE="http://ssl.bulix.org/projects/${PN}"
+SRC_URI="http://ssl.bulix.org/projects/lcd4linux/attachment/wiki/Download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="mysql python iconv mpd"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
+		ea232 g15 hd44780 hd44780i2c lcd2usb
+		lcdlinux lcdterm ledmatrix lph7508 m50530
+		mtxorb milfordbpk noritake null picolcd
+		png ppm routerboard serdisplib simplelcd
+		t6963 trefon usbhub usblcd wincor
+		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 )
+	python? ( dev-lang/python )
+	iconv?  ( virtual/libiconv )
+	mpd?    ( media-libs/libmpd )
+
+	lcd_devices_bwct?     ( dev-libs/libusb )
+	lcd_devices_g15?      ( dev-libs/libusb )
+	lcd_devices_lcd2usb?  ( dev-libs/libusb )
+	lcd_devices_picolcd?  ( dev-libs/libusb )
+	lcd_devices_trefon?   ( dev-libs/libusb )
+	lcd_devices_usbhub?   ( 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 )"
+
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	echo
+	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 file ic_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
+	echo
+}
+
+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
+		EA232graphic G15 HD44780 HD44780-I2C LCD2USB
+		LCDLinux LCDTerm LEDMatrix LPH7508 M50530
+		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.
+
+	local myconf myp
+
+	# plugins
+	if [ -n "$LCD4LINUX_PLUGINS" ]; then
+		myp="$LCD4LINUX_PLUGINS"
+	else
+		myp="all"
+	fi
+	use iconv || myp="${myp},!iconv"
+	use mpd || myp="${myp},!mpd"
+	use mysql || myp="${myp},!mysql"
+	use python || myp="${myp},!python"
+	elog "Active plugins: ${myp}"
+
+	# 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
+
+	# workaround the build failing because of b0rked settings
+	if use lcd_devices_hd44780 && use lcd_devices_hd44780i2c ; then
+		echo
+		ewarn "Disabling hd44780 LCD_DEVICE as hd44780i2c is set!"
+		echo
+		COMMA_DRIVERS="${COMMA_DRIVERS},!HD44780"
+	fi
+
+	# avoid package brokenness
+	if use lcd_devices_X ; then
+		myconf="--x-libraries=/usr/$(get_libdir) --x-include=/usr/include"
+	else
+		myconf="--without-x"
+	fi
+
+	econf \
+		--sysconfdir=/etc/lcd4linux \
+		--with-drivers="${COMMA_DRIVERS}" \
+		--with-plugins="${myp}" \
+		$(use_with python) \
+		${myconf} \
+		|| die "econf failed"
+
+	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc README 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
+		echo
+		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"
+		echo
+	fi
+	ewarn "If you are upgrading, please note that the default config file was moved to /etc/lcd4linux.conf"
+}