Fix building with Autoconf >= 2.65 wrt #298002, thanks to Flameeyes and SpanKY.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 94a24730f020..fe0c941ec3cd 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lcd4linux
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.37 2009/08/17 16:09:34 rbu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.38 2010/03/05 23:26:14 ssuominen Exp $
+
+  05 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  lcd4linux-0.10.1_rc2-r2.ebuild,
+  +files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch:
+  Fix building with Autoconf >= 2.65 wrt #298002, thanks to Flameeyes and
+  SpanKY.
 
   17 Aug 2009; Robert Buchholz <rbu@gentoo.org>
   -files/lcd4linux-0.10.0-gcc4-compat.patch,
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 1f7b8d53cef0..b1fbbd264a64 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,8 +1,9 @@
+AUX lcd4linux-0.10.1_rc2-autoconf-2.65.patch 593 RMD160 7b52b4a0868be11b13bdb468756e025b52c600a8 SHA1 f984b9d8811f3b180962d4fa268d908e3d05a73e SHA256 7aab2efe60f6914da17c30b075ec127e07e4dc815f834c49017723baf02ba2be
 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 5291 RMD160 3dac9c580b20ec64e7db3d65ddcd98634c6ebe1f SHA1 c30e718279b733bcd8af96d2e83cd8cd089140f0 SHA256 08252cb8326018622f956c1258be4ba962d833459031397a8698b5cb539dff2b
-MISC ChangeLog 7146 RMD160 7823c4c6de07a278a5577fcd4855399f0c9c44f5 SHA1 552c65de5df123bca02fc9161004f8168a1346dc SHA256 dee60b4629dadb6f4e93d3167612b0f4968c86604805e919efe4e8e5e0231a2f
+EBUILD lcd4linux-0.10.1_rc2-r2.ebuild 5348 RMD160 a941cb7419498725ea516f33af6c8ffecd7f4b75 SHA1 9063297fa851be4ed525af91cd0af2a235111c79 SHA256 fadb75d3ad928d01364bc7b5d5ef9319976f1dd67c8c8c13a132c3ab173a4615
+MISC ChangeLog 7376 RMD160 4e3063d38c193977a881eaebe1494c2977f01ac9 SHA1 56d793c5249a4ccb234f653b8e63d749c5174428 SHA256 54b9041dc06336fa54017fdd9bc877e2269946ee6ab551d49e35ad13655e4e3f
 MISC metadata.xml 643 RMD160 8aa56b2bc130bbcf2af2a2c145a0f4af75d9326f SHA1 a64de62d03807e81e70138e281645498f14763b5 SHA256 31e29e07063d19571b7d767916921d92cf4482fd060150d4d75a8fc12160c388
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
new file mode 100644
index 000000000000..6b176a6ecf64
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
@@ -0,0 +1,20 @@
+--- ac_python_devel.m4.orig	2010-03-06 01:28:40.000000000 +0200
++++ ac_python_devel.m4	2010-03-06 01:29:47.000000000 +0200
+@@ -68,7 +68,7 @@
+ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+ Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+ to something else than an empty string.
+-])dnl
++])
+ 		else
+ 			AC_MSG_RESULT([skip at user request])
+ 		fi
+@@ -92,7 +92,7 @@
+ If you have it installed, but it isn't the default Python
+ interpreter in your system path, please pass the PYTHON_VERSION 
+ variable to configure. See ``configure --help'' for reference.
+-])dnl
++])
+ 		fi
+ 	fi
+ 
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 b2c516c1c0e8..558921377255 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/08/17 16:09:34 rbu Exp $
+# $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 $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils multilib autotools
@@ -8,7 +8,7 @@ inherit eutils multilib autotools
 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}"
+HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -73,6 +73,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-warnings.patch"
 	epatch "${FILESDIR}/${P}-mpd.patch"
 	epatch "${FILESDIR}/${P}-nordtsc.patch"
+	epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
 
 	eautoreconf
 }