commit: 0ab7f929beba4f8924aca8025bd22e91ac53115d Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 13:49:16 2015 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 13:49:16 2015 +0000 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0ab7f929
dev-java/netbeans-java: fixed issue with jtidy jar being renamed Package-Manager: portage-2.2.26 dev-java/netbeans-java/Manifest | 3 ++- ...20151216.ebuild => netbeans-java-8.1-r2.ebuild} | 28 +++++++++++----------- .../netbeans-java-9999_p20151216.ebuild | 5 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest index cf3d4f8..cc3e9a4 100644 --- a/dev-java/netbeans-java/Manifest +++ b/dev-java/netbeans-java/Manifest @@ -69,6 +69,7 @@ DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df989321 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628 +EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc EBUILD netbeans-java-8.1.ebuild 14772 SHA256 cb902b5daf59fb70506d8b8b665418eb98ef2088a72be533b321cc894ef81642 SHA512 b34b6aa8b6358916b0d65f1af261c5cef5e14e9b037cfb6592b98c34f74c556ea57422cc9cd71c1b6cffe6676a7d16cd44b4ddabf270b06078a907a4a79a2fea WHIRLPOOL 1b497bcf6e5141438b69ed81efd64e60532bf956dceea98f30a50d52c3a9bf04c415d578e1315081deef37fd7a7684ddf4806c88c48e51a1ff6eafa7c9fa338d EBUILD netbeans-java-9999_p20151116.ebuild 14977 SHA256 6d2fe9f3504482acf75d54b570f39cf22c4aa6acf0b38cfff626683f29f0bcfb SHA512 fd58bdc830c52dbeef1446cd139d5904398a71edbbd7b2c9ad7e896ea8da019de71dc018e5884813ff621fe8da12875d6ba156b1286fe761d65b4aa9ad425782 WHIRLPOOL aaaef945b9eae8a9c595d3daf194cdb533d7c9c9a4bb4b3290a72411ca26faf24b599fb491a9581182d1c24fd5e1a7e37753f39853057e7868bf46915f66ac10 EBUILD netbeans-java-9999_p20151117.ebuild 14977 SHA256 98c36c94348280a6addaec7c642e24cbf12fc7450fb88dc1ae385de5929e2489 SHA512 9e905ef1e6c12b343f6b4daa84c853ea77d1d1e616b06f51ba6d733314f7f2271a08b674ddc9d7f392e7fad76f3755e416159d91b1a8f98255800728faf09053 WHIRLPOOL 327d1a7cb619a5ffee2dc3d772d7310efc41453c74719cecf8750f63f51197947ca87d868f8feda4d43e4cfae34183464cd912c376bcb2c9f7da426d53682686 @@ -97,5 +98,5 @@ EBUILD netbeans-java-9999_p20151211.ebuild 14983 SHA256 f67bed8eed366dcec9820112 EBUILD netbeans-java-9999_p20151213.ebuild 14983 SHA256 37c8da5f8681611a45b0d3a6893f22e04269f100acf0bf5f253dae11ae1c4bf0 SHA512 e9efaacbc5814be9c743555b0a0b1fd878985e47e0c0fafb1f3b6acb2550d8c18832376d81efc7476cee79975ae13af4fc0a2d919b4fcf325f14b54956d7d6f7 WHIRLPOOL 24e471622344e96c3767b0fea01d3d93cab7c74555d95e785c29ea92f68337aa819c7fd3ae6d65eb70ba2a923d47ff9d7d01b166c74433309b8c178253f73a77 EBUILD netbeans-java-9999_p20151214.ebuild 14983 SHA256 25f3c402a0e2f2083b20dd569e1f367ea199d01a566fd1430ac35d444f63b638 SHA512 44ec4b3e59226b5b236b7a07f00c395bc79b08d221aa4b6fc9c07026c1777e39b06cac8b72a7ded99081b8afaae10c504205a71f0856ea0c66d5fec54572cd03 WHIRLPOOL 06af83dc5e639d9fd27e601728985b7d972d66fe1fcad3eef42aceb2182aed549ae3c6927d2dd5bea35188caee98785be9b4f9c669c9bbdb8b55ec226d086798 EBUILD netbeans-java-9999_p20151215.ebuild 14983 SHA256 481955ba0d522521b6b9ca7453c71234bf8d3b164b86d42fa83ea61016baea6e SHA512 f0ffbd80e9105327692891625af3f3b9b8ba8b968c0c5e6f96608e83e7c04d992b7a491e607c4d5e380f1c87dc5d11c219019a36d4147df12db148290740586a WHIRLPOOL 7c9e8efb84c297119ca80ed9ec42f979c2f5f89ac7430d1e4c6e85b626b2dc8e9eb487de0caff68a6ea315bb6ab524c66c4c4d8630cbcdef5b88f2d6bd344ef5 -EBUILD netbeans-java-9999_p20151216.ebuild 14983 SHA256 07f54df1a864c444804da986a1576ef32edbf0bee32b98b700299e61170bf619 SHA512 0b192f7604a227f6d2e26e530b808040e889f8a2c6818a4a97af2bbfb6cae3691ec202deaed32b967ccd2697dd979bf02ced9ee31dd38cd43c8b56d34231722f WHIRLPOOL b7ab0fd9331ec16684d621465fcef852211411ec1c82315e710fcefb792a053e90fb4a87b2107a7ac0938b26514953d3e6b92bb5692c90c362f7daacecd38450 +EBUILD netbeans-java-9999_p20151216.ebuild 15021 SHA256 6c7fa9c8f0b92595c1f157739f7ff38828d79e1a0015a4732e48f0d7111bd398 SHA512 48e7783a100cda46cd40e046f449ea25c377f9056b22d6f03cdd741efdac2b51d055b2c6d77ecf43f51946482da7d2bf2f9abf5cfc7a26e44f599cd4bc4377a0 WHIRLPOOL f2c226798250382f44bf94d0ad79870ee57957f0be9d00c4a3194c07ed8bf37d0f2eb3466800f5b8f647ba2337452516b8ae4e6da2ab9375bb3d0329a96c86c8 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43 diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild similarity index 93% copy from dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild copy to dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild index 534b870..f977c58 100644 --- a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild +++ b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild @@ -9,12 +9,11 @@ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Netbeans Java Cluster" HOMEPAGE="http://netbeans.org/projects/java"; -SLOT="9999" -SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-16_00-02-04/zip/netbeans-trunk-nightly-201512160002-src.zip"; +SLOT="8.1" +SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"; # jarjar-1.4 contains also asm libraries SRC_URI="${SOURCE_URL} - http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2 - http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar + http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar @@ -30,8 +29,9 @@ SRC_URI="${SOURCE_URL} http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar - http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar - http://hg.netbeans.org/binaries/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-nb-javac-impl.jar + http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar + http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar + http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip @@ -59,7 +59,7 @@ DEPEND=">=virtual/jdk-1.7 RDEPEND=">=virtual/jdk-1.7 ${CDEPEND} dev-java/absolutelayout:0 - >=dev-java/antlr-2.7.7-r7:0 + dev-java/antlr:0[java(+)] dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 @@ -70,7 +70,7 @@ RDEPEND=">=virtual/jdk-1.7 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 - dev-java/jtidy:0 + >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 @@ -121,10 +121,9 @@ src_unpack() { einfo "Deleting bundled jars..." find -name "*.jar" -type f -delete - unpack netbeans-9999-r14-build.xml.patch.bz2 + unpack netbeans-8.1-build.xml.patch.bz2 pushd "${S}" >/dev/null || die - ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die @@ -140,8 +139,8 @@ src_unpack() { ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die - ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die - ln -s "${DISTDIR}"/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die + ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die + ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die @@ -155,7 +154,7 @@ src_prepare() { einfo "Deleting bundled class files..." find -name "*.class" -type f | xargs rm -vf - epatch netbeans-9999-r14-build.xml.patch + epatch netbeans-8.1-build.xml.patch # Support for custom patches if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then @@ -232,6 +231,7 @@ src_install() { popd >/dev/null || die local instdir=${INSTALL_DIR}/modules/ext/hibernate4 + local dinstdir="${D}/${instdir}" pushd "${D}"/${instdir} >/dev/null || die rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die @@ -241,7 +241,7 @@ src_install() { rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die - rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/jtidy.jar ${instdir}/jtidy-r8-20060801.jar || die + rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild index 534b870..150a65e 100644 --- a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild +++ b/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild @@ -70,7 +70,7 @@ RDEPEND=">=virtual/jdk-1.7 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 - dev-java/jtidy:0 + >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 @@ -232,6 +232,7 @@ src_install() { popd >/dev/null || die local instdir=${INSTALL_DIR}/modules/ext/hibernate4 + local dinstdir="${D}/${instdir}" pushd "${D}"/${instdir} >/dev/null || die rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die @@ -241,7 +242,7 @@ src_install() { rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die - rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/jtidy.jar ${instdir}/jtidy-r8-20060801.jar || die + rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
