From: Miroslav Šulc Date: Mon, 22 Aug 2011 12:56:49 +0000 (+0000) Subject: dev-java/netbeans-ide: fixed compilation issue X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9ac0b02b2599d7f8b396f7ed51a211413edc7691;p=gentoo.git dev-java/netbeans-ide: fixed compilation issue Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog index 9685b3a8fcb5..bbe89419bcc6 100644 --- a/dev-java/netbeans-ide/ChangeLog +++ b/dev-java/netbeans-ide/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/netbeans-ide # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/ChangeLog,v 1.6 2011/08/22 12:45:13 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/ChangeLog,v 1.7 2011/08/22 12:56:49 fordfrog Exp $ + + 22 Aug 2011; Miroslav Å ulc netbeans-ide-7.0.1.ebuild: + Fixed problem with compilation on some systems when DISPLAY is set (bug + #379769) 22 Aug 2011; Miroslav Å ulc -netbeans-ide-7.0.ebuild: Removed obsolete version diff --git a/dev-java/netbeans-ide/netbeans-ide-7.0.1.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.0.1.ebuild index 36cfb15787d8..d2acda00e347 100644 --- a/dev-java/netbeans-ide/netbeans-ide-7.0.1.ebuild +++ b/dev-java/netbeans-ide/netbeans-ide-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-ide/netbeans-ide-7.0.1.ebuild,v 1.1 2011/08/05 09:45:17 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/netbeans-ide-7.0.1.ebuild,v 1.2 2011/08/22 12:56:49 fordfrog Exp $ EAPI="4" WANT_ANT_TASKS="ant-nodeps" @@ -106,7 +106,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.ide -Dext.binaries.downloaded=true" +EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true" JAVA_PKG_BSFIX="off" src_unpack() { @@ -240,6 +240,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/ide >/dev/null || die