[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     0bf259f8b9d72dc2db16918e456450a0c132e651
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 16:38:21 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 16:57:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf259f8

dev-java/jline: Bump dev-java/jansi SLOT from 1.11 to 0.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jline/jline-2.12.1-r1.ebuild | 60 +++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
new file mode 100644
index 0000000..672aac8
--- /dev/null
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="https://github.com/jline/jline2"
+SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/jansi:0
+	dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}2-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	# Don't forget the resources!
+	mkdir -p target/classes || die
+	cp -r src/main/resources/* target/classes || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {CHANGELOG,README}.md
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     6d252229af32a1f879892f290e0c945966f5bbfa
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 13:17:16 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 13:47:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d252229

dev-java/jline: Stable for amd64+x86.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jline/jline-2.12.1-r1.ebuild | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index 672aac8..0699aea 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -14,23 +14,32 @@ SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
-CDEPEND="dev-java/jansi:0
+CDEPEND="
+	dev-java/jansi:0
 	dev-java/jansi-native:0"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
+DEPEND="
+	test? (
+		dev-java/junit:4
+	)
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}2-${P}"
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
+JAVA_GENTOO_CLASSPATH="
+	jansi
+	jansi-native
+"
 
 java_prepare() {
 	# Easier to use java-pkg-simple.

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     d57ba6b00d800dcef3935a68660b84e5d135a5fc
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 13:24:37 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 13:47:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57ba6b0

dev-java/jline: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jline/jline-2.12.1.ebuild | 60 --------------------------------------
 1 file changed, 60 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1.ebuild b/dev-java/jline/jline-2.12.1.ebuild
deleted file mode 100644
index a8372f3..0000000
--- a/dev-java/jline/jline-2.12.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for handling console input"
-HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/jline2/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/jansi:1.11
-	dev-java/jansi-native:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}2-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jansi-1.11,jansi-native"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-
-	# Don't forget the resources!
-	mkdir -p target/classes || die
-	cp -r src/main/resources/* target/classes || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {CHANGELOG,README}.md
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     9d2caa321f9d98cc4f80dad4692efaebbd3f78ac
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 10:50:12 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 10:50:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d2caa32

dev-java/jline: Mend JAVA_GENTOO_CLASSPATH by listing deps and separate them with commas. Fixes bug 570204.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jline/jline-2.12.1-r1.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index 0699aea..c0e04de 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -36,10 +36,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 JAVA_SRC_DIR="src/main/java"
 
-JAVA_GENTOO_CLASSPATH="
-	jansi
-	jansi-native
-"
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
 
 java_prepare() {
 	# Easier to use java-pkg-simple.

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Alexis Ballier]

commit:     cbb3829f3ab62d445c88862adb8b95ee4a8e8059
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 20:40:48 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 20:42:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb3829f

dev-java/jline: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/jline/jline-2.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index bcba6c32862..d1355aaf283 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     fd7f56451c1d331499a7e33c5748b6e297c87bfc
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 21:02:11 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 21:02:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7f5645

dev-java/jline: update SRC_URI.

Closes: https://bugs.gentoo.org/646198
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-java/jline/jline-2.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index d1355aaf283..2cf20f9d999 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java library for handling console input"
 HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     c9b331ba51da61751da41227e3dd2ea463653482
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 08:24:24 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:23:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b331ba

dev-java/jline: stable for amd64+x86.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-java/jline/jline-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
index 95b69b972b4..60944d342c3 100644
--- a/dev-java/jline/jline-1.0-r1.ebuild
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://jline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="
 	>=virtual/jdk-1.6

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     b41efc3ab2e14686fa7f6d68d6afe92be9b8df33
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 08:27:41 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:23:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41efc3a

dev-java/jline: clean up old.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-java/jline/jline-1.0.ebuild | 57 -----------------------------------------
 1 file changed, 57 deletions(-)

diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0.ebuild
deleted file mode 100644
index 5d846154e3f..00000000000
--- a/dev-java/jline/jline-1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-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="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}/src"
-
-java_prepare() {
-	rm -fv "${WORKDIR}"/${P}/*.jar || die
-
-	# 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
-	# - 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
-	use test && java-pkg_jar-from --build-only junit
-}
-
-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 0.9.9, defaults to
-	# jline-0.9.9 -nichoj
-	eant package -Dmaven.build.finalName=${P}
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test -Djunit.present=true
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	#no api docs in this release
-	#use doc && java-pkg_dojavadoc ../apidocs
-	use source && java-pkg_dosrc src/main/java
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrice Clement]

commit:     a412d43674d07ea0d6f6f489536f3937a97f21e5
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 08:21:52 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:23:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a412d436

dev-java/jline: EAPI 6 bump.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-java/jline/jline-1.0-r1.ebuild | 70 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
new file mode 100644
index 00000000000..95b69b972b4
--- /dev/null
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Handle console input in Java"
+HOMEPAGE="http://jline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# 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
+	# - change classpath definitions to "*.jar"
+
+	cp "${FILESDIR}/maven-build.xml" build.xml || die
+	cp "${FILESDIR}/maven-build.properties" . || die
+	java-ant_ignore-system-classes
+
+	if use test; then
+	    mkdir lib || die
+	    cd lib || die
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+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 0.9.9, defaults to
+	# jline-0.9.9 -nichoj
+	eant package -Dmaven.build.finalName=${P}
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Djunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	# no api docs in this release
+	# use doc && java-pkg_dojavadoc ../apidocs
+	use source && java-pkg_dosrc src/main/java
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Patrick Lauer]

commit:     3bd4e86e822abf82881a5eeb5c268ad1e7d7befa
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 16:15:44 2019 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 16:15:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd4e86e

dev-java/jline: Create directory unconditionally

Avoids build failure

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-java/jline/jline-1.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
index 60944d342c3..86146fac2fd 100644
--- a/dev-java/jline/jline-1.0-r1.ebuild
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -43,9 +43,9 @@ src_prepare() {
 	cp "${FILESDIR}/maven-build.properties" . || die
 	java-ant_ignore-system-classes
 
+	mkdir lib || die
+	cd lib || die
 	if use test; then
-	    mkdir lib || die
-	    cd lib || die
 		java-pkg_jar-from --build-only junit
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     bdfd51a9a270cd425cbfa6da28f8180083619229
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 06:34:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 08:28:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfd51a9

dev-java/jline: add 2.14.6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/Manifest            |  1 +
 dev-java/jline/jline-2.14.6.ebuild | 66 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index 2a51185c724..d2ec5d9401e 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,2 +1,3 @@
 DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
 DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
+DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
new file mode 100644
index 00000000000..d8cb303a8f1
--- /dev/null
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="https://github.com/jline/jline2"
+SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}2-${P}"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+# Needs yet-unpackaged powermock for tests
+RESTRICT="!test? ( test ) test"
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/jansi-native:0"
+
+DEPEND="
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	# Don't forget the resources!
+	mkdir -p target/classes || die
+	cp -r src/main/resources/* target/classes || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,easymock-3.2,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java" || die)
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java" || die)
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {CHANGELOG,README}.md
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Arthur Zamarin]

commit:     e7b010bf884a6c168571926940c950a3beebc9f1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 07:23:41 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 07:24:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b010bf

dev-java/jline: Keyword 2.12.1-r1 ppc64, #822945

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jline/jline-2.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index e40695a585b8..b0d0dafc0f21 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     3c8d99305b294bac1f0528df3053b11337e28deb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 04:10:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 04:10:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8d9930

dev-java/jline: Stabilize 2.14.6 x86, #826850

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index d8cb303a8f10..2801d1790a4a 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     3bea7d4fdf0f5414af456c7e44a23fa5be25bc08
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 04:13:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 04:13:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bea7d4f

dev-java/jline: Stabilize 2.14.6 arm64, #826850

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index 2801d1790a4a..d048408919ac 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="~amd64 arm64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     2c83dc66aec788293c7bb0d873645354f9c560e2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 04:14:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 04:14:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c83dc66

dev-java/jline: Stabilize 2.14.6 amd64, #826850

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index d048408919ac..1b3399727951 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Arthur Zamarin]

commit:     55af22d4f64b52a4bf2a6a57938573c789db360c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 19:06:30 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 19:06:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55af22d4

dev-java/jline: Keyword 2.14.6 ppc64, #826846

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index 1b3399727951..7105a33024f8 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Arthur Zamarin]

commit:     978beb149a6ce02c40547edace0351e3491e1c0b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 07:15:15 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 07:16:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978beb14

dev-java/jline: Stabilize 2.14.6 ppc64, #827830

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index 7105a33024f8..26d6c114de99 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Sam James]

commit:     2fbd5433754fc7d0399e93aaf09727cec1983c14
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Dec  1 08:02:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 18:55:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbd5433

dev-java/jline: Drop 2.12.1-r1, 1.0-r1

Closes: https://bugs.gentoo.org/736834
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23108
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jline/Manifest               |  2 -
 dev-java/jline/jline-1.0-r1.ebuild    | 70 -----------------------------------
 dev-java/jline/jline-2.12.1-r1.ebuild | 66 ---------------------------------
 3 files changed, 138 deletions(-)

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index d2ec5d9401eb..b48e375690f1 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,3 +1 @@
-DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
-DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
 DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51

diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
deleted file mode 100644
index eb4e3f9754da..000000000000
--- a/dev-java/jline/jline-1.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Handle console input in Java"
-HOMEPAGE="http://jline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:0
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# 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
-	# - 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 || die
-	cd lib || die
-	if use test; then
-		java-pkg_jar-from --build-only junit
-	fi
-}
-
-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 0.9.9, defaults to
-	# jline-0.9.9 -nichoj
-	eant package -Dmaven.build.finalName=${P}
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test -Djunit.present=true
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	# no api docs in this release
-	# use doc && java-pkg_dojavadoc ../apidocs
-	use source && java-pkg_dosrc src/main/java
-}

diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
deleted file mode 100644
index b0d0dafc0f21..000000000000
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for handling console input"
-HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/jansi:0
-	dev-java/jansi-native:0"
-
-DEPEND="
-	test? (
-		dev-java/junit:4
-	)
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}2-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-
-	# Don't forget the resources!
-	mkdir -p target/classes || die
-	cp -r src/main/resources/* target/classes || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {CHANGELOG,README}.md
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jline/

[Arthur Zamarin]

commit:     c05cb85c257c6e99bbe13b5dc88ad940c6a81580
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 18:35:47 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 18:44:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05cb85c

dev-java/jline: Keyword 2.14.6 arm, #828049

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jline/jline-2.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index 26d6c114de99..181001afabb7 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"