Fix the installed jjtraveler-config script.

(Portage version: 2.1.2.3)

4 files changed, 72 insertions, 3 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/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
+}