diff options
| author |   Johann Schmitz <ercpe@gentoo.org> | 2013-11-30 17:39:59 +0000 |
|---|---|---|
| committer | Johann Schmitz <ercpe@gentoo.org> | 2013-11-30 17:39:59 +0000 |
| commit | 8be09956bbc7105d8c2798ccdd5b9242be85cfb7 (patch) | |
| tree | 6fe5fadeb4a761d7eaede69d172751a610d1f9bb /dev-java | |
| parent | Initial ebuild. (diff) | |
| download | gentoo-2-8be09956bbc7105d8c2798ccdd5b9242be85cfb7.tar.gz gentoo-2-8be09956bbc7105d8c2798ccdd5b9242be85cfb7.tar.bz2 gentoo-2-8be09956bbc7105d8c2798ccdd5b9242be85cfb7.zip | |
Removed un-bundling of cglib/asm from mockito as it creates troubles with other packages.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/mockito/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/mockito/mockito-1.9.5-r1.ebuild (renamed from dev-java/mockito/mockito-1.9.5.ebuild) | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/dev-java/mockito/ChangeLog b/dev-java/mockito/ChangeLog index 7bd5e4c0ffe5..b3762fcbdf46 100644 --- a/dev-java/mockito/ChangeLog +++ b/dev-java/mockito/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/mockito # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/ChangeLog,v 1.2 2013/10/12 16:17:15 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/ChangeLog,v 1.3 2013/11/30 17:39:59 ercpe Exp $ + +*mockito-1.9.5-r1 (30 Nov 2013) + + 30 Nov 2013; Johann Schmitz <ercpe@gentoo.org> +mockito-1.9.5-r1.ebuild, + -mockito-1.9.5.ebuild: + Removed un-bundling of cglib/asm from mockito as it creates troubles with + other packages. 12 Oct 2013; Johann Schmitz <ercpe@gentoo.org> mockito-1.9.5.ebuild: Added missing dependency to hamcrest-core:0 to mockito and set JAVA_SRC_DIR to diff --git a/dev-java/mockito/mockito-1.9.5.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild index c8c48e039a08..ac67f9a95548 100644 --- a/dev-java/mockito/mockito-1.9.5.ebuild +++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5.ebuild,v 1.2 2013/10/12 16:17:15 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5-r1.ebuild,v 1.1 2013/11/30 17:39:59 ercpe Exp $ EAPI="5" @@ -19,9 +19,9 @@ KEYWORDS="~amd64 ~x86" IUSE="" CDEPEND="dev-java/junit:4 - dev-java/cglib:3 dev-java/objenesis:0 - dev-java/hamcrest-core:0" + dev-java/hamcrest-core:0 + dev-java/ant-core:0" RDEPEND=">=virtual/jre-1.5 ${CDEPEND}" DEPEND=">=virtual/jdk-1.5 @@ -31,7 +31,7 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}" JAVA_SRC_DIR="src" -JAVA_GENTOO_CLASSPATH="junit-4,cglib-3,objenesis,hamcrest-core" +JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core" src_unpack() { unpack ${A} @@ -39,6 +39,5 @@ src_unpack() { } java_prepare() { - rm -rf "${S}"/src/org/mockito/{cglib,asm} || die - find src/ -name "*.java" | xargs sed -i -e 's/import org.mockito.cglib/import net.sf.cglib/g' || die + find "${S}" -name "*.jar" -delete || die } |