Let it work with python3 as main interpreter and include missing header (#311529 by Ian Delaney).

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 39 insertions, 23 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 3c0603cf79a1..36cb77ac2cc3 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.40 2012/05/06 16:01:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.41 2012/05/06 16:24:52 pacho Exp $
+
+  06 May 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/lcd4linux-0.10.1_rc2-missing-header.patch,
+  lcd4linux-0.10.1_rc2-r2.ebuild:
+  Let it work with python3 as main interpreter and include missing header
+  (#311529 by Ian Delaney).
 
   06 May 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   lcd herd is empty, drop old.
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index a6edb75e93cf..fac0725cc9be 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX lcd4linux-0.10.1_rc2-autoconf-2.65.patch 593 RMD160 7b52b4a0868be11b13bdb468756e025b52c600a8 SHA1 f984b9d8811f3b180962d4fa268d908e3d05a73e SHA256 7aab2efe60f6914da17c30b075ec127e07e4dc815f834c49017723baf02ba2be
+AUX lcd4linux-0.10.1_rc2-missing-header.patch 337 RMD160 10a9421ef74972e3fe03ca921421704e714b9cab SHA1 b9c0faf03981080f3c1d72c7eaa846101fc7ec04 SHA256 39dca4b3a224f006c8c5b065d1a51f494b985d73b8a2e04e39fc5b88bc12684d
 AUX lcd4linux-0.10.1_rc2-mpd.patch 9230 RMD160 98e6e7e36d06888566e65e2e12e2fef120520ecb SHA1 ede43c6bb493cf4512628bc6a7d0e3f09da6b092 SHA256 ee1294d4c53086b998f1ff3fa90987b5a58baa589850b77edab755ef836b1583
 AUX lcd4linux-0.10.1_rc2-nordtsc.patch 4703 RMD160 cdb4affb7d3ded92a7879e1cdbcdacd6bd9cfd39 SHA1 18627aa1b136649c03b0837c7b1e1aa967192b02 SHA256 f0520872c820003e78f90304c0e36511e53d11cf67732eb4debb44cc68697e34
 AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 RMD160 e344704288d650d5ef7f334fb3ce2d3a5029e334 SHA1 fb4c9bba8b854e2d2a53ae222e6e2c554ec12ac8 SHA256 8960a45af139e2f2d226474c9d5f099ca70605bb72815b03d9ad72222be7b8d5
 AUX lcd4linux-0.10.1_rc2.initd 661 RMD160 e5b51ce6bb1e750d4480d564b04f7c3c50b060c3 SHA1 672b36d6593f7d9f586db0e55d4310ef6fa7ed3d SHA256 87351cb7d48cfbbf94da3432113debd5a74c5c87802c39af64b2fe61eb7f79b1
 DIST lcd4linux-0.10.1-RC2.tar.gz 386188 RMD160 5f4465d20c26e43aea79150cad00141d63bb784d SHA1 90b6e6dbebc545c027ad0b97f74c2813357c1a4b SHA256 9e69ded08dc9a8c75f36a3c020e7aa96b90313d91b2f58add6d4dfff1f8861b0
-EBUILD lcd4linux-0.10.1_rc2-r2.ebuild 5348 RMD160 a941cb7419498725ea516f33af6c8ffecd7f4b75 SHA1 9063297fa851be4ed525af91cd0af2a235111c79 SHA256 fadb75d3ad928d01364bc7b5d5ef9319976f1dd67c8c8c13a132c3ab173a4615
-MISC ChangeLog 7571 RMD160 6444ed050dbd4e1079468e4c291c9aefff1111f7 SHA1 08ae0fa60eeaa1324c5c863f28bab2b83fd43a5d SHA256 d4d355f2e438d9842b67d3f2af1f25b44966d19500c2e262110e5eeee66772f4
+EBUILD lcd4linux-0.10.1_rc2-r2.ebuild 5371 RMD160 991305dc801151089e9ccdbb056ec40474d3b378 SHA1 eb61643c26ea673a60dd20206414bc25cbf7f066 SHA256 18a50db938f8cebf1718b52753a5759ab2440693acc968d9aace54b117ba420c
+MISC ChangeLog 7806 RMD160 dbb7a5cf977e4a753d32ad332df02b74460b29d8 SHA1 6cfb62f40d02b76584ab18d52e19681ce1b38ae3 SHA256 e3e84fb4f10696d6f2014daf8cfd10ee96ac5719704383c31bc1ca9123b121eb
 MISC metadata.xml 624 RMD160 5512daac22c603d93bee7468a625f18e8d6ea1c7 SHA1 9a76395edb8b36f1a2e4d0b0a09aa82b8e509c01 SHA256 b981cbe0a700004dce47db8ebdd349639259f716cda9d8becc737288f4ff5c47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+moFYACgkQCaWpQKGI+9QdFgCfXMUwsvoxzQzRdQMLQhbY4T9z
-zSYAn1LV1n/BzPMsf0yYwkzbQ7eT1ma+
-=Aov+
+iEYEARECAAYFAk+mpdoACgkQCaWpQKGI+9QvngCfU+VScGFjOOmPvOHxrcp69vFU
+mo4AnAwoLBFGe1A9L/W0VPOtfWhkx6ff
+=elSk
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
new file mode 100644
index 000000000000..6b38dc038c4a
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
@@ -0,0 +1,12 @@
+diff -ur lcd4linux-0.10.1-RC2.orig/lcd4linux.c  lcd4linux-0.10.1-RC2/lcdinux-0.10.1-RC2/lcd4linux.c
+--- lcd4linux.c	2007-03-22 15:10:41.000000000 +0900
++++ lcd4linux.c	2011-11-23 12:12:03.782869315 +0800
+@@ -26,7 +26,7 @@
+  */
+ 
+ #include "config.h"
+-
++#include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
index 558921377255..4ab5a78212e8 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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-r2.ebuild,v 1.8 2010/03/05 23:26:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild,v 1.9 2012/05/06 16:24:52 pacho Exp $
 
+EAPI=4
+PYTHON_DEPEND="python? 2"
 WANT_AUTOMAKE="1.9"
-inherit eutils multilib autotools
+inherit eutils multilib autotools python
 
 MY_P=${P/_rc/-RC}
 
@@ -36,7 +38,6 @@ done
 
 DEPEND="
 	mysql?  ( virtual/mysql )
-	python? ( dev-lang/python )
 	iconv?  ( virtual/libiconv )
 	mpd?    ( media-libs/libmpd )
 
@@ -59,26 +60,26 @@ RDEPEND="${DEPEND}"
 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 i2c_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
-	echo
-}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-warnings.patch"
 	epatch "${FILESDIR}/${P}-mpd.patch"
 	epatch "${FILESDIR}/${P}-nordtsc.patch"
 	epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
-
+	epatch "${FILESDIR}/${P}-missing-header.patch"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# 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
@@ -153,12 +154,10 @@ src_compile() {
 		|| 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"
+	emake DESTDIR="${D}" install
 
 	dodoc README ChangeLog
 
@@ -171,11 +170,9 @@ src_install() {
 
 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"
 }