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

[Miroslav Šulc]

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

dev-java/netbeans-java: unbundled mimepull and cleanup

---
 dev-java/netbeans-java/ChangeLog                   |    4 +
 dev-java/netbeans-java/Manifest                    |    2 +
 ...-r1.ebuild => netbeans-java-7.2_beta-r2.ebuild} |   74 +-------------------
 ...uild => netbeans-java-9999_p20120530-r1.ebuild} |   74 +-------------------
 4 files changed, 10 insertions(+), 144 deletions(-)

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index df688c8..5eaa088 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -54,8 +54,10 @@ DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc0
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 RMD160 8b5ef1094e65db4cfd4e98de9fdc214eda0e743c SHA1 3267c7d4f4ff18d23eca483d85c8bcd3c58207ff SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0
 EBUILD netbeans-java-7.1.2-r1.ebuild 14893 RMD160 28cb8be1dffd063222c8c9b2771ef642d10f4ba5 SHA1 583919f7be167cf23d4b659daf09de190e768c16 SHA256 b4441067f67ff63b24929fa054ff0a28ccc0e47be47d1ca609a84872b119c990
 EBUILD netbeans-java-7.2_beta-r1.ebuild 14489 RMD160 835cc16a13a36c92c8162b10c51996742de896d6 SHA1 af314e31b1337e0ccf71bab95ae271aa2b40c439 SHA256 fffa479c842fdaf93e68a6092e6106dcddffde9adab8cfdce17bde8cf9e5ab0b
+EBUILD netbeans-java-7.2_beta-r2.ebuild 12262 RMD160 b843233a4b1d031247242764f8fa2b4747c5f843 SHA1 54415445b148ad2f371e248d6b1a5295788e40bc SHA256 a24e8b8696c777f27de8368c173b2a8175a5579f71fd1d28827fc53770eecd1f
 EBUILD netbeans-java-9999_p20120524.ebuild 14408 RMD160 961dc40179337df61bc7d9756fe0e391c71476a1 SHA1 ec4cff82d21980642da2354cdb50c67b18e62faf SHA256 b523afd8248cae40d3cfb6eafff52eb32c4b999d6976b53ad3d33d7da811cdd7
 EBUILD netbeans-java-9999_p20120527.ebuild 14430 RMD160 b4b0c4eb33ffab22d27be8fe715d0f1a45dcc8c5 SHA1 9b6801a1286d2e8bac59e6bebd8c1e16f1e9250b SHA256 edaa62dab98a958d6949a58684ea4355590d83add3e05a7e4bdba71f22219087
+EBUILD netbeans-java-9999_p20120530-r1.ebuild 12203 RMD160 cb456fd9961b106fdfa8b89d876865288c5259b7 SHA1 531d3b577d0360d24fb52209aff016b8e85d5c55 SHA256 22984cd1eee9046e81941b007ed5f4d906efe3be7cf89f1e443960d5e30c1c5d
 EBUILD netbeans-java-9999_p20120530.ebuild 14430 RMD160 3deb3af5ec2be405ea2733e26347edac82f4ea39 SHA1 953ae5607fcfc5e2cd818bf23f0d9e169347ee39 SHA256 acd799067ce2ffbc1c0da90f4e081388680be8a274012540f09b9825894ff960
 MISC ChangeLog 35875 RMD160 ddf43102a74b681dfe5ccaf8d8a894a10e347ec0 SHA1 8a9e307924df8d84ff794081f64734568ee8b14d SHA256 e6ddffbbef282c225f0ff41c8201114b3f39a5d125da2276a57387731f42b566
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.2_beta-r2.ebuild
similarity index 83%
rename from dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild
rename to dev-java/netbeans-java/netbeans-java-7.2_beta-r2.ebuild
index 0722208..68ed9eb 100644
--- a/dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.2_beta-r2.ebuild
@@ -66,6 +66,7 @@ RDEPEND=">=virtual/jdk-1.6
 	dev-java/jsr250:0
 	dev-java/glassfish-transaction-api:0
 	dev-java/jtidy:0
+	dev-java/mimepull:0
 	dev-java/saaj:0
 	dev-java/stax-ex:0
 	dev-java/xmlstreambuffer:0"
@@ -190,22 +191,9 @@ src_install() {
 	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
 
 	doins -r *
-	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
 	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
 	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
 
-	#insinto ${INSTALL_DIR}/ant
-	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	#doins -r ant/extra
-	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	#doins -r ant/nblib
-	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
 	popd >/dev/null || die
 
 	local instdir=/${INSTALL_DIR}/modules/ext
@@ -213,17 +201,6 @@ src_install() {
 	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
 	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
 	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/hibernate
@@ -235,14 +212,7 @@ src_install() {
 	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
 	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
 	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
 	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
 	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
 	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
 	popd >/dev/null || die
@@ -250,22 +220,14 @@ src_install() {
 	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
 	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
 	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
 	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
 	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
 	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
 	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
 	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
@@ -273,40 +235,8 @@ src_install() {
 
 	local instdir=${INSTALL_DIR}/modules/ext/maven
 	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
 	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
 	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20120530-r1.ebuild
similarity index 83%
rename from dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild
rename to dev-java/netbeans-java/netbeans-java-9999_p20120530-r1.ebuild
index e6629fd..f6a6c04 100644
--- a/dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20120530-r1.ebuild
@@ -65,6 +65,7 @@ RDEPEND=">=virtual/jdk-1.6
 	dev-java/jsr181:0
 	dev-java/glassfish-transaction-api:0
 	dev-java/jtidy:0
+	dev-java/mimepull:0
 	dev-java/saaj:0
 	dev-java/stax-ex:0
 	dev-java/xmlstreambuffer:0"
@@ -189,22 +190,9 @@ src_install() {
 	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
 
 	doins -r *
-	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
 	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
 	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
 
-	#insinto ${INSTALL_DIR}/ant
-	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	#doins -r ant/extra
-	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	#doins -r ant/nblib
-	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
 	popd >/dev/null || die
 
 	local instdir=/${INSTALL_DIR}/modules/ext
@@ -212,17 +200,6 @@ src_install() {
 	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
 	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
 	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/hibernate
@@ -234,14 +211,7 @@ src_install() {
 	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
 	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
 	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
 	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
 	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
 	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
 	popd >/dev/null || die
@@ -249,62 +219,22 @@ src_install() {
 	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
 	pushd "${D}"/${instdir} >/dev/null || die
 	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
 	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
 	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
 	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
 	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
 	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
 	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/maven
 	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
 	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
 	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java