diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-16 02:37:57 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-16 02:37:57 +0000 |
| commit | 83f6e0f5f4d6983499383d82c64966421a84d485 (patch) | |
| tree | e0e477c66f57091a5fa1155926283e819867bfd6 /media-sound | |
| parent | Python-related improvements by Arfrever. Bug 312179. (diff) | |
| download | gentoo-2-83f6e0f5f4d6983499383d82c64966421a84d485.tar.gz gentoo-2-83f6e0f5f4d6983499383d82c64966421a84d485.tar.bz2 gentoo-2-83f6e0f5f4d6983499383d82c64966421a84d485.zip | |
Fix detection of SWIG. Patch by Arfrever. Bug 391903.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/lash/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch | 15 | ||||
| -rw-r--r-- | media-sound/lash/lash-0.5.4-r1.ebuild | 9 |
3 files changed, 26 insertions, 6 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/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() { |