diff options
author | 2005-06-04 16:02:53 +0000 | |
---|---|---|
committer | 2005-06-04 16:02:53 +0000 | |
commit | 56eebf8b7e8bb2bb6ec95b55f99ae65cbfe790e2 (patch) | |
tree | 1f1867a884e95720a6a54cfad5d87420515fdd02 | |
parent | 2.3 doesnt install a versioned jar any longer, fixes #93280. introduced suppo... (diff) | |
download | gentoo-2-56eebf8b7e8bb2bb6ec95b55f99ae65cbfe790e2.tar.gz gentoo-2-56eebf8b7e8bb2bb6ec95b55f99ae65cbfe790e2.tar.bz2 gentoo-2-56eebf8b7e8bb2bb6ec95b55f99ae65cbfe790e2.zip |
Updated reference to servletapi-2.3, we dont install a versioned servletapi jar any longer.
(Portage version: 2.0.51.22-r1)
-rw-r--r-- | dev-db/hsqldb/ChangeLog | 9 | ||||
-rw-r--r-- | dev-db/hsqldb/Manifest | 8 | ||||
-rw-r--r-- | dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1 (renamed from dev-db/hsqldb/files/digest-hsqldb-1.7.3.1) | 0 | ||||
-rw-r--r-- | dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild (renamed from dev-db/hsqldb/hsqldb-1.7.3.1.ebuild) | 4 | ||||
-rw-r--r-- | dev-java/xom/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/xom/files/digest-xom-1.0-r1 (renamed from dev-java/xom/files/digest-xom-1.0) | 0 | ||||
-rw-r--r-- | dev-java/xom/xom-1.0-r1.ebuild (renamed from dev-java/xom/xom-1.0.ebuild) | 14 | ||||
-rw-r--r-- | dev-java/xt/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/xt/Manifest | 12 | ||||
-rw-r--r-- | dev-java/xt/files/digest-xt-20020426a-r1 (renamed from dev-java/xt/files/digest-xt-20020426a) | 0 | ||||
-rw-r--r-- | dev-java/xt/xt-20020426a-r1.ebuild (renamed from dev-java/xt/xt-20020426a.ebuild) | 4 | ||||
-rw-r--r-- | dev-util/netbeans/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/netbeans/files/digest-netbeans-4.0-r1 | 2 | ||||
-rw-r--r-- | dev-util/netbeans/netbeans-4.0-r1.ebuild | 343 | ||||
-rw-r--r-- | dev-util/netbeans/netbeans-4.0.ebuild | 4 |
15 files changed, 395 insertions, 32 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog index 880c95edc2bc..7e2062e45a8c 100644 --- a/dev-db/hsqldb/ChangeLog +++ b/dev-db/hsqldb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/hsqldb # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.11 2005/05/18 11:29:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.12 2005/06/04 16:02:23 luckyduck Exp $ + +*hsqldb-1.7.3.1-r1 (04 Jun 2005) + + 04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -hsqldb-1.7.3.1.ebuild, + +hsqldb-1.7.3.1-r1.ebuild: + Updated reference to servletapi-2.3, we dont install a versioned servletapi + jar any longer. 18 May 2005; Markus Rothe <corsair@gentoo.org> hsqldb-1.7.3.1.ebuild: Stable on ppc64 diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest index bd5d1dc80208..57cef893887d 100644 --- a/dev-db/hsqldb/Manifest +++ b/dev-db/hsqldb/Manifest @@ -1,7 +1,7 @@ -MD5 231424d997671d580c659cdb4be99c7a ChangeLog 1580 -MD5 422987a20b21aba357549be2e442cba7 hsqldb-1.7.3.1.ebuild 2581 +MD5 ca5995c486b3b4e308b59a7b90415d66 ChangeLog 1816 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 -MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1 64 -MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461 +MD5 3649328ab63559419485791e89af38d9 hsqldb-1.7.3.1-r1.ebuild 2550 MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153 +MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339 +MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64 diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1 index ca1745f96ca7..ca1745f96ca7 100644 --- a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1 +++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1 diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild index 4ee010038508..c9435ac29376 100644 --- a/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild +++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild,v 1.8 2005/05/18 11:29:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.1 2005/06/04 16:02:23 luckyduck Exp $ inherit java-pkg eutils @@ -27,7 +27,7 @@ src_unpack() { unpack ${A} cd ${S}/lib rm *.jar - java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar + java-pkg_jar-from servletapi-2.3 cd .. sed -i -r \ -e "s/etc\/sysconfig/etc\/conf.d/g" \ diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog index 04aa72ae4268..37c7f961456e 100644 --- a/dev-java/xom/ChangeLog +++ b/dev-java/xom/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/xom # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.13 2005/04/28 19:19:18 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.14 2005/06/04 16:02:48 luckyduck Exp $ + +*xom-1.0-r1 (04 Jun 2005) + + 04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -xom-1.0.ebuild, + +xom-1.0-r1.ebuild: + Updated reference to servletapi-2.3, we dont install a versioned servletapi + jar any longer. 28 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xom-1.0.ebuild, -xom-1.0_beta5.ebuild, -xom-1.0_beta6.ebuild: diff --git a/dev-java/xom/files/digest-xom-1.0 b/dev-java/xom/files/digest-xom-1.0-r1 index c722e54a8182..c722e54a8182 100644 --- a/dev-java/xom/files/digest-xom-1.0 +++ b/dev-java/xom/files/digest-xom-1.0-r1 diff --git a/dev-java/xom/xom-1.0.ebuild b/dev-java/xom/xom-1.0-r1.ebuild index 9679adb502c6..3948660d614b 100644 --- a/dev-java/xom/xom-1.0.ebuild +++ b/dev-java/xom/xom-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0.ebuild,v 1.2 2005/04/28 19:19:18 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r1.ebuild,v 1.1 2005/06/04 16:02:48 luckyduck Exp $ inherit java-pkg @@ -16,15 +16,15 @@ IUSE="doc jikes source" DEPEND=">=virtual/jdk-1.3 >=dev-java/ant-1.4 - >=dev-java/xerces-2.6.2-r1 + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.3 + =dev-java/xerces-2.6* dev-java/xalan dev-java/junit dev-java/icu4j dev-java/tagsoup - =dev-java/servletapi-2.3* - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jdk-1.3" + =dev-java/servletapi-2.3*" S=${WORKDIR}/XOM @@ -37,7 +37,7 @@ src_unpack() { java-pkg_jar-from junit java-pkg_jar-from xalan java-pkg_jar-from xerces-2 - java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar + java-pkg_jar-from servletapi-2.3 java-pkg_jar-from icu4j icu4j.jar normalizer.jar java-pkg_jar-from tagsoup } diff --git a/dev-java/xt/ChangeLog b/dev-java/xt/ChangeLog index 34237c359035..9d2a828e0dd4 100644 --- a/dev-java/xt/ChangeLog +++ b/dev-java/xt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/xt # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.11 2005/04/17 15:13:15 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.12 2005/06/04 16:02:36 luckyduck Exp $ + +*xt-20020426a-r1 (04 Jun 2005) + + 04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -xt-20020426a.ebuild, + +xt-20020426a-r1.ebuild: + Updated reference to servletapi-2.3, we dont install a versioned servletapi + jar any longer. 17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xt-20020426a.ebuild: xml-apis.jar is provided by xml-commons , see #82561 diff --git a/dev-java/xt/Manifest b/dev-java/xt/Manifest index 0c499d9e0bb0..7e17538e5c3f 100644 --- a/dev-java/xt/Manifest +++ b/dev-java/xt/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 cefc8c843f7a54e6bacd7e0c9f915c4a xt-20020426a.ebuild 1042 +MD5 e59de71c45a441dfce02ededb812c0eb xt-20020426a.ebuild 1035 MD5 337e6a0e81a3584d2232d8be5a5610ff ChangeLog 624 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 MD5 927a81935aafb4f9c5e60755172bf28c files/digest-xt-20020426a 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCYn0e06ebR+OMO78RAuh6AJ4rKs7gGaCWkyelW/AdqERqUEykWQCeIyTT -E3ZQQUALhpnfp65GVFXGLTw= -=8lvf ------END PGP SIGNATURE----- diff --git a/dev-java/xt/files/digest-xt-20020426a b/dev-java/xt/files/digest-xt-20020426a-r1 index 35fb51b7b15a..35fb51b7b15a 100644 --- a/dev-java/xt/files/digest-xt-20020426a +++ b/dev-java/xt/files/digest-xt-20020426a-r1 diff --git a/dev-java/xt/xt-20020426a.ebuild b/dev-java/xt/xt-20020426a-r1.ebuild index 747124af435b..06e772a2fa04 100644 --- a/dev-java/xt/xt-20020426a.ebuild +++ b/dev-java/xt/xt-20020426a-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20020426a.ebuild,v 1.7 2005/04/17 15:13:15 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20020426a-r1.ebuild,v 1.1 2005/06/04 16:02:36 luckyduck Exp $ inherit java-pkg @@ -31,7 +31,7 @@ src_unpack() { cd lib java-pkg_jar-from xml-commons xml-apis.jar java-pkg_jar-from xp - java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlets.jar + java-pkg_jar-from servletapi-2.3 servlet.jar servlets.jar } src_compile() { diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 6225571a5238..95c789122dd8 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.29 2005/05/24 05:43:39 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.30 2005/06/04 16:02:53 luckyduck Exp $ + +*netbeans-4.0-r1 (04 Jun 2005) + + 04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> netbeans-4.0.ebuild, + +netbeans-4.0-r1.ebuild: + Updated reference to servletapi-2.3, we dont install a versioned servletapi + jar any longer. 24 May 2005; Saleem Abdulrasool <compnerd@gentoo.org> netbeans-4.0.ebuild: Adding patch to please the SUN JDKs. Resolves Bug #93617. Patch from diff --git a/dev-util/netbeans/files/digest-netbeans-4.0-r1 b/dev-util/netbeans/files/digest-netbeans-4.0-r1 new file mode 100644 index 000000000000..b44ef1705c28 --- /dev/null +++ b/dev-util/netbeans/files/digest-netbeans-4.0-r1 @@ -0,0 +1,2 @@ +MD5 a5488c563b93b3181cfeccbb67ee761c netbeans-4_0-src-ide_sources.tar.bz2 53877180 +MD5 c851459f64b3e8586b616463a1ad75e8 netbeans-4_0-docs-javadoc.tar.bz2 12728428 diff --git a/dev-util/netbeans/netbeans-4.0-r1.ebuild b/dev-util/netbeans/netbeans-4.0-r1.ebuild new file mode 100644 index 000000000000..22cb27729279 --- /dev/null +++ b/dev-util/netbeans/netbeans-4.0-r1.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-4.0-r1.ebuild,v 1.1 2005/06/04 16:02:53 luckyduck Exp $ + +inherit eutils java-pkg + +# Server Tarball layout structure +# 4.0 200412081800/d5a0f13566068cb86e33a46ea130b207 +# 4.1 200505031930/66083d474e5fdfc80a1443fb851bd9d5 + +# ant-mis is stuff we never use put instead of pactching we let the build process use this file +# so adding the license just to be sure +# The list of files in here is not complete but just some I listed. +# Apache-1.1: webserver.jar +# Apache-2.0: ant-misc-1.6.2.zip +# as-is: docbook-xsl-1.65.1.zip, pmd-netbeans35-bin-0.91.zip + +# There are many other scrambled files in Netbeans but the +# default module configuration doesn't use all of them. +# +# If you want to find out useless java-pkg_jar-from calls and all scrambled files, which don't have +# symlinks to the installed files, you can use a ruby script I wrote. It is in the experimental tree: +# https://gentooexperimental.org/svn/java/gentoo-java-experimental/dev-util/netbeans/files +# +# This command should be run after ebuild <pkg> unpack in the source root +# 'ebuild netbeans-4.0.ebuild compile | grep Unscrambling | grep "\.jar"' +# Check which jars are actually being used to compile Netbeans +# +# This command should be run after ebuild <pkg> install in the image root +# 'find . -name "*.jar" -type f | less' +# Check the list to see that no packed jars get copied to the image +# +# Remove the unset DISPLAY line from src_compile to get graphical license dialogs and pause before +# unscramble + +MY_PV=${PV/./_} + +BASELOCATION="http://www.netbeans.org/download/${MY_PV}/fcs/200412081800/d5a0f13566068cb86e33a46ea130b207" +MAINTARBALL="netbeans-${MY_PV}-src-ide_sources.tar.bz2" +JAVADOCTARBALL="netbeans-${MY_PV}-docs-javadoc.tar.bz2" + +DESCRIPTION="NetBeans IDE for Java" +HOMEPAGE="http://www.netbeans.org" +SRC_URI="${BASELOCATION}/${MAINTARBALL} + doc? ( ${BASELOCATION}/${JAVADOCTARBALL} )" + +LICENSE="Apache-1.1 Apache-2.0 SPL W3C sun-bcla-j2eeeditor sun-bcla-javac sun-javac as-is docbook sun-resolver" +SLOT="4.0" +KEYWORDS="~x86 ~amd64" +IUSE="debug doc" + +# dev-java/xml-commons-resolver for future versions +RDEPEND=">=virtual/jre-1.4.2 + =dev-java/commons-logging-1.0* + dev-java/commons-el + =dev-java/junit-3.8* + =dev-java/servletapi-2.2* + =dev-java/servletapi-2.3* + =dev-java/servletapi-2.4* + =dev-java/xerces-2.6.2* + dev-java/sac + dev-java/flute + dev-java/jmi-interface + >=dev-java/javahelp-bin-2.0.02-r1 + ~www-servers/tomcat-5.0.28 + dev-java/sun-j2ee-deployment-bin + dev-java/xml-commons + dev-java/jakarta-jstl" +DEPEND="${RDEPEND} + >=virtual/jdk-1.4.2 + >=dev-java/ant-1.6.1 + =dev-java/jakarta-regexp-1.3* + =dev-java/xalan-2* + dev-java/jtidy + =dev-java/jaxen-1.1* + dev-java/saxpath + dev-java/javamake-bin + dev-util/pmd" + +TOMCATSLOT="5" + +# Replacement JARs for Netbeans +COMMONS_LOGGING="commons-logging commons-logging.jar commons-logging-1.0.4.jar" +JASPERCOMPILER="tomcat-${TOMCATSLOT} jasper-compiler.jar jasper-compiler-5.0.28.jar" +JASPERRUNTIME="tomcat-${TOMCATSLOT} jasper-runtime.jar jasper-runtime-5.0.28.jar" +JH="javahelp-bin jh.jar jh-2.0_01.jar" +JMI="jmi-interface jmi.jar jmi.jar" +JSPAPI="servletapi-2.4 jsp-api.jar jsp-api-2.0.jar" +JSR="sun-j2ee-deployment-bin sun-j2ee-deployment-bin.jar jsr88javax.jar" +JSTL="jakarta-jstl jstl.jar jstl-1.1.2.jar" +JUNIT="junit junit.jar junit-3.8.1.jar" +MOF="jmi-interface mof.jar mof.jar" +PMD="pmd pmd.jar pmd-1.3.jar" +REGEXP="jakarta-regexp-1.3 jakarta-regexp.jar regexp-1.2.jar" +SERVLET22="servletapi-2.2 servletapi-2.2.jar servlet-2.2.jar" +SERVLET23="servletapi-2.3 servlet.jar servlet-2.3.jar" +SERVLET24="servletapi-2.4 servlet-api.jar servlet-api-2.4.jar" +STANDARD="jakarta-jstl standard.jar standard-1.1.2.jar" +XERCES="xerces-2 xercesImpl.jar xerces-2.6.2.jar" +XMLCOMMONS="xml-commons xml-apis.jar xml-commons-dom-ranges-1.0.b2.jar" + +S=${WORKDIR}/netbeans-src +BUILDDESTINATION="${S}/nbbuild/netbeans" + +src_unpack () { + unpack ${MAINTARBALL} + + if use doc; then + mkdir javadoc && cd javadoc + unpack ${JAVADOCTARBALL} || die "Unable to extract javadoc" + rm -f *.zip + fi + + cd ${S}/nbbuild + # Disable the bundled Tomcat in favor of Portage installed version + sed -i -e "s%tomcatint/tomcat5/bundled,%%g" *.properties + + cd ${S}/ant/external/ + touch ant-api-1.6.2.zip + touch ant-docs-1.6.2.zip + + # We have ant libs here so using the system libs + epatch ${FILESDIR}/antbuild.xml.patch + mkdir lib && cd lib + java-pkg_jar-from ant-tasks + java-pkg_jar-from ant-core + + cd ${S}/core/external + java-pkg_jar-from ${JH} + + cd ${S}/mdr/external/ + java-pkg_jar-from ${JMI} + java-pkg_jar-from ${MOF} + + cd ${S}/nbbuild/external + java-pkg_jar-from javahelp-bin jhall.jar jhall-2.0_01.jar + + cd ${S}/libs/external/ + java-pkg_jar-from ${XERCES} + java-pkg_jar-from ${COMMONS_LOGGING} + java-pkg_jar-from xalan xalan.jar xalan-2.5.2.jar + java-pkg_jar-from ${XMLCOMMONS} + java-pkg_jar-from ${PMD} + java-pkg_jar-from ${REGEXP} + # j2eeeditor-1.0.jar is only used in Netbeans but licensed under + # Sun's bcla + supplemental terms + + cd ${S}/xml/external/ + java-pkg_jar-from sac + java-pkg_jar-from xerces-2 xercesImpl.jar xerces2.jar + java-pkg_jar-from flute + # There's also resolver-1_1_nb.jar in this directory. + # The implementation is from Sun and I haven't found it. + # In later Netbeans versions xml-commons is used so we will use it + # then. + + cd ${S}/httpserver/external/ + java-pkg_jar-from ${SERVLET22} + # The webserver.jar in here is a stripped down version of Tomcat 3.3. + # We will use the included jar because we don't want to have Tomcat 3.X + # in the tree and because maintaining it would probably be a pain. + + cd ${S}/j2eeserver/external + java-pkg_jar-from ${JSR} + + cd ${S}/java/external/ + java-pkg_jar-from javamake-bin javamake.jar javamake-1.2.12.jar + # gjast.jar is a mix of Netbeans stuff with sun javac stuff + # It is not available elsewhere. + + cd ${S}/junit/external/ + java-pkg_jar-from ${JUNIT} + touch junit-3.8.1-api.zip + + cd ${S}/tasklist/external/ + java-pkg_jar-from jtidy Tidy.jar Tidy-r7.jar + + cd ${S}/web/external + java-pkg_jar-from ${SERVLET23} + java-pkg_jar-from ${SERVLET24} + java-pkg_jar-from commons-el + java-pkg_jar-from jaxen-1.1 jaxen-1.1_beta2.jar jaxen-full.jar + java-pkg_jar-from saxpath + java-pkg_jar-from ${JASPERCOMPILER} + java-pkg_jar-from ${JASPERRUNTIME} + java-pkg_jar-from ${JSPAPI} + java-pkg_jar-from ${JSTL} + java-pkg_jar-from ${STANDARD} + touch jsp20-docs.zip + touch jstl-1.1.2-javadoc.zip + touch servlet24-docs.zip +} + +src_compile() { + local antflags="" + + if use debug; then + antflags="${antflags} -Dbuild.compiler.debug=true" + antflags="${antflags} -Dbuild.compiler.deprecation=true" + else + antflags="${antflags} -Dbuild.compiler.deprecation=false" + fi + + antflags="${antflags} -Dnetbeans.no.pre.unscramble=true" + antflags="${antflags} -Dstop.when.broken.modules=true" + + # The build will attempt to display graphical + # dialogs for the licence agreements if this is set. + unset DISPLAY + + # Sun JDK doesnt like that very much, so lets pleasure them too ;-) + export ANT_OPTS="${ANT_OPTS} -Djava.awt.headless=true" + + # The location of the main build.xml file + cd ${S}/nbbuild + + # Specify the build-nozip target otherwise it will build + # a zip file of the netbeans folder, which will copy directly. + yes yes 2>/dev/null | ant ${antflags} build-nozip || die "Compiling failed!" + + # Remove non-x86 Linux binaries + find ${BUILDDESTINATION} -type f \ + -name "*.exe" -o \ + -name "*.cmd" -o \ + -name "*.bat" -o \ + -name "*.dll" \ + | xargs rm -f + + # Removing external stuff. They are api docs from external libs. + cd ${BUILDDESTINATION}/ide4/docs + rm -f *.zip + + # The next directory seems to be empty + if ! rmdir doc 2> /dev/null; then + use doc || rm -fr ./doc + fi + + # Use the system ant + cd ${BUILDDESTINATION}/ide4/ant + + rm -fr ./lib + rm -fr ./bin +} + +src_install() { + local DESTINATION="${ROOT}/usr/share/netbeans-${SLOT}" + insinto $DESTINATION + + einfo "Installing the program..." + cd ${BUILDDESTINATION} + doins -r * + + symlink_extjars ${D}/${DESTINATION} + + fperms 755 \ + ${DESTINATION}/bin/netbeans \ + ${DESTINATION}/platform4/lib/nbexec + + # The wrapper wrapper :) + newbin ${FILESDIR}/startscript.sh netbeans-${SLOT} + + # Ant installation + local ANTDIR="${DESTINATION}/ide4/ant" + cd ${D}/${ANTDIR} + + dodir /usr/share/ant-core/lib + dosym /usr/share/ant-core/lib ${ANTDIR}/lib + + dodir /usr/share/ant-core/bin + dosym /usr/share/ant-core/bin ${ANTDIR}/bin + + # Documentation + einfo "Installing Documentation..." + + cd ${D}/${DESTINATION} + + use doc && java-pkg_dohtml -r ${WORKDIR}/javadoc/* + + dodoc build_info + dohtml CREDITS.html README.html netbeans.css + + rm -f build_info CREDITS.html README.html netbeans.css + + # Icons and shortcuts + einfo "Installing icons..." + + dodir ${DESTINATION}/icons + insinto ${DESTINATION}/icons + doins ${S}/core/ide/release/bin/icons/*png + + for res in "16x16" "24x24" "32x32" "48x48" "128x128" ; do + dodir /usr/share/icons/hicolor/${res}/apps + dosym ${DESTINATION}/icons/nb${res}.png /usr/share/icons/hicolor/${res}/apps/netbeans.png + done + + make_desktop_entry netbeans-${SLOT} Netbeans netbeans Development +} + +pkg_postinst () { + einfo "Your tomcat directory might not have the right permissions." + einfo "Please make sure that normal users can read the directory: " + einfo "${ROOT}/usr/share/tomcat-${TOMCATSLOT} " + einfo " " + einfo "The integrated Tomcat is not installed, but you can easily " + einfo "use the system Tomcat. See Netbeans documentation if you " + einfo "don't know how to do that. The relevant settings are in the" + einfo "runtime window. " +} + +# Supporting functions for this ebuild + +function fix_manifest() { + sed -i "s%ext/${1}%$(java-pkg_getjar ${2} ${3})%" ${4} +} + +function symlink_extjars() { + cd ${1}/ide4/modules/ext + java-pkg_jar-from ${COMMONS_LOGGING} + java-pkg_jar-from flute + java-pkg_jar-from ${JMI} + java-pkg_jar-from ${JUNIT} + java-pkg_jar-from ${MOF} + java-pkg_jar-from sac + + cd ${1}/ide4/modules/autoload/ext + java-pkg_jar-from commons-el + java-pkg_jar-from ${SERVLET22} + java-pkg_jar-from ${SERVLET23} + java-pkg_jar-from ${SERVLET24} + java-pkg_jar-from ${XERCES} + java-pkg_jar-from ${JSR} + java-pkg_jar-from ${JASPERCOMPILER} + java-pkg_jar-from ${JASPERRUNTIME} + java-pkg_jar-from ${XMLCOMMONS} + java-pkg_jar-from ${JSPAPI} + + cd ${1}/ide4/config/TagLibraries/JSTL11 + java-pkg_jar-from jakarta-jstl jstl.jar + java-pkg_jar-from jakarta-jstl standard.jar + + cd ${1}/platform4/modules/ext + java-pkg_jar-from ${JH} +} diff --git a/dev-util/netbeans/netbeans-4.0.ebuild b/dev-util/netbeans/netbeans-4.0.ebuild index ed1a4fc94ee6..8f251434e59f 100644 --- a/dev-util/netbeans/netbeans-4.0.ebuild +++ b/dev-util/netbeans/netbeans-4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-4.0.ebuild,v 1.3 2005/05/24 05:43:39 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-4.0.ebuild,v 1.4 2005/06/04 16:02:53 luckyduck Exp $ inherit eutils java-pkg @@ -93,7 +93,7 @@ MOF="jmi-interface mof.jar mof.jar" PMD="pmd pmd.jar pmd-1.3.jar" REGEXP="jakarta-regexp-1.3 jakarta-regexp.jar regexp-1.2.jar" SERVLET22="servletapi-2.2 servletapi-2.2.jar servlet-2.2.jar" -SERVLET23="servletapi-2.3 servletapi-2.3.jar servlet-2.3.jar" +SERVLET23="servletapi-2.3 servlet.jar servlet-2.3.jar" SERVLET24="servletapi-2.4 servlet-api.jar servlet-api-2.4.jar" STANDARD="jakarta-jstl standard.jar standard-1.1.2.jar" XERCES="xerces-2 xercesImpl.jar xerces-2.6.2.jar" |