diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-05-30 08:59:38 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-05-30 08:59:38 +0000 |
| commit | 58a62c47eec602fb5f82c5ce7f33ac8b2d7fa2bc (patch) | |
| tree | 345c150b2a4007c30b6f04ef9c153220166f6672 /dev-java | |
| parent | Updated path for sources USE flag. (diff) | |
| download | gentoo-2-58a62c47eec602fb5f82c5ce7f33ac8b2d7fa2bc.tar.gz gentoo-2-58a62c47eec602fb5f82c5ce7f33ac8b2d7fa2bc.tar.bz2 gentoo-2-58a62c47eec602fb5f82c5ce7f33ac8b2d7fa2bc.zip | |
Fixed install error for USE=doc.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/javax-inject/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/javax-inject/javax-inject-1-r1.ebuild | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/dev-java/javax-inject/ChangeLog b/dev-java/javax-inject/ChangeLog index d7ecbc0ee527..b8ede5c3eb30 100644 --- a/dev-java/javax-inject/ChangeLog +++ b/dev-java/javax-inject/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/javax-inject # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/ChangeLog,v 1.2 2013/05/29 11:34:30 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/ChangeLog,v 1.3 2013/05/30 08:59:38 tomwij Exp $ + + 30 May 2013; Tom Wijsman <TomWij@gentoo.org> javax-inject-1-r1.ebuild: + Fixed install error for USE=doc. *javax-inject-1-r1 (29 May 2013) diff --git a/dev-java/javax-inject/javax-inject-1-r1.ebuild b/dev-java/javax-inject/javax-inject-1-r1.ebuild index 4efa5d89288c..79fa15bd1f2e 100644 --- a/dev-java/javax-inject/javax-inject-1-r1.ebuild +++ b/dev-java/javax-inject/javax-inject-1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild,v 1.1 2013/05/29 11:34:30 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild,v 1.2 2013/05/30 08:59:38 tomwij Exp $ EAPI="5" @@ -38,9 +38,17 @@ java_prepare() { sed -i 's/\(<mkdir dir="${maven.build.outputDir}"\/>\)/\1<javac srcdir="." destdir="${maven.build.outputDir}" \/>/g' build.xml || die } +src_compile() { + java-pkg-2_src_compile + + if use doc ; then + javadoc -d javadoc $(find javax -name "*.java") || die "Javadoc failed" + fi +} + src_install() { java-pkg_newjar target/javax.inject-${PV}.jar - - use doc && java-pkg_dojavadoc target/api + + use doc && java-pkg_dojavadoc javadoc use source && java-pkg_dosrc javax } |