Migrate to generation 2 so that we can call java-pkg_regjar on the installed jars and don't set a global classpath any more to stop this package from breaking other applications. Fixes bug #154044.

(Portage version: 2.1.2)

3 files changed, 65 insertions, 1 deletions

diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 7fc8fd192e07..cbd171863c6a 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/sun-j2ee
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.24 2007/01/05 23:37:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.25 2007/01/16 19:17:40 betelgeuse Exp $
+
+*sun-j2ee-1.3.1-r4 (16 Jan 2007)
+
+  16 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-j2ee-1.3.1-r4.ebuild:
+  Migrate to generation 2 so that we can call java-pkg_regjar on the installed
+  jars and don't set a global classpath any more to stop this package from
+  breaking other applications. Fixes bug #154044.
 
   05 Jan 2007; Vlastimil Babka <caster@gentoo.org> sun-j2ee-1.3.1-r2.ebuild,
   sun-j2ee-1.3.1-r3.ebuild:
diff --git a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r4 b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r4
new file mode 100644
index 000000000000..25a2a69f482c
--- /dev/null
+++ b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r4
@@ -0,0 +1,3 @@
+MD5 deb95389621b79e1c72c843ba0c46a54 j2sdkee-1_3_1-linux.tar.gz 14863533
+RMD160 baa0aff413bdab417660539b2e3eba52a73eccbc j2sdkee-1_3_1-linux.tar.gz 14863533
+SHA256 24db2e3b69d6eb795d6082da299ec203f6075b0b2b0f5a31521966486e33c70b j2sdkee-1_3_1-linux.tar.gz 14863533
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r4.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r4.ebuild
new file mode 100644
index 000000000000..f20b7af58147
--- /dev/null
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r4.ebuild,v 1.1 2007/01/16 19:17:40 betelgeuse Exp $
+
+inherit java-pkg-2 eutils
+
+MY_PN="j2sdkee"
+
+DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
+SRC_URI="${MY_PN}-1_3_1-linux.tar.gz"
+HOMEPAGE="http://java.sun.com/j2ee/sdk_1.3/"
+DEPEND=">=sys-libs/lib-compat-1.1"
+RDEPEND=">=virtual/jre-1.3.1"
+LICENSE="sun-bcla-j2ee"
+RESTRICT="fetch"
+SLOT="0"
+KEYWORDS="~x86 -ppc"
+IUSE="doc"
+
+S=${WORKDIR}/${MY_PN}${PV}
+
+pkg_nofetch() {
+	die "Please download ${SRC_URI} from ${HOMEPAGE} to ${DISTDIR}"
+}
+
+src_install() {
+	local dirs="bin lib conf config cloudscape lib images nativelib repository public_html logs help images xsl"
+
+	dodir /opt/${P}
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/
+	done
+
+	java-pkg_regjar "${D}"/opt/${P}/lib/*.jar
+	java-pkg_regjar ${D}/opt/${P}/*/*/*.jar
+
+	dodir /etc/env.d/java
+	local j2eeenv=${T}/22${P}
+	cat > $j2eeenv <<-END
+PATH=/opt/${P}/bin
+J2EE_HOME=/opt/${P}
+END
+	doenvd "${j2eeenv}"
+
+	dodoc LICENSE README || die
+
+	use doc && java-pkg_dohtml -r doc/*
+}
+
+pkg_postinst() {
+	elog "Remember to set JAVA_HOME before running /opt/${P}/bin/j2ee"
+	elog "A set of sample configuration files (that work) can be found in /opt/${P}/conf and /opt/${P}/config"
+}