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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/
Date: Sat,  2 Jun 2012 11:56:39 +0000 (UTC)	[thread overview]
Message-ID: <1338636685.0f5cf67dc89b3a73cc85cb5334e0844bb532ec82.fordfrog@gentoo> (raw)

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

next             reply	other threads:[~2012-06-02 11:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-02 11:56 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-07 17:04 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/ Miroslav Šulc
2011-03-31 11:54 Miroslav Šulc

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:bedc187 dfblob:fb0804c dfblob:db9ee47 dfblob:810ac5e
dfblob:6f4bc81 dfblob:a9bf1bd dfblob:ece1f93 dfblob:b720143 )
 OR (
bs:"[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1338636685.0f5cf67dc89b3a73cc85cb5334e0844bb532ec82.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox