Fix building w/ GCC 4.1 and clean up ebuild. Bug #152248 by kartebi.

Package-Manager: portage-2.1.2-r14

5 files changed, 71 insertions, 38 deletions

diff --git a/media-sound/jmax/ChangeLog b/media-sound/jmax/ChangeLog
index 9267c3b0ba1b..a0e213e60f41 100644
--- a/media-sound/jmax/ChangeLog
+++ b/media-sound/jmax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/jmax
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.14 2007/01/05 17:33:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.15 2007/03/04 22:29:32 dirtyepic Exp $
+
+  04 Mar 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/jmax-4.1.0-gcc41.patch, +files/jmax-4.1.0-usercflags.patch,
+  jmax-4.1.0.ebuild:
+  Fix building w/ GCC 4.1 and clean up ebuild.  Bug #152248 by kartebi.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> jmax-4.1.0.ebuild:
   Convert to use elog.
diff --git a/media-sound/jmax/Manifest b/media-sound/jmax/Manifest
index 998dad72c786..456abc6f4ba9 100644
--- a/media-sound/jmax/Manifest
+++ b/media-sound/jmax/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jmax-4.0.2-work_with_recent_alsa-lib.patch 991 RMD160 ebae93cce9d54fcb5e7f75e5ac98be8753c96736 SHA1 9ab8194018c9ed19105550ce5e16dc71144faa2e SHA256 9343a1eb6d4d3a85ebcdd404230f33de63e2fbfae0f37b551b948dffec2b76ec
 MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991
 RMD160 ebae93cce9d54fcb5e7f75e5ac98be8753c96736 files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991
@@ -13,20 +10,28 @@ AUX jmax-4.1.0-gcc34.patch 968 RMD160 c4eac6f0309ca9455b20697735c58f0757f9f1f4 S
 MD5 14eb868795e30de75f2f6bcd7a962de3 files/jmax-4.1.0-gcc34.patch 968
 RMD160 c4eac6f0309ca9455b20697735c58f0757f9f1f4 files/jmax-4.1.0-gcc34.patch 968
 SHA256 8069e1a1abbb703a37e96d3564c1119acfa43fd99679a738fbcdf1c3e7053add files/jmax-4.1.0-gcc34.patch 968
+AUX jmax-4.1.0-gcc41.patch 672 RMD160 805fefc46bfbbf4825cff1ca6b5d37147487be2a SHA1 93cfd8897511a323608f59f4448ba5b3fe75ec05 SHA256 fe613c09f3e29604c0dbf1f48c05abb6ef870be0de9b6679e01920bbfd9628c2
+MD5 6fae58d275f96ed00074db0145e2b12e files/jmax-4.1.0-gcc41.patch 672
+RMD160 805fefc46bfbbf4825cff1ca6b5d37147487be2a files/jmax-4.1.0-gcc41.patch 672
+SHA256 fe613c09f3e29604c0dbf1f48c05abb6ef870be0de9b6679e01920bbfd9628c2 files/jmax-4.1.0-gcc41.patch 672
 AUX jmax-4.1.0-otherArch.patch 651 RMD160 cd1df0f8708eb202bd1abe3fa002f9d820024d0b SHA1 be8c73329e9eeb6795ff5e76a5f00c5a1b5234af SHA256 42cd4f8c8694b4718990dc5f5e0a47562a0a962263884c0d4c45d6898d260e3b
 MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651
 RMD160 cd1df0f8708eb202bd1abe3fa002f9d820024d0b files/jmax-4.1.0-otherArch.patch 651
 SHA256 42cd4f8c8694b4718990dc5f5e0a47562a0a962263884c0d4c45d6898d260e3b files/jmax-4.1.0-otherArch.patch 651
+AUX jmax-4.1.0-usercflags.patch 431 RMD160 c67bceea9143c01b2f37c4b8a0d4360f04e3f9bb SHA1 f0f76c02972976a697d416ebc179b6fae084cc5a SHA256 0356c7ea8b35873b7faf03b8fb11ad329f6f13a34468b1335962af1c9fbf9698
+MD5 06664eecf5fc2dc795a35ac565f30fdc files/jmax-4.1.0-usercflags.patch 431
+RMD160 c67bceea9143c01b2f37c4b8a0d4360f04e3f9bb files/jmax-4.1.0-usercflags.patch 431
+SHA256 0356c7ea8b35873b7faf03b8fb11ad329f6f13a34468b1335962af1c9fbf9698 files/jmax-4.1.0-usercflags.patch 431
 DIST jmax-4.1.0.tar.gz 3045368 RMD160 794e3070e2bffab8c02f5f72c146ebb86b53e661 SHA1 8ee91f9a155898be659d50c8f521733f6e3ee643 SHA256 9d0b3bef3f6245891a05f755c9f3b8a126698a4cef61d082e56c8bf4118e9a7e
 DIST jmax-m4-1.0.tar.bz2 7506 RMD160 038b648132663fd72f4dfa4e56b30943b0a8ad39 SHA1 17e68898d05fbab252836bde78c5ac2130628cb6 SHA256 e741581fa95397639c8c4f0b3d220945298dd5fe488a80d011d784936f2f5898
-EBUILD jmax-4.1.0.ebuild 1570 RMD160 10b32d822bdc7c2613a5f46404fc0c564a96f6e6 SHA1 fe2f35017199d9eb7cdac6f96aac757401f11d97 SHA256 1ccfd4fdb61dda0bfd669ac2800dfe8e167ce7f266daa140cff15f68a72dc9dc
-MD5 0662ceeb80fc4fd67b17b901f11b185b jmax-4.1.0.ebuild 1570
-RMD160 10b32d822bdc7c2613a5f46404fc0c564a96f6e6 jmax-4.1.0.ebuild 1570
-SHA256 1ccfd4fdb61dda0bfd669ac2800dfe8e167ce7f266daa140cff15f68a72dc9dc jmax-4.1.0.ebuild 1570
-MISC ChangeLog 1847 RMD160 085716d63abae53ee24ef1470c55335148504fcd SHA1 f23cb1ae7f4e4e9bc69bef4d257f317fbedcba8d SHA256 16c9d4c81cca12016e93b9c5aa98de9362fdb101cb4f87bed80b97ee0330932a
-MD5 9237f733ddc1e8b5b3af694f76cec714 ChangeLog 1847
-RMD160 085716d63abae53ee24ef1470c55335148504fcd ChangeLog 1847
-SHA256 16c9d4c81cca12016e93b9c5aa98de9362fdb101cb4f87bed80b97ee0330932a ChangeLog 1847
+EBUILD jmax-4.1.0.ebuild 1585 RMD160 2f5d6df23fec20f69a34e0df9fc0dbd6519d4705 SHA1 2adcdc726c8d6fe31086117f212ae2ce1181bff2 SHA256 67845be059a80e6ff17ba4c9c23e789070052464c4715df448d5d053dc0a7107
+MD5 d57d6e35c164a7b54460113d18e3966c jmax-4.1.0.ebuild 1585
+RMD160 2f5d6df23fec20f69a34e0df9fc0dbd6519d4705 jmax-4.1.0.ebuild 1585
+SHA256 67845be059a80e6ff17ba4c9c23e789070052464c4715df448d5d053dc0a7107 jmax-4.1.0.ebuild 1585
+MISC ChangeLog 2058 RMD160 106614f91ceb4521316b5d0ce5d4d1ba9a1fc22c SHA1 63f510335e5d61bc5150b9f3d19a1a1bba210f3f SHA256 8597dcb38e930af49cbc4fcdfe051f58cd2beb18a2ffc508838b823c2e7728a6
+MD5 feeb5838dbdacc4e5df0cb5f9b2d8111 ChangeLog 2058
+RMD160 106614f91ceb4521316b5d0ce5d4d1ba9a1fc22c ChangeLog 2058
+SHA256 8597dcb38e930af49cbc4fcdfe051f58cd2beb18a2ffc508838b823c2e7728a6 ChangeLog 2058
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -34,10 +39,3 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 fbd3c0da47829fe560b8152956c86d1d files/digest-jmax-4.1.0 467
 RMD160 75ade236f17347342352a5d6fc4db289b5c61e50 files/digest-jmax-4.1.0 467
 SHA256 71d23fa1d0435d55e1f3998f267ccfddf0451b12d3d0e4906ab70f620839b595 files/digest-jmax-4.1.0 467
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnowHAiZjviIA2XgRAgOkAKC7cmHHTCuwYNLgR+bECUhmb9BS7gCg65Z3
-SGTX6fx1/Dgo/VZONLcH3og=
-=f7Qc
------END PGP SIGNATURE-----
diff --git a/media-sound/jmax/files/jmax-4.1.0-gcc41.patch b/media-sound/jmax/files/jmax-4.1.0-gcc41.patch
new file mode 100644
index 000000000000..5c0b8d63bd66
--- /dev/null
+++ b/media-sound/jmax/files/jmax-4.1.0-gcc41.patch
@@ -0,0 +1,21 @@
+diff -Naur jmax-4.1.0-orig/packages/guiobj/c/src/keyserver.h jmax-4.1.0/packages/guiobj/c/src/keyserver.h
+--- jmax-4.1.0-orig/packages/guiobj/c/src/keyserver.h	2003-07-22 10:10:51.000000000 -0600
++++ jmax-4.1.0/packages/guiobj/c/src/keyserver.h	2007-03-04 15:51:55.000000000 -0600
+@@ -47,7 +47,7 @@
+   n_codes
+ };
+ 
+-extern fts_symbol_t sym_f1;
++/*extern fts_symbol_t sym_f1;
+ extern fts_symbol_t sym_F1;
+ extern fts_symbol_t sym_f2;
+ extern fts_symbol_t sym_F2;
+@@ -77,7 +77,7 @@
+ extern fts_symbol_t sym_shift;
+ extern fts_symbol_t sym_alt;
+ extern fts_symbol_t sym_ctrl;
+-extern fts_symbol_t sym_space;
++extern fts_symbol_t sym_space;*/
+ 
+ typedef struct _listener_
+ {
diff --git a/media-sound/jmax/files/jmax-4.1.0-usercflags.patch b/media-sound/jmax/files/jmax-4.1.0-usercflags.patch
new file mode 100644
index 000000000000..3a965f7fdb15
--- /dev/null
+++ b/media-sound/jmax/files/jmax-4.1.0-usercflags.patch
@@ -0,0 +1,12 @@
+diff -Naur jmax-4.1.0-orig/configure.in jmax-4.1.0/configure.in
+--- jmax-4.1.0-orig/configure.in	2006-12-03 21:09:56.000000000 -0600
++++ jmax-4.1.0/configure.in	2006-12-03 21:11:11.000000000 -0600
+@@ -207,7 +207,7 @@
+ CFLAGS="$CFLAGS -Wall -Wno-unused"
+ if test "$with_debug" != "yes"
+ then
+-  CFLAGS="$CFLAGS -O3 -funroll-loops -fmove-all-movables -fstrict-aliasing"
++  CFLAGS="$CFLAGS"
+ fi
+ if test "$check_memory" = "yes"
+ then
diff --git a/media-sound/jmax/jmax-4.1.0.ebuild b/media-sound/jmax/jmax-4.1.0.ebuild
index 0f143e60784b..e05ffa991841 100644
--- a/media-sound/jmax/jmax-4.1.0.ebuild
+++ b/media-sound/jmax/jmax-4.1.0.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2007 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.8 2007/01/05 17:33:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.1.0.ebuild,v 1.9 2007/03/04 22:29:32 dirtyepic Exp $
 
 WANT_AUTOMAKE="1.4"
 WANT_AUTOCONF="2.5"
 
-IUSE="alsa jack doc"
-
-inherit eutils libtool autotools
+inherit eutils libtool autotools java-pkg-2
 
 DESCRIPTION="jMax is a visual programming environment for building interactive real-time music and multimedia applications."
 HOMEPAGE="http://freesoftware.ircam.fr/rubrique.php3?id_rubrique=2"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	 mirror://gentoo/jmax-m4-1.0.tar.bz2"
+		mirror://gentoo/jmax-m4-1.0.tar.bz2"
 
-SLOT="0"
-LICENSE="GPL-2"
 #-amd64, -sparc: 4.1.0: fts/linux.c has only code for ppc and ix86
-
 KEYWORDS="-amd64 ~ppc -sparc x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="alsa jack"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND="=virtual/jre-1.4*
 	jack? ( media-sound/jack-audio-connection-kit )
 	alsa? ( media-libs/alsa-lib )"
 
 DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	doc? ( app-doc/doxygen )
-	sys-devel/autoconf"
+	=virtual/jdk-1.4*"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -38,28 +35,28 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc34.patch"
 	# fixed 57691
 	epatch "${FILESDIR}/${P}-fix-java-check.patch"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-usercflags.patch"
 
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
 src_compile() {
 	econf \
-		`use_enable jack` || die "econf failed"
+		$(use_enable jack) || die "econf failed"
 	# -j2 fails.  See bug #47978
 	emake -j1 || die "emake failed"
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 
-	dodoc AUTHORS ChangeLog JMAX-VERSION LICENCE.fr LICENSE LISEZMOI README
+	dodoc AUTHORS ChangeLog JMAX-VERSION README
 }
 
-
-
 pkg_postinst() {
 	echo
-	elog "To get started, have a look at the tutorials"
-	elog "in /usr/share/jmax/tutorials/basics"
+	einfo "To get started, have a look at the tutorials"
+	einfo "in /usr/lib/jmax/tutorials/basics"
 	echo
 }