stable on amd64, ppc and x86

(Portage version: 2.0.51.21)

9 files changed, 22 insertions, 258 deletions

diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog
index 362cec9fa3e4..434402c1faa3 100644
--- a/dev-java/picocontainer/ChangeLog
+++ b/dev-java/picocontainer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/picocontainer
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.10 2004/10/22 10:02:14 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.11 2005/05/04 16:53:36 luckyduck Exp $
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/build-1.0_beta3.xml, -picocontainer-1.0_beta3.ebuild,
+  picocontainer-1.0_beta4.ebuild:
+  stable on amd64, ppc and x86
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   picocontainer-1.0_beta4.ebuild:
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
index e821b6ef14b2..b55830c64ff6 100644
--- a/dev-java/picocontainer/Manifest
+++ b/dev-java/picocontainer/Manifest
@@ -1,8 +1,5 @@
-MD5 698dfbdecc70773380935adb1edcbda8 ChangeLog 1597
+MD5 2364715b473d410c86a3f0a60b7e2af9 picocontainer-1.0_beta4.ebuild 1179
+MD5 4ab9c5ec531ce84a42a9356fc1790c0d ChangeLog 1778
 MD5 bebc5edd0414aba81a45ce457cd9d4f3 metadata.xml 553
-MD5 5a96b43c680e3333141333d22ca76135 picocontainer-1.0_beta3.ebuild 1180
-MD5 4ceaa83b4c5f3e1f399a177ba4bb2e1e picocontainer-1.0_beta4.ebuild 1201
-MD5 a8864951b56c2a4abc07e4cb8a4067f2 files/build-1.0_beta3.xml 6500
-MD5 a8864951b56c2a4abc07e4cb8a4067f2 files/build-1.0_beta4.xml 6500
-MD5 adc69399f0b305739a9e45e3372d2380 files/digest-picocontainer-1.0_beta3 79
 MD5 c2b76bdb1d4fad1a042d5c415bec441b files/digest-picocontainer-1.0_beta4 79
+MD5 a8864951b56c2a4abc07e4cb8a4067f2 files/build-1.0_beta4.xml 6500
diff --git a/dev-java/picocontainer/files/build-1.0_beta3.xml b/dev-java/picocontainer/files/build-1.0_beta3.xml
deleted file mode 100644
index b759d7210da0..000000000000
--- a/dev-java/picocontainer/files/build-1.0_beta3.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  build.xml generated by maven from project.xml version 1.0-SNAPSHOT
-  on date June 25 2003, time 1707
--->
-
-<project default="jar" name="picocontainer" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="picocontainer-1.0-SNAPSHOT">
-  </property>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="">
-    <mkdir dir="${classesdir}">
-    </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/java">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-    </jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}">
-    </delete>
-    <delete dir="${distdir}">
-    </delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist">
-    </mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar">
-      </fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*">
-      </fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures.">
-    </fail>
-  </target>
-  <target name="internal-test" depends="compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value=".">
-      </sysproperty>
-      <formatter type="xml">
-      </formatter>
-      <formatter usefile="false" type="plain">
-      </formatter>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
-          <include name="**/*TestCase.java">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  Codehaus. All Rights Reserved.">
-    </property>
-    <property name="title" value="PicoContainer 1.0-SNAPSHOT API">
-    </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.picocontainer.*">
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
-    </get>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
-    </get>
-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
-    </get>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-    </get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-    </unjar>
-  </target>
-
-  <target name="cvs:make-patch" description="Creates a patch of *your* changes">
-    <cvs command="-q diff -b -u -N" output="patch.txt"/>
-    <echo>
-      Please create a new issue in PicoContainer's JIRA: 
-      http://jira.codehaus.org/secure/BrowseProject.jspa?id=10120
-      Then attach the patch.txt file.
-      If your patch consists of entirely new files too, please zip them
-      up and attach them too.
-      
-      If your patch includes JUnit tests and a decent description,
-      you increase the chance of having the patch applied by some
-      of the committers.
-    </echo>    
-  </target>
-
-  <target name="cvsgrab" description="download sources with CVSGrab">
-    <taskdef 
-      name="cvsgrab" 
-      classname="net.sourceforge.cvsgrab.CVSGrabTask" 
-      classpath="${cvsgrab.home}/lib/cvsgrab.jar"/>
-
-    <cvsgrab 
-      destdir="${basedir}/.."
-      rootUrl="http://picocontainer.cvs.codehaus.org/"
-      cvsroot=":pserver:anonymous@cvs.codehaus.org:/cvsroot/picocontainer"
-      packagePath="pico" 
-      verbose="true"
-      tag="HEAD"/>
-  </target>
-</project>
diff --git a/dev-java/picocontainer/files/digest-picocontainer-1.0_beta3 b/dev-java/picocontainer/files/digest-picocontainer-1.0_beta3
deleted file mode 100644
index 6344122372f5..000000000000
--- a/dev-java/picocontainer/files/digest-picocontainer-1.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 826630b78e17b62b816242d3c052ca13 picocontainer-1.0-beta-3-src.tar.gz 35777
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
deleted file mode 100644
index 961af654153a..000000000000
--- a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.7 2004/10/16 23:09:47 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="http://docs.codehaus.org/display/PICO/"
-HOMEPAGE="http://docs.codehaus.org/display/PICO/"
-SRC_URI="http://dist.codehaus.org/picocontainer/distributions/${PN}-1.0-beta-3-src.tar.gz"
-LICENSE="PicoContainer"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE="doc"
-DEPEND="=dev-java/ant-1.5*
-	~dev-java/junit-3.8.1"
-S=${WORKDIR}/${PN}-1.0-beta-3
-
-src_unpack() {
-	unpack ${A}
-	# FIXME: patch
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
-	mkdir -p ${S}/target/lib
-	(
-		cd ${S}/target/lib
-		java-pkg_jar-from ant ant.jar ant-1.5.jar
-		java-pkg_jar-from ant ant-optional.jar ant-optional-1.5.jar
-		java-pkg_jar-from junit junit.jar junit-3.8.1.jar
-	)
-}
-
-src_compile() {
-	ant jar || die
-	if (use doc) ; then
-		ant javadoc || die
-	fi
-	cp target/picocontainer-1.0-SNAPSHOT.jar \
-		target/picocontainer-1.0.jar
-}
-
-src_install() {
-	dodoc LICENSE.txt
-	use doc && ( java-pkg_dohtml -r dist/docs/api )
-	java-pkg_dojar target/picocontainer-1.0.jar
-}
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
index df2e676fafba..c8a47d6dad19 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.7 2004/10/22 10:02:14 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.8 2005/05/04 16:53:36 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://docs.codehaus.org/display/PICO/"
 SRC_URI="http://dist.codehaus.org/picocontainer/distributions/${PN}-1.0-beta-4-src.tar.gz"
 LICENSE="PicoContainer"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE="doc"
 DEPEND=">=dev-java/ant-1.5*
 		>=dev-java/junit-3.8.1"
@@ -38,7 +38,6 @@ src_compile() {
 }
 
 src_install() {
-	dodoc LICENSE.txt
 	use doc && ( java-pkg_dohtml -r dist/docs/api )
 	java-pkg_dojar target/picocontainer-1.0.jar
 }
diff --git a/dev-java/radeox/ChangeLog b/dev-java/radeox/ChangeLog
index f9a27c5e5b41..8d9013cc5969 100644
--- a/dev-java/radeox/ChangeLog
+++ b/dev-java/radeox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/radeox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.8 2005/03/29 16:18:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.9 2005/05/04 16:53:51 luckyduck Exp $
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> radeox-1.0_beta2.ebuild:
+  stable on amd64, ppc and x86
 
   29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> radeox-1.0_beta2.ebuild:
   moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
index 1d647ecf3441..2ed57d9fdd8a 100644
--- a/dev-java/radeox/Manifest
+++ b/dev-java/radeox/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2c00d6250c331dde18be9d52798c8e1e ChangeLog 924
+MD5 3797b84925e6e0b48f22d48b29a05a25 ChangeLog 1033
 MD5 51b360ad1459b4dae2f08ec2c406e915 metadata.xml 581
-MD5 f2e0788a68dbc3d0a13ce5b032b3c464 radeox-1.0_beta2.ebuild 1398
+MD5 3533f2d9eddc91530162ca1cd9fad631 radeox-1.0_beta2.ebuild 1383
 MD5 af5915048f26e92415eed2a0302e4184 files/digest-radeox-1.0_beta2 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCSYBS06ebR+OMO78RAvGiAJ0So7PoJbNUipBs5993k8UxiFscPACeMHnd
-mgVMw7lkDv7uXZtaG9okgoM=
-=M8z+
------END PGP SIGNATURE-----
diff --git a/dev-java/radeox/radeox-1.0_beta2.ebuild b/dev-java/radeox/radeox-1.0_beta2.ebuild
index 47d789632ca1..e45244fa82f5 100644
--- a/dev-java/radeox/radeox-1.0_beta2.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2.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/radeox/radeox-1.0_beta2.ebuild,v 1.8 2005/03/29 16:20:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.9 2005/05/04 16:53:52 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.radeox.org"
 SRC_URI="ftp://snipsnap.org/radeox/${PN}-1.0-BETA-2-src.tgz"
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant
@@ -47,7 +47,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc Changes.txt README Radeox.version license.txt
+	dodoc Changes.txt README Radeox.version
 	use doc && java-pkg_dohtml -r docs/api
 	java-pkg_dojar lib/{radeox,radeox-api}.jar
 }