[gentoo-commits] gentoo-x86 commit in dev-java/javax-inject: ChangeLog javax-inject-1-r1.ebuild

[Tom Wijsman (tomwij)]

tomwij      13/05/30 08:59:38

  Modified:             ChangeLog javax-inject-1-r1.ebuild
  Log:
  Fixed install error for USE=doc.
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.3                  dev-java/javax-inject/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javax-inject/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	29 May 2013 11:34:30 -0000	1.2
+++ ChangeLog	30 May 2013 08:59:38 -0000	1.3
@@ -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@g.o> javax-inject-1-r1.ebuild:
+  Fixed install error for USE=doc.
 
 *javax-inject-1-r1 (29 May 2013)
 



1.2                  dev-java/javax-inject/javax-inject-1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild?r1=1.1&r2=1.2

Index: javax-inject-1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javax-inject-1-r1.ebuild	29 May 2013 11:34:30 -0000	1.1
+++ javax-inject-1-r1.ebuild	30 May 2013 08:59:38 -0000	1.2
@@ -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 @@
 	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
 }