summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2007-04-28 20:53:04 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2007-04-28 20:53:04 +0000
commitece0b2dedd0c24043b517f416bd481111678b353 (patch)
treea8f4931cec9aca4a2c87e59b76c0bc3cd39660da /dev-java/smack/smack-2.2.1.ebuild
parentDrop dodir from dodir/insinto combination. (diff)
downloadgentoo-2-ece0b2dedd0c24043b517f416bd481111678b353.tar.gz
gentoo-2-ece0b2dedd0c24043b517f416bd481111678b353.tar.bz2
gentoo-2-ece0b2dedd0c24043b517f416bd481111678b353.zip
Fix for JAVA_PKG_STRICT.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/smack/smack-2.2.1.ebuild')
-rw-r--r--dev-java/smack/smack-2.2.1.ebuild40
1 files changed, 28 insertions, 12 deletions
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/*
+
}