public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/netbeans-platform: ChangeLog netbeans-platform-7.1.2.ebuild
@ 2012-05-30  5:57 Johannes Huber (johu)
  0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber (johu) @ 2012-05-30  5:57 UTC (permalink / raw
  To: gentoo-commits

johu        12/05/30 05:57:55

  Modified:             ChangeLog netbeans-platform-7.1.2.ebuild
  Log:
  Stable for x86, wrt bug #417799
  
  (Portage version: 2.2.0_alpha108/cvs/Linux i686)

Revision  Changes    Path
1.16                 dev-java/netbeans-platform/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	28 May 2012 12:34:50 -0000	1.15
+++ ChangeLog	30 May 2012 05:57:55 -0000	1.16
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/netbeans-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.15 2012/05/28 12:34:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.16 2012/05/30 05:57:55 johu Exp $
+
+  30 May 2012; Johannes Huber <johu@gentoo.org> netbeans-platform-7.1.2.ebuild:
+  Stable for x86, wrt bug #417799
 
   28 May 2012; Agostino Sarubbo <ago@gentoo.org>
   netbeans-platform-7.1.2.ebuild:



1.3                  dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?r1=1.2&r2=1.3

Index: netbeans-platform-7.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netbeans-platform-7.1.2.ebuild	28 May 2012 12:34:50 -0000	1.2
+++ netbeans-platform-7.1.2.ebuild	30 May 2012 05:57:55 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.2.ebuild,v 1.2 2012/05/28 12:34:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.3 2012/05/30 05:57:55 johu Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -18,7 +18,7 @@
 	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
 	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}"
 






^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/netbeans-platform: ChangeLog netbeans-platform-7.1.2.ebuild
@ 2012-05-28 12:34 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 3+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-05-28 12:34 UTC (permalink / raw
  To: gentoo-commits

ago         12/05/28 12:34:51

  Modified:             ChangeLog netbeans-platform-7.1.2.ebuild
  Log:
  Stable for amd64, wrt bug #417799
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.15                 dev-java/netbeans-platform/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	7 May 2012 06:32:55 -0000	1.14
+++ ChangeLog	28 May 2012 12:34:50 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/netbeans-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.14 2012/05/07 06:32:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.15 2012/05/28 12:34:50 ago Exp $
+
+  28 May 2012; Agostino Sarubbo <ago@gentoo.org>
+  netbeans-platform-7.1.2.ebuild:
+  Stable for amd64, wrt bug #417799
 
   07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   netbeans-platform-7.1.1.ebuild:



1.2                  dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?r1=1.1&r2=1.2

Index: netbeans-platform-7.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-platform-7.1.2.ebuild	26 Apr 2012 21:50:38 -0000	1.1
+++ netbeans-platform-7.1.2.ebuild	28 May 2012 12:34:50 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.2.ebuild,v 1.1 2012/04/26 21:50:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.2 2012/05/28 12:34:50 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -18,7 +18,7 @@
 	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
 	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 






^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/netbeans-platform: ChangeLog netbeans-platform-7.1.2.ebuild
@ 2012-04-26 21:50 Miroslav Sulc (fordfrog)
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2012-04-26 21:50 UTC (permalink / raw
  To: gentoo-commits

fordfrog    12/04/26 21:50:38

  Modified:             ChangeLog
  Added:                netbeans-platform-7.1.2.ebuild
  Log:
  dev-java/netbeans-platform: version bump in 7.1 slot
  
  (Portage version: 2.1.10.57/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 dev-java/netbeans-platform/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	5 Mar 2012 14:07:39 -0000	1.11
+++ ChangeLog	26 Apr 2012 21:50:38 -0000	1.12
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/netbeans-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.11 2012/03/05 14:07:39 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.12 2012/04/26 21:50:38 fordfrog Exp $
+
+*netbeans-platform-7.1.2 (26 Apr 2012)
+
+  26 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-7.1.2.ebuild:
+  Version bump in 7.1 slot
 
 *netbeans-platform-7.1.1 (05 Mar 2012)
 



1.1                  dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild?rev=1.1&content-type=text/plain

Index: netbeans-platform-7.1.2.ebuild
===================================================================
# Copyright 1999-2012 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.1.2.ebuild,v 1.1 2012/04/26 21:50:38 fordfrog Exp $

EAPI="4"
WANT_ANT_TASKS="ant-nodeps"
inherit eutils java-pkg-2 java-ant-2

DESCRIPTION="Netbeans Platform"
HOMEPAGE="http://netbeans.org/features/platform/"
SLOT="7.1"
SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
SRC_URI="${SOURCE_URL}
	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
	http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar
	http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar
	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}"

CDEPEND="dev-java/javahelp:0
	>=dev-java/jna-3.2.7:0
	dev-java/swing-layout:1[source]"
DEPEND="virtual/jdk:1.6
	app-arch/unzip
	${CDEPEND}"
RDEPEND=">=virtual/jdk-1.6
	${CDEPEND}"

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.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
JAVA_PKG_BSFIX="off"

src_unpack() {
	unpack $(basename ${SOURCE_URL})

	einfo "Deleting bundled jars..."
	find -name "*.jar" -type f -delete

	unpack netbeans-9999-r1-build.xml.patch.bz2

	pushd "${S}" >/dev/null || die
	ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die
	ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die
	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die
	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
	popd >/dev/null || die
}

src_prepare() {
	einfo "Deleting bundled class files..."
	find -name "*.class" -type f | xargs rm -vf

	epatch netbeans-9999-r1-build.xml.patch
	# upstream jna jar contains bundled binary libraries so we disable that feature

	# Support for custom patches
	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`

		if [ -n "${files}" ] ; then
			einfo "Applying custom patches:"

			for file in ${files} ; do
				epatch "${file}"
			done
		fi
	fi

	einfo "Symlinking external libraries..."
	java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die

	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

	java-pkg_dojar lib/*.jar
	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die

	insinto ${INSTALL_DIR}
	doins -r *
	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
	rm -fr "${D}"/modules/lib || die

	popd >/dev/null || die

	fperms 775 ${INSTALL_DIR}/lib/nbexec
	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}

	local instdir=${INSTALL_DIR}/modules/ext
	pushd "${D}"/${instdir} >/dev/null || die
	# felix-main-2.0.2.jar
	# felix-2.0.3.jar
	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
	# osgi.cmpn-4.2.jar
	# osgi.core-4.2.jar
	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die
	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
	# updater.jar
	popd >/dev/null || die

	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-05-30  5:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30  5:57 [gentoo-commits] gentoo-x86 commit in dev-java/netbeans-platform: ChangeLog netbeans-platform-7.1.2.ebuild Johannes Huber (johu)
  -- strict thread matches above, loose matches on Subject: below --
2012-05-28 12:34 Agostino Sarubbo (ago)
2012-04-26 21:50 Miroslav Sulc (fordfrog)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox