commit: 88e184d9bce26945c3aafd02f9d55d1b71ca8d1e Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Apr 16 16:22:10 2015 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Apr 16 16:22:10 2015 +0000 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=88e184d9
dev-java/netbeans-java: updated deps dev-java/netbeans-java/ChangeLog | 4 ++++ dev-java/netbeans-java/Manifest | 2 +- dev-java/netbeans-java/netbeans-java-9999_p20150416.ebuild | 9 ++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog index 04ac2c2..c765ff8 100644 --- a/dev-java/netbeans-java/ChangeLog +++ b/dev-java/netbeans-java/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Apr 2015; Miroslav Šulc <[email protected]> + netbeans-java-9999_p20150416.ebuild: + updated deps + *netbeans-java-9999_p20150416 (16 Apr 2015) 16 Apr 2015; Miroslav Šulc <[email protected]> diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest index e745cce..2b7eb69 100644 --- a/dev-java/netbeans-java/Manifest +++ b/dev-java/netbeans-java/Manifest @@ -133,6 +133,6 @@ EBUILD netbeans-java-9999_p20150407.ebuild 13432 SHA256 5543d011f709b31172e78113 EBUILD netbeans-java-9999_p20150410.ebuild 13432 SHA256 f90675ce725ec35a82539566f7e9200b9a96d4ab098e22169018c2e8dd7a3ce6 SHA512 331bb790373abe682580ffa87578c3e0425171725167f337af2340a0ef4890db8ee78a2f18a64c111b121d526ac1ff479587e610838e81ad7ac5e97070c62e7a WHIRLPOOL 8ff6cf0b27e85cfdf9008d6ad11344da3c765a3d9fcc9d15c6b20194828aa024bd491c986f73079a8fa3eaa410e1575c8eec005625ba68a504035dd2858ce223 EBUILD netbeans-java-9999_p20150413.ebuild 13432 SHA256 426d577023f3b0038f70423d60f9949b74f8535124939689a3f1bf05ac8d36b8 SHA512 0f430d6eefa450d4fac4174a696707c87ac397be2d75f04e1f5bf4c66f8c9f20682ea3c187c14d62af437d0698c4e474f7ef31b36fbfc31dc4a922373894b431 WHIRLPOOL 256470c8e91feca39b9653404120eb3007582dbd9483baf43895fe6c25c0ffd4809752046abaa19964c9ba3a4dabc78225fce5dc7c5397b5f212c87ade509020 EBUILD netbeans-java-9999_p20150414.ebuild 13432 SHA256 4cc1ea0b3e212da96fae22ba8258d6ec49d79434711f1e7d1f5468eb7432a319 SHA512 9775ce0b0ddc727485fc7f91bc7ed6bb95552f088a7ed8addb61fbba6ab82b48e55ca7d521c1dfe1241698e147da6e9bd1f4ea4fc9fed0328dfcece4a22d0aef WHIRLPOOL 39896ca770d2a12480e1ad26fd982ae2bcb263edb6ae27743c838f65943eeb7e87c102d3590bc14e23111026e36ef853b2ece613dc1cb7de02432752008f47e1 -EBUILD netbeans-java-9999_p20150416.ebuild 13432 SHA256 41dbe5b5e90a7410f5006ef4c7848ad29f2f427a8c656e7ee9c865e4b12f795d SHA512 34ae444d659fe95ed8e61c68fdfdfa34ce6a0f0adfb415e08ad7adaa9317bf3e6abcd7c8dd857f639cafa83a6ae4cc1d558535b9f1421a3a38689c82715f6c9f WHIRLPOOL f01470479a3e50bbb21c2cd33ea45f7968cbb4a669d3d2fca989b00c79d9f3515a801afb36d300f96d3b5c2a98b36c8cc7a785ee1544fbd7e1d3129a2be8215f +EBUILD netbeans-java-9999_p20150416.ebuild 13404 SHA256 7866d55e780d403033e129e539e305154e49d662bea6fe78f552630dd73227de SHA512 8e4c20b6d3d0b8e1bfe80d32291f8bbe934ceff4b6e81b95971f9667709bdc21fea97b9247ada8ca2a36ba3b555803d667cdce0df66491a9660da3077cf54fc2 WHIRLPOOL babcf787c4d8b113c84245dfcefaf8a29f19f63b1b9b593074294462277ededa9d90609a9d9a8289e2c51d4f1a8fa02ff4da72f6d0cae1422d5e87adad8d3e6b MISC ChangeLog 157113 SHA256 cea9ff6380565d1040718b28c77eb6b00e02f975c4a3f15b57c5e9548094c4a8 SHA512 8ccd62217e886b8d12dd50fa2d251abe782bc6a559855af9515594be436fff20f083c69688436526cd918b994e2b65130d23cdcb37af7352eacf1bd41e284991 WHIRLPOOL 3ed565ffb748026910345f699089f615c136b6161ab0bfdecd6f1e5afab2c693b2d65c019104f895cf23c46ab98d3c38dc9b406a073e7c2566cc106d237dae0e MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43 diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150416.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150416.ebuild index cc8edf7..6d6650c 100644 --- a/dev-java/netbeans-java/netbeans-java-9999_p20150416.ebuild +++ b/dev-java/netbeans-java/netbeans-java-9999_p20150416.ebuild @@ -45,7 +45,7 @@ CDEPEND="~dev-java/netbeans-platform-${PV} ~dev-java/netbeans-ide-${PV} ~dev-java/netbeans-websvccommon-${PV} dev-java/beansbinding:0 - dev-java/cglib:2.2 + dev-java/cglib:3 dev-java/jdom:1.0" DEPEND=">=virtual/jdk-1.7 app-arch/unzip @@ -58,7 +58,6 @@ RDEPEND=">=virtual/jdk-1.7 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/c3p0:0 - dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 @@ -161,7 +160,7 @@ src_prepare() { einfo "Symlinking external libraries..." java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar - java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar + java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar @@ -212,14 +211,14 @@ src_install() { pushd "${D}"/${instdir} >/dev/null || die 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 + rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die popd >/dev/null || die local instdir=${INSTALL_DIR}/modules/ext/hibernate4 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 - rm cglib-2.2.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.2.jar || die + rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.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 javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
