From f40cfa718b2338e10eba5ae09ba63b60b1d2d800 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Sat, 28 Apr 2007 20:53:04 +0000 Subject: [PATCH] Fix for JAVA_PKG_STRICT. Package-Manager: portage-2.1.2.5 --- dev-java/smack/ChangeLog | 7 ++++-- dev-java/smack/Manifest | 24 +++++++++---------- dev-java/smack/smack-2.2.1.ebuild | 40 +++++++++++++++++++++---------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dev-java/smack/ChangeLog b/dev-java/smack/ChangeLog index f19689050b53..f97c58c46c8f 100644 --- a/dev-java/smack/ChangeLog +++ b/dev-java/smack/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/smack -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/smack/ChangeLog,v 1.2 2006/09/11 17:53:54 nelchael Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/smack/ChangeLog,v 1.3 2007/04/28 20:53:04 nelchael Exp $ + + 28 Apr 2007; Krzysiek Pawlik smack-2.2.1.ebuild: + Fix for JAVA_PKG_STRICT. 11 Sep 2006; Krzysiek Pawlik smack-2.2.1.ebuild: Added ~ppc. diff --git a/dev-java/smack/Manifest b/dev-java/smack/Manifest index 7b9ee0cd12e9..3a695eb754ea 100644 --- a/dev-java/smack/Manifest +++ b/dev-java/smack/Manifest @@ -2,14 +2,14 @@ Hash: SHA1 DIST smack-dev-2.2.1.tar.gz 4052596 RMD160 1854c1a95054b5e409f156f86a525ba7740e0072 SHA1 bdccbbcf01ea3c15b5a511d36b99d01c74455e27 SHA256 8706d0c2fb72a94f3a8c33e720f49fb3ec5179ddd7df87d484f86a775b176814 -EBUILD smack-2.2.1.ebuild 981 RMD160 b8bd37696510cce38df79e2a6b404eaeecf34c81 SHA1 2fd31430d80a38606436245c124c673f956e25bb SHA256 8375003ae66c55a2b722ef91603e2f3d070f662f64b0c16d7a9a4097999b3419 -MD5 c9bda4a11e5318141986a78b32e9aa1b smack-2.2.1.ebuild 981 -RMD160 b8bd37696510cce38df79e2a6b404eaeecf34c81 smack-2.2.1.ebuild 981 -SHA256 8375003ae66c55a2b722ef91603e2f3d070f662f64b0c16d7a9a4097999b3419 smack-2.2.1.ebuild 981 -MISC ChangeLog 430 RMD160 2ec7d960ad4ed4bd36a4d01a437d4cf44b47ee66 SHA1 8cdbd8c91030c935a24b6fb93f4e037529f9cd7c SHA256 3271a102d759cd701c91db7c5c810f46dbb7bb7425d0d39846ee542d9930e0e5 -MD5 0a8051999024e6f20ea7712fe2b19d0f ChangeLog 430 -RMD160 2ec7d960ad4ed4bd36a4d01a437d4cf44b47ee66 ChangeLog 430 -SHA256 3271a102d759cd701c91db7c5c810f46dbb7bb7425d0d39846ee542d9930e0e5 ChangeLog 430 +EBUILD smack-2.2.1.ebuild 1192 RMD160 aaaef05f300440e021478645e7d96ac114631c1a SHA1 3546b53b781c9f7390df70dc860845afd3efbbb1 SHA256 a0dc83b26407314d11fa478cf56eb625b828f27d3f9ec051f3ac74107e3b721a +MD5 fcfe8a8884073a0a87c42ac6ff48897c smack-2.2.1.ebuild 1192 +RMD160 aaaef05f300440e021478645e7d96ac114631c1a smack-2.2.1.ebuild 1192 +SHA256 a0dc83b26407314d11fa478cf56eb625b828f27d3f9ec051f3ac74107e3b721a smack-2.2.1.ebuild 1192 +MISC ChangeLog 531 RMD160 66e12ecc857069651253e6a041be062f9559f1bd SHA1 eeb2ba60b022eac6d99d87befb1c2a0b3395128d SHA256 3fd9ff04b3e355b02b453d625c378156ae67aabfa02c17a79ea9f023ed020f8c +MD5 c956e53d90d93f3004a1f4e3eb0a1de0 ChangeLog 531 +RMD160 66e12ecc857069651253e6a041be062f9559f1bd ChangeLog 531 +SHA256 3fd9ff04b3e355b02b453d625c378156ae67aabfa02c17a79ea9f023ed020f8c ChangeLog 531 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159 @@ -18,9 +18,9 @@ MD5 8d9b4336ca8a9908a9d2250f11841f5f files/digest-smack-2.2.1 250 RMD160 80dc480536642770327ebd59d17ade644016e90b files/digest-smack-2.2.1 250 SHA256 62b4935fbbb0c89f4caeff08b353bd8d2631a6a2d160c1e19d78d029c9a44585 files/digest-smack-2.2.1 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFBaK9go/w9rxVVVERAmtiAJ9owcfa8bL9CuJb7n93sUQ3BRskYACgsbU3 -1ASAZ5d1QYjFUBn1QHIjjrc= -=nA4C +iD8DBQFGM7Rmgo/w9rxVVVERAt1fAJ41eUOJmUUmJh/J+x9XiG+2A3hI0wCfd+4h +BhyQRNjA+RiBCQ6KiaqhH14= +=2zuS -----END PGP SIGNATURE----- diff --git a/dev-java/smack/smack-2.2.1.ebuild b/dev-java/smack/smack-2.2.1.ebuild index b392f6d1059c..733cfa1b0a7a 100644 --- a/dev-java/smack/smack-2.2.1.ebuild +++ b/dev-java/smack/smack-2.2.1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/smack/smack-2.2.1.ebuild,v 1.2 2006/09/11 17:53:54 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/smack/smack-2.2.1.ebuild,v 1.3 2007/04/28 20:53:04 nelchael Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -14,30 +16,44 @@ SRC_URI="http://www.jivesoftware.org/builds/${PN}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="2.2" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc source" +IUSE="" + +COMMON_DEP="dev-java/xpp3" DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core" -RDEPEND=">=virtual/jre-1.4" + ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" src_unpack() { + unpack ${A} - cd ${S} - rm *.jar build/lib/*.jar -} + cd "${S}" + rm -f *.jar build/lib/*.jar build/merge/*.jar build/*.jar + + cd "${S}/build/lib/" + java-pkg_jar-from xpp3 + + sed -i -e '/zipfileset/d' "${S}/build/build.xml" || die -src_compile() { - eant -f build/build.xml \ - jar $(use_doc javadoc -Djavadoc.dest.dir=api) } +EANT_BUILD_XML="build/build.xml" +EANT_EXTRA_ARGS="-Djavadoc.dest.dir=api" + src_install() { + java-pkg_dojar *.jar + dohtml *.html - use doc && java-pkg_dohtml -r api documentation/* + use doc && { + java-pkg_dohtml -r documentation/* + java-pkg_dojavadoc api + } use source && java-pkg_dosrc source/* + } -- 2.26.2