Current portage state

svn path=/trunk/; revision=88

4 files changed, 199 insertions, 0 deletions

diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
new file mode 100644
index 0000000..2cd60f5
--- /dev/null
+++ b/app-misc/lcd4linux/Manifest
@@ -0,0 +1,12 @@
+AUX lcd4linux-0.10.0-gcc4-compat.patch 2340 RMD160 950c6136274023768254a2c4f99eb81ad3151052 SHA1 458de2a09d4a7d0e4caa7a88d6af43d2cc6b3e8d SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3
+MD5 14eda3a02aa51ce2db5e016cc565a7a3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
+RMD160 950c6136274023768254a2c4f99eb81ad3151052 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
+SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
+DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
+EBUILD lcd4linux-0.10.0.ebuild 2860 RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b SHA1 67d8edcd3a92d42f20c04fe0e740681f8c24a701 SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495
+MD5 fe42a836ba0a86165098c0093c25f4c9 lcd4linux-0.10.0.ebuild 2860
+RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b lcd4linux-0.10.0.ebuild 2860
+SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495 lcd4linux-0.10.0.ebuild 2860
+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
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0 b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0
new file mode 100644
index 0000000..de6c25a
--- /dev/null
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.10.0
@@ -0,0 +1,3 @@
+MD5 b7fb1c24b940482cd730cf212d1b5062 lcd4linux-0.10.0.tar.gz 294851
+RMD160 98f810297de3d746d559998516b83a2939fc8568 lcd4linux-0.10.0.tar.gz 294851
+SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909 lcd4linux-0.10.0.tar.gz 294851
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
new file mode 100644
index 0000000..f5e3f6c
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
@@ -0,0 +1,68 @@
+GCC4 fixes, see bug #147388.
+Patch from upstream SVN
+
+--- /trunk/drv_SimpleLCD.c (revision 547)
++++ /trunk/drv_SimpleLCD.c (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
++/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
+  * 
+  * driver for a simple serial terminal.
+@@ -23,4 +23,7 @@
+  *
+  * $Log: lcd4linux-0.10.0-gcc4-compat.patch,v $
+  * Revision 1.1  2006/12/06 11:31:16  jokey
+  * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update
+  * (Portage version: 2.1.2_rc2-r5)
+  *
++ * Revision 1.5  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.4  2005/05/08 04:32:44  reinelt
+  * CodingStyle added and applied
+@@ -199,4 +202,5 @@
+ {
+     int rows = -1, cols = -1;
++    int value;
+     unsigned int flags = 0;
+     char *s;
+@@ -210,7 +214,8 @@
+     }
+ 
+-    cfg_number(section, "BarCharValue", 0, 0, 255, &flags);
+-    bar_char = flags;
+-    cfg_number(section, "Options", 0, 0, 0xffff, &flags);
++    cfg_number(section, "BarCharValue", 0, 0, 255, &value);
++    bar_char = value;
++    cfg_number(section, "Options", 0, 0, 0xffff, &value);
++    flags = value;
+     if (drv_generic_serial_open(section, Name, flags) < 0)
+ 	return -1;
+Index: /trunk/lcd4linux_i2c.h
+===================================================================
+--- /trunk/lcd4linux_i2c.h (revision 562)
++++ /trunk/lcd4linux_i2c.h (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
++/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
+  *
+  * user space i2c sturctures and defines, taken from the official kernel i2c 
+@@ -33,4 +33,7 @@
+  *
+  * $Log: lcd4linux-0.10.0-gcc4-compat.patch,v $
+  * Revision 1.1  2006/12/06 11:31:16  jokey
+  * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update
+  * (Portage version: 2.1.2_rc2-r5)
+  *
++ * Revision 1.3  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.2  2005/06/01 12:09:13  reinelt
+  * removed ^M from lcd4linux_i2c.h; indent.sh run
+@@ -79,5 +82,5 @@
+ /* Transfer num messages.
+  */
+-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num);
++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num);
+ 
+ /*
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
new file mode 100644
index 0000000..f6318cb
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 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.5 2006/12/06 11:31:16 jokey 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 X usb mysql python"
+
+DEPEND="png? ( media-libs/libpng
+	media-libs/gd )
+	X? ( x11-libs/libX11 )
+	usb? ( dev-libs/libusb )
+	mysql? ( virtual/mysql )"
+#		python? ( dev-lang/python )
+# mpd is needed soon
+# python is broken
+
+pkg_preinst() {
+	einfo "If you wish to compile only specific drivers or plugins, please use"
+	einfo "the LCD4LINUX_PLUGINS and LCD4LINUX_DRIVERS environment variables."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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"
+		einfo "Active plugins (overridden): ${myp}"
+	else
+		myp="all"
+		use mysql || myp="${myp},!mysql"
+		#use python || myp="${myp},!python"
+		myp="${myp},!python"
+		einfo "Active plugins: ${myp}"
+	fi
+
+	# drivers
+	if [ -n "$LCD4LINUX_DRIVERS" ]; then
+		myd="$LCD4LINUX_DRIVERS"
+		einfo "Active drivers (overridden): ${myd}"
+	else
+		myd="all"
+		use usb || myd="${myd},!USBLCD"
+		use png || myd="${myd},!PNG"
+		use X || myd="${myd},!X11"
+		einfo "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
+}
+