Uses java-osgi to create an OSGi compliant jar.

Package-Manager: portage-2.1.3.19

6 files changed, 89 insertions, 23 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index 6cfaa2586ee7..201c6caea2e8 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-el
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.21 2007/04/25 19:24:48 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.22 2008/01/14 10:46:39 elvanor Exp $
+
+*commons-el-1.0-r2 (14 Jan 2008)
+
+  14 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/commons-el-1.0-manifest, +commons-el-1.0-r2.ebuild:
+  Uses java-osgi to create an OSGi compliant jar.
 
   25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   commons-el-1.0-r1.ebuild:
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index 7c984c35173e..1fee37345b1c 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX commons-el-1.0-manifest 557 RMD160 2a92c42ee59526b3c45f8bd22d4ae9e1c13db4ac SHA1 81d3698dc37c45807d2a78b6571a5a70b85427b4 SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1
+MD5 b4b91b756da3b9f12c8fd467188f29b6 files/commons-el-1.0-manifest 557
+RMD160 2a92c42ee59526b3c45f8bd22d4ae9e1c13db4ac files/commons-el-1.0-manifest 557
+SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1 files/commons-el-1.0-manifest 557
 DIST commons-el-1.0-src.tar.gz 64009 RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 SHA1 bb39426efbd03a2b27105fa42faf90858cfc3d50 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6
-EBUILD commons-el-1.0-r1.ebuild 1417 RMD160 ecfd6ab9a1ead7b37d5165db6f8908809069500e SHA1 f5b987a96b8bd56e96d93d8fea71a1af8d2163eb SHA256 90844ea1ca72c3236e39cd4611d607dcfadbe5884cb4e3eb24c8670ea3274fb8
-MD5 c29f14c916b3edee5efd5810e69f6fb4 commons-el-1.0-r1.ebuild 1417
-RMD160 ecfd6ab9a1ead7b37d5165db6f8908809069500e commons-el-1.0-r1.ebuild 1417
-SHA256 90844ea1ca72c3236e39cd4611d607dcfadbe5884cb4e3eb24c8670ea3274fb8 commons-el-1.0-r1.ebuild 1417
-MISC ChangeLog 2333 RMD160 067ff8eb47c03dacb1cce5a9aa328977a38f4a9e SHA1 67bc33933eb9370a3ee2dddd84df3e27c3f5b0b9 SHA256 2da225e3a287d14b9b5bc13e11ffb2c05e1cdf4959d1759a1b62f0f1f70c3114
-MD5 2f5a057babf020c2478b0b50b8b0971e ChangeLog 2333
-RMD160 067ff8eb47c03dacb1cce5a9aa328977a38f4a9e ChangeLog 2333
-SHA256 2da225e3a287d14b9b5bc13e11ffb2c05e1cdf4959d1759a1b62f0f1f70c3114 ChangeLog 2333
+EBUILD commons-el-1.0-r1.ebuild 1416 RMD160 67cf808bc8d1cc1ab4c0a3f77230ea198bba1904 SHA1 b76d5ffd06008abe5eb468293fda0daf7a41264c SHA256 f31f75375a9ba33e9f20ce8a333dbfd97fc0c010a2294e987d21a18716b5a21e
+MD5 31325b4c808dee5052e16ae439697ff2 commons-el-1.0-r1.ebuild 1416
+RMD160 67cf808bc8d1cc1ab4c0a3f77230ea198bba1904 commons-el-1.0-r1.ebuild 1416
+SHA256 f31f75375a9ba33e9f20ce8a333dbfd97fc0c010a2294e987d21a18716b5a21e commons-el-1.0-r1.ebuild 1416
+EBUILD commons-el-1.0-r2.ebuild 1474 RMD160 1f65ad0a9eed5f152a6557c91bde7744ad88a676 SHA1 c6bec34eeaad728013617c0cc62f5d6d10d54375 SHA256 27f287fd557440a6fd9082c82c5702bcf7bf2818c161f696a77447006d6b4a1d
+MD5 14bf652554b0d1835e453bb736d451ce commons-el-1.0-r2.ebuild 1474
+RMD160 1f65ad0a9eed5f152a6557c91bde7744ad88a676 commons-el-1.0-r2.ebuild 1474
+SHA256 27f287fd557440a6fd9082c82c5702bcf7bf2818c161f696a77447006d6b4a1d commons-el-1.0-r2.ebuild 1474
+MISC ChangeLog 2533 RMD160 ec09ae886a1f90308fc0dc1b69a554788cb37f4c SHA1 0eac5045403f48bde3df5fc6124e0cd62b414a9d SHA256 3980d22c43aec862bab5ef9de6df815d017bb50c628acbdc582102c7b8db6108
+MD5 511bfbf4e1948c1b4f7a9e5ac36abb12 ChangeLog 2533
+RMD160 ec09ae886a1f90308fc0dc1b69a554788cb37f4c ChangeLog 2533
+SHA256 3980d22c43aec862bab5ef9de6df815d017bb50c628acbdc582102c7b8db6108 ChangeLog 2533
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -17,10 +22,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0-r1 253
 RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0-r1 253
 SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGL6sBcxLzpIGCsLQRAlwuAKCZI8uH6SLeDCCTetw+Uw7Cxq1PKgCfcMjt
-S4vsKs1503gYk8Qb5bx0S7Q=
-=OPwS
------END PGP SIGNATURE-----
+MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0-r2 253
+RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0-r2 253
+SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0-r2 253
diff --git a/dev-java/commons-el/commons-el-1.0-r1.ebuild b/dev-java/commons-el/commons-el-1.0-r1.ebuild
index e97c66a68a5f..4d4aab55084d 100644
--- a/dev-java/commons-el/commons-el-1.0-r1.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.8 2007/04/25 19:24:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.9 2008/01/14 10:46:39 elvanor Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P}-src
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	mv build.properties build.properties.old
 
 	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
diff --git a/dev-java/commons-el/commons-el-1.0-r2.ebuild b/dev-java/commons-el/commons-el-1.0-r2.ebuild
new file mode 100644
index 000000000000..ed61152a3862
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r2.ebuild,v 1.1 2008/01/14 10:46:39 elvanor Exp $
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache."
+HOMEPAGE="http://jakarta.apache.org/commons/el/"
+SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+COMMON_DEP="~dev-java/servletapi-2.4"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	mv "build.properties" "build.properties.old"
+
+	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
+	echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties
+	echo "servletapi.build.notrequired = true" >> build.properties
+	echo "jspapi.build.notrequired = true" >> build.properties
+
+	# Build.xml is broken, fix it
+	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
+}
+
+src_install() {
+	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \
+		"Apache Commons EL" || die "Unable to install"
+
+	dodoc LICENSE.txt RELEASE-NOTES.txt || die
+	dohtml STATUS.html PROPOSAL.html || die
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-el/files/commons-el-1.0-manifest b/dev-java/commons-el/files/commons-el-1.0-manifest
new file mode 100644
index 000000000000..86777e8ec2f7
--- /dev/null
+++ b/dev-java/commons-el/files/commons-el-1.0-manifest
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.el
+Bundle-Version: 1.0
+Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commons.el.parser;version="1.0.0"
+Import-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.jsp;version="2.0",
+ javax.servlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version="2.0",
+ javax.servlet.jsp.tagext;version="2.0",javax.servlet.resources;version="2.4"
diff --git a/dev-java/commons-el/files/digest-commons-el-1.0-r2 b/dev-java/commons-el/files/digest-commons-el-1.0-r2
new file mode 100644
index 000000000000..22867fcbbb5e
--- /dev/null
+++ b/dev-java/commons-el/files/digest-commons-el-1.0-r2
@@ -0,0 +1,3 @@
+MD5 25038283a0b5f638db5e891295d20020 commons-el-1.0-src.tar.gz 64009
+RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 commons-el-1.0-src.tar.gz 64009
+SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 commons-el-1.0-src.tar.gz 64009