[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/

[Miroslav Šulc]

commit:     2e4ff93fba72a122d8d877279ddf03bd1a917d2e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:08:00 2012 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 11:08:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=2e4ff93f

dev-java/netbeans-enterprise: cleanup

---
 dev-java/netbeans-enterprise/ChangeLog             |    5 ++
 dev-java/netbeans-enterprise/Manifest              |    6 +-
 .../netbeans-enterprise-7.2_beta.ebuild            |   66 --------------------
 .../netbeans-enterprise-9999_p20120530.ebuild      |   66 --------------------
 4 files changed, 8 insertions(+), 135 deletions(-)

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 8c5f3fa..6cde03a 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jun 2012; Miroslav Šulc <fordfrog@g.o>
+  netbeans-enterprise-7.2_beta.ebuild,
+  netbeans-enterprise-9999_p20120530.ebuild:
+  cleanup
+
   01 Jun 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-enterprise-9999_p20120520.ebuild:
   removed obsolete version

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 1996246..5fe67c8 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -62,9 +62,9 @@ DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9
 DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 RMD160 0ecafb9ced600f753a5ab6359d6c762313ac2631 SHA1 d710a4694c708d8f78cfe04211ad1a199fa6ce0a SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 RMD160 0c1271e6e8de8b488da68eca78497d4f018e8e15 SHA1 e2c482b57c7eb35e25da6b8a7a21d53231fd7d85 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda
-EBUILD netbeans-enterprise-7.2_beta.ebuild 20005 RMD160 ca8c5e038e3a91066d6e152bc055b4655c204609 SHA1 30f0057a2972374f2e647e5ac2405bea828cbf50 SHA256 d875258bcd80ad9b06b8c31e5adeacc6c40499b12358be240babfc794e9b4c43
+EBUILD netbeans-enterprise-7.2_beta.ebuild 18116 RMD160 5256763ce9985a6267b69c418ecfdd115c354e06 SHA1 e3ee588e2800d9081f55e54335160c0573ffe996 SHA256 a465abb35ca4f2fe68ccc936692471540c18a0d6cf425bb9eadc69a13bd9b730
 EBUILD netbeans-enterprise-9999_p20120524.ebuild 20047 RMD160 98da4a113f22b8d8de6ea6babd41b053edc0c91e SHA1 e0e24b73abae1447f20a88eb631feda2c1e060dc SHA256 b061d72b6cdb991fd5cbb07f91f55a8264cb86ab1ce0a92ef68b53d005dd5c5e
 EBUILD netbeans-enterprise-9999_p20120527.ebuild 20047 RMD160 9079f0c258de1c04532ba9533296d8ad6a7356e2 SHA1 80965caeb6c0aa8c3213825bad73dfa43c48e9db SHA256 b9e71729972d58e1cb13f23854f41eea6ad374daed6c5e67e1d3ce6144519fe3
-EBUILD netbeans-enterprise-9999_p20120530.ebuild 20047 RMD160 352b20fc938102aa78224d3904d725f78c798557 SHA1 1dfef2d8d58c9c36319cd6be058b4c5f7812a81e SHA256 9550ea00216efb2900d5b600abc33e5581f57b0d33e5295f5191084904f5d48c
-MISC ChangeLog 37255 RMD160 58223bd7793554d07619455576bc14a2ce652221 SHA1 93258d855651c75fb20e363bc96e7f890ea65ad6 SHA256 e1f2a882466059d0e320a6ca64181dbff557b6b76a214090ab89ba5cd8842967
+EBUILD netbeans-enterprise-9999_p20120530.ebuild 18158 RMD160 bf33cda8916cbe7faa4c2dbe79405a2809ddcc47 SHA1 6d3163c29d12ef2e284c343034734e9a64adde05 SHA256 7f27b1eb8ccb9241f985b37520e3a1888ffbcc4c0145c5effb2940f0698de421
+MISC ChangeLog 37402 RMD160 3d5c25d7c1daeebdc68904b2703fa9ac8a5a26a1 SHA1 55f8ceb5361dd9037444f27a5417743cda24a75d SHA256 bc210ee431c7d0c300e7f5781b92b3fbf31149c67c01b71a91256d35bae28be0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.2_beta.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.2_beta.ebuild
index 1febd6a..bf39b93 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-7.2_beta.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-7.2_beta.ebuild
@@ -231,18 +231,8 @@ src_install() {
 	local instdir=${INSTALL_DIR}/modules/ext
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
-	# el-impl.jar
-	# glassfish-jspparser-3.0.jar
-	# glassfish-logging-2.0.jar
-	# javaee-api-6.0.jar
-	# javaee-api-6.0-license.txt
-	# javaee-web-api-6.0.jar
-	# javaee-web-api-6.0-license.txt
-	# jsp-parser-ext.jar
 	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
 	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
-	# org-netbeans-modules-web-httpmonitor.jar
-	# servlet3.0-jsp2.2-api.jar
 	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
 	popd >/dev/null || die
 
@@ -252,66 +242,19 @@ src_install() {
 	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
-	pushd "${D}"/${instdir} >/dev/null || die
-	# javax.annotation.jar
-	# javax.annotation-license.txt
-	# jaxb-api-osgi.jar
-	# jaxb-api-osgi-license.txt
-	# webservices-api-osgi.jar
-	# webservices-api-osgi-license.txt
-	popd >/dev/null || die
-
 	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
 	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
 	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
 	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/metro
-	pushd "${D}"/${instdir} >/dev/null || die
-	# webservices-api.jar
-	# webservices-extra-api.jar
-	# webservices-extra.jar
-	# webservices-rt.jar
-	# webservices-tools.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/primefaces
-	pushd "${D}"/${instdir} >/dev/null || die
-	# primefaces-2.1.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/rest
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
-	# jackson-core-asl-1.1.1.jar
-	# jersey-client-1.3.jar
-	# jersey-core-1.3.jar
-	# jersey-json-1.3.jar
-	# jersey-multipart-1.3.jar
-	# jersey-server-1.3.jar
-	# jersey-spring-1.3.jar
 	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
 	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
-	# mimepull-1.4.jar
-	# oauth-client-1.3.jar
-	# oauth-signature-1.3.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-webmvc-2.5.6.SEC01.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/struts
@@ -321,21 +264,12 @@ src_install() {
 	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
 	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
 	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
-	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
 	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
 	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
 	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
 	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
 	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
 	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
-	# struts-core-1.3.8.jar
-	# struts-el-1.3.8.jar
-	# struts-extras-1.3.8.jar
-	# struts-faces-1.3.8.jar
-	# struts-mailreader-dao-1.3.8.jar
-	# struts-scripting-1.3.8.jar
-	# struts-taglib-1.3.8.jar
-	# struts-tiles-1.3.8.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild
index cdbb8ed..4dd42fa 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild
@@ -231,18 +231,8 @@ src_install() {
 	local instdir=${INSTALL_DIR}/modules/ext
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
-	# el-impl.jar
-	# glassfish-jspparser-3.0.jar
-	# glassfish-logging-2.0.jar
-	# javaee-api-6.0.jar
-	# javaee-api-6.0-license.txt
-	# javaee-web-api-6.0.jar
-	# javaee-web-api-6.0-license.txt
-	# jsp-parser-ext.jar
 	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
 	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
-	# org-netbeans-modules-web-httpmonitor.jar
-	# servlet3.0-jsp2.2-api.jar
 	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
 	popd >/dev/null || die
 
@@ -252,66 +242,19 @@ src_install() {
 	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
-	pushd "${D}"/${instdir} >/dev/null || die
-	# javax.annotation.jar
-	# javax.annotation-license.txt
-	# jaxb-api-osgi.jar
-	# jaxb-api-osgi-license.txt
-	# webservices-api-osgi.jar
-	# webservices-api-osgi-license.txt
-	popd >/dev/null || die
-
 	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
 	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
 	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
 	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/metro
-	pushd "${D}"/${instdir} >/dev/null || die
-	# webservices-api.jar
-	# webservices-extra-api.jar
-	# webservices-extra.jar
-	# webservices-rt.jar
-	# webservices-tools.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/primefaces
-	pushd "${D}"/${instdir} >/dev/null || die
-	# primefaces-2.1.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/rest
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
-	# jackson-core-asl-1.1.1.jar
-	# jersey-client-1.3.jar
-	# jersey-core-1.3.jar
-	# jersey-json-1.3.jar
-	# jersey-multipart-1.3.jar
-	# jersey-server-1.3.jar
-	# jersey-spring-1.3.jar
 	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
 	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
-	# mimepull-1.4.jar
-	# oauth-client-1.3.jar
-	# oauth-signature-1.3.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-webmvc-2.5.6.SEC01.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/struts
@@ -321,21 +264,12 @@ src_install() {
 	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
 	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
 	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
-	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
 	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
 	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
 	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
 	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
 	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
 	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
-	# struts-core-1.3.8.jar
-	# struts-el-1.3.8.jar
-	# struts-extras-1.3.8.jar
-	# struts-faces-1.3.8.jar
-	# struts-mailreader-dao-1.3.8.jar
-	# struts-scripting-1.3.8.jar
-	# struts-taglib-1.3.8.jar
-	# struts-tiles-1.3.8.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise