[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

[Michał Górny]

commit:     f5b6cd58d567592d8b919b1d1b10b173c23276b0
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Wed Oct  5 15:38:48 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 15:38:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=f5b6cd58

src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java: Minor change

1. Relocated doc source, and though not used test IUSE variables from
   IUSE with rest of ebuild variables to above inherit using
   JAVA_PKG_IUSE. Left test there in case default test case is added to
   java eclasses, but at this time has no usage in JAVA_PKG_IUSE.

 .../gentoo/java/ebuilder/maven/MavenEbuilder.java   | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 067ea80..50c5992 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -38,11 +38,11 @@ public class MavenEbuilder {
             writeHeader(writer);
             writeCommand(config, writer);
             writeEAPI(writer);
-            writeInherit(writer);
+            MavenProject mp = mavenProjects.get(mavenProjects.size() - 1);
+            writeInherit(mp, writer);
             // write the info from the last project as it is probably the one
             // that depends on the rest
-            writePackageInfo(config,
-                    mavenProjects.get(mavenProjects.size() - 1), writer);
+            writePackageInfo(config, mp, writer);
 
             writeDependencies(config, mavenProjects, writer);
             writeSourceDir(writer);
@@ -481,7 +481,14 @@ public class MavenEbuilder {
      *
      * @param writer ebuild writer
      */
-    private void writeInherit(final PrintWriter writer) {
+    private void writeInherit(final MavenProject mavenProject,
+                              final PrintWriter writer) {
+        writer.println();
+        writer.print("IUSE=\"doc source");
+        if (mavenProject.hasTests()) {
+            writer.print(" test");
+        }
+        writer.println('"');
         writer.println();
         writer.println("inherit java-pkg-2 java-pkg-simple");
     }
@@ -562,11 +569,7 @@ public class MavenEbuilder {
         writer.print(config.getKeywords());
         writer.println('"');
 
-        writer.print("IUSE=\"doc source");
-
-        if (mavenProject.hasTests()) {
-            writer.print(" test");
-        }
+        writer.print("IUSE=\"");
 
         writer.println('"');