summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-01-12 22:37:59 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-01-12 22:37:59 +0000
commit875b004a1b26f8ec175b10b642314793598cfe78 (patch)
tree089fe4c08dab4e0619f4712f914ba0ad425f116e /dev-util/netbeans
parentstable bump (diff)
downloadhistorical-875b004a1b26f8ec175b10b642314793598cfe78.tar.gz
historical-875b004a1b26f8ec175b10b642314793598cfe78.tar.bz2
historical-875b004a1b26f8ec175b10b642314793598cfe78.zip
netbeans-6.9.1: just few minor fixes, also switched to EAPI=3
Package-Manager: portage-2.1.9.30/cvs/Linux x86_64
Diffstat (limited to 'dev-util/netbeans')
-rw-r--r--dev-util/netbeans/ChangeLog7
-rw-r--r--dev-util/netbeans/Manifest4
-rw-r--r--dev-util/netbeans/netbeans-6.9.1.ebuild18
3 files changed, 19 insertions, 10 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 0c9a10fc7210..105b4a07c906 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/netbeans
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.148 2010/08/08 20:22:10 fordfrog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.149 2011/01/12 22:37:59 fordfrog Exp $
+
+ 12 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.9.1.ebuild:
+ just few minor fixes, also switched to EAPI=3
08 Aug 2010; Miroslav Šulc <fordfrog@gentoo.org> -files/6.9/netbeans.png,
netbeans-6.9.1.ebuild:
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 4e72357e56e9..ab8503973439 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -25,6 +25,6 @@ EBUILD netbeans-6.7.1.ebuild 42302 RMD160 97684afb2c5ca20d654e03fb44c75918f5bb4f
EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2a3a SHA1 bf2af027925686c64e58a34d60bbe7fada2cac4a SHA256 5b34a9b43e28cefa7518645f2850f480e25701e09b9cbb4afb304cdb893d3d80
EBUILD netbeans-6.9-r2.ebuild 46059 RMD160 a76d01fb0de80eb5151602e6d7abcf9108b96a29 SHA1 1e8de42b3a199b922e8d1ebe1ca84e8e685a8ed0 SHA256 85f98f30743b35af4bfa9d16706c9c9ebd4d7b0d6c5bb0d385a21b1e1c76326d
EBUILD netbeans-6.9-r3.ebuild 47312 RMD160 46785d484ca8ae6fb3593f43a3bb9fb0e4c91f2b SHA1 d56cb739b6851485809b3b86fda1388682408456 SHA256 1c06cbc5f876129bb4b1c9af05d0cf4f52dfb219b5136b0c8222f3e987ae4282
-EBUILD netbeans-6.9.1.ebuild 49172 RMD160 25333befb248036758a8e9365f72596c889136e8 SHA1 b97b20898c2921024b5aeb92acb646c4d07a4677 SHA256 5bb7cf622d055543abbe6b027dcdb79160a25324e28b9bb3a46351c30d1e0573
-MISC ChangeLog 27966 RMD160 446d50db4af40e4a98e40f044bc1f2ef9c19bf19 SHA1 16d4c3acdcd2ba0b64b556330ce56c46cbe311ef SHA256 8b3df6f5eea77e82508a320fafc1c1a24ecf6a2a28015d2b04ec3b1216037a1f
+EBUILD netbeans-6.9.1.ebuild 49335 RMD160 5e1cad03a280bd71c108a565e85fe460c48c0063 SHA1 9fc22a9136e315db63443e20a772c8a466257b8c SHA256 676aa2f22764b1118faf8b7273f0fc1e27e6a4901892282481599393dc8aa2fb
+MISC ChangeLog 28090 RMD160 576d7df1844ac373946b13ed176c4e68ca6dbb6e SHA1 e04d273493fb89e6acd94ff4bbd8bd4913b11085 SHA256 359727bb0cc595c4dfe379164fc248856d377b69566d1240e8f6ca0108f28ae4
MISC metadata.xml 1322 RMD160 04ba87bda7c1a2322721b78b5e071760be5686f7 SHA1 2a9a7b60c4da843a985ab38c0e5deb8654a62952 SHA256 2edbcc66e3e4449c48a6aae87e223c396acaf0a81483d2f7106ebf7a909c2af5
diff --git a/dev-util/netbeans/netbeans-6.9.1.ebuild b/dev-util/netbeans/netbeans-6.9.1.ebuild
index a99a594da6d7..0c48969a5443 100644
--- a/dev-util/netbeans/netbeans-6.9.1.ebuild
+++ b/dev-util/netbeans/netbeans-6.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.1.ebuild,v 1.2 2010/08/08 20:22:10 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.1.ebuild,v 1.3 2011/01/12 22:37:59 fordfrog Exp $
-EAPI="2"
+EAPI="3"
WANT_SPLIT_ANT="true"
inherit eutils java-pkg-2 java-ant-2
@@ -451,6 +451,12 @@ pkg_setup() {
java-pkg-2_pkg_setup
}
+# Custom unpack function to prevent warning about not being able to unpack netbeans-6.9.png
+src_unpack () {
+ unpack ${P}.tar.bz2
+ unpack ${P}-l10n.tar.bz2
+}
+
src_prepare () {
# We need to disable downloading of jars
epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \
@@ -848,11 +854,11 @@ src_install() {
dodir /usr/share/icons/hicolor/32x32/apps
dosym ${DESTINATION}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
dodir /usr/share/icons/hicolor/128x128/apps
- cp "${S}"/${PN}-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
+ cp "${DISTDIR}"/${PN}-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
fi
- make_desktop_entry netbeans-${SLOT} "Netbeans ${SLOT}" netbeans-${SLOT} Development
+ make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
}
pkg_postinst() {
@@ -1020,7 +1026,7 @@ symlink_extjars() {
# osgi.cmpn-4.2.jar - not packaged
dosyminstjar ${targetdir} swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
- if use netbeans_module_cnd ; then
+ if use netbeans_modules_cnd ; then
targetdir="cnd/modules/ext"
# antlr-3.1.3.jar - upstream contains more classes
# antlr-runtime-3.1.3.jar - subset of antlr classes