Migrate to generation 2 so that we can call java-pkg_regjar on the installed jars...

Package-Manager: portage-2.1.2

diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 7fc8fd192e07df847a1663fa351210c9872a2bb9..cbd171863c6ace4d1a28314eace34172ce8d511c 100644 (file)
--- 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/Manifest b/dev-java/sun-j2ee/Manifest
index d075ee2466aa2338cdea22713c97f96659b09ccc..1a5f7d7433bcff5e70a467789ccb4e695f91f5b7 100644 (file)
--- a/dev-java/sun-j2ee/Manifest
+++ b/dev-java/sun-j2ee/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sun-j2ee-1.3.1-scripts.patch 5202 RMD160 3b55b65a7e0c77c4ebc80fb1165046eae783740c SHA1 291b671d4492dc761dda80a11b111fabb7450b75 SHA256 9a783b9f7afa24e0a585dd3fa5b29af891fcd4fc22d40e3661f8035d69b0f6fc
 MD5 0e746d96b6bd83a7b3f23659bc73331d files/sun-j2ee-1.3.1-scripts.patch 5202
 RMD160 3b55b65a7e0c77c4ebc80fb1165046eae783740c files/sun-j2ee-1.3.1-scripts.patch 5202
@@ -11,10 +14,14 @@ EBUILD sun-j2ee-1.3.1-r3.ebuild 1383 RMD160 35634daac754c1a89f4de7efb5c8be4eea60
 MD5 7973e4831f2c8083f035bbe80cc341f6 sun-j2ee-1.3.1-r3.ebuild 1383
 RMD160 35634daac754c1a89f4de7efb5c8be4eea603768 sun-j2ee-1.3.1-r3.ebuild 1383
 SHA256 1785d092b8aded8a4ba3972236f45b36e376439954355604b8995671f12dadad sun-j2ee-1.3.1-r3.ebuild 1383
-MISC ChangeLog 3333 RMD160 a7c4f258144492fa91e5b57cfe91f6a788542983 SHA1 0771107372ee66680a3fcf750c13322ff844c7a3 SHA256 af8491a1e1fc765b4863bdddc2724adf0476943b223b562cdda16f84579be737
-MD5 bc1d19caf7f4916962c3c01830a682f3 ChangeLog 3333
-RMD160 a7c4f258144492fa91e5b57cfe91f6a788542983 ChangeLog 3333
-SHA256 af8491a1e1fc765b4863bdddc2724adf0476943b223b562cdda16f84579be737 ChangeLog 3333
+EBUILD sun-j2ee-1.3.1-r4.ebuild 1366 RMD160 94c01373897558f12736b755d378f3bd9a96af04 SHA1 e694fb031421f51e6422277c6c03c7af8448c0b4 SHA256 9ff4b6e6c746c98bf8463c8a7114166017d633547cc5d6e2cb53224a8e9735b0
+MD5 4ff0d36da208053543781b5a17c3cb2b sun-j2ee-1.3.1-r4.ebuild 1366
+RMD160 94c01373897558f12736b755d378f3bd9a96af04 sun-j2ee-1.3.1-r4.ebuild 1366
+SHA256 9ff4b6e6c746c98bf8463c8a7114166017d633547cc5d6e2cb53224a8e9735b0 sun-j2ee-1.3.1-r4.ebuild 1366
+MISC ChangeLog 3658 RMD160 2cb8fe1ce48a1bef76622e664cf815d0d54e3b8a SHA1 dba235807d41afe682b302762cb9e16955292099 SHA256 6d3d5544ec47dd8850357180623492c5abf7b476cdbbaab01e50b2aba6bc470e
+MD5 fa35484f69da32797e086b1258b163d3 ChangeLog 3658
+RMD160 2cb8fe1ce48a1bef76622e664cf815d0d54e3b8a ChangeLog 3658
+SHA256 6d3d5544ec47dd8850357180623492c5abf7b476cdbbaab01e50b2aba6bc470e ChangeLog 3658
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,3 +32,13 @@ SHA256 4f557fc68d916f24a256e5cd1bdb1877f773312a8ff8eb8245b5a57fafafeddf files/di
 MD5 6c20b38ab45e59d10b647fce8883d83d files/digest-sun-j2ee-1.3.1-r3 265
 RMD160 23d6d6ad3053820298b18ffd9f38e198445569ad files/digest-sun-j2ee-1.3.1-r3 265
 SHA256 4f557fc68d916f24a256e5cd1bdb1877f773312a8ff8eb8245b5a57fafafeddf files/digest-sun-j2ee-1.3.1-r3 265
+MD5 6c20b38ab45e59d10b647fce8883d83d files/digest-sun-j2ee-1.3.1-r4 265
+RMD160 23d6d6ad3053820298b18ffd9f38e198445569ad files/digest-sun-j2ee-1.3.1-r4 265
+SHA256 4f557fc68d916f24a256e5cd1bdb1877f773312a8ff8eb8245b5a57fafafeddf files/digest-sun-j2ee-1.3.1-r4 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFrSTdcxLzpIGCsLQRAhwhAJ9t2pECCUzO2cYDK/WUDcwCEB597QCfdeFD
+xpa/d8t32dBJJwPD+jzdSmw=
+=sFlV
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..25a2a69
--- /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 (file)
index 0000000..f20b7af
--- /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"
+}