Fix for the GTK M4 macro checking gtk:1, thanks Alex Belykh, bug #353785

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

4 files changed, 29 insertions, 7 deletions

diff --git a/sci-physics/lightspeed/ChangeLog b/sci-physics/lightspeed/ChangeLog
index 972946e9dcb4..e6bb8af7ce90 100644
--- a/sci-physics/lightspeed/ChangeLog
+++ b/sci-physics/lightspeed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/lightspeed
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.16 2011/03/06 09:34:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.17 2011/04/07 18:37:15 bicatali Exp $
+
+  07 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  lightspeed-1.2a-r1.ebuild, +files/lightspeed-1.2a-autoconf.patch:
+  Fix for the GTK M4 macro checking gtk:1, thanks Alex Belykh, bug #353785
 
   06 Mar 2011; Justin Lecher <jlec@gentoo.org> lightspeed-1.2a-r1.ebuild:
   Correct Slots for gtk 3 introduction to tree
diff --git a/sci-physics/lightspeed/Manifest b/sci-physics/lightspeed/Manifest
index 6db2953b94f1..1de2c0dd99f4 100644
--- a/sci-physics/lightspeed/Manifest
+++ b/sci-physics/lightspeed/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lightspeed-1.2a-autoconf.patch 592 RMD160 0f43123b22d4ba56146b8178a32a0ba28170781e SHA1 a25f52aba6ee865b584ed8df33a64565f50a7f84 SHA256 035dba75084fcc884146fe7e60e226d6f5daa2b63e3a1ece9d6ee79f45ca4e69
 DIST lightspeed-1.2a.tar.gz 163764 RMD160 8d52ec115db8d27ebe501df7fff11447750d1f6e SHA1 767ac436fa8b93cf8937045e336b555d91e3bdef SHA256 a8752acce625436b699b4d3c1ab479bd4116673784f17e527a3e37374abc4f4b
 DIST lightspeed_1.2a-7.diff.gz 379281 RMD160 1713bff69c3cbf19a4d80ae1025834f2c6f5f93b SHA1 bf4cbfce1eed74efc5bdf0f3d246fa57225d2056 SHA256 1cbc562d1ad10afb9598510537cd64fdbbb1f9bd12ac27c5180a668bbc548a58
 DIST objects-1.tar.gz 767805 RMD160 874b6f72a4e94789df62d40e63d89aeb0741d71b SHA1 9bf2d48cfce77d7f2c882ce341b38a09daef8cb4 SHA256 dd82324796b9f114c652220d069b131321a129ea41ef99cc0b8cbdf8c666bf5b
-EBUILD lightspeed-1.2a-r1.ebuild 1731 RMD160 ef0cb99516ac80675a28eb003fa4fb99a65cf559 SHA1 11a4e1ade628d9eea187ddacaa5ca9acce2c9e75 SHA256 d6159bdcb114ed3c3e355fd7b2e65da605f5e81ceb2e04bce7f4a0c318a627a0
-MISC ChangeLog 2930 RMD160 8508ed1e86b2ccaecdf8b3bb8c4731f82bc89728 SHA1 647f0612cae4574cc116abd4bcc7dc60d151e1d1 SHA256 81a579600c81613cc252c218a79bfae9f79155d92e3a7940bb0b40ce50800a83
+EBUILD lightspeed-1.2a-r1.ebuild 1777 RMD160 44b152766bacb9b5aa53997437856a0a002b195b SHA1 96d19d0420e6e5b46ce6153df358596007e04793 SHA256 76942adec2a1dfb245b418c3977dcc02f5cdb58759aabd76a2ee4fe66981e4f7
+MISC ChangeLog 3133 RMD160 f424c6404001504e16f20ccbae5c8f5c98e7d34c SHA1 c7e7b8c87589084a134b45c30d4220dc29024521 SHA256 da779c4082ee8f98f41dc8431ea68626839abd4ef67bd5f6c6a75c90c2e897b3
 MISC metadata.xml 574 RMD160 791e0a30267ad4a83fcd69b74105f213cb2163e1 SHA1 244bfeaf9c3c6d20f46863daeb0a0d36447a0187 SHA256 d516b42c066a9178bd30efc879c12d371dd8fdaa54dcf83ecf8a58c8d6dcb0dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1zVTEACgkQgAnW8HDreRavpwCfSNSHuQCXq9SkI1ZPz9TD0tVL
-A3UAn1Cq30PcIeQejk+XB0xJnc0mrxx/
-=6QMo
+iEYEARECAAYFAk2eBGUACgkQ1ycZbhPLE2Cl+QCgq5qy+isH6Qy+heX44r0iWB9D
+XrkAmwb9GLrQx7opwDWWWeH6RWrhmrqk
+=CdgU
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/lightspeed/files/lightspeed-1.2a-autoconf.patch b/sci-physics/lightspeed/files/lightspeed-1.2a-autoconf.patch
new file mode 100644
index 000000000000..c6b2f9fda711
--- /dev/null
+++ b/sci-physics/lightspeed/files/lightspeed-1.2a-autoconf.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.in b/configure.in
+index 1cfbcba..5363c05 100644
+--- a/configure.in
++++ b/configure.in
+@@ -54,9 +54,8 @@ if test "x$with_gtk" != "x1" -a "$gtkmorph_gtk" = ""  ; then
+   AC_MSG_NOTICE([ Testing for GTK 2 skipped])
+ fi
+ if test "x$with_gtk" != "x2"  -a "$version_of_gtk" = "" ; then
+-  AM_PATH_GTK(1.0.1, , [AC_MSG_ERROR([Cannot find proper GTK+ version])])
+-  version_of_gtk=gtk1
+-  AC_DEFINE(HAVE_GTK1,1,"compiled with GTK 1 and GtkGLArea ")
++  AC_MSG_ERROR([Cannot find proper GTK+ version])
++  exit 1
+ fi
+ 
+ AM_CONDITIONAL(COND_GTK1, test "$version_of_gtk" = "gtk1" )
diff --git a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
index e520c49cce48..4ea83e1f16ab 100644
--- a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
+++ b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.11 2011/03/06 09:34:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.12 2011/04/07 18:37:15 bicatali Exp $
 
 EAPI=2
 
@@ -40,6 +40,7 @@ S2="${WORKDIR}/objects"
 
 src_prepare() {
 	epatch "${WORKDIR}/${DEB_PATCH}.diff"
+	epatch "${FILESDIR}"/${P}-autoconf.patch
 	eautoreconf
 }