Restrict junit dependency, version dump.

Package-Manager: portage-2.1.4_rc14

10 files changed, 18 insertions, 177 deletions

diff --git a/dev-java/mockmaker/ChangeLog b/dev-java/mockmaker/ChangeLog
index 0109b591a323..2b46fda103c1 100644
--- a/dev-java/mockmaker/ChangeLog
+++ b/dev-java/mockmaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mockmaker
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockmaker/ChangeLog,v 1.8 2007/11/10 12:21:05 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockmaker/ChangeLog,v 1.9 2008/01/10 22:38:11 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  -mockmaker-1.12.0_p20050104.ebuild, mockmaker-1.12.0_p20050104-r1.ebuild:
+  Restrict junit dependency, version dump.
 
   10 Nov 2007; nixnut <nixnut@gentoo.org>
   mockmaker-1.12.0_p20050104-r1.ebuild:
diff --git a/dev-java/mockmaker/files/digest-mockmaker-1.12.0_p20050104 b/dev-java/mockmaker/files/digest-mockmaker-1.12.0_p20050104
deleted file mode 100644
index ea912c06e04a..000000000000
--- a/dev-java/mockmaker/files/digest-mockmaker-1.12.0_p20050104
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 53a0f0c6a4b7a62ea08b426e974058a7 mockmaker-1.12.0_p20050104.tar.bz2 263986
-RMD160 a52109da312dd1537966842ffdc7630b307fd05b mockmaker-1.12.0_p20050104.tar.bz2 263986
-SHA256 5feef7ca748e2e167da64459262b08b3824c7f0323419d01820ea1e99add31a9 mockmaker-1.12.0_p20050104.tar.bz2 263986
diff --git a/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild b/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild
index f1421dc7b352..9fb310903779 100644
--- a/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild
+++ b/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild,v 1.6 2007/11/10 12:21:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockmaker/mockmaker-1.12.0_p20050104-r1.ebuild,v 1.7 2008/01/10 22:38:11 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -15,7 +15,7 @@ IUSE="source"
 
 RDEPEND=">=virtual/jre-1.4
 	dev-java/qdox
-	dev-java/junit
+	=dev-java/junit-3.8*
 	>=dev-java/ant-core-1.4
 	dev-java/mockobjects"
 
diff --git a/dev-java/mockmaker/mockmaker-1.12.0_p20050104.ebuild b/dev-java/mockmaker/mockmaker-1.12.0_p20050104.ebuild
deleted file mode 100644
index fc9335d5c3ed..000000000000
--- a/dev-java/mockmaker/mockmaker-1.12.0_p20050104.ebuild
+++ /dev/null
@@ -1,42 +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/mockmaker/mockmaker-1.12.0_p20050104.ebuild,v 1.5 2007/08/04 10:59:59 fordfrog Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Program for automatically creating source code for mock object."
-HOMEPAGE="http://mockmaker.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.12"
-KEYWORDS="x86 amd64 ppc"
-IUSE="doc jikes"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/qdox"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	jikes? ( >=dev-java/jikes-1.21 )
-	>=dev-java/ant-core-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-
-	# we keep mmmockobjects.jar since it's used for bootstrapping
-	java-pkg_jar-from qdox-1.6
-}
-
-src_compile() {
-	local antflags="compile"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "failed to build"
-}
-
-src_install() {
-	java-pkg_dojar dist/tmp/${PN}.jar
-
-	dodoc README.txt
-	use doc && java-pkg_dohtml -r doc/*
-}
diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index f8cb45861cdb..d29fc3976e4f 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xom
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.39 2007/11/24 19:08:01 nelchael Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.40 2008/01/10 22:39:35 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> -xom-1.0-r2.ebuild,
+  -xom-1.0-r3.ebuild, xom-1.0-r4.ebuild:
+  Restrict junit dependency, version dump.
 
   24 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org> xom-1.0-r4.ebuild:
   Stable on ppc, see bug #199673.
diff --git a/dev-java/xom/files/digest-xom-1.0-r2 b/dev-java/xom/files/digest-xom-1.0-r2
deleted file mode 100644
index 27aa669027b5..000000000000
--- a/dev-java/xom/files/digest-xom-1.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af472e90685eef0ac1e731eb84a49763 xom-1.0.tar.gz 3396586
-RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 xom-1.0.tar.gz 3396586
-SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16 xom-1.0.tar.gz 3396586
diff --git a/dev-java/xom/files/digest-xom-1.0-r3 b/dev-java/xom/files/digest-xom-1.0-r3
deleted file mode 100644
index 27aa669027b5..000000000000
--- a/dev-java/xom/files/digest-xom-1.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af472e90685eef0ac1e731eb84a49763 xom-1.0.tar.gz 3396586
-RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 xom-1.0.tar.gz 3396586
-SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16 xom-1.0.tar.gz 3396586
diff --git a/dev-java/xom/xom-1.0-r2.ebuild b/dev-java/xom/xom-1.0-r2.ebuild
deleted file mode 100644
index e2bf8bb03746..000000000000
--- a/dev-java/xom/xom-1.0-r2.ebuild
+++ /dev/null
@@ -1,56 +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/xom/xom-1.0-r2.ebuild,v 1.13 2007/11/13 23:31:48 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-XOMVER="xom-${PV/_beta/b}"
-DESCRIPTION="XOM is a new XML object model."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	>=dev-java/xerces-2.7
-	dev-java/xalan
-	dev-java/junit
-	=dev-java/icu4j-3.0*
-	dev-java/tagsoup
-	=dev-java/servletapi-2.4*"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S=${WORKDIR}/XOM
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	java-pkg_jar-from tagsoup
-}
-
-src_compile() {
-	local antflags="jar -Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar"
-	eant ${antflags} || die "Failed Compiling"
-}
-
-src_install() {
-	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
-	dodoc Todo.txt
-
-	use doc && java-pkg_dohtml -r apidocs/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/xom/xom-1.0-r3.ebuild b/dev-java/xom/xom-1.0-r3.ebuild
deleted file mode 100644
index 12ace59a08b0..000000000000
--- a/dev-java/xom/xom-1.0-r3.ebuild
+++ /dev/null
@@ -1,60 +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/xom/xom-1.0-r3.ebuild,v 1.4 2007/11/15 18:48:02 nelchael Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-XOMVER="xom-${PV/_beta/b}"
-DESCRIPTION="A new XML object model."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/xerces-2.7
-	dev-java/xalan
-	dev-java/junit
-	=dev-java/icu4j-3.0*
-	examples? ( =dev-java/servletapi-2.4* )
-	dev-java/tagsoup"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/XOM
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	rm -v *.jar || die
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	java-pkg_jar-from tagsoup
-}
-
-src_compile() {
-	eant jar -Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar \
-		-Dservlet.jar="$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" \
-		$(use examples && echo samples) \
-		|| die "Failed Compiling"
-}
-
-src_install() {
-	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
-	use examples && java-pkg_dojar build/xom-samples.jar
-	dodoc Todo.txt || die
-
-	use doc && java-pkg_dojavadoc apidocs/
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}
diff --git a/dev-java/xom/xom-1.0-r4.ebuild b/dev-java/xom/xom-1.0-r4.ebuild
index 195602865445..baeadf1c1c82 100644
--- a/dev-java/xom/xom-1.0-r4.ebuild
+++ b/dev-java/xom/xom-1.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r4.ebuild,v 1.5 2007/11/24 19:08:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r4.ebuild,v 1.6 2008/01/10 22:39:35 caster Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -18,7 +18,7 @@ IUSE=""
 
 COMMON_DEPEND=">=dev-java/xerces-2.7
 		dev-java/xalan
-		dev-java/junit
+		=dev-java/junit-3.8*
 		=dev-java/icu4j-3.0*
 		examples? ( =dev-java/servletapi-2.4* )
 		dev-java/tagsoup"