From 4038830ace01dfb1fdfb93b2e590988a00f5b8d0 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 26 Apr 2007 21:24:26 +0000 Subject: [PATCH] Add missing junit dep, minor style tweaks. Package-Manager: portage-2.1.2.4 --- dev-java/xjavadoc/ChangeLog | 5 ++++- dev-java/xjavadoc/Manifest | 26 ++++++++---------------- dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild | 21 +++++++++---------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog index 931b63e4af08..a0ca2aa41828 100644 --- a/dev-java/xjavadoc/ChangeLog +++ b/dev-java/xjavadoc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/xjavadoc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.10 2007/04/14 19:43:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.11 2007/04/26 21:24:26 caster Exp $ + + 26 Apr 2007; Vlastimil Babka xjavadoc-1.1-r1.ebuild: + Add missing junit dep, minor style tweaks. 14 Apr 2007; Petteri Räty xjavadoc-1.1-r1.ebuild: Migrate to splitted ant. diff --git a/dev-java/xjavadoc/Manifest b/dev-java/xjavadoc/Manifest index 713f2a68d051..dd3fd3148e4d 100644 --- a/dev-java/xjavadoc/Manifest +++ b/dev-java/xjavadoc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xjavadoc-1.1-buildfile.patch 1094 RMD160 0089d1d57736a77b94be78509b4c428abba07a6e SHA1 940771b526c2c2092ad54338d211e917b3b7a9fd SHA256 9e47de14cea9105743d4f1e11206778419a90dd5cdc64b33c204185feca86c57 MD5 ab072e0465aa3f0ab9c007d189415e06 files/xjavadoc-1.1-buildfile.patch 1094 RMD160 0089d1d57736a77b94be78509b4c428abba07a6e files/xjavadoc-1.1-buildfile.patch 1094 @@ -11,14 +8,14 @@ RMD160 b2518f2907d5abce8868ad1e6d990dbe295a0034 files/xjavadoc-1.1-nojunit.patch SHA256 4dff308db89d52e830dd5224b72e4c3f886885a54fd8aedd5bf14550586479f1 files/xjavadoc-1.1-nojunit.patch 1073 DIST xjavadoc-1.1-src.tar.gz 58804 RMD160 d4e468f62fefa220fde99d61310028f333ab6df3 SHA1 f49cad5437a27637fbfa77e4ae20ba4fed2a24ba SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 DIST xjavadoc-1.1-supplement.tar.bz2 458861 RMD160 72cf2febdf681e2ee91a55cd907c439d2c085178 SHA1 8ea32f6e3da1b6e1da188760a7d5296a2ac74c42 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b -EBUILD xjavadoc-1.1-r1.ebuild 1192 RMD160 bec66859ea10abdfa96f9a9fc9b1fd57535591c7 SHA1 2e4b45395d7e87f7d6721fcb620cd096fdac63af SHA256 e054003f313ef561017f11b94779abcb97315c33c851ceea1fcea358c0fbd4d8 -MD5 35f6c9081daa3830cf982b753c5949d3 xjavadoc-1.1-r1.ebuild 1192 -RMD160 bec66859ea10abdfa96f9a9fc9b1fd57535591c7 xjavadoc-1.1-r1.ebuild 1192 -SHA256 e054003f313ef561017f11b94779abcb97315c33c851ceea1fcea358c0fbd4d8 xjavadoc-1.1-r1.ebuild 1192 -MISC ChangeLog 1465 RMD160 56a340647d7c7f328d7a2835fc62cec5a345a774 SHA1 1ca85238acd78eff8d7bb7e17d30e63288283301 SHA256 d93278260835b3ba5e2562d2d9eaf120013b1b9b417b3672878af5116e2ac057 -MD5 0a94668fad98f3e3afd67b67667225ae ChangeLog 1465 -RMD160 56a340647d7c7f328d7a2835fc62cec5a345a774 ChangeLog 1465 -SHA256 d93278260835b3ba5e2562d2d9eaf120013b1b9b417b3672878af5116e2ac057 ChangeLog 1465 +EBUILD xjavadoc-1.1-r1.ebuild 1177 RMD160 02e58f8fe6ca850fb97685216b3eaed73d50f6da SHA1 3559498e38438c9f26f6a6eabc3e432f83dea71e SHA256 5fd3af46ec53a2ad0d7547fbeedf81b63a47bf973855ffb4ab8f7ec729ec8a52 +MD5 19c4ee96a1c984287fabd29ced773a3c xjavadoc-1.1-r1.ebuild 1177 +RMD160 02e58f8fe6ca850fb97685216b3eaed73d50f6da xjavadoc-1.1-r1.ebuild 1177 +SHA256 5fd3af46ec53a2ad0d7547fbeedf81b63a47bf973855ffb4ab8f7ec729ec8a52 xjavadoc-1.1-r1.ebuild 1177 +MISC ChangeLog 1582 RMD160 a703d7621398e8ec7f62123d8fa3729d3eb1dfe7 SHA1 1e1fc80f671f1025a9c11d2ac30762a628ecfb1f SHA256 82c6dbed52c45766cb83a52b8ae3aeedce6d7e1c7702bcc365ba6a2f4adf4f94 +MD5 1bbdf49b64467cbe9c93853effe1c00f ChangeLog 1582 +RMD160 a703d7621398e8ec7f62123d8fa3729d3eb1dfe7 ChangeLog 1582 +SHA256 82c6dbed52c45766cb83a52b8ae3aeedce6d7e1c7702bcc365ba6a2f4adf4f94 ChangeLog 1582 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -26,10 +23,3 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 eb89a38c8bd0969c9235f18ed5d2ac89 files/digest-xjavadoc-1.1-r1 521 RMD160 fc296379aab2f2fa2ea6a16b1110c98e86d69291 files/digest-xjavadoc-1.1-r1 521 SHA256 021290de69ca9c71059d9e19af3a843d2cfd573cba587a2f25fbe17d9ec1f79d files/digest-xjavadoc-1.1-r1 521 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGIS7ocxLzpIGCsLQRAt11AJ49w2DqTk0HhTiJev8/kK/Wopp4WgCfXeEL -kCH5rmJ5WO6daZ/wv4st6sQ= -=pirF ------END PGP SIGNATURE----- diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild index 503994cc6599..f6a5635ddb82 100644 --- a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild +++ b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.5 2007/04/14 19:43:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.6 2007/04/26 21:24:26 caster Exp $ +JAVA_PKG_IUSE="source" inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet" @@ -12,36 +13,34 @@ SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="source" +IUSE="" -COMMON_DEPEND="dev-java/commons-collections" +COMMON_DEPEND="dev-java/commons-collections + =dev-java/junit-3*" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.4 || ( dev-java/ant-nodeps dev-java/ant-tasks ) dev-java/javacc - ${COMMON_DEPEND} - source? ( app-arch/zip )" + ${COMMON_DEPEND}" src_unpack() { unpack ${A} - cd "${S}" + # remove the junit tests, would need xdoclet, causing circular dep epatch ${FILESDIR}/${P}-nojunit.patch cd "${S}/lib" rm -v *.jar || die - java-pkg_jar-from commons-collections + java-pkg_jar-from commons-collections,junit java-pkg_jar-from --build-only javacc } -src_compile() { - ANT_TASKS="ant-nodeps" eant jar -} +EANT_ANT_TASKS="ant-nodeps" src_install() { java-pkg_dojar target/${PN}.jar - use source && java-pkg_dosrc ${S}/src/* + use source && java-pkg_dosrc src/* } -- 2.26.2