From 2fd725508afc71d627625eafbe81f3d88f160a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sat, 4 Aug 2012 13:31:01 +0200
Subject: [PATCH] [dev-java/jline] version bump from tree to 2 series of jline,
 slotting *might* be needed, need to check reverse deps, tests need to be
 checked as well

---
 dev-java/jline/Manifest                     |   1 +
 dev-java/jline/files/maven-build.properties |  26 ++
 dev-java/jline/files/maven-build.xml        | 278 ++++++++++++++++++++
 dev-java/jline/jline-2.7.ebuild             |  62 +++++
 4 files changed, 367 insertions(+)
 create mode 100644 dev-java/jline/Manifest
 create mode 100644 dev-java/jline/files/maven-build.properties
 create mode 100644 dev-java/jline/files/maven-build.xml
 create mode 100644 dev-java/jline/jline-2.7.ebuild

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
new file mode 100644
index 0000000..c640e25
--- /dev/null
+++ b/dev-java/jline/Manifest
@@ -0,0 +1 @@
+DIST jline-2.7.tar.gz 80138 SHA256 071d491d8082c5bf6560aebb862b81308a0d686c2f1b46c7a44dd462cbaacd25 SHA512 ef4d6226d3ea0ec2d527ca0ea921f4b7aac319ee30dacd90bf1fc873890cc548765c21645a28b2d408d4b2f0ce6d65533c919ad8cbfc62a667da15bbbf59ac91 WHIRLPOOL bb987fa07881ef89913b257e755f5c8c8f9b67c15aae4aec63852489dc7eabfe6342c9c6062ee5c3f49917e62df1208ade02ebbd778f7afbfece088d5e79ca12
diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties
new file mode 100644
index 0000000..37c9668
--- /dev/null
+++ b/dev-java/jline/files/maven-build.properties
@@ -0,0 +1,26 @@
+#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
+#Wed Aug 01 13:52:00 CEST 2012
+maven.settings.offline=false
+maven.build.finalName=jline-2.7
+maven.build.resourceDir.1=src/main/filtered-resources
+maven.build.resourceDir.0=src/main/resources
+maven.build.testOutputDir=${maven.build.dir}/test-classes
+maven.build.testResourceDir.1=src/test/filtered-resources
+build.number=
+maven.build.testResourceDir.0=src/test/resources
+maven.reporting.outputDirectory=${maven.build.dir}/site
+project.build.sourceEncoding=UTF-8
+maven.build.timestamp.format=yyyyMMddHHmm
+maven.build.srcDir.0=src/main/java
+sonatypeOssDistMgmtSnapshotsUrl=https\://oss.sonatype.org/content/repositories/snapshots/
+project.build.directory=${maven.build.dir}
+maven.test.reports=${maven.build.dir}/test-reports
+maven.build.dir=target
+project.build.outputDirectory=${maven.build.outputDir}
+maven.test.redirectTestOutputToFile=true
+project.reporting.outputEncoding=UTF-8
+maven.build.testDir.0=src/test/java
+maven.settings.interactiveMode=true
+build.timestamp=201208011351
+maven.repo.local=lib
+maven.build.outputDir=${maven.build.dir}/classes
diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml
new file mode 100644
index 0000000..dd087a0
--- /dev/null
+++ b/dev-java/jline/files/maven-build.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 8/1/12 1:51 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jline-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jline-2.7"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.resourceDir.1" value="src/main/filtered-resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.build.testResourceDir.1" value="src/test/filtered-resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.settings.offline" value="true"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="**/*"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}">
+        <include name="**/*"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/*Test.java"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/org/fusesource/jansi/jansi/1.8"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/fusesource/jansi/jansi/1.8/jansi-1.8.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi/1.8/jansi-1.8.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.8/jansi-1.8.jar" 
+         dest="${maven.repo.local}/org/fusesource/jansi/jansi/1.8/jansi-1.8.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jline/jline-2.7.ebuild b/dev-java/jline/jline-2.7.ebuild
new file mode 100644
index 0000000..548a6c6
--- /dev/null
+++ b/dev-java/jline/jline-2.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+COMMIT="28d037f"
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="http://jline.sourceforge.net/"
+SRC_URI="https://github.com/jline/jline2/tarball/${P} -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	>=dev-java/jansi-1.8
+	>=dev-java/jansi-native-1.4
+	test? ( dev-java/ant-junit
+		 >=dev-java/hamcrest-core-1.1 )"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}-jline2-${COMMIT}"
+
+java_prepare() {
+	# we don't support maven for building yet. this build.xml was generated by:
+	# - mvn ant:ant
+	# - tweak build.xml to not load properties from home dir
+	# - tweak the test target to match the test cases
+	# - change maven.repo.local from ~/.maven to "lib" in .properties
+	# - removed manifest
+	# - change classpath definitions to "*.jar"
+	cp "${FILESDIR}/maven-build.xml" build.xml || die
+	cp "${FILESDIR}/maven-build.properties" . || die
+	java-ant_ignore-system-classes
+
+	mkdir lib && cd lib || die
+	java-pkg_jar-from jansi
+	java-pkg_jar-from jansi-native
+}
+
+src_compile() {
+	# precompiled javadocs (needs maven to generate)
+	# -Dmaven.build.finalName is needed to override the one defined in the
+	# build.xml, which because it was generated with 2.7, defaults to
+	# jline-2.7 -Dessa
+	eant package -Dmaven.build.finalName=${P}
+}
+
+src_test() {
+	use test && java-pkg_jar-from --build-only junit
+	use test && java-pkg_jar-from --build-only hamcrest-core
+	ANT_TASKS="ant-junit" eant test -Djunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/jline-${PV}.ja
+	use doc && java-pkg_dojavadoc ../apidocs
+	use source && java-pkg_dosrc src/main/java
+}