Migrate to generation 2 and make this compile again. Thanks to Mike Smith <mas3f@alumni.virginia.edu>.

Package-Manager: portage-2.1.2.3

5 files changed, 111 insertions, 9 deletions

diff --git a/dev-java/jjtraveler/ChangeLog b/dev-java/jjtraveler/ChangeLog
index 615f2cc9256d..a1ae015bf4fa 100644
--- a/dev-java/jjtraveler/ChangeLog
+++ b/dev-java/jjtraveler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jjtraveler
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jjtraveler/ChangeLog,v 1.8 2007/02/09 02:08:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jjtraveler/ChangeLog,v 1.9 2007/04/02 08:42:40 betelgeuse Exp $
+
+*jjtraveler-0.4.3-r1 (02 Apr 2007)
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.4.3-makefile.am.patch, +jjtraveler-0.4.3-r1.ebuild:
+  Migrate to generation 2 and make this compile again. Thanks to Mike Smith
+  <mas3f@alumni.virginia.edu>.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest
index 535b47dd52d9..a3bc41b9a9e3 100644
--- a/dev-java/jjtraveler/Manifest
+++ b/dev-java/jjtraveler/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.4.3-makefile.am.patch 1050 RMD160 96e29ba8f542c2e4659f66150c232c860b5f84e3 SHA1 3c6bd1e5ea8ad99f98b2a56cb0b2010ce3347e18 SHA256 5fa64fa7cddc2bb924d8f7e3aecffa1fa9b8e674cf245145a6c10fb7c5eeee82
+MD5 8e096af270cce1d28454b2137b02e6b0 files/0.4.3-makefile.am.patch 1050
+RMD160 96e29ba8f542c2e4659f66150c232c860b5f84e3 files/0.4.3-makefile.am.patch 1050
+SHA256 5fa64fa7cddc2bb924d8f7e3aecffa1fa9b8e674cf245145a6c10fb7c5eeee82 files/0.4.3-makefile.am.patch 1050
 DIST JJTraveler-0.4.3.tar.gz 219594 RMD160 574b02f18fa71fd8aab90ef3083e3f9f4ccfe365 SHA1 75b7600b7aa6fa1acb5b5f425eb55ea280d0b6b4 SHA256 e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0
+EBUILD jjtraveler-0.4.3-r1.ebuild 1437 RMD160 600d60fc4a6847ff58ade9c738091ee0298c9c9c SHA1 478681b307f4dd14dc14b3535d4200f494386057 SHA256 cd47e94bb5231ab64f204b35c1b58708ab1201469c6e9617f4d0c1db0ba1aa4a
+MD5 86e49118eab77e0c7f7eba45e2fb6dd6 jjtraveler-0.4.3-r1.ebuild 1437
+RMD160 600d60fc4a6847ff58ade9c738091ee0298c9c9c jjtraveler-0.4.3-r1.ebuild 1437
+SHA256 cd47e94bb5231ab64f204b35c1b58708ab1201469c6e9617f4d0c1db0ba1aa4a jjtraveler-0.4.3-r1.ebuild 1437
 EBUILD jjtraveler-0.4.3.ebuild 890 RMD160 fb487832fd4038be02012b0967fd9817f26eaf4c SHA1 8a353ac168fa8fc863de311446e3095c39b47f04 SHA256 1a4a023b85d795bc5ae5e935d5fea6ef62dfa2909f3dd9d0caecb64b8c552b62
 MD5 b31ec2a5d0cd760ba59474e7f6fa79b8 jjtraveler-0.4.3.ebuild 890
 RMD160 fb487832fd4038be02012b0967fd9817f26eaf4c jjtraveler-0.4.3.ebuild 890
 SHA256 1a4a023b85d795bc5ae5e935d5fea6ef62dfa2909f3dd9d0caecb64b8c552b62 jjtraveler-0.4.3.ebuild 890
-MISC ChangeLog 947 RMD160 deb18d566646be7b771905dc76153ccef921911b SHA1 ed50e0a6004e1a37edb104ebaa34b85b28746d63 SHA256 2aa14a1e354d1687bf9135b23a2d0db493db2fddff6b4a926ebf716419a08120
-MD5 1d057f1e32498693bbb9780bf802f61b ChangeLog 947
-RMD160 deb18d566646be7b771905dc76153ccef921911b ChangeLog 947
-SHA256 2aa14a1e354d1687bf9135b23a2d0db493db2fddff6b4a926ebf716419a08120 ChangeLog 947
+MISC ChangeLog 1208 RMD160 6caad15b2307e917d76fb6401244d678811f584f SHA1 dca8cc919bc34385e7fd952c2469c78bafb6278d SHA256 34f35775a927ae2badd9e6af29f5429f0f72d4239675ba8b175146ff0a859a4b
+MD5 076776eae4084c617fbc7508bef1947f ChangeLog 1208
+RMD160 6caad15b2307e917d76fb6401244d678811f584f ChangeLog 1208
+SHA256 34f35775a927ae2badd9e6af29f5429f0f72d4239675ba8b175146ff0a859a4b ChangeLog 1208
 MISC metadata.xml 249 RMD160 6db6fd6b5ca57ed91f5a71e9180ada0d4819ca9e SHA1 93b00bce95b25a4482d86a46e3966e3bea094355 SHA256 9cfeefb8b80bfdaaa52a743f733c96055f2364e09e30db30585c5a325b61463f
 MD5 7e8fc34441612f3c9026431a35dc23e0 metadata.xml 249
 RMD160 6db6fd6b5ca57ed91f5a71e9180ada0d4819ca9e metadata.xml 249
@@ -17,10 +25,13 @@ SHA256 9cfeefb8b80bfdaaa52a743f733c96055f2364e09e30db30585c5a325b61463f metadata
 MD5 d0ba5081f14f9e6fafe6742e6adce3ba files/digest-jjtraveler-0.4.3 250
 RMD160 15f8c5cc6faae35a25fadadddfd2f3d9ae7fcd70 files/digest-jjtraveler-0.4.3 250
 SHA256 f4f4872e3ad31cbf80e6afc71b3a953c22efca25beba2c979193cedb9fa67798 files/digest-jjtraveler-0.4.3 250
+MD5 d0ba5081f14f9e6fafe6742e6adce3ba files/digest-jjtraveler-0.4.3-r1 250
+RMD160 15f8c5cc6faae35a25fadadddfd2f3d9ae7fcd70 files/digest-jjtraveler-0.4.3-r1 250
+SHA256 f4f4872e3ad31cbf80e6afc71b3a953c22efca25beba2c979193cedb9fa67798 files/digest-jjtraveler-0.4.3-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFy9eWAiZjviIA2XgRAiXLAKCobOZACso3oQ5ktDyRQzPLZ/WpPwCeM8FA
-2OclGeO7r4eXVJvME2HI/1Q=
-=drj/
+iD8DBQFGEMIKcxLzpIGCsLQRAoWOAJ0cNSIYGiFMdSvQtmoljXJZ+M4kWQCfTT4J
+J/Agc6XBDTki1Iz4eKc3GV0=
+=fBgE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
new file mode 100644
index 000000000000..a15e304df8c4
--- /dev/null
+++ b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
@@ -0,0 +1,20 @@
+diff -ru JJTraveler-0.4.3-vanilla/Makefile.am JJTraveler-0.4.3-patched/Makefile.am
+--- JJTraveler-0.4.3-vanilla/Makefile.am	2004-04-14 08:55:45.000000000 -0400
++++ JJTraveler-0.4.3-patched/Makefile.am	2007-02-26 09:12:28.000000000 -0500
+@@ -26,5 +26,4 @@
+ noinst_SCRIPTS = ${PACKAGE}-${VERSION}.pkg
+ 
+ ${PACKAGE}-${VERSION}.pkg: ${PACKAGE}.pkg Makefile
+-	sed 's#__VERSION__#${VERSION}#g;\
+-             s#__PACKAGE__#${PACKAGE}#g' < $< > $@
++	sed 's#__VERSION__#${VERSION}#g;s#__PACKAGE__#${PACKAGE}#g' < $< > $@
+diff -ru JJTraveler-0.4.3-vanilla/scripts/Makefile.am JJTraveler-0.4.3-patched/scripts/Makefile.am
+--- JJTraveler-0.4.3-vanilla/scripts/Makefile.am	2004-02-02 10:12:10.000000000 -0500
++++ JJTraveler-0.4.3-patched/scripts/Makefile.am	2007-02-26 09:11:03.000000000 -0500
+@@ -5,5 +5,4 @@
+ EXTRA_DIST = jjtraveler-config.sh.src
+ 
+ % : %.sh.src Makefile
+-	sed 's@__PREFIX__@${prefix}@g;\
+-             s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
++	sed 's@__PREFIX__@${prefix}@g;s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
diff --git a/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r1 b/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r1
new file mode 100644
index 000000000000..b44ddfc571fd
--- /dev/null
+++ b/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r1
@@ -0,0 +1,3 @@
+MD5 35bf801ee61f042513ae88247fe1bf1d JJTraveler-0.4.3.tar.gz 219594
+RMD160 574b02f18fa71fd8aab90ef3083e3f9f4ccfe365 JJTraveler-0.4.3.tar.gz 219594
+SHA256 e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 JJTraveler-0.4.3.tar.gz 219594
diff --git a/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild b/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..4b35bda5eb32
--- /dev/null
+++ b/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild,v 1.1 2007/04/02 08:42:40 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source doc"
+WANT_AUTOMAKE="1.7"
+
+inherit autotools java-pkg-2
+
+DESCRIPTION="A visitor combinator framework for Java"
+HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary"
+MY_P=JJTraveler-${PV}
+SRC_URI="http://www.cwi.nl/projects/MetaEnv/jjtraveler/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="
+	>=virtual/jdk-1.4
+	dev-java/junit"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/junit"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0.4.3-makefile.am.patch"
+	eautomake
+
+	cp "${FILESDIR}/0.4.3-build.xml" "${S}/build.xml" -i || die
+	(
+		echo "#!/bin/sh"
+		echo "java-config -p ${PN}-${SLOT}"
+	) > "${S}/jjtraveler-config"
+
+	rm -v jars/*.jar || die
+	cd jars
+	java-pkg_jar-from junit
+}
+
+src_compile() {
+	econf \
+		--with-javac-flags="$(java-pkg_javac-args)"
+	emake || die "emake failed"
+	if use doc; then
+		cd src/jjtraveler
+		make htmljava.stamp || die "Failed to create javadoc"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar ./src/${P}.jar
+
+	dobin jjtraveler-config || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
+	use source && java-pkg_dosrc src/jjtraveler
+	use doc && java-pkg_dojavadoc src/jjtraveler/doc
+}