summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-06-11 15:50:20 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-06-11 15:50:20 +0000
commit48bcce15bbca18122b118bbcc4e12d99ac278553 (patch)
tree3e9fd92a9fde261ee8a50ea3fe910a4eedbc403b /dev-util
parentRemoved old ebuild (diff)
downloadhistorical-48bcce15bbca18122b118bbcc4e12d99ac278553.tar.gz
historical-48bcce15bbca18122b118bbcc4e12d99ac278553.tar.bz2
historical-48bcce15bbca18122b118bbcc4e12d99ac278553.zip
Remove build requirement on sun-jmx as Netbeans builds just fine with the jar deleted.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/netbeans/ChangeLog6
-rw-r--r--dev-util/netbeans/Manifest22
-rw-r--r--dev-util/netbeans/netbeans-5.5-r6.ebuild12
3 files changed, 22 insertions, 18 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index da927b6f8168..87da40d4fee9 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/netbeans
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.66 2007/05/23 17:36:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.67 2007/06/11 15:50:20 betelgeuse Exp $
+
+ 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> netbeans-5.5-r6.ebuild:
+ Remove build requirement on sun-jmx as Netbeans builds just fine with the
+ jar deleted.
23 May 2007; Diego Pettenò <flameeyes@gentoo.org> netbeans-5.5-r6.ebuild:
Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c1fd4dfe6584..3a95f1ac54d0 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -35,14 +35,14 @@ EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123c
MD5 c88a45d50b635a08a98c7df99e63a87a netbeans-3.6-r1.ebuild 3140
RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 netbeans-3.6-r1.ebuild 3140
SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb netbeans-3.6-r1.ebuild 3140
-EBUILD netbeans-5.5-r6.ebuild 13578 RMD160 b330bc6496dc84bd5ed6dfb3129215663615a520 SHA1 392b1ff16f0f39ef0e8ca2775ac95da5c478da1b SHA256 9121612b3ba32640c42819252d82f2ab668888193098893851f54ee1600930da
-MD5 deb1bd00e774233fa1d262f23e8a3a6d netbeans-5.5-r6.ebuild 13578
-RMD160 b330bc6496dc84bd5ed6dfb3129215663615a520 netbeans-5.5-r6.ebuild 13578
-SHA256 9121612b3ba32640c42819252d82f2ab668888193098893851f54ee1600930da netbeans-5.5-r6.ebuild 13578
-MISC ChangeLog 12300 RMD160 7e3775d1d5a7ba5b6bcee076c8a7309828ebb64c SHA1 aa6a6edf44eb982c12c156dadb4305bbd3ec97d8 SHA256 17bca9cc8214bd5a411f2eff809e1b9c82d5cf8dc48d6feabe300b8c73399f31
-MD5 069b1e9adc1d4697d087595597e7025e ChangeLog 12300
-RMD160 7e3775d1d5a7ba5b6bcee076c8a7309828ebb64c ChangeLog 12300
-SHA256 17bca9cc8214bd5a411f2eff809e1b9c82d5cf8dc48d6feabe300b8c73399f31 ChangeLog 12300
+EBUILD netbeans-5.5-r6.ebuild 13577 RMD160 e6569b105f5eaa0fcab73488ddcccc57e8b8170a SHA1 976f0e1c18a595f043fad2caf831afcdf3d80928 SHA256 2b4b3ebd8adb8920310e40bf9c6f0f5ded8c9447d77fff9b982df7635181910e
+MD5 316a9a7401ac1e0e2f9b75a1cedf9422 netbeans-5.5-r6.ebuild 13577
+RMD160 e6569b105f5eaa0fcab73488ddcccc57e8b8170a netbeans-5.5-r6.ebuild 13577
+SHA256 2b4b3ebd8adb8920310e40bf9c6f0f5ded8c9447d77fff9b982df7635181910e netbeans-5.5-r6.ebuild 13577
+MISC ChangeLog 12470 RMD160 4f5303e21897a68aca1216fdfb8c90aadb1eeda6 SHA1 756573ac6f6e6d945eb6db8782318e3e953db7ab SHA256 261d4704cc4a09bebef7efac76cdc5f4b553d948ed562282072a42d9b05dd25d
+MD5 89a0bed64900b8636654432037c673ab ChangeLog 12470
+RMD160 4f5303e21897a68aca1216fdfb8c90aadb1eeda6 ChangeLog 12470
+SHA256 261d4704cc4a09bebef7efac76cdc5f4b553d948ed562282072a42d9b05dd25d ChangeLog 12470
MISC metadata.xml 1328 RMD160 4eecca7673969a73ff2ca027a39392d9b1a2f4c9 SHA1 dbea16e30375f2831e91c850baf699411fe9d1c6 SHA256 a573ece663e4ce95e27ceaf072610b6e9912dbfd580b8f3b7fc1480345ae2788
MD5 6f58315d4c3eb8d8a3c27be4f8054542 metadata.xml 1328
RMD160 4eecca7673969a73ff2ca027a39392d9b1a2f4c9 metadata.xml 1328
@@ -56,7 +56,7 @@ SHA256 6ccefbf351ddcc6eb05dc70fb8ba2453bbec18957ccf012e31f920e52c73e664 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGVHueAiZjviIA2XgRAjYaAJ9A2aSzW7F6g4q2xxsto/Q9ps0hwACgiUPq
-tCzf1sR6uSDIKpKqOkc+pDQ=
-=BDh9
+iD8DBQFGbW9HcxLzpIGCsLQRAjE2AJ9xF6EfW98T5iTRSqDxjHBCoqsmTQCfZF/9
+NW9amiHEvM8K2sZFz8OFa9U=
+=Hnxb
-----END PGP SIGNATURE-----
diff --git a/dev-util/netbeans/netbeans-5.5-r6.ebuild b/dev-util/netbeans/netbeans-5.5-r6.ebuild
index e98765430356..4fc00f2c0bc6 100644
--- a/dev-util/netbeans/netbeans-5.5-r6.ebuild
+++ b/dev-util/netbeans/netbeans-5.5-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r6.ebuild,v 1.6 2007/05/23 17:36:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r6.ebuild,v 1.7 2007/06/11 15:50:20 betelgeuse Exp $
inherit eutils java-pkg-2 java-ant-2 versionator
@@ -76,7 +76,6 @@ DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
>=dev-java/prefuse-20060715_beta
>=dev-java/rome-0.6
=dev-java/servletapi-2.3*
- dev-java/sun-jmx
=dev-java/xml-xmlbeans-1*
>=dev-util/pmd-1.3
${COMMON_DEPEND}"
@@ -139,7 +138,7 @@ src_compile() {
-name "*.exe" -o \
-name "*.cmd" -o \
-name "*.bat" -o \
- -name "*.dll" \
+ -name "*.dll" \
| xargs rm -f
# Removing external stuff. They are api docs from external libs.
@@ -286,9 +285,10 @@ place_unpack_symlinks() {
cd ${S}/nbbuild/external
java-pkg_jar-from javahelp jhall.jar jhall-2.0_03.jar
- einfo "Symlinking jars for serverplugins"
- cd ${S}/serverplugins/external
- java-pkg_jar-from --build-only sun-jmx jmxri.jar jmxremote.jar
+ cd "${S}/serverplugins/external"
+ # Builds just fine without this. Maybe lefover from times when NB could be
+ # built with 1.4?
+ rm -v jmxremote.jar || die
einfo "Symlinking jars for tasklist"
cd ${S}/tasklist/external