commit: ecd8b2b20615c70464bf3db29ad0aa418e3ab148 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Aug 5 21:12:22 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 5 21:31:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=ecd8b2b2
[dev-java/jacorb] Drop very old version from 2006 depended on defunct dev-java/picocontainer dev-java/jacorb/ChangeLog | 30 -------- dev-java/jacorb/Manifest | 1 - dev-java/jacorb/files/jacorb-2.2.4-dist.patch | 105 -------------------------- dev-java/jacorb/jacorb-2.2.4-r1.ebuild | 94 ----------------------- dev-java/jacorb/metadata.xml | 5 -- 5 files changed, 235 deletions(-) diff --git a/dev-java/jacorb/ChangeLog b/dev-java/jacorb/ChangeLog deleted file mode 100644 index 3b0a18a..0000000 --- a/dev-java/jacorb/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ -# ChangeLog for dev-java/scout -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 27 May 2007; Vlastimil Babka <[email protected]> -jacorb-2.2.4.ebuild, - +jacorb-2.2.4-r1.ebuild: - Revbump to use new slot 1.2 of picocontainer - - 14 Feb 2007; Vlastimil Babka <[email protected]> jacorb-2.2.4.ebuild: - Filter ecj which breaks. - - 14 Feb 2007; Vlastimil Babka <[email protected]> jacorb-2.2.4.ebuild, - files/jacorb-2.2.4-dist.patch: - Fix deps, small style tweaks. - - 14 Feb 2007; Vlastimil Babka <[email protected]> -jacorb-2.2.1.ebuild, - -files/jacorb-2.2.1-dist.patch, -jacorb-2.2.3.ebuild, - -files/jacorb-2.2.3-dist.patch: - Keep just the latest version. - - 13 Feb 2007; kiorky <[email protected]> +jacorb-2.2.1.ebuild, - +files/jacorb-2.2.1-dist.patch, +jacorb-2.2.3.ebuild, - +files/jacorb-2.2.3-dist.patch, +jacorb-2.2.4.ebuild, - +files/jacorb-2.2.4-dist.patch: - Migrating to -2 eclasses for older than dev-java/jacorb-2.2.4 - Add some die messages - Correct Typos / Dates - Bumping to version 2.2.4 - see #143209 - diff --git a/dev-java/jacorb/Manifest b/dev-java/jacorb/Manifest deleted file mode 100644 index a59b628..0000000 --- a/dev-java/jacorb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST JacORB-2.2.4-source.zip 15952132 SHA256 cc30f33ada0fdd71a15c2fbff2c1211e86dd3ff9369fd0ce7a531f032b0b8e54 diff --git a/dev-java/jacorb/files/jacorb-2.2.4-dist.patch b/dev-java/jacorb/files/jacorb-2.2.4-dist.patch deleted file mode 100644 index 43807e0..0000000 --- a/dev-java/jacorb/files/jacorb-2.2.4-dist.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- build.xml 2006-05-12 11:13:36.000000000 +0200 -+++ build.xml 2007-02-13 13:26:07.928208588 +0100 -@@ -32,7 +32,7 @@ - - <!-- package idl.jar --> - <target name="idllib" depends="idlsrc" > -- <jar jarfile="${lib}/idl.jar" -+ <jar jarfile="${dist}/idl.jar" - basedir="${classdir}" - includes="org/jacorb/idl/**" - /> -@@ -69,8 +69,8 @@ - <target name="libs" depends="init,jar,jaco"/> - - <target name="jar" depends="init"> -- <delete file="${lib}/jacorb.jar" failonerror="false"/> -- <jar jarfile="${lib}/jacorb.jar" -+ <delete file="${dist}/jacorb.jar" failonerror="false"/> -+ <jar jarfile="${dist}/jacorb.jar" - basedir="${classdir}" - includes="org/jacorb/**,org/omg/**" - excludes="org/jacorb/idl/**,org/jacorb/demo/**,org/jacorb/test/**, org/jacorb/notification/jmx/jboss/**" -@@ -83,7 +83,7 @@ - <!-- Use the java.endorsed.dirs mechanism to replace the SDK CORBA classes with those in jacorb.jar for SDK 1.4 --> - - <path id="cp.raw" > -- <pathelement location="${basedir}/lib/jacorb.jar" /> -+ <pathelement location="${basedir}/dist/jacorb.jar" /> - <pathelement location="${basedir}/lib/logkit-1.2.jar" /> - <pathelement location="${basedir}/lib/avalon-framework-4.1.5.jar" /> - </path> -@@ -165,8 +165,8 @@ - <!-- This target creates a jar file that contains the --> - <!-- core ORB components and (generated) OMG classes --> - <target name="core_jacorb_jar" depends="init"> -- <delete file="${lib}/core_jacorb.jar"/> -- <jar jarfile="${lib}/core_jacorb.jar" -+ <delete file="${dist}/core_jacorb.jar"/> -+ <jar jarfile="${dist}/core_jacorb.jar" - basedir="${classdir}" - includes="org/jacorb/orb/**,org/jacorb/poa/**,org/jacorb/util/**,org/jacorb/security/ssl/**,org/omg/CONV_FRAME/**,org/omg/CORBA/**,org/omg/CORBA_2_3/**,org/omg/CosNaming/**,org/omg/Dynamic/**,org/omg/DynamicAny/**,org/omg/GIOP/**,org/omg/IIOP/**,org/omg/IOP/**,org/omg/Portable*/**,org/omg/BiDirPolicy/**,org/omg/ETF/**,org/omg/SSLIOP/**,org/omg/TimeBase/**" - excludes="org/jacorb/poa/gui/*,org/jacorb/util/tracing/*" -@@ -177,8 +177,8 @@ - <!-- following JacORB services and utilities: --> - <!-- ImR + GUI, IR + GUI, POA GUI, Tracing, Proxy --> - <target name="jacorb_services_jar" depends="init"> -- <delete file="${lib}/jacorb_services.jar"/> -- <jar jarfile="${lib}/jacorb_services.jar" -+ <delete file="${dist}/jacorb_services.jar"/> -+ <jar jarfile="${dist}/jacorb_services.jar" - basedir="${classdir}" - includes="org/jacorb/imr/**,org/jacorb/ir/**,org/jacorb/poa/gui/*,org/jacorb/util/CAD*,org/jacorb/util/tracing/*,org/jacorb/proxy/*" - /> -@@ -188,8 +188,8 @@ - <!-- following OMG services: --> - <!-- Concurrency, Events, Trading, Transaction, but not Naming --> - <target name="omg_services_jar" depends="init"> -- <delete file="${lib}/omg_services.jar"/> -- <jar jarfile="${lib}/omg_services.jar" -+ <delete file="${dist}/omg_services.jar"/> -+ <jar jarfile="${dist}/omg_services.jar" - basedir="${classdir}" - includes="org/jacorb/concurrency/**,org/jacorb/events/**,org/jacorb/trading/**,org/jacorb/transaction/**,org/omg/Cos*/**" - excludes="org/omg/CosNaming/**" -@@ -200,8 +200,8 @@ - <!-- This target creates a jar file that contains the --> - <!-- (genrated) OMG and JacORB security classes --> - <target name="security_jar" depends="init"> -- <delete file="${lib}/security.jar"/> -- <jar jarfile="${lib}/security.jar" -+ <delete file="${dist}/security.jar"/> -+ <jar jarfile="${dist}/security.jar" - basedir="${classdir}" - includes="org/jacorb/security/**,org/omg/Security*/**,org/omg/SSLIOP/**,org/omg/TimeBase/**" - /> -@@ -228,8 +228,8 @@ - - <target name="realclean" depends="clean" description="Clean the checkout including generated jars"> - <delete failonerror="false" > -- <fileset dir="lib/" includes="jacorb.jar, idl.jar"/> -- </delete > -+ <fileset dir="dist/" includes="jacorb.jar, idl.jar"/> -+ </delete> - </target> - - ---- etc/common.xml 2005-12-01 23:37:42.000000000 +0100 -+++ etc/common.xml 2007-02-13 13:20:19.984340894 +0100 -@@ -7,6 +7,7 @@ - <target name="base-init" unless="BASE-INIT"> - <property name="dirs.base" value="${basedir}"/> - <property name="src" value="${dirs.base}/src"/> -+ <property name="dist" value="${dirs.base}/dist"/> - <property name="src.generated" value="${src}/generated" /> - <property name="lib" value="${dirs.base}/lib"/> - <property name="idl" value="${dirs.base}/idl"/> -@@ -55,6 +56,8 @@ - - <mkdir dir="${classdir}"/> - <mkdir dir="${src}/generated"/> -+ <mkdir dir="${dist}/"/> -+ - <filter token="path" value="basedir"/> - - <!-- = = = = = = = = = = = = = = = = = diff --git a/dev-java/jacorb/jacorb-2.2.4-r1.ebuild b/dev-java/jacorb/jacorb-2.2.4-r1.ebuild deleted file mode 100644 index d840dd5..0000000 --- a/dev-java/jacorb/jacorb-2.2.4-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils versionator java-pkg-2 java-ant-2 - -MY_PN="JacORB" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="The free Java implementation of the OMG's CORBA standard." -HOMEPAGE="http://www.jacorb.org/"; -SRC_URI="http://www.jacorb.org/releases/${PV}/${MY_P}-source.zip"; - -LICENSE="GPL-2" -SLOT="2.2" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -# TODO: test if X is needed at runtime -# TODO: re-add X dep, with modular-X deps -CDEPEND=" - dev-java/antlr - =dev-java/avalon-framework-4.1* - dev-java/concurrent-util - =dev-java/avalon-logkit-2* - =dev-java/java-service-wrapper-3.1* - >=dev-java/picocontainer-1.2 - dev-java/log4j - dev-java/backport-util-concurrent - dev-java/ant-core" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -S="${WORKDIR}/${MY_P}" - -ANTLR="antlr antlr.jar antlr-2.7.2.jar" -AVALON_FRAMEWORK="avalon-framework-4.1 avalon-framework.jar avalon-framework-4.1.5.jar" -CONCURRENT="concurrent-util concurrent.jar concurrent-1.3.2.jar" -LOGKIT="avalon-logkit-2.0 avalon-logkit.jar logkit-1.2.jar" -WRAPPER="java-service-wrapper-3.1 wrapper.jar wrapper-3.1.0.jar" -PICOCONTAINER="picocontainer-1.2 picocontainer.jar picocontainer-1.2.jar" - -src_unpack() { - unpack ${A} - - cd ${S} || die "cd failed" - - # workaround for a test which dont want do rewrite his build.xml - rm -rf ${S}/test || die "rm fautive test failed" - - # patch build.xml to put jars into dist/ - # TODO submit upstream - epatch ${FILESDIR}/${P}-dist.patch - - cd ${S}/lib || die "cd failed" - rm *.jar || die "rm failed" - java-pkg_jar-from ${ANTLR} - java-pkg_jar-from ${AVALON_FRAMEWORK} - java-pkg_jar-from ${CONCURRENT} - java-pkg_jar-from ${LOGKIT} - java-pkg_jar-from ${WRAPPER} - java-pkg_jar-from ${PICOCONTAINER} - java-pkg_jar-from backport-util-concurrent - java-pkg_jar-from ant-core ant.jar -} - -src_compile() { - local antflags="realclean all core_jacorb_jar jacorb_services_jar omg_services_jar \ - security_jar" - - # breaks with them, see #93396 comment #9 - java-pkg_filter-compiler ecj-3.1 ecj-3.2 - - # Need to up maximum memory to avoid OutOfMemoryErrors - ANT_OPTS="${ANT_OPTS} -Xmx512m" \ - eant ${antflags} $(use_doc doc) - - cd ${S}/bin || die "cd failed" - rm -f *.bat *template* *.exe || die "rm exe failed" -} - -src_install() { - java-pkg_dojar dist/*.jar - - cd ${S}/bin || die "cd failed" - local binlist=$(grep -l /bin/sh * | grep -v .template) - dobin ${binlist} - - cd ${S}/doc || die "cd failed" - dodoc REL_NOTES Coding.txt - dohtml *.html - use doc && java-pkg_dojavadoc api -} diff --git a/dev-java/jacorb/metadata.xml b/dev-java/jacorb/metadata.xml deleted file mode 100644 index 838c00a..0000000 --- a/dev-java/jacorb/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>java</herd> -</pkgmetadata>
