--- lcd4linux.orig/lcd4linux-0.10.1_rc2-r2.ebuild	2010-03-06 07:26:14.000000000 +0800
+++ lcd4linux.orig/lcd4linux-0.10.1_rc2-r2.ebuild	2011-11-23 12:26:04.410869054 +0800
@@ -2,8 +2,9 @@ 
 # 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 $
 
+EAPI="3"
 WANT_AUTOMAKE="1.9"
-inherit eutils multilib autotools
+inherit eutils multilib autotools python
 
 MY_P=${P/_rc/-RC}
 
@@ -39,7 +40,7 @@ 
 	python? ( dev-lang/python )
 	iconv?  ( virtual/libiconv )
 	mpd?    ( media-libs/libmpd )
-
+	python? ( =dev-lang/python-2* )
 	lcd_devices_bwct?     ( =virtual/libusb-0* )
 	lcd_devices_g15?      ( =virtual/libusb-0* )
 	lcd_devices_lcd2usb?  ( =virtual/libusb-0* )
@@ -59,6 +60,7 @@ 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	python_set_active_version 2
 	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:"
@@ -66,19 +68,16 @@ 
 	echo
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+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}/${PN}"-header.patch || die
 	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,7 +152,9 @@ 
 		|| die "econf failed"
 
 	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
+}
 
+src_compile() {
 	emake || die "make failed"
 }
 
--- 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>