summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/bytelist/ChangeLog6
-rw-r--r--dev-java/bytelist/bytelist-1.0.2.ebuild39
-rw-r--r--dev-java/bytelist/bytelist-1.0.ebuild38
-rw-r--r--dev-java/commons-codec/ChangeLog6
-rw-r--r--dev-java/commons-codec/commons-codec-1.3-r2.ebuild48
-rw-r--r--dev-java/commons-codec/files/1.3-tests-fix.patch69
-rw-r--r--dev-java/commons-daemon/ChangeLog8
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild67
-rw-r--r--dev-java/commons-daemon/files/1.0.1-as-needed.patch38
-rw-r--r--dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch11
-rw-r--r--dev-java/commons-daemon/files/1.0.1-execve-self.patch10
-rw-r--r--dev-java/commons-daemon/files/1.0.1-fbsd.patch13
-rw-r--r--dev-java/commons-pool/ChangeLog5
-rw-r--r--dev-java/commons-pool/commons-pool-1.4.ebuild44
-rw-r--r--dev-java/groovy/ChangeLog6
-rw-r--r--dev-java/groovy/groovy-1.6.5.ebuild119
-rw-r--r--dev-java/groovy/groovy-1.6.7.ebuild119
-rw-r--r--dev-java/jdbc-mysql/ChangeLog5
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild90
-rw-r--r--dev-java/jgoodies-looks/ChangeLog9
-rw-r--r--dev-java/jgoodies-looks/files/build-1.3.2.xml82
-rw-r--r--dev-java/jgoodies-looks/files/build-2.0.4.xml81
-rw-r--r--dev-java/jgoodies-looks/files/jgoodies-looks-2.1.4-configureEditor.patch12
-rw-r--r--dev-java/jgoodies-looks/files/plastic-1.3.2.txt8
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.1.4.ebuild70
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild5
-rw-r--r--dev-java/joni/ChangeLog5
-rw-r--r--dev-java/joni/joni-1.1.3.ebuild33
-rw-r--r--dev-java/sat4j-core/ChangeLog6
-rw-r--r--dev-java/sat4j-core/sat4j-core-2.1.1.ebuild58
-rw-r--r--dev-java/sat4j-core/sat4j-core-2.1.ebuild58
-rw-r--r--dev-java/sat4j-pseudo/ChangeLog6
-rw-r--r--dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild69
-rw-r--r--dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild69
-rw-r--r--dev-java/slf4j-api/ChangeLog5
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.5.2.ebuild32
-rw-r--r--dev-java/slf4j-nop/ChangeLog5
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-1.5.2.ebuild36
38 files changed, 61 insertions, 1329 deletions
diff --git a/dev-java/bytelist/ChangeLog b/dev-java/bytelist/ChangeLog
index aec278470e34..e7886cd94ac1 100644
--- a/dev-java/bytelist/ChangeLog
+++ b/dev-java/bytelist/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/bytelist
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bytelist/ChangeLog,v 1.13 2010/10/15 12:35:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bytelist/ChangeLog,v 1.14 2010/10/17 12:30:32 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -bytelist-1.0.ebuild,
+ -bytelist-1.0.2.ebuild:
+ Remove old.
15 Oct 2010; Brent Baude <ranger@gentoo.org> bytelist-1.0.6.ebuild:
stable ppc, bug 324437
diff --git a/dev-java/bytelist/bytelist-1.0.2.ebuild b/dev-java/bytelist/bytelist-1.0.2.ebuild
deleted file mode 100644
index 01443655042d..000000000000
--- a/dev-java/bytelist/bytelist-1.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bytelist/bytelist-1.0.2.ebuild,v 1.5 2010/01/03 20:18:59 fauli Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JRuby support library"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- dev-java/jcodings"
-
-DEPEND=">=virtual/jdk-1.4
- dev-java/jcodings
- test? ( dev-java/ant-junit )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jcodings"
-
-java_prepare() {
- # Don't do tests unnecessarily.
- sed -i 's:depends="test":depends="compile":' build.xml
-}
-
-src_install() {
- java-pkg_newjar lib/${PN}-1.0.1.jar
- use source && java-pkg_dosrc src/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/bytelist/bytelist-1.0.ebuild b/dev-java/bytelist/bytelist-1.0.ebuild
deleted file mode 100644
index 5023e6c73ce2..000000000000
--- a/dev-java/bytelist/bytelist-1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bytelist/bytelist-1.0.ebuild,v 1.2 2009/01/05 22:01:39 maekke Exp $
-
-JAVA_PKG_IUSE="source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JRuby support library"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://dev.gentooexperimental.org/~chewi/distfiles/${P}.tar.bz2"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Don't do tests unnecessarily.
- sed -i 's:depends="test":depends="compile":' build.xml
-}
-
-src_install() {
- java-pkg_newjar lib/bytelist-0.1.jar
- use source && java-pkg_dosrc src/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog
index daea9494e876..187a417533ac 100644
--- a/dev-java/commons-codec/ChangeLog
+++ b/dev-java/commons-codec/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-codec
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.43 2010/10/14 16:54:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.44 2010/10/17 12:24:03 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org>
+ -files/1.3-tests-fix.patch, -commons-codec-1.3-r2.ebuild:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> commons-codec-1.4.ebuild:
stable ppc, bug 316295
diff --git a/dev-java/commons-codec/commons-codec-1.3-r2.ebuild b/dev-java/commons-codec/commons-codec-1.3-r2.ebuild
deleted file mode 100644
index 5844a6b7e9ff..000000000000
--- a/dev-java/commons-codec/commons-codec-1.3-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r2.ebuild,v 1.6 2010/03/20 10:55:52 betelgeuse Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of common encoders and decoders in Java."
-HOMEPAGE="http://commons.apache.org/codec"
-SRC_URI="mirror://apache/jakarta/commons/codec/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit:0 )
- ${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/1.3-tests-fix.patch"
- sed -i "s_../LICENSE_LICENSE.txt_" build.xml || die "sed failed"
- echo "conf.home=./src/conf" >> build.properties
- echo "source.home=./src/java" >> build.properties
- echo "build.home=./output" >> build.properties
- echo "dist.home=./output/dist" >> build.properties
- echo "test.home=./src/test" >> build.properties
- echo "final.name=commons-codec" >> build.properties
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
- java-pkg_dojar output/dist/${PN}.jar
-
- dodoc RELEASE-NOTES.txt || die
- use doc && java-pkg_dojavadoc output/dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-codec/files/1.3-tests-fix.patch b/dev-java/commons-codec/files/1.3-tests-fix.patch
deleted file mode 100644
index d753b8fc961a..000000000000
--- a/dev-java/commons-codec/files/1.3-tests-fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur commons-codec-1.3-src/src/test/org/apache/commons/codec/language/SoundexTest.java commons-codec-1.3-src_patched/src/test/org/apache/commons/codec/language/SoundexTest.java
---- commons-codec-1.3-src/src/test/org/apache/commons/codec/language/SoundexTest.java 2004-06-02 03:55:38.000000000 +0300
-+++ commons-codec-1.3-src_patched/src/test/org/apache/commons/codec/language/SoundexTest.java 2008-09-26 00:00:42.000000000 +0300
-@@ -1,9 +1,10 @@
- /*
-- * Copyright 2001-2004 The Apache Software Foundation.
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-+ * Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements. See the NOTICE file distributed with
-+ * this work for additional information regarding copyright ownership.
-+ * The ASF licenses this file to You under the Apache License, Version 2.0
-+ * (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
-@@ -19,6 +20,7 @@
-
- import junit.framework.Test;
- import junit.framework.TestSuite;
-+
- import org.apache.commons.codec.EncoderException;
- import org.apache.commons.codec.StringEncoder;
- import org.apache.commons.codec.StringEncoderAbstractTest;
-@@ -340,30 +342,39 @@
- /**
- * Fancy characters are not mapped by the default US mapping.
- *
-- * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080
-+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=29080
- */
- public void testUsMappingOWithDiaeresis() {
- assertEquals("O000", this.getEncoder().encode("o"));
-+ if ( Character.isLetter('ö') ) {
- try {
- assertEquals("Ö000", this.getEncoder().encode("ö"));
- fail("Expected IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e) {
- // expected
- }
-+ } else {
-+ assertEquals("", this.getEncoder().encode("ö"));
-+ }
- }
-
- /**
- * Fancy characters are not mapped by the default US mapping.
- *
-- * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080
-+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=29080
- */
- public void testUsMappingEWithAcute() {
- assertEquals("E000", this.getEncoder().encode("e"));
-+ if ( Character.isLetter('é') ) {
- try {
- assertEquals("É000", this.getEncoder().encode("é"));
- fail("Expected IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e) {
- // expected
- }
-+ } else {
-+ assertEquals("", this.getEncoder().encode("é"));
- }
-+ }
-+
- }
diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 1acdf39a92b6..f7d36d981a9c 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/commons-daemon
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.39 2010/10/14 16:55:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.40 2010/10/17 12:25:14 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org>
+ -files/1.0.1-as-needed.patch, -commons-daemon-1.0.1-r2.ebuild,
+ -files/1.0.1-capabilities-non-root.patch, -files/1.0.1-execve-self.patch,
+ -files/1.0.1-fbsd.patch:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> commons-daemon-1.0.2.ebuild:
stable ppc, bug 316297
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
deleted file mode 100644
index a132895a95f7..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild,v 1.5 2007/11/25 12:06:34 nelchael Exp $
-
-WANT_AUTOCONF=2.5
-inherit java-pkg-2 java-ant-2 eutils autotools
-
-DESCRIPTION="Tools to allow java programs to run as unix daemons"
-SRC_URI="mirror://apache/jakarta/commons/daemon/source/daemon-${PV}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/commons/daemon/"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc examples source"
-
-DEPEND=">=virtual/jdk-1.4
- dev-java/ant-core
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/daemon-${PV}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Submitted upstream to http://bugs.gentoo.org/show_bug.cgi?id=132563
- epatch "${FILESDIR}/1.0.1-as-needed.patch"
-
- # Fix fbsd building, from upstream svn, #157381
- epatch "${FILESDIR}/1.0.1-fbsd.patch"
-
- # https://issues.apache.org/jira/browse/DAEMON-93
- epatch "${FILESDIR}/1.0.1-capabilities-non-root.patch"
-
- # Already in trunk
- epatch "${FILESDIR}/1.0.1-execve-self.patch"
-
- cd "${S}/src/native/unix"
- sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
- eautoconf
-}
-
-src_compile() {
- # compile native stuff
- cd "${S}/src/native/unix"
- econf || die "configure failed"
- emake || die "make failed"
-
- # compile java stuff
- cd "${S}"
- eant jar $(use_doc)
-}
-
-src_install() {
- dobin src/native/unix/jsvc
- java-pkg_dojar dist/${PN}.jar
-
- dodoc README RELEASE-NOTES.txt *.html
- use doc && java-pkg_dohtml -r dist/docs/*
- if use examples; then
- dodir /usr/share/doc/${PF}/examples
- cp -R src/samples/* "${D}/usr/share/doc/${PF}/examples"
- fi
- use source && java-pkg_dosrc src/java/* src/native/unix/native
-}
diff --git a/dev-java/commons-daemon/files/1.0.1-as-needed.patch b/dev-java/commons-daemon/files/1.0.1-as-needed.patch
deleted file mode 100644
index 3f2bc5f1ac40..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- daemon-1.0.1/src/native/unix/support/apsupport.m4.orig 2006-05-07 15:28:22.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4 2006-05-07 15:34:42.000000000 +0200
-@@ -35,7 +35,7 @@
- linux*)
- CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
- supported_os="linux"
-- LDFLAGS="$LDFLAGS -ldl -lpthread"
-+ LIBS="$LIBS -ldl -lpthread"
- ;;
- cygwin)
- CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
-@@ -94,4 +94,5 @@
- AC_MSG_RESULT([ok])
- AC_SUBST(CFLAGS)
- AC_SUBST(LDFLAGS)
-+ AC_SUBST(LIBS)
- ])
---- daemon-1.0.1/src/native/unix/Makedefs.in.orig 2006-05-07 15:50:07.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/Makedefs.in 2004-02-27 09:40:46.000000000 +0100
-@@ -22,6 +22,7 @@
- JAR = @JAR@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
- JAVACFLAGS = @JAVACFLAGS@
- RANLIB = @RANLIB@
- LDCMD = @LDCMD@
---- daemon-1.0.1/src/native/unix/native/Makefile.in.orig 2006-05-07 15:36:54.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/native/Makefile.in 2006-05-07 15:37:44.000000000 +0200
-@@ -36,7 +36,7 @@
- $(RANLIB) libservice.a
-
- jsvc: jsvc-unix.o libservice.a
-- $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
-+ $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
-
- clean:
- rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a
diff --git a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch b/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
deleted file mode 100644
index 5a9566b91676..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig 2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c 2007-01-20 12:12:35.000000000 +0100
-@@ -475,7 +475,7 @@
-
- #ifdef OS_LINUX
- /* setuid()/setgid() only apply the current thread so we must do it now */
-- if (linuxset_user_group(args->user,uid,gid)!=0)
-+ if (getuid()==0 && linuxset_user_group(args->user,uid,gid)!=0)
- return(4);
- #endif
- /* Initialize the Java VM */
diff --git a/dev-java/commons-daemon/files/1.0.1-execve-self.patch b/dev-java/commons-daemon/files/1.0.1-execve-self.patch
deleted file mode 100644
index 578d2e021e8f..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-execve-self.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig 2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c 2007-01-20 13:15:43.000000000 +0100
-@@ -652,6 +652,7 @@
- log_debug("Invoking w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH"));
-
- argv[0]=args->procname;
-+ execve("/proc/self/exe",argv,environ);
- execve(old,argv,environ);
- log_error("Cannot execute JSVC executor process");
- return(1);
diff --git a/dev-java/commons-daemon/files/1.0.1-fbsd.patch b/dev-java/commons-daemon/files/1.0.1-fbsd.patch
deleted file mode 100644
index b7851899752d..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: daemon-1.0.1/src/native/unix/support/apsupport.m4
-===================================================================
---- daemon-1.0.1.orig/src/native/unix/support/apsupport.m4
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4
-@@ -49,7 +49,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
- CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread"
- LDFLAGS="-Kthread $LDFLAGS -ldl"
- ;;
-- freebsd4.?)
-+ freebsd*)
- CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
- LDFLAGS="-pthread $LDFLAGS"
- supported_os="freebsd"
diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index 084978082782..b327f56a01b0 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/commons-pool
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.54 2010/10/14 16:57:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.55 2010/10/17 12:26:00 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -commons-pool-1.4.ebuild:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> commons-pool-1.5.4.ebuild:
stable ppc, bug 316307
diff --git a/dev-java/commons-pool/commons-pool-1.4.ebuild b/dev-java/commons-pool/commons-pool-1.4.ebuild
deleted file mode 100644
index a159256fb7cf..000000000000
--- a/dev-java/commons-pool/commons-pool-1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.4.ebuild,v 1.5 2010/01/03 20:31:28 fauli Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides general purpose object pooling API"
-HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
- test? (
- dev-java/ant-junit
- dev-java/junit:0
- )"
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-}
-
-EANT_BUILD_TARGET="build-jar"
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- dodoc README.txt RELEASE-NOTES.txt || die
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 3e2212b35e7e..fd210fdb4690 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/groovy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.43 2010/10/15 17:40:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.44 2010/10/17 12:31:30 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -groovy-1.6.5.ebuild,
+ -groovy-1.6.7.ebuild:
+ Remove old.
15 Oct 2010; Brent Baude <ranger@gentoo.org> groovy-1.6.8.ebuild:
Marking groovy-1.6.8 ppc for bug 321355
diff --git a/dev-java/groovy/groovy-1.6.5.ebuild b/dev-java/groovy/groovy-1.6.5.ebuild
deleted file mode 100644
index d383d38ce80f..000000000000
--- a/dev-java/groovy/groovy-1.6.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.6.5.ebuild,v 1.3 2010/01/07 20:35:06 ranger Exp $
-
-# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
-# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
-
-# We currently do not build the embeddable jar (which is created using JarJar).
-# We could provide that via an USE flag.
-# We also don't use automatic build rewriting as there seems to be already some level of support
-# in the upstream build system
-
-# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
-# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
-# There is also a bug (visible when loading groovyConsole for instance) where asm-1.5 is put on the cp,
-# this conflicts with the 2.2 version needed by Groovy.
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV/_rc/-RC-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-
-SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
-LICENSE="codehaus-groovy"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND="
- dev-java/asm:2.2
- dev-java/antlr:0
- >=dev-java/xstream-1.3
- >=dev-java/junit-3.8.2:0
- >=dev-java/jline-0.9.91
- >=dev-java/ant-core-1.7.0
- >=dev-java/commons-cli-1.2
- dev-java/servletapi:2.4
- >=dev-java/bsf-2.4
- java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.5
- !<dev-java/groovy-1.6.3
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- dev-java/ant-ivy:2
- doc? (
- dev-java/qdox
- )
- test? (
- dev-java/jmock
- dev-java/xmlunit
- dev-db/hsqldb
- dev-java/commons-logging
- dev-java/ant-junit
- dev-java/ant-trax
- )
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_PKG_BSFIX=""
-
-src_prepare() {
- rm -rf bootstrap
- # security directory is needed for tests, but they currently don't pass
- #rm -rf security
- mkdir -p target/lib && cd target/lib
- mkdir compile && mkdir runtime && mkdir tools
- cd compile
-
- java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-2.2,xstream
- java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
- java-pkg_jar-from --virtual jmx
- java-pkg_jar-from --build-only ant-ivy:2
- use doc && java-pkg_jar-from --build-only qdox-1.6
-}
-
-src_compile() {
- eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
- -DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
-
- use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
- -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
-}
-
-src_test() {
- cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
-
- java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
-
- cd "${S}"
- ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
- -DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
-}
-
-src_install() {
- java-pkg_newjar "target/dist/${PN}.jar"
- use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
-
- # FIXME: install those two later
- #
- #use doc && java-pkg_dojavadoc "target/html/api/"
- #use doc && java-pkg_dojavadoc "target/html/gapi/"
-
- use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
- java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
- java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
- java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
- java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-}
diff --git a/dev-java/groovy/groovy-1.6.7.ebuild b/dev-java/groovy/groovy-1.6.7.ebuild
deleted file mode 100644
index 5463814dc8cc..000000000000
--- a/dev-java/groovy/groovy-1.6.7.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.6.7.ebuild,v 1.2 2010/01/15 20:27:39 abcd Exp $
-
-# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
-# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
-
-# We currently do not build the embeddable jar (which is created using JarJar).
-# We could provide that via an USE flag.
-# We also don't use automatic build rewriting as there seems to be already some level of support
-# in the upstream build system
-
-# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
-# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
-# There is also a bug (visible when loading groovyConsole for instance) where asm-1.5 is put on the cp,
-# this conflicts with the 2.2 version needed by Groovy.
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV/_rc/-RC-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-
-SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
-LICENSE="codehaus-groovy"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND="
- dev-java/asm:2.2
- dev-java/antlr:0
- >=dev-java/xstream-1.3
- >=dev-java/junit-3.8.2:0
- >=dev-java/jline-0.9.91
- >=dev-java/ant-core-1.7.0
- >=dev-java/commons-cli-1.2
- dev-java/servletapi:2.4
- >=dev-java/bsf-2.4
- java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.5
- !<dev-java/groovy-1.6.3
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- dev-java/ant-ivy:2
- doc? (
- dev-java/qdox
- )
- test? (
- dev-java/jmock
- dev-java/xmlunit
- dev-db/hsqldb
- dev-java/commons-logging
- dev-java/ant-junit
- dev-java/ant-trax
- )
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_PKG_BSFIX=""
-
-src_prepare() {
- rm -rf bootstrap
- # security directory is needed for tests, but they currently don't pass
- #rm -rf security
- mkdir -p target/lib && cd target/lib
- mkdir compile && mkdir runtime && mkdir tools
- cd compile
-
- java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-2.2,xstream
- java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
- java-pkg_jar-from --virtual jmx
- java-pkg_jar-from --build-only ant-ivy:2
- use doc && java-pkg_jar-from --build-only qdox-1.6
-}
-
-src_compile() {
- eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
- -DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
-
- use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
- -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
-}
-
-src_test() {
- cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
-
- java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
-
- cd "${S}"
- ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
- -DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
-}
-
-src_install() {
- java-pkg_newjar "target/dist/${PN}.jar"
- use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
-
- # FIXME: install those two later
- #
- #use doc && java-pkg_dojavadoc "target/html/api/"
- #use doc && java-pkg_dojavadoc "target/html/gapi/"
-
- use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
- java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
- java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
- java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
- java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-}
diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index ba183d1fc745..6a155f43b8d0 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jdbc-mysql
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.73 2010/10/14 16:49:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.74 2010/10/17 12:21:19 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -jdbc-mysql-5.1.6.ebuild:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> jdbc-mysql-5.1.11.ebuild:
stable ppc, bug 309109
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
deleted file mode 100644
index 9359b280119e..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.5 2010/06/30 20:46:26 caster Exp $
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="c3p0 log4j"
-COMMON_DEP="
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )
- dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-JAVA_PKG_NV_DEPEND="
- || ( =virtual/jdk-1.5* =virtual/jdk-1.4* )"
-
-DEPEND="${JAVA_PKG_NV_DEPEND}
- >=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
- # http://bugs.mysql.com/bug.php?id=28286
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
- # checks fail if java6 bootclasspath is not a single jar
- sed -i 's/depends="-compiler-check, /depends="/' build.xml || die
-
- rm -v *.jar || die
-
- # use test && mkdir src/lib-nodist # needed, or ant will fail
-
- cd src/lib
- rm -v *.jar || die
- java-pkg_jar-from commons-logging
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-# Needs two different source/targets
-JAVA_PKG_BSFIX="off"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- local vm=$(depend-java-query -v ">=virtual/jdk-1.6")
- local javac=$(GENTOO_VM="${vm}" java-config --javac)
- local rt=$(GENTOO_VM="${vm}" java-config -g BOOTCLASSPATH)
- einfo "Using ${vm} to compile the JDBC4 driver"
- einfo "javac: ${javac}"
- einfo "bootclasspath: ${rt}"
- java-pkg-2_src_compile \
- -Dcom.mysql.jdbc.java6.javac="${javac}" \
- -Dcom.mysql.jdbc.java6.rtjar="${rt}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
- cd src/lib
- java-pkg_jar-from junit
- cd "${S}"
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
- # Skip bytecode check because we want two versions there
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
- dodoc README CHANGES || die
- dohtml docs/*.html || die
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jgoodies-looks/ChangeLog b/dev-java/jgoodies-looks/ChangeLog
index 18fd25bea6d2..19a3baa26648 100644
--- a/dev-java/jgoodies-looks/ChangeLog
+++ b/dev-java/jgoodies-looks/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/jgoodies-looks
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/ChangeLog,v 1.41 2010/10/15 12:32:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/ChangeLog,v 1.42 2010/10/17 12:30:01 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -files/plastic-1.3.2.txt,
+ -files/build-1.3.2.xml, -files/build-2.0.4.xml,
+ -jgoodies-looks-2.1.4.ebuild,
+ -files/jgoodies-looks-2.1.4-configureEditor.patch,
+ jgoodies-looks-2.3.1.ebuild:
+ Remove old.
15 Oct 2010; Brent Baude <ranger@gentoo.org> jgoodies-looks-2.3.1.ebuild:
stable ppc, bug 320831
diff --git a/dev-java/jgoodies-looks/files/build-1.3.2.xml b/dev-java/jgoodies-looks/files/build-1.3.2.xml
deleted file mode 100644
index dc6481c57a58..000000000000
--- a/dev-java/jgoodies-looks/files/build-1.3.2.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Looks" default="jar" basedir=".">
-
- <!-- This is a customized build.xml for portage! -->
- <!--
- <property file="${basedir}/build.properties"/>
- <property file="${basedir}/default.properties"/>
- -->
-
- <!-- Specification data -->
- <property name="spec.title" value="JGoodies Looks API Specification"/>
- <property name="spec.version" value="1.3"/>
- <property name="spec.vendor" value="Karsten Lentzsch"/>
-
- <!-- Implementation data -->
- <property name="impl.title" value="JGoodies Looks"/>
- <property name="impl.version" value="1.3.2"/>
- <property name="impl.vender" value="Karsten Lentzsch"/>
-
- <!-- Directory structure information -->
- <property name="build" value="${basedir}/build"/>
- <property name="src" value="${basedir}/src"/>
-
- <!-- JavaDoc information -->
- <property name="packages" value="com.jgoodies.*"/>
-
- <target name="init">
- <tstamp />
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/doc"/>
- <mkdir dir="${build}/doc/api"/>
- </target>
-
- <target name="manifest" depends="init">
- <manifest file="MANIFEST.MF" mode="update">
- <attribute name="Built-By" value="Gentoo Portage"/>
- <attribute name="Specification-Title" value="${spec.title}"/>
- <attribute name="Specification-Version" value="${spec.version}"/>
- <attribute name="Specification-Vendor" value="${spec.vendor}"/>
- <attribute name="Implementation-Title" value="${impl.title}"/>
- <attribute name="Implementation-Version" value="${impl.version}"/>
- <attribute name="Implementation-Vendor" value="${impl.vendor}"/>
- </manifest>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="${src}" destdir="${build}" source="1.4" target="1.4" encoding="ISO-8859-1">
- <exclude name="examples/**/*"/>
- <exclude name="photoshop/**/*"/>
- <exclude name="test/**/*"/>
- </javac>
-
- <!--
- Copy application resources
- NOTE: THIS MAY NEED TO BE CHANGED IN FUTURE VERSIONS!!
- -->
- <copy toDir="${build}/com/jgoodies/looks/common">
- <fileset dir="${src}/com/jgoodies/looks/common" includes="shadow.png"/>
- </copy>
- <copy toDir="${build}/com/jgoodies/looks/plastic">
- <fileset dir="${src}/com/jgoodies/looks/plastic" includes="icons/**/*"/>
- </copy>
- <copy toDir="${build}/com/jgoodies/looks/windows">
- <fileset dir="${src}/com/jgoodies/looks/windows" includes="icons/**/*"/>
- </copy>
- </target>
-
- <target name="javadoc" depends="compile">
- <javadoc sourcepath="${src}" packagenames="${packages}" destdir="${build}/docs/"/>
- </target>
-
- <target name="jar" depends="compile,manifest">
- <jar jarfile="looks-${impl.version}.jar" manifest="MANIFEST.MF">
- <fileset dir="${build}"/>
- <zipfileset dir="${basedir}"
- includes="plastic.txt"
- fullpath="META-INF/services/javax.swing.LookAndFeel"/>
- </jar>
- </target>
-
-</project>
diff --git a/dev-java/jgoodies-looks/files/build-2.0.4.xml b/dev-java/jgoodies-looks/files/build-2.0.4.xml
deleted file mode 100644
index 8af2916ac2be..000000000000
--- a/dev-java/jgoodies-looks/files/build-2.0.4.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Looks" default="jar" basedir=".">
-
- <!-- This is a customized build.xml for portage! -->
- <!--
- <property file="${basedir}/build.properties"/>
- <property file="${basedir}/default.properties"/>
- -->
-
- <!-- Specification data -->
- <property name="spec.title" value="JGoodies Looks API Specification"/>
- <property name="spec.version" value="2.0"/>
- <property name="spec.vendor" value="JGoodies Karsten Lentzsch"/>
-
- <!-- Implementation data -->
- <property name="impl.title" value="JGoodies Looks"/>
- <property name="impl.version" value="2.0.4"/>
- <property name="impl.vender" value="JGoodies Karsten Lentzsch"/>
-
- <!-- Directory structure information -->
- <property name="build" value="${basedir}/build"/>
- <property name="src" value="${basedir}/src/core"/>
-
- <!-- JavaDoc information -->
- <property name="packages" value="com.jgoodies.*"/>
-
- <target name="init">
- <tstamp />
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/doc"/>
- <mkdir dir="${build}/doc/api"/>
- </target>
-
- <target name="manifest" depends="init">
- <manifest file="MANIFEST.MF" mode="update">
- <attribute name="Built-By" value="Gentoo Portage"/>
- <attribute name="Specification-Title" value="${spec.title}"/>
- <attribute name="Specification-Version" value="${spec.version}"/>
- <attribute name="Specification-Vendor" value="${spec.vendor}"/>
- <attribute name="Implementation-Title" value="${impl.title}"/>
- <attribute name="Implementation-Version" value="${impl.version}"/>
- <attribute name="Implementation-Vendor" value="${impl.vendor}"/>
- </manifest>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="${src}" destdir="${build}" source="1.4" target="1.4" encoding="ISO-8859-1">
- <exclude name="examples/**/*"/>
- <exclude name="photoshop/**/*"/>
- <exclude name="test/**/*"/>
- </javac>
-
- <!--
- Copy application resources
- NOTE: THIS MAY NEED TO BE CHANGED IN FUTURE VERSIONS!!
- -->
- <copy toDir="${build}/com/jgoodies/looks/common">
- <fileset dir="${src}/com/jgoodies/looks/common" includes="shadow.png"/>
- </copy>
- <copy toDir="${build}/com/jgoodies/looks/plastic">
- <fileset dir="${src}/com/jgoodies/looks/plastic" includes="icons/**/*"/>
- </copy>
- <copy toDir="${build}/com/jgoodies/looks/windows">
- <fileset dir="${src}/com/jgoodies/looks/windows" includes="icons/**/*"/>
- </copy>
- </target>
-
- <target name="javadoc" depends="compile">
- <javadoc sourcepath="${src}" packagenames="${packages}" destdir="${build}/docs/"/>
- </target>
-
- <target name="jar" depends="compile,manifest">
- <jar jarfile="looks-${impl.version}.jar" manifest="MANIFEST.MF">
- <fileset dir="${build}"/>
- <zipfileset dir="${basedir}"
- includes="plastic.txt"
- fullpath="META-INF/services/javax.swing.LookAndFeel"/>
- </jar>
- </target>
-</project>
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-2.1.4-configureEditor.patch b/dev-java/jgoodies-looks/files/jgoodies-looks-2.1.4-configureEditor.patch
deleted file mode 100644
index e639c409ba41..000000000000
--- a/dev-java/jgoodies-looks/files/jgoodies-looks-2.1.4-configureEditor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru looks-2.1.4.vanilla/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java looks-2.1.4/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java
---- looks-2.1.4.vanilla/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java 2007-12-09 15:55:24.000000000 +0100
-+++ looks-2.1.4/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java 2007-12-09 15:56:04.000000000 +0100
-@@ -155,7 +155,7 @@
- }
-
-
-- protected void configureEditor() {
-+ public void configureEditor() {
- super.configureEditor();
- if (!comboBox.isEnabled()) {
- editor.setBackground(UIManager.getColor("ComboBox.disabledBackground"));
diff --git a/dev-java/jgoodies-looks/files/plastic-1.3.2.txt b/dev-java/jgoodies-looks/files/plastic-1.3.2.txt
deleted file mode 100644
index e887d9d13da6..000000000000
--- a/dev-java/jgoodies-looks/files/plastic-1.3.2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# JGoodies Plastic L&F- replacement for Metal
-com.jgoodies.looks.plastic.PlasticLookAndFeel
-# JGoodies Plastic 3D L&F
-com.jgoodies.looks.plastic.Plastic3DLookAndFeel
-# JGoodies Plastic XP L&F
-com.jgoodies.looks.plastic.PlasticXPLookAndFeel
-# JGoodies Windows L&F
-com.jgoodies.looks.windows.WindowsLookAndFeel
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.1.4.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.1.4.ebuild
deleted file mode 100644
index d6ebaad326b2..000000000000
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.1.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-2.1.4.ebuild,v 1.5 2009/07/05 21:19:16 aballier Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="looks"
-MY_PV="${PV//./_}"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="2.0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # remove the bootclasspath brokedness, make building demo optional
- epatch "${FILESDIR}/${PN}-2.0.4-build.xml.patch"
-
- # unzip the look&feel settings from bundled jar before we delete it
- unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
- || die "unzip of javax.swing.LookAndFeel failed"
- # and rename it to what build.xml expects
- mv javax.swing.LookAndFeel all.txt
-
- rm -v *.jar demo/*.jar lib/*.jar || die
- rm -rv docs/api || die
-
- epatch "${FILESDIR}/${P}-configureEditor.patch"
-
-}
-
-src_compile() {
- # bug #150970
- java-pkg_filter-compiler jikes
-
- # jar target fails unless we make descriptors.dir an existing directory
- # I checked the ustream binary distribution and they also don't actually
- # put anything there.
- # 31.7.2006 betelgeuse@gentoo.org
- # update: it's where it looks for all.txt file
- # 16.1.2007 caster@gentoo.org
- eant -Ddescriptors.dir="${S}" jar-all $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/looks.jar
-
- dodoc RELEASE-NOTES.txt || die
- dohtml README.html || die
- if use doc; then
- java-pkg_dohtml -r docs/*
- java-pkg_dojavadoc build/docs/api
- fi
- use source && java-pkg_dosrc src/core/com
-}
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
index 75886d518871..96f20871c6aa 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild,v 1.4 2010/10/15 12:32:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild,v 1.5 2010/10/17 12:30:01 caster Exp $
JAVA_PKG_IUSE="doc source"
@@ -39,9 +39,6 @@ src_unpack() {
rm -v *.jar demo/*.jar lib/*.jar || die
rm -rv docs/api || die
-
-# epatch "${FILESDIR}/${P}-configureEditor.patch"
-
}
src_compile() {
diff --git a/dev-java/joni/ChangeLog b/dev-java/joni/ChangeLog
index b19107631de1..50aa244188a7 100644
--- a/dev-java/joni/ChangeLog
+++ b/dev-java/joni/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/joni
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joni/ChangeLog,v 1.10 2010/10/15 12:37:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joni/ChangeLog,v 1.11 2010/10/17 12:30:57 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -joni-1.1.3.ebuild:
+ Remove old.
15 Oct 2010; Brent Baude <ranger@gentoo.org> joni-1.1.4.ebuild:
stable ppc, bug 330155
diff --git a/dev-java/joni/joni-1.1.3.ebuild b/dev-java/joni/joni-1.1.3.ebuild
deleted file mode 100644
index d23f0b8d6da1..000000000000
--- a/dev-java/joni/joni-1.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joni/joni-1.1.3.ebuild,v 1.6 2010/05/28 19:51:10 josejx Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="source"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Java port of the Oniguruma regular expression engine"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-CDEPEND="dev-java/asm:3
- dev-java/jcodings:0"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="asm-3 jcodings"
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/sat4j-core/ChangeLog b/dev-java/sat4j-core/ChangeLog
index 27c67c7c5873..02a277c354a6 100644
--- a/dev-java/sat4j-core/ChangeLog
+++ b/dev-java/sat4j-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/sat4j-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/ChangeLog,v 1.9 2010/09/21 20:06:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/ChangeLog,v 1.10 2010/10/17 12:33:27 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -sat4j-core-2.1.ebuild,
+ -sat4j-core-2.1.1.ebuild:
+ Remove old.
21 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
sat4j-core-2.2.0.ebuild:
diff --git a/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild b/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild
deleted file mode 100644
index 82d4be60c6c8..000000000000
--- a/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild,v 1.3 2010/05/29 16:33:53 phajdan.jr Exp $
-
-EAPI="2"
-
-MY_PN="org.${PN//-/.}"
-MY_PV="20090826"
-BUILD_PV="2.4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight constraint programming with a SAT solver"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
- http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${PN}-v${MY_PV}.zip
-}
-
-java_prepare() {
- mkdir -p core/{lib,src} || die
-
- # Don't complain about missing javadoc stylesheet.
- touch core/lib/stylesheet.css
-
- # Grab build.xml. Don't fetch from CVS.
- sed 's/depends="prepare,getsource"/depends="prepare"/g' \
- "${DISTDIR}/${P}-build.xml" > build.xml || die
-
- # Unpack manifest.
- cd core || die
- jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
- # Unpack sources.
- cd src || die
- jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-EANT_BUILD_TARGET="core"
-EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
-
-src_install() {
- java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
- use doc && java-pkg_dojavadoc api/core
- use source && java-pkg_dosrc core/src/org
-}
diff --git a/dev-java/sat4j-core/sat4j-core-2.1.ebuild b/dev-java/sat4j-core/sat4j-core-2.1.ebuild
deleted file mode 100644
index 7de3c96cf127..000000000000
--- a/dev-java/sat4j-core/sat4j-core-2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/sat4j-core-2.1.ebuild,v 1.3 2010/04/13 11:57:15 fauli Exp $
-
-EAPI="2"
-
-MY_PN="org.${PN//-/.}"
-MY_PV="20090520"
-BUILD_PV="2.4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight constraint programming with a SAT solver"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
- http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${PN}-v${MY_PV}.zip
-}
-
-java_prepare() {
- mkdir -p core/{lib,src} || die
-
- # Don't complain about missing javadoc stylesheet.
- touch core/lib/stylesheet.css
-
- # Grab build.xml. Don't fetch from CVS.
- sed 's/depends="prepare,getsource"/depends="prepare"/g' \
- "${DISTDIR}/${P}-build.xml" > build.xml || die
-
- # Unpack manifest.
- cd core || die
- jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
- # Unpack sources.
- cd src || die
- jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-EANT_BUILD_TARGET="core"
-EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
-
-src_install() {
- java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
- use doc && java-pkg_dojavadoc api/core
- use source && java-pkg_dosrc core/src/org
-}
diff --git a/dev-java/sat4j-pseudo/ChangeLog b/dev-java/sat4j-pseudo/ChangeLog
index 3e354b0c713f..91a6261066b8 100644
--- a/dev-java/sat4j-pseudo/ChangeLog
+++ b/dev-java/sat4j-pseudo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/sat4j-pseudo
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/ChangeLog,v 1.9 2010/09/21 20:08:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/ChangeLog,v 1.10 2010/10/17 12:32:35 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -sat4j-pseudo-2.1.ebuild,
+ -sat4j-pseudo-2.1.1.ebuild:
+ Remove old.
21 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
sat4j-pseudo-2.2.0.ebuild:
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
deleted file mode 100644
index 032af8aa16b3..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild,v 1.3 2010/06/25 22:24:23 angelos Exp $
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20090826"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
- http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
- mkdir -p {core,pb}/{lib,src} || die
-
- # Don't complain about missing javadoc stylesheet.
- touch core/lib/stylesheet.css
-
- # Grab build.xml. Don't fetch from CVS. Don't build core.
- sed -e 's/depends="core"//g' \
- -e 's/depends="prepare,getsource"/depends="prepare"/g' \
- "${DISTDIR}/${P}-build.xml" > build.xml || die
-
- # This is the version identifier used for custom builds.
- echo 'CUSTOM' > core/src/sat4j.version || die
-
- # Unpack manifest.
- cd pb || die
- jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
- # Unpack sources.
- cd src || die
- jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
- java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
- use doc && java-pkg_dojavadoc api/pb
- use source && java-pkg_dosrc pb/src/org
-}
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild
deleted file mode 100644
index 03dfcb19965a..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild,v 1.3 2010/04/13 11:59:41 fauli Exp $
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20090520"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
- http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
- mkdir -p {core,pb}/{lib,src} || die
-
- # Don't complain about missing javadoc stylesheet.
- touch core/lib/stylesheet.css
-
- # Grab build.xml. Don't fetch from CVS. Don't build core.
- sed -e 's/depends="core"//g' \
- -e 's/depends="prepare,getsource"/depends="prepare"/g' \
- "${DISTDIR}/${P}-build.xml" > build.xml || die
-
- # This is the version identifier used for custom builds.
- echo 'CUSTOM' > core/src/sat4j.version || die
-
- # Unpack manifest.
- cd pb || die
- jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
- # Unpack sources.
- cd src || die
- jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
- java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
- use doc && java-pkg_dojavadoc api/pb
- use source && java-pkg_dosrc pb/src/org
-}
diff --git a/dev-java/slf4j-api/ChangeLog b/dev-java/slf4j-api/ChangeLog
index 52c9638513d5..1b938d13a5ea 100644
--- a/dev-java/slf4j-api/ChangeLog
+++ b/dev-java/slf4j-api/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/slf4j-api
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/ChangeLog,v 1.12 2010/10/14 16:59:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/ChangeLog,v 1.13 2010/10/17 12:26:35 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -slf4j-api-1.5.2.ebuild:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> slf4j-api-1.5.11.ebuild:
stable ppc, bug 316317
diff --git a/dev-java/slf4j-api/slf4j-api-1.5.2.ebuild b/dev-java/slf4j-api/slf4j-api-1.5.2.ebuild
deleted file mode 100644
index 41885f822984..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/slf4j-api-1.5.2.ebuild,v 1.6 2009/07/19 13:40:28 nixnut Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="mirror://gentoo/${P}-sources.jar"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${A}
- cp -v "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/slf4j-nop/ChangeLog b/dev-java/slf4j-nop/ChangeLog
index 7382456a1066..56c9bf7c0c19 100644
--- a/dev-java/slf4j-nop/ChangeLog
+++ b/dev-java/slf4j-nop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/slf4j-nop
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-nop/ChangeLog,v 1.11 2010/10/14 17:01:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-nop/ChangeLog,v 1.12 2010/10/17 12:27:07 caster Exp $
+
+ 17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -slf4j-nop-1.5.2.ebuild:
+ Remove old.
14 Oct 2010; Brent Baude <ranger@gentoo.org> slf4j-nop-1.5.11.ebuild:
stable ppc, bug 316319
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.5.2.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.5.2.ebuild
deleted file mode 100644
index e916abfbeb36..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-nop/slf4j-nop-1.5.2.ebuild,v 1.6 2009/07/19 13:41:51 nixnut Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="mirror://gentoo/${P}-sources.jar"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- dev-java/slf4j-api"
-DEPEND=">=virtual/jdk-1.4
- dev-java/slf4j-api
- app-arch/unzip"
-
-S="${WORKDIR}"
-
-EANT_GENTOO_CLASSPATH="slf4j-api"
-
-src_unpack() {
- unpack ${A}
- cp -v "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
-}