Depend on >=dev-java/jakarta-oro-2.0.8-r2 to prevent versions from dev-java/oro that was moved to jakarta-oro from matching. Switch to java-pkg_doexamples.

(Portage version: 2.1.3_rc5)

2 files changed, 18 insertions, 12 deletions

diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index 576ed5fdce76..584a09bcc8cb 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.42 2007/02/11 12:25:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.43 2007/06/29 09:23:52 betelgeuse Exp $
+
+  29 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-net-1.4.1-r1.ebuild:
+  Depend on >=dev-java/jakarta-oro-2.0.8-r2 to prevent versions from
+  dev-java/oro that was moved to jakarta-oro from matching. Switch to
+  java-pkg_doexamples.
 
   11 Feb 2007; Vlastimil Babka <caster@gentoo.org> -files/gentoo-1.2.diff,
   -files/gentoo.diff, -commons-net-1.2.2-r1.ebuild,
@@ -70,6 +76,7 @@
   commons-net-1.3.0-r1.ebuild, -commons-net-1.3.0.ebuild:
   cleanup, removed old revision with a dependency to oro.
 
+*commons-net-1.3.0-r1 (29 Mar 2005)
 *commons-net-1.2.2-r1 (29 Mar 2005)
 
   29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
diff --git a/dev-java/commons-net/commons-net-1.4.1-r1.ebuild b/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
index 2298eac2488c..4500e0b66658 100644
--- a/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
+++ b/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.4.1-r1.ebuild,v 1.10 2007/02/10 19:10:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.4.1-r1.ebuild,v 1.11 2007/06/29 09:23:52 betelgeuse Exp $
+
+# disabling unit tests:
+# http://issues.apache.org/bugzilla/show_bug.cgi?id=37985
+JAVA_PKG_IUSE="doc examples source" # junit
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -8,21 +12,19 @@ MY_P="${P}-src"
 DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions."
 HOMEPAGE="http://jakarta.apache.org/commons/net/"
 SRC_URI="mirror://apache/jakarta/commons/net/source/${MY_P}.tar.gz"
+
+# dev-java/oro had a package move to jakarta-oro so depend on a version
+# that oro did not have. Most likely the cause of https://bugs.gentoo.org/show_bug.cgi?id=183595
 COMMON_DEP="
-	>=dev-java/jakarta-oro-2.0"
+	>=dev-java/jakarta-oro-2.0.8-r2"
 RDEPEND=">=virtual/jre-1.3
 	${COMMON_DEP}
 	"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.5.4
-	source? ( app-arch/zip )
 	${COMMON_DEP}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-# disabling unit tests:
-# http://issues.apache.org/bugzilla/show_bug.cgi?id=37985
-IUSE="doc examples source" # junit
 
 src_unpack() {
 	unpack ${A}
@@ -40,9 +42,6 @@ src_install() {
 	java-pkg_newjar target/${P}.jar ${PN}.jar
 
 	use doc && java-pkg_dojavadoc dist/docs/api
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/java/examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
+	use examples && java-pkg_doexamples src/java/examples
 	use source && java-pkg_dosrc src/java/org
 }