* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/
@ 2011-03-31 11:54 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-03-31 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 5ddd7f6c7dee6c6cc4d19c5a2d9ab9d181f95c01
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 11:54:29 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 11:54:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=5ddd7f6c
netbeans-platform: fixed bug #361439
---
dev-java/netbeans-platform/ChangeLog | 5 +++++
dev-java/netbeans-platform/Manifest | 6 +++---
.../netbeans-platform-7.0_beta2_p20110324.ebuild | 2 +-
.../netbeans-platform-7.0_rc1.ebuild | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 3cac0c3..a81254b 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Mar 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ netbeans-platform-7.0_rc1.ebuild,
+ netbeans-platform-7.0_beta2_p20110324.ebuild:
+ Fixed bug #361439
+
30 Mar 2011; Miroslav Šulc <fordfrog@gentoo.org>
-netbeans-platform-7.0_beta2.ebuild:
Removed old beta release
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 97f1bf3..94be023 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -6,7 +6,7 @@ DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160
DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-platform-7.0_beta2_p20110324.ebuild 4860 RMD160 0ce94b11d482f3f2a36a7b6b8cce20499968ae0f SHA1 3ed40227b0225daf0a1e6251ced7831b0a4d2eac SHA256 d52a3d18d4c3086a19b47d31cf76450aea786f3fbaa04464b33c753b680d51c7
-EBUILD netbeans-platform-7.0_rc1.ebuild 4835 RMD160 ea1bbe2b2bb992cfee479ef47f06ed250159be08 SHA1 82be94abdf61ca76b160ec041a2256f0041e9810 SHA256 a777764ea7f4001e11dbbb39034cc9a7a030e6870fb3b58a5367a924ba8327a8
-MISC ChangeLog 4938 RMD160 99f96d3380ca0f3ab8d9694b74956d6a3cf1f120 SHA1 2867f4f78e557bf30ee148d6670cd7ea974e9ca9 SHA256 0c4382f6443bc90706e89b9796d12c3736b6517a2eed3797ea4a0cd916e0fc53
+EBUILD netbeans-platform-7.0_beta2_p20110324.ebuild 4885 RMD160 37856b84aae3c298e67b54fc7bd5a91641816c64 SHA1 06201c7d73ddb7e42c4b5410391d33e135a775f9 SHA256 fc75121fe3114563a8f50a1a87af984bb2db29d41df27f2256e6853d3308fcb3
+EBUILD netbeans-platform-7.0_rc1.ebuild 4860 RMD160 d9264390a4720f48ca19d8d2f194a907fb8e7af4 SHA1 f50ff8867750ea098418052168621052f6ae59ff SHA256 33c5d0c6a78134d0be9eb08975ec7b5a650187db0a4f81961881e1035615d7af
+MISC ChangeLog 5095 RMD160 5eb167816a4c9ef6ad13e7269cdbe481860555c0 SHA1 a84fbe185d3fead6cbcef8b8b49488d4e77ddfaf SHA256 f817735f156bb95496edc728c30ed0abccf968b53c0dab9a3e84c577330ddd17
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0_beta2_p20110324.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0_beta2_p20110324.ebuild
index fb1aafc..b6e737c 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0_beta2_p20110324.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0_beta2_p20110324.ebuild
@@ -35,7 +35,7 @@ INSTALL_DIR="/usr/share/${PN}-${SLOT}"
EANT_BUILD_XML="nbbuild/build.xml"
EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
JAVA_PKG_BSFIX="off"
src_unpack() {
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0_rc1.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0_rc1.ebuild
index 6ed1345..09de1b7 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0_rc1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0_rc1.ebuild
@@ -35,7 +35,7 @@ INSTALL_DIR="/usr/share/${PN}-${SLOT}"
EANT_BUILD_XML="nbbuild/build.xml"
EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
JAVA_PKG_BSFIX="off"
src_unpack() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/
@ 2011-08-07 17:04 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-08-07 17:04 UTC (permalink / raw
To: gentoo-commits
commit: bf8aca30e535dcea18ca311bf0a0dd427531483f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 17:04:11 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 17:04:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=bf8aca30
dev-java/netbeans-platform: fixed compilation
---
dev-java/netbeans-platform/ChangeLog | 6 ++++++
dev-java/netbeans-platform/Manifest | 10 +++++-----
.../netbeans-platform-7.0.1.ebuild | 5 +++++
.../netbeans-platform/netbeans-platform-7.0.ebuild | 5 +++++
.../netbeans-platform-9999_p20110722.ebuild | 5 +++++
.../netbeans-platform-9999_p20110728.ebuild | 5 +++++
6 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 4ad1f7b..6494f5c 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ netbeans-platform-7.0.ebuild, netbeans-platform-7.0.1.ebuild,
+ netbeans-platform-9999_p20110722.ebuild,
+ netbeans-platform-9999_p20110728.ebuild:
+ Fixed compilation on systems where it fails when DISPLAY is set
+
*netbeans-platform-7.0.1 (02 Aug 2011)
02 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 1dd95b0..2ca40ad 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -9,9 +9,9 @@ DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e
DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
-EBUILD netbeans-platform-7.0.1.ebuild 4859 RMD160 d65ace70cb3e930b040b723cb665f1f5c5be2227 SHA1 68333eb1ab7b36ed7d602e8405f408439d0b78cd SHA256 e1c63ead3f116d4d2bbd2512b1e99524866e0160818004fc005d645ca6e529ff
-EBUILD netbeans-platform-7.0.ebuild 4855 RMD160 1bf2c46bf11d3c8767d5f03996acf9f8e81b5b87 SHA1 b26949f5b85e72c7e2b7b55b6f8f40f9493dfcd3 SHA256 3375b2dd5b9b638e91d78dc56c81128adf63b03e909c518dcae6dacb6d3ef761
-EBUILD netbeans-platform-9999_p20110722.ebuild 4882 RMD160 ff3e75ef5c4cd90b73df51c4ab726a0e0dc9f49e SHA1 fbc32b53d9b0e2603319d4fa4480a42be17ae78f SHA256 d07efa50f3b8ff8df2daf5a9b35995657eac9080557c377880bf54916ee9b24b
-EBUILD netbeans-platform-9999_p20110728.ebuild 4882 RMD160 3bdd9fe0a7855310f8888b3c3c63d05215218f60 SHA1 c739bbf9612748233322a39c493259676d9883df SHA256 c6963d73968fcf600cf3b62dfc50d96e955ee765e8c0790f4e25c708a4e78bde
-MISC ChangeLog 12367 RMD160 299ede2a2e55592a0589f269ff90f66237cd7b5a SHA1 fee571ec19a769b4d58df55c18aa852cfa8e3a60 SHA256 d1adc72900a45f116800ac8ba933c675ec1d87cf445f1fc32e20e924ff22a45d
+EBUILD netbeans-platform-7.0.1.ebuild 4988 RMD160 044cf71db52c5718f11e0586f5f08e5cb6f09b15 SHA1 47ad9159f57f16af3167c834a6a120509a670039 SHA256 21dbf43987b108e822e90a16e995745e2506436d99963876888c156c830352f9
+EBUILD netbeans-platform-7.0.ebuild 4984 RMD160 470f1d4c95158b6b7fb94ac4ee6b7985bd1fb61b SHA1 4465113d75eed71d2d0f4e13f4804ae6454d7c09 SHA256 51245298e580ca1a40d2dbb5df91dcb08a37cd21ba53bf58d28159315faf1794
+EBUILD netbeans-platform-9999_p20110722.ebuild 5011 RMD160 c2e23a5dc98b7d96d958ec18cb044908a5a8f699 SHA1 7f01e0bece69c6054ba280d026a474479f4207fe SHA256 97c4a75faf1d4e36608167cc104f15ada74d00d287291432ed6015a015808855
+EBUILD netbeans-platform-9999_p20110728.ebuild 5011 RMD160 36d6d4cfd9f68c109e337a6a6f26e740def18bcb SHA1 e6d3ac6ee9a42a8676ad867ab26dd3dcab81f1e9 SHA256 4ef9d12d4ca7487089d247528f94dce4b4eb3011afbf25dace2de6be1871382a
+MISC ChangeLog 12636 RMD160 30fe1630b098637e961ac201fe9e2b6fdf922b0a SHA1 319388e9a40ed35158777ca516ad1bb625f32dbd SHA256 b77a81fee459f8b215cbbf46518efdcc745f50f567678a458ce503bb1971f3cd
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild
index 670ba79..1867279 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild
@@ -86,6 +86,11 @@ src_prepare() {
java-pkg-2_src_prepare
}
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
src_install() {
pushd nbbuild/netbeans/platform >/dev/null || die
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild
index e7c156c..c959cf0 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild
@@ -86,6 +86,11 @@ src_prepare() {
java-pkg-2_src_prepare
}
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
src_install() {
pushd nbbuild/netbeans/platform >/dev/null || die
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110722.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110722.ebuild
index dc8b79c..ea9261b 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20110722.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20110722.ebuild
@@ -86,6 +86,11 @@ src_prepare() {
java-pkg-2_src_prepare
}
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
src_install() {
pushd nbbuild/netbeans/platform >/dev/null || die
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild
index a095cf4..1ac3e1b 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild
@@ -86,6 +86,11 @@ src_prepare() {
java-pkg-2_src_prepare
}
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
src_install() {
pushd nbbuild/netbeans/platform >/dev/null || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/
@ 2012-06-02 11:56 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2012-06-02 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 0f5cf67dc89b3a73cc85cb5334e0844bb532ec82
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 2 11:31:25 2012 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 2 11:31:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=0f5cf67d
dev-java/netbeans-platform: unbundled osgi core and cleanup
---
dev-java/netbeans-platform/ChangeLog | 4 ++++
dev-java/netbeans-platform/Manifest | 6 +++---
...ebuild => netbeans-platform-7.2_beta-r1.ebuild} | 12 ++++--------
... => netbeans-platform-9999_p20120530-r1.ebuild} | 12 ++++--------
4 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index bedc187..fb0804c 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Jun 2012; Miroslav Šulc <fordfrog@gentoo.org>
+ -netbeans-platform-7.2_beta.ebuild, -netbeans-platform-9999_p20120530.ebuild:
+ unbundled osgi core and cleanup
+
01 Jun 2012; Miroslav Šulc <fordfrog@gentoo.org>
-netbeans-platform-9999_p20120520.ebuild:
removed obsolete version
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index db9ee47..810ac5e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -22,9 +22,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-platform-7.0.1.ebuild 5049 RMD160 d6a01c7785d02b9e5aebb1a2f192c5a2b6f1ccae SHA1 2acc23f9e9f6f5c60cabce30e651b3d31d91ac41 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e
EBUILD netbeans-platform-7.1.2.ebuild 5034 RMD160 e437fa7566697d4ddfacaa5343e92212aa3b0026 SHA1 7011abec507e2c96ca56069cf6d3a2d69909b124 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6
-EBUILD netbeans-platform-7.2_beta.ebuild 5510 RMD160 dd9a73dff8a444c8a5ddeac53bc12d732eb1634e SHA1 e12a32a98a6ed70281ab500b50f86056bb5eabbe SHA256 b5ebd34e1db6b85e3238903885756c404d0e675aba0470b84405c6c977191966
+EBUILD netbeans-platform-7.2_beta-r1.ebuild 5430 RMD160 462cd01606f46c9f3d3da37c6b878390cecad7d8 SHA1 56344a68a637f8ad87530e033c7d057bc9ea9564 SHA256 b4eb5db733247b3eefe638df343ae6bc6234052b4822fc2c45d83609b96c7da3
EBUILD netbeans-platform-9999_p20120524.ebuild 5552 RMD160 b122e66e9655da1cbf1292730f27389c011f8555 SHA1 f2a1df369f96fb76f56aea34d0a7964b7ce2794d SHA256 77d3de6348063bdd554cec8a4edf23ad8541e9253b0e7178770f26b2d4ac1fed
EBUILD netbeans-platform-9999_p20120527.ebuild 5552 RMD160 f7bb7d56940b23273ce7675ec7271fde89778a46 SHA1 14746055ff8a55681ad6ba81fd8d93886b58222a SHA256 9941eb058661c967f7d29593bde92980aec038b5a61c15615c2386141e1eea56
-EBUILD netbeans-platform-9999_p20120530.ebuild 5552 RMD160 d09fa00816090af84573a9c940f73d87f2fadcd9 SHA1 f55c81b86538bfeeeccf3b18b4fcd5a98d586816 SHA256 0fdc5458513e8645c6ecf542799f87f1cf9c32f941fd725ae1dfe953fcd5501e
-MISC ChangeLog 36776 RMD160 a977f6f1a9f76254cd8477799cf44cc70a1ed200 SHA1 d6b132c06b90b7d8defd4591af3baeaae19be5e5 SHA256 404c4c790c7af3942a86a74ca3cad0060ed4805caec9a904ad3e44db62335df3
+EBUILD netbeans-platform-9999_p20120530-r1.ebuild 5472 RMD160 fea3be081c6a8ea1592530e7024de376690acca8 SHA1 b58ddd4fbb214e56e9a6230b588743193122d22e SHA256 328049bad85b6ae539cfe2dd5df9a75328c44f031a3d8f333b427d71a0158a57
+MISC ChangeLog 36943 RMD160 78d7e8c1049528f59e622ae52df2746e11ded31f SHA1 83a13653dccbe0027fd175399b8d1a0241597e06 SHA256 017c09d597251189a3e03fd9cea4e3599196f32244879c90d5660ce9afabba3c
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.2_beta.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.2_beta-r1.ebuild
similarity index 94%
rename from dev-java/netbeans-platform/netbeans-platform-7.2_beta.ebuild
rename to dev-java/netbeans-platform/netbeans-platform-7.2_beta-r1.ebuild
index 6f4bc81..a9bf1bd 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.2_beta.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.2_beta-r1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="${SOURCE_URL}
http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
- http://hg.netbeans.org/binaries/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar
http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
http://hg.netbeans.org/binaries/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar
http://hg.netbeans.org/binaries/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip"
@@ -26,6 +25,7 @@ S="${WORKDIR}"
CDEPEND="dev-java/javahelp:0
>=dev-java/jna-3.4:0
+ dev-java/osgi-core-api:0
dev-java/swing-layout:1[source]"
DEPEND="virtual/jdk:1.6
app-arch/unzip
@@ -53,7 +53,6 @@ src_unpack() {
ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
ln -s "${DISTDIR}"/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar netbinox/external/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar || die
ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
- ln -s "${DISTDIR}"/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar libs.osgi/external/osgi.core-4.3.jar || die
ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
ln -s "${DISTDIR}"/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar libs.testng/external/testng-6.5.1-dist.jar || die
ln -s "${DISTDIR}"/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip libs.testng/external/testng-6.5.1-javadoc.zip || die
@@ -64,8 +63,8 @@ src_prepare() {
einfo "Deleting bundled class files..."
find -name "*.class" -type f | xargs rm -vf
- epatch netbeans-7.2-build.xml.patch
# upstream jna jar contains bundled binary libraries so we disable that feature
+ epatch netbeans-7.2-build.xml.patch
# Support for custom patches
if [ -n "${NETBEANS72_PATCHES_DIR}" -a -d "${NETBEANS72_PATCHES_DIR}" ] ; then
@@ -84,6 +83,7 @@ src_prepare() {
java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.4.0.jar
java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.4.0.jar
+ java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-4.3.jar
java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
@@ -116,15 +116,11 @@ src_install() {
local instdir=${INSTALL_DIR}/modules/ext
pushd "${D}"/${instdir} >/dev/null || die
- # felix-main-2.0.2.jar
- # felix-4.0.2.jar
rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
rm jna-3.4.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.4.0.jar || die
- # osgi.cmpn-4.2.jar
- # osgi.core-4.3.jar
+ rm osgi.core-4.3.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-4.3.jar || die
rm platform-3.4.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.4.0.jar || die
rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
- # updater.jar
popd >/dev/null || die
dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20120530-r1.ebuild
similarity index 94%
rename from dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild
rename to dev-java/netbeans-platform/netbeans-platform-9999_p20120530-r1.ebuild
index ece1f93..b720143 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20120530-r1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="${SOURCE_URL}
http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
- http://hg.netbeans.org/binaries/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar
http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
http://hg.netbeans.org/binaries/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar
http://hg.netbeans.org/binaries/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip"
@@ -26,6 +25,7 @@ S="${WORKDIR}"
CDEPEND="dev-java/javahelp:0
>=dev-java/jna-3.4:0
+ dev-java/osgi-core-api:0
dev-java/swing-layout:1[source]"
DEPEND="virtual/jdk:1.6
app-arch/unzip
@@ -53,7 +53,6 @@ src_unpack() {
ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
ln -s "${DISTDIR}"/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar netbinox/external/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar || die
ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
- ln -s "${DISTDIR}"/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar libs.osgi/external/osgi.core-4.3.jar || die
ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
ln -s "${DISTDIR}"/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar libs.testng/external/testng-6.5.1-dist.jar || die
ln -s "${DISTDIR}"/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip libs.testng/external/testng-6.5.1-javadoc.zip || die
@@ -64,8 +63,8 @@ src_prepare() {
einfo "Deleting bundled class files..."
find -name "*.class" -type f | xargs rm -vf
- epatch netbeans-9999-r6-build.xml.patch
# upstream jna jar contains bundled binary libraries so we disable that feature
+ epatch netbeans-9999-r6-build.xml.patch
# Support for custom patches
if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
@@ -84,6 +83,7 @@ src_prepare() {
java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.4.0.jar
java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.4.0.jar
+ java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-4.3.jar
java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
@@ -116,15 +116,11 @@ src_install() {
local instdir=${INSTALL_DIR}/modules/ext
pushd "${D}"/${instdir} >/dev/null || die
- # felix-main-2.0.2.jar
- # felix-4.0.2.jar
rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
rm jna-3.4.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.4.0.jar || die
- # osgi.cmpn-4.2.jar
- # osgi.core-4.3.jar
+ rm osgi.core-4.3.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-4.3.jar || die
rm platform-3.4.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.4.0.jar || die
rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
- # updater.jar
popd >/dev/null || die
dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-02 11:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-02 11:56 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2011-08-07 17:04 Miroslav Šulc
2011-03-31 11:54 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox