diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-07-22 15:07:01 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-07-22 15:07:01 +0000 |
| commit | ad98dd9280910dd51500c0aee13297b5ef5cf32d (patch) | |
| tree | f0a599bbeee9f2e18d589a8362b3cb46558688e6 /media-sound/jmax | |
| parent | added ipadic license (diff) | |
| download | gentoo-2-ad98dd9280910dd51500c0aee13297b5ef5cf32d.tar.gz gentoo-2-ad98dd9280910dd51500c0aee13297b5ef5cf32d.tar.bz2 gentoo-2-ad98dd9280910dd51500c0aee13297b5ef5cf32d.zip | |
added patch to fix java checking, closes 57691
Diffstat (limited to 'media-sound/jmax')
| -rw-r--r-- | media-sound/jmax/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/jmax/Manifest | 5 | ||||
| -rw-r--r-- | media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch | 11 | ||||
| -rw-r--r-- | media-sound/jmax/jmax-4.1.0.ebuild | 4 |
4 files changed, 22 insertions, 4 deletions
diff --git a/media-sound/jmax/ChangeLog b/media-sound/jmax/ChangeLog index 05fe483cbb42..f4818a30bb77 100644 --- a/media-sound/jmax/ChangeLog +++ b/media-sound/jmax/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/jmax # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.7 2004/07/09 02:38:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.8 2004/07/22 15:07:01 axxo Exp $ + + 22 Jul 2004; Thomas Matthijs <axxo@gentoo.org> + +files/jmax-4.1.0-fix-java-check.patch, jmax-4.1.0.ebuild: + fix java checking 57691 *jmax-4.1.0 (08 Jul 2004) diff --git a/media-sound/jmax/Manifest b/media-sound/jmax/Manifest index 044dec1fb29b..ae0563baf66d 100644 --- a/media-sound/jmax/Manifest +++ b/media-sound/jmax/Manifest @@ -1,7 +1,8 @@ -MD5 e93b35c24944b0148994c3b682e50b99 jmax-4.1.0.ebuild 1580 -MD5 38157855609009ce57d94d78f0856505 ChangeLog 967 +MD5 82e19c59a23cc918560ee6eb7c1a5f34 jmax-4.1.0.ebuild 1641 +MD5 5ab110d943bf8c6e5c6712c3d600106b ChangeLog 1104 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221 MD5 14eb868795e30de75f2f6bcd7a962de3 files/jmax-4.1.0-gcc34.patch 968 MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991 MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651 +MD5 8f583b35738cdfbbaeea6289b3e2f6ff files/jmax-4.1.0-fix-java-check.patch 715 MD5 bc96e130e7d54a74caa5c39641d6e898 files/digest-jmax-4.1.0 125 diff --git a/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch new file mode 100644 index 000000000000..7d0d1f96d589 --- /dev/null +++ b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch @@ -0,0 +1,11 @@ +--- m4/ac_check_java_version.m4.orig 2004-07-22 16:58:54.685070072 +0200 ++++ m4/ac_check_java_version.m4 2004-07-22 16:59:02.856827776 +0200 +@@ -9,7 +9,7 @@ + AC_CACHE_CHECK([if $JAVA version is good], ac_cv_check_java_version, [ + + if AC_TRY_COMMAND($JAVA -version) > /dev/null 2>&1; then +- java_version=`$JAVA -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' ` ++ java_version=`$JAVA -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' | sed 's/-.*//' ` + java_major_version=`echo $java_version | sed 's/\([[0-9]][[0-9]]*\)\..*/\1/'` + java_minor_version=`echo $java_version | sed 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\(\.[[0-9]][[0-9]]*\)*/\1/' | sed 's/_.*//g'` + diff --git a/media-sound/jmax/jmax-4.1.0.ebuild b/media-sound/jmax/jmax-4.1.0.ebuild index 04ab11a23834..088ecc23df9c 100644 --- a/media-sound/jmax/jmax-4.1.0.ebuild +++ b/media-sound/jmax/jmax-4.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.1.0.ebuild,v 1.2 2004/07/14 20:49:16 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.1.0.ebuild,v 1.3 2004/07/22 15:07:01 axxo Exp $ IUSE="alsa jack doc" @@ -33,6 +33,8 @@ src_unpack() { unpack jmax-m4-1.0.tar.bz2 epatch ${FILESDIR}/${P}-otherArch.patch epatch ${FILESDIR}/${P}-gcc34.patch + # fixed 57691 + epatch ${FILESDIR}/${P}-fix-java-check.patch export WANT_AUTOMAKE=1.6 export WANT_AUTOCONF=2.5 |