From 0db69b462ba0a942606095090387fb55c9838adc Mon Sep 17 00:00:00 2001 From: William Thomson Date: Wed, 15 Nov 2006 18:29:31 +0000 Subject: [PATCH] Fixed invalid iuse per bug #155268, changed from junit to test. However tests don't seem to be compiled or run :(, still needs luv there Package-Manager: portage-2.1.2_rc1-r6 --- dev-java/commons-httpclient/ChangeLog | 7 ++++++- dev-java/commons-httpclient/Manifest | 16 ++++++++-------- .../commons-httpclient-3.0.1.ebuild | 16 +++++++++++----- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog index 4e18651c4a55..138639bf7d8a 100644 --- a/dev-java/commons-httpclient/ChangeLog +++ b/dev-java/commons-httpclient/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-httpclient # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.32 2006/11/15 04:18:29 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.33 2006/11/15 18:29:31 wltjr Exp $ + + 15 Nov 2006; William L. Thomson Jr. + commons-httpclient-3.0.1.ebuild: + Fixed invalid iuse per bug #155268, changed from junit to test. However + tests don't seem to be compiled or run :(, still needs luv there 15 Nov 2006; William L. Thomson Jr. +files/commons-httpclient-3.0.1-gentoo.patch: diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest index 7d4730d9ec51..01c743d15cf9 100644 --- a/dev-java/commons-httpclient/Manifest +++ b/dev-java/commons-httpclient/Manifest @@ -30,18 +30,18 @@ EBUILD commons-httpclient-3.0-r1.ebuild 1429 RMD160 409ad139e7e416a12397c169966c MD5 b52f05c525bac8344b3a06173b6932a7 commons-httpclient-3.0-r1.ebuild 1429 RMD160 409ad139e7e416a12397c169966c53f75708bab7 commons-httpclient-3.0-r1.ebuild 1429 SHA256 d90515c4983b6ea7668ff96fd71f9053b7d00d6498ac50e682760aff25b34503 commons-httpclient-3.0-r1.ebuild 1429 -EBUILD commons-httpclient-3.0.1.ebuild 1456 RMD160 5897e7b7593966d4f74106b95bbe65271b3b4008 SHA1 087629508375b8ab9aa9cb09b1d27762783df8d8 SHA256 c175ccd19ade67ff335092333559048563bc4f0bf3e80c407eb256cb15301742 -MD5 34bee1234c5ab454fa03554bf86cd45a commons-httpclient-3.0.1.ebuild 1456 -RMD160 5897e7b7593966d4f74106b95bbe65271b3b4008 commons-httpclient-3.0.1.ebuild 1456 -SHA256 c175ccd19ade67ff335092333559048563bc4f0bf3e80c407eb256cb15301742 commons-httpclient-3.0.1.ebuild 1456 +EBUILD commons-httpclient-3.0.1.ebuild 1555 RMD160 69d84bad4f6e49e8b2ab627b1c211a7c4b6bb69c SHA1 ea5f2837df6fc9cb41b02339d035dcccfc191cf7 SHA256 7a9580085b50e704b499ac6e8cb207dcfced36be7d523053c9589789bbda016c +MD5 b829a1e944d77ee247f9dbdfc2c38e82 commons-httpclient-3.0.1.ebuild 1555 +RMD160 69d84bad4f6e49e8b2ab627b1c211a7c4b6bb69c commons-httpclient-3.0.1.ebuild 1555 +SHA256 7a9580085b50e704b499ac6e8cb207dcfced36be7d523053c9589789bbda016c commons-httpclient-3.0.1.ebuild 1555 EBUILD commons-httpclient-3.0.ebuild 1410 RMD160 acf3e6b4e273c7c7dd1cc61d0baa2d29766c3f50 SHA1 3d2cd08c21fb6744fabba6c7fc4894e653630f96 SHA256 db157c6d03ab21379673f52686acbe7ee1eaf709107570b0d382cc2fd1de0172 MD5 da124c5c8b147db6c2054a25ccd95fcc commons-httpclient-3.0.ebuild 1410 RMD160 acf3e6b4e273c7c7dd1cc61d0baa2d29766c3f50 commons-httpclient-3.0.ebuild 1410 SHA256 db157c6d03ab21379673f52686acbe7ee1eaf709107570b0d382cc2fd1de0172 commons-httpclient-3.0.ebuild 1410 -MISC ChangeLog 5068 RMD160 704292b9de6174b7f262159e76cd639cc71f5e66 SHA1 f580ee0f1b355fbc8e35f7fe0c9289cbf4691490 SHA256 d60f9f89b8733a43beafb8b304e0697b9a17a2f44141cca50827395e23535c6c -MD5 895d55be039d81ab33ecb269c3c80409 ChangeLog 5068 -RMD160 704292b9de6174b7f262159e76cd639cc71f5e66 ChangeLog 5068 -SHA256 d60f9f89b8733a43beafb8b304e0697b9a17a2f44141cca50827395e23535c6c ChangeLog 5068 +MISC ChangeLog 5302 RMD160 0c5ec8df49cb001e6827a069265f4100a778c71b SHA1 3701d647b826cea10319e2c35f2bdf2200065cd2 SHA256 c0cc3fd4b3eec67f6a8841d3f0c773d2dc09d2739e6a6b9faa76aca15e11c095 +MD5 7c8cb534099f75fd603eba6f13f96eff ChangeLog 5302 +RMD160 0c5ec8df49cb001e6827a069265f4100a778c71b ChangeLog 5302 +SHA256 c0cc3fd4b3eec67f6a8841d3f0c773d2dc09d2739e6a6b9faa76aca15e11c095 ChangeLog 5302 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild index 6aa277ea81e1..eebcdc8c23cd 100644 --- a/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild +++ b/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild,v 1.1 2006/11/15 04:10:15 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild,v 1.2 2006/11/15 18:29:31 wltjr Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${MY_P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="3" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc examples source" +IUSE="doc examples source test" RDEPEND=">=virtual/jre-1.3 dev-java/commons-logging @@ -20,8 +20,11 @@ RDEPEND=">=virtual/jre-1.3 DEPEND=">=virtual/jdk-1.3 sys-apps/sed - >=dev-java/ant-core-1.4 - junit? ( dev-java/junit ) + test? ( + dev-java/junit + dev-java/ant + ) + !test? ( >=dev-java/ant-core-1.4 ) source? ( app-arch/zip ) ${RDEPEND}" @@ -37,7 +40,7 @@ src_unpack() { } src_compile() { - eant dist $(use_doc) + eant dist $(use_doc) $(use test && echo "-Dtest.entry=true") } src_install() { @@ -50,3 +53,6 @@ src_install() { cp -r src/examples/* ${D}/usr/share/doc/${PF}/examples fi } +src_test() { + eant test +} -- 2.26.2