Fix the installed jjtraveler-config script.

Package-Manager: portage-2.1.2.3

5 files changed, 90 insertions, 14 deletions

diff --git a/dev-java/jjtraveler/ChangeLog b/dev-java/jjtraveler/ChangeLog
index dfdcc301bb69..8a1961d1c331 100644
--- a/dev-java/jjtraveler/ChangeLog
+++ b/dev-java/jjtraveler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2007/04/03 07:45:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jjtraveler/ChangeLog,v 1.11 2007/04/05 15:38:16 betelgeuse Exp $
+
+*jjtraveler-0.4.3-r2 (05 Apr 2007)
+
+  05 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jjtraveler-0.4.3-r1.ebuild, +jjtraveler-0.4.3-r2.ebuild:
+  Fix the installed jjtraveler-config script.
 
   03 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   jjtraveler-0.4.3-r1.ebuild:
diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest
index cbe98dbfc78d..da3120e680a1 100644
--- a/dev-java/jjtraveler/Manifest
+++ b/dev-java/jjtraveler/Manifest
@@ -6,18 +6,22 @@ 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 1376 RMD160 42ede5d97160a2be9b56fe8b11e6430864de2cb9 SHA1 c837a7e19d801e46af35e25046f1d3492731a984 SHA256 17e1009ef5466d9266ade61f0f6c8b4d59b68e5488533aa37828f0524d3d3eb1
-MD5 5751da0b2a02185fc6f2cedb8c0431ce jjtraveler-0.4.3-r1.ebuild 1376
-RMD160 42ede5d97160a2be9b56fe8b11e6430864de2cb9 jjtraveler-0.4.3-r1.ebuild 1376
-SHA256 17e1009ef5466d9266ade61f0f6c8b4d59b68e5488533aa37828f0524d3d3eb1 jjtraveler-0.4.3-r1.ebuild 1376
+EBUILD jjtraveler-0.4.3-r1.ebuild 1368 RMD160 27396854617fa2535ba781592e47e671c2b222b8 SHA1 c0f313bbc1c017b1f1746ab69a6a7f3bccf48d7e SHA256 189bb72ab47a4286a340064277d3c7cded7f46514b4bde013dec2b2158f077f0
+MD5 96cb8d9ec2a3984978568932fbe0711d jjtraveler-0.4.3-r1.ebuild 1368
+RMD160 27396854617fa2535ba781592e47e671c2b222b8 jjtraveler-0.4.3-r1.ebuild 1368
+SHA256 189bb72ab47a4286a340064277d3c7cded7f46514b4bde013dec2b2158f077f0 jjtraveler-0.4.3-r1.ebuild 1368
+EBUILD jjtraveler-0.4.3-r2.ebuild 1368 RMD160 ff4155940accdb3794f24824f9034be27637357f SHA1 97a275695410e435e654e5dd0e45e81da22b77e1 SHA256 8d02391a9e56207e4897e64fd86ab9b3ac3d1d69de731aca806c3fe113b02127
+MD5 1591bde5a379efdf34848eab51d6e4fd jjtraveler-0.4.3-r2.ebuild 1368
+RMD160 ff4155940accdb3794f24824f9034be27637357f jjtraveler-0.4.3-r2.ebuild 1368
+SHA256 8d02391a9e56207e4897e64fd86ab9b3ac3d1d69de731aca806c3fe113b02127 jjtraveler-0.4.3-r2.ebuild 1368
 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 1347 RMD160 69910e9f3168a6dd828943730fd7b78eb2664392 SHA1 280b4250df562affff1d314657010cc516586167 SHA256 9ad7e1d7ffe2a3c92fb3d9388b2c5259d1effc9e054e4c131150edec837442a6
-MD5 c4ef6eefff3414f273c3de37d35a9a8c ChangeLog 1347
-RMD160 69910e9f3168a6dd828943730fd7b78eb2664392 ChangeLog 1347
-SHA256 9ad7e1d7ffe2a3c92fb3d9388b2c5259d1effc9e054e4c131150edec837442a6 ChangeLog 1347
+MISC ChangeLog 1542 RMD160 64de2ddfc34ac8f7aa1b628c2b66ade78622922a SHA1 658792166869567cc6f2855dd178e73af77fdade SHA256 75353cfde5738da226fef40d117e77af587db1f86852d7a8a396a6b52ba40417
+MD5 4ae7f24d8b2e43157007f6a2b10a1caf ChangeLog 1542
+RMD160 64de2ddfc34ac8f7aa1b628c2b66ade78622922a ChangeLog 1542
+SHA256 75353cfde5738da226fef40d117e77af587db1f86852d7a8a396a6b52ba40417 ChangeLog 1542
 MISC metadata.xml 249 RMD160 6db6fd6b5ca57ed91f5a71e9180ada0d4819ca9e SHA1 93b00bce95b25a4482d86a46e3966e3bea094355 SHA256 9cfeefb8b80bfdaaa52a743f733c96055f2364e09e30db30585c5a325b61463f
 MD5 7e8fc34441612f3c9026431a35dc23e0 metadata.xml 249
 RMD160 6db6fd6b5ca57ed91f5a71e9180ada0d4819ca9e metadata.xml 249
@@ -28,10 +32,13 @@ SHA256 f4f4872e3ad31cbf80e6afc71b3a953c22efca25beba2c979193cedb9fa67798 files/di
 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
+MD5 d0ba5081f14f9e6fafe6742e6adce3ba files/digest-jjtraveler-0.4.3-r2 250
+RMD160 15f8c5cc6faae35a25fadadddfd2f3d9ae7fcd70 files/digest-jjtraveler-0.4.3-r2 250
+SHA256 f4f4872e3ad31cbf80e6afc71b3a953c22efca25beba2c979193cedb9fa67798 files/digest-jjtraveler-0.4.3-r2 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGEgYdcxLzpIGCsLQRAhYMAJ9baWv7AiYhadHMeT9P1DUJV2lwVACfU9ZJ
-vNZRKSZKyPX3uJSWmO0AL+Q=
-=eAya
+iD8DBQFGFRfscxLzpIGCsLQRAhgCAKCX757ZxNnycEFt4qOln8aqAUq+DQCgjuOZ
+iz/U1zkrCqDsmYm0EM58Hgk=
+=8ULw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r2 b/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r2
new file mode 100644
index 000000000000..b44ddfc571fd
--- /dev/null
+++ b/dev-java/jjtraveler/files/digest-jjtraveler-0.4.3-r2
@@ -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
index 76553866669f..2ee32487ba0c 100644
--- a/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild
+++ b/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/04/03 07:45:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jjtraveler/jjtraveler-0.4.3-r1.ebuild,v 1.3 2007/04/05 15:38:16 betelgeuse Exp $
 
 JAVA_PKG_IUSE="source doc"
 WANT_AUTOMAKE="1.7"
@@ -31,7 +31,7 @@ src_unpack() {
 
 	(
 		echo "#!/bin/sh"
-		echo "java-config -p ${PN}-${SLOT}"
+		echo "java-config -p ${PN}"
 	) > "${S}/jjtraveler-config"
 
 	rm -v jars/*.jar || die
diff --git a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..985c5c880337
--- /dev/null
+++ b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
@@ -0,0 +1,60 @@
+# 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-r2.ebuild,v 1.1 2007/04/05 15:38:16 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
+
+	(
+		echo "#!/bin/sh"
+		echo "java-config -p ${PN}"
+	) > "${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
+}