Restrict junit dependency, version dump.

Package-Manager: portage-2.1.4_rc14

4 files changed, 9 insertions, 50 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/*
-}