Fix detection of SWIG. Patch by Arfrever. Bug 391903.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 33 insertions, 16 deletions

diff --git a/media-sound/lash/ChangeLog b/media-sound/lash/ChangeLog
index f73e3c507f3e..c1460c20e127 100644
--- a/media-sound/lash/ChangeLog
+++ b/media-sound/lash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lash
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.33 2011/03/29 06:56:34 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.34 2012/03/16 02:37:57 floppym Exp $
+
+  16 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/lash-0.5.4-swig_version_comparison.patch, lash-0.5.4-r1.ebuild:
+  Fix detection of SWIG. Patch by Arfrever. Bug 391903.
 
   29 Mar 2011; Tim Harder <radhermit@gentoo.org> lash-0.5.4-r1.ebuild:
   Use slot dep for gtk+ and remove unnecessary die statement for econf.
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index c73bb3e31f22..ad36bb851a4f 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lash-0.5.4-glibc2.8.patch 337 RMD160 a06ca6ffb2b5e0e7bc8cd0dde2afb963841e663b SHA1 72e1881315df0b04cb650c6282b3d0feaa24aee1 SHA256 f3ae3954e6754b9d2fc43773fb1472f5e64c58188c6fff3517f11f0f75a1f546
+AUX lash-0.5.4-swig_version_comparison.patch 1124 RMD160 2bd67dd3f41227d5a0ec03be25448c8b89d05cf2 SHA1 14aa82d66b54e6b2473c7e759b7f63e332b5581d SHA256 519eef6c47dfc411a6fa54bb2dbb83ca023a4850dcf944504e2f424c954ebfd8
 DIST lash-0.5.4.tar.gz 623469 RMD160 251a20c0597b8ec6fac2a39bab1d18ab5c017f40 SHA1 d8fa24ebef0807c3b0426894d7ecd6229fda28b4 SHA256 105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16
-EBUILD lash-0.5.4-r1.ebuild 1247 RMD160 d31adfa1e5cff21035b6dd2c58c94e85e2c8f437 SHA1 7c1b03ace5677933abda684ed39e300b4da8decf SHA256 dc7f158376825685f46d7d3385bec4f5b0928f7b5d5e4a7cabc9b68fa732629f
-MISC ChangeLog 4503 RMD160 5e6637163caa7ebe12bb0dfb4bab5c8064828ff7 SHA1 e62a88d7b813428af3c84eff929a4c4d98b60ca9 SHA256 f5554c644d08d6bc3c73214dc2fa5a02a26fbb6ab454406190d58c7926fd2357
+EBUILD lash-0.5.4-r1.ebuild 1318 RMD160 bb5dbb174aaa79c7b6f59bd72330871f2483c055 SHA1 3df5c277a343a3d5b9183cba2fa2cb041f84bfce SHA256 f9c271e6d6d788105f8bb6f8e33fb4e17c881b04468fbfb33ecc79f6f25d1494
+MISC ChangeLog 4680 RMD160 3814ecd756c3a723bae790f4abffedacb5d53a9c SHA1 65f336cc149340e9dddd5f04abe31b9afc78be00 SHA256 259150cfae7c96f54c23f88097f85db1d16d4f4d2686504f13e09d0d28063f3e
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNkYKqAAoJEEqz6FtPBkyjJc4H/2PY/hZva8PBvpZUiBAr2pEt
-499V7E5YtGBbbNz2iE3CIPMI2XxBSqVLFNzfAehHoVMw2TTWMAr1FeeBlK6c6QZG
-0Mdm/aap+AbCTaaxnz37VEpx77FJe5QgARhSRNuGrCcetjkzIkNM5To9U/+LvYhe
-SMZDI4tC3CTH+Z3EngxqYeHiVhvy6JsN5KaVHlIpliTYakMzJEqoZZxDWIKDto9f
-qA7OGabxNo0z4EUw3QTT0E0ptwPzCO1cHeASuSpa6OJ/AxMvx5uBhBgwVQZyTwIa
-RaJn00seJhbgGqJb+vA2sTXA6e1/U4nkkaTxo3v4+yJxoif+jOv7issnWcIRuMU=
-=IdOf
+iF4EAREIAAYFAk9ip4sACgkQC77qH+pIQ6QiDAEAreHkg+Rsn6kTP0mKoqS6d+8j
+LRaYI5X+2vQGu5rl9EMA/jlSuWKLX0Vk+MUZsYEPW2fRX+icx1alwjbIRg6tzzQw
+=YgVG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
new file mode 100644
index 000000000000..6dcd4366da7c
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
@@ -0,0 +1,15 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -40,9 +40,9 @@
+                         if test -z "$available_patch" ; then
+                                 [available_patch=0]
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++                        if ! { test $available_major -gt $required_major \
++                                || test $available_major -eq $required_major -a $available_minor -ge $required_minor \
++                                || test $available_major -eq $required_major -a $available_minor -eq $required_minor -a $available_patch -ge $required_patch; } ; then
+                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
+                         else
diff --git a/media-sound/lash/lash-0.5.4-r1.ebuild b/media-sound/lash/lash-0.5.4-r1.ebuild
index d08bba5ecbf5..9fb7110b8e70 100644
--- a/media-sound/lash/lash-0.5.4-r1.ebuild
+++ b/media-sound/lash/lash-0.5.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r1.ebuild,v 1.12 2011/03/29 06:56:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r1.ebuild,v 1.13 2012/03/16 02:37:57 floppym Exp $
 
 EAPI=2
 
-inherit eutils libtool
+inherit autotools eutils
 
 DESCRIPTION="LASH Audio Session Handler"
 HOMEPAGE="http://www.nongnu.org/lash/"
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-glibc2.8.patch"
-	elibtoolize
+	epatch "${FILESDIR}/${P}-swig_version_comparison.patch"
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {