summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-08-07 17:07:12 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-08-07 17:07:12 +0000
commit9f643ab7d7e84eb1e7f7f0f101c680917d0d7e30 (patch)
treef1e7c06a800e4a7a271cf0be8832fd8bf367614b /dev-java
parentDrop alpha keyword (diff)
downloadgentoo-2-9f643ab7d7e84eb1e7f7f0f101c680917d0d7e30.tar.gz
gentoo-2-9f643ab7d7e84eb1e7f7f0f101c680917d0d7e30.tar.bz2
gentoo-2-9f643ab7d7e84eb1e7f7f0f101c680917d0d7e30.zip
dev-java/netbeans-platform: fixed compilation
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/netbeans-platform/ChangeLog6
-rw-r--r--dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild7
-rw-r--r--dev-java/netbeans-platform/netbeans-platform-7.0.ebuild7
3 files changed, 17 insertions, 3 deletions
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index a91836940ac7..d7ee14a3ae72 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/netbeans-platform
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.5 2011/08/05 09:42:25 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.6 2011/08/07 17:07:12 fordfrog Exp $
+
+ 07 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ netbeans-platform-7.0.ebuild, netbeans-platform-7.0.1.ebuild:
+ Fixed compilation on systems where it fails when DISPLAY is set
*netbeans-platform-7.0.1 (05 Aug 2011)
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 ef9802acb477..3cb6254ee416 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild,v 1.1 2011/08/05 09:42:25 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.0.1.ebuild,v 1.2 2011/08/07 17:07:12 fordfrog Exp $
EAPI="4"
WANT_ANT_TASKS="ant-nodeps"
@@ -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 04e3e9047c81..84df10b5cc1b 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild,v 1.1 2011/04/21 10:27:02 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.0.ebuild,v 1.2 2011/08/07 17:07:12 fordfrog Exp $
EAPI="4"
WANT_ANT_TASKS="ant-nodeps"
@@ -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