Attachment 209178 Details for Bug 205489 – Patch of changes from hamcrest-1.1.ebuild in java-overlay.

[patch] Patch of changes from hamcrest-1.1.ebuild in java-overlay.

hamcrest-1.2.diff (text/plain), 3.88 KB, created by Daniel Solano Gómez on 2009-11-03 23:37:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Solano Gómez

Created: 2009-11-03 23:37:09 UTC

Size: 3.88 KB

patch

obsolete

>--- /usr/local/portage/layman/java-overlay/dev-java/hamcrest/hamcrest-1.1.ebuild	2009-10-26 18:49:21.000000000 -0500
>+++ hamcrest-1.2.ebuild	2009-11-03 17:34:05.000000000 -0600
>@@ -1,65 +1,70 @@
>-# Copyright 1999-2007 Gentoo Foundation
>+# Copyright 1999-2009 Gentoo Foundation
> # Distributed under the terms of the GNU General Public License v2
> # $Header: $
> 
>-JAVA_PKG_IUSE="doc source test"
>+EAPI="2"
>+JAVA_PKG_IUSE="examples test"
> inherit java-pkg-2 java-ant-2
>+
> DESCRIPTION="Library of matchers for building test expressions."
>-HOMEPAGE="http://code.google.com/p/hamcrest/"
>+HOMEPAGE="http://code.google.com/p/${MY_PN}/"
> SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
> LICENSE="BSD-2"
>-SLOT="0"
>-KEYWORDS="~x86 ~amd64"
>+SLOT="1.2"
>+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
> IUSE=""
> 
>-CDEPEND=">=dev-java/easymock-2.2
>-	>=dev-java/jmock-1.0
>-	=dev-java/qdox-1.6*"
>+CDEPEND="
>+	~dev-java/hamcrest-core-${PV}
>+	~dev-java/hamcrest-library-${PV}
>+	~dev-java/hamcrest-integration-${PV}"
> DEPEND=">=virtual/jdk-1.5
>+	userland_GNU? ( sys-apps/findutils )
> 	test? (
>-		dev-java/ant-junit
>-		=dev-java/junit-3.8*
>+		~dev-java/hamcrest-generator-${PV}
>+		dev-java/junit:4
>+		dev-java/ant-junit4
>+		dev-java/easymock:2
>+		dev-java/jmock:1.0
> 	)
>-	>=dev-java/jarjar-0.9
> 	${CDEPEND}"
> RDEPEND=">=virtual/jre-1.5
> 	${CDEPEND}"
> 
>-src_unpack() {
>-	unpack ${A}
>-	cd ${S}
>-	find -name "*.jar" | xargs rm -v
>-	java-ant_rewrite-classpath
>-
>-	# These jars must be symlinked as specifying them using gentoo.classpath
>-	# does not work and both compilation and test fail
>-	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
>-	java-pkg_jar-from --into lib/integration easymock-2 easymock.jar easymock-2.2.jar
>-	java-pkg_jar-from --into lib/integration jmock-1.0 jmock.jar jmock-1.10RC1.jar
>+JAVA_ANT_REWRITE_CLASSPATH=1
>+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java-to-jar"
>+
>+java_prepare() {
>+	# Don't include source in JAR.  If a Gentoo user wants the source the source
>+	# USE flag will be enabled
>+	epatch "${FILESDIR}/hamcrest-1.2-no_source_in_jar.patch"
>+	# Empty out the contents of the generator target; it has already been built.
>+	epatch "${FILESDIR}/hamcrest-1.2-empty_generator.patch"
>+	# Empty out the contents of the core target; it has already been built.
>+	epatch "${FILESDIR}/hamcrest-1.2-empty_core.patch"
>+	# Empty out the contents of the library target; it has already been built.
>+	epatch "${FILESDIR}/hamcrest-1.2-empty_library.patch"
>+	# Empty out the contents of the integration target; it has already been built.
>+	epatch "${FILESDIR}/hamcrest-1.2-empty_integration.patch"
>+
>+	find -iname "*.jar" -exec rm -v {} + || die "Failed to remove bundled JARs"
> }
> 
> src_compile() {
>-	# javadoc fails if these files and directories do not exist
>-	if use doc ; then
>-		mkdir -p ${S}/build/generated-code
>-		echo "<html><body></body></html>" > ${S}/overview.html
>-	fi
>-
>-	ANT_TASKS="jarjar-1" eant bigjar $(use_doc javadoc) -Dversion=${PV}
>+	einfo "Nothing to do..."
> }
> 
> src_test() {
>-	ANT_TASKS="ant-junit jarjar-1" eant unit-test \
>-		-Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
>+	ANT_TASKS="ant-junit4"
>+	eant unit-test \
>+		-Dversion="${PV}" \
>+		-Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT}):\
>+			$(java-pkg_getjars hamcrest-core-${SLOT},hamcrest-library-${SLOT},hamcrest-integration-${SLOT}):\
>+			$(java-pkg_getjars --build-only junit-4,easymock-2,jmock-1.0)"
> }
> 
> src_install() {
>-	for name in all core generator integration library text ; do
>-		java-pkg_newjar build/${PN}-${name}-${PV}.jar ${PN}-${name}.jar
>-	done
>-
>-	use doc && java-pkg_dojavadoc build/javadoc
>-	use source && java-pkg_dosrc ${PN}-core/src/main/java/org ${PN}-generator/src/main/java/org \
>-		${PN}-integration/src/main/java/org ${PN}-library/src/main/java/org \
>-		${PN}-text/src/main/java/org
>+	dodoc README.txt CHANGES.txt
>+
>+	use examples && java-pkg_doexamples ${PN}-examples
> }

Actions: View | Diff

Attachments on bug 205489: 206124 | 206126 | 206128 | 206129 | 206130 | 206132 | 206156 | 209178