dev-java/netbeans-platform: fixed compilation

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 20 insertions, 6 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/Manifest b/dev-java/netbeans-platform/Manifest
index 2c5011f09dec..35747e9dd69e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -6,7 +6,7 @@ DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-EBUILD netbeans-platform-7.0.1.ebuild 4980 RMD160 38fb0a5377e75dedf07893201a659569cb42d36e SHA1 9a55712af9d732b942a90e4433f8cb7b15d6ffbf SHA256 8865526c476c620b59ee0e0cb3441e65fa7e76cc1d99ad81169f77d0def52beb
-EBUILD netbeans-platform-7.0.ebuild 4974 RMD160 da6a53457cfec4c6548ed86e69aa44b10b30c961 SHA1 2cb26a4e49bb1d66167658480a241b455e93650e SHA256 08b93ab3d28c24cba58cfe35d67fb71478df3bb451fda0a3a3d74c1638148220
-MISC ChangeLog 1014 RMD160 6579765a6eaddaf3ae8d8ccdf41131da0b0601d8 SHA1 c0f3fdd3a6f648dec36f13bec5a4c3cf41a4228e SHA256 a85c7b406b80f6fe5e6031b04aa6751d5d9480c86f2c278bc6c3f01b2056b742
+EBUILD netbeans-platform-7.0.1.ebuild 5109 RMD160 6a75f779689c74f77c61eb5b53111a32caf5bef9 SHA1 3ae6cd1e591c76e68baf7aded719b753afd54cc5 SHA256 a6f6738d96bb698159a6f4bad65b031f82625488c186b1bfeb15f8225f62f2a5
+EBUILD netbeans-platform-7.0.ebuild 5103 RMD160 1c1a5b4026cceaf4ceae7e186379400f6219b8dd SHA1 e6d7f7aef3ef8bc185af177087db2d18c0576aa7 SHA256 a0fc941e76cd8041b52af524f9f96045266ff708799d248a2ba75f030c9d95f8
+MISC ChangeLog 1197 RMD160 1942c85e11ae5ce5a55893f053135d6a533ec590 SHA1 d970d85cce569ab120bc6ec38996c97b8cf3c00a SHA256 ccec0143bfcb1c0307dfb244d3f09b32b0a9884c8f427504bb0ff027f9914a01
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
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