From 452245b21f3e070c502332843f08a7482946f8cf Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 13 Mar 2015 23:05:46 +0000 Subject: [PATCH] Version bump. Closes bug #535884. Thanks to Arfrever. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4 --- dev-java/jline/ChangeLog | 10 ++- dev-java/jline/Manifest | 30 +++++++-- .../jline/files/jline-0.9.91-import.patch | 13 ---- dev-java/jline/jline-2.11.ebuild | 61 ------------------- ...ine-2.11-r1.ebuild => jline-2.12.1.ebuild} | 13 ++-- 5 files changed, 39 insertions(+), 88 deletions(-) delete mode 100644 dev-java/jline/files/jline-0.9.91-import.patch delete mode 100644 dev-java/jline/jline-2.11.ebuild rename dev-java/jline/{jline-2.11-r1.ebuild => jline-2.12.1.ebuild} (78%) diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog index 4ca0e88decb0..3e199b531b71 100644 --- a/dev-java/jline/ChangeLog +++ b/dev-java/jline/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jline -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.29 2014/06/17 11:14:19 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.30 2015/03/13 23:05:32 chewi Exp $ + +*jline-2.12.1 (13 Mar 2015) + + 13 Mar 2015; James Le Cuirot +jline-2.12.1.ebuild, + -files/jline-0.9.91-import.patch, -jline-2.11-r1.ebuild, -jline-2.11.ebuild: + Version bump. Closes bug #535884. Thanks to Arfrever. 17 Jun 2014; Manuel Rüger -jline-0.9.91.ebuild, -jline-0.9.94.ebuild: diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest index 17343c0ca969..a6f650f2b8af 100644 --- a/dev-java/jline/Manifest +++ b/dev-java/jline/Manifest @@ -1,10 +1,30 @@ -AUX jline-0.9.91-import.patch 438 SHA256 6002cbdcfb1bd2b6401a33d912b9ccc386bd0ec2c2f6dd2b181dd7d0c0a22859 SHA512 f637a20bedf1b76bf976a48901485bfbecf3dbfab9f383d68b6253dc63942d4bf69b5cc3cb88dadc838ed4da0403a84196d3128deb76920079e62662b9d74c18 WHIRLPOOL 352edcafa9e940b209ae1f5a84ef373fc514c7f7008ccbfcb366f7e6ead507b6d760937d49e96ed1f299a8b8950822227f1375d7c41be2a5fe736280a91e4665 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX maven-build.properties 501 SHA256 ed14880aca9146984f0b988b66e83c1d77e3367003371570855a9ac5d688dac3 SHA512 2e3347c2b53266c7d41cd9f73e79bdfecd28e41e78208b360533414ed551f101d04e4a76d416f061e56bbce43baf96c4c52fdba65ded3c0be18533c2c226ef6f WHIRLPOOL 29ee5d331c7bdf52f0d6f066aa936ff8dcf4b54479aae46d9f30f77e35443646c82588229a12f30fa858d901103913790a5b97227d1078b9874f246e516e9294 AUX maven-build.xml 8634 SHA256 92c9be86eb0fcff6c3e44cb352f81e615627a96a7f25250ee53c5b9b34f84c0d SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936 WHIRLPOOL 4631c8b7d4475fc67be975669943cf208ad0610f891874eed31678c05ad9139e06a7c62127a981f89c4a69c9fd7ec6393c0dffceadb521a4861a2defaa38dd59 DIST jline-1.0.zip 463082 SHA256 761458d1541a44e678b3847917116a90001cf5cd22287c24c55dcf2c69ec73ca SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9 WHIRLPOOL d80416660992a9fd6d13f350d7620556f46f48fe9071e939de555bbee35d3e68f6c6eee64ae18e03d826e8928987f4e2193bcf8fee1cb027a1a9791ca89c0cce -DIST jline-2.11.tar.gz 90597 SHA256 58dab6b0f7322104a38e92e4d3400ecebb3c4a660cfdb7cfd5372a3c96086607 SHA512 1c9fc35fadc0f530c580253cfb1b23c9819c8a874b31d0da7e6094bee7112d43872ba0f10fb97ca3041672513a09eff30a6c47895cd20d47264b9703813a2391 WHIRLPOOL 0de880cba5bb931e6ff8a102e5d0fb7924d0247831fd697581ce28175eab334283cd57d92669b3ff1419184976f1193e2144ceb3c1ef4f54926e6eaee34d037a +DIST jline-2.12.1.tar.gz 97289 SHA256 41c03847f862c7eceb3c5b1cef9bc89f62db43c53f3328e46a6257bebcc7d68d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d WHIRLPOOL fdbebc7e16fadced5c0744be0175d47b3a0f12379c588f994d5870f685f421adeeb842192e0c14f855bf0a094ace4d11cb541397b19453324a1e6b031a3f5166 EBUILD jline-1.0.ebuild 1754 SHA256 40f4aaea0c877fcda036fc46ddf0cdede1b3c0f1e76e2a206d9694928cbb85b8 SHA512 a024f251f54b62a894958b12401ebbb37f851cc6e9d254c2e2c7bc60d74c0a0bb11d126c762d45067c1f09a4b0e9fa66a55c7119a08a5bf784955ffea853c87f WHIRLPOOL 9a3293d460ad929a64429a117a520fb5d52b02038b2058fdcfdf3f53d8e64646b1758512077eb926a28293c3033c4410479bf7465f105a5d7bb175a343163585 -EBUILD jline-2.11-r1.ebuild 1382 SHA256 b11df6fca5dc346ce3b3113f8f2cabeba05cf0ed98c5677192a27f9203e16bc1 SHA512 63d86d09c92456a68e7abdc2fda79dd132f179b5108fd33b372354e8a80308cfbee4ed012440bc20751ce6e03df6e71390382cd73afa02a78fcd1945ca4a6257 WHIRLPOOL 1ed135afd20d200c1bc091639dd3665a0bd4a2cfd0eea93dbba1fff7eac25425a7d420cfca674f3be7e027d639abc7e61f54ef19921bf85c11ef8b67c65d0d8a -EBUILD jline-2.11.ebuild 1371 SHA256 3b05e0d61cf8d3f4c159acd55cc09248b77e7a53d967e330953dca9a35a9840e SHA512 af45d9517c4f0c0ca65da6415a14ff6abe725d6e886f3d18c97c94b0a75f4e85b9f1e0e5d3a3ca908565c2ece4a00cb5dc5e7954d1990c4f34d91f846fdfb1fa WHIRLPOOL 84129a88434043650868244659c35c0b01fd5a6b70a53e48dcd245bc015c20909992d5780b549ca3782a67276b1aa4745c13b0c9dbc86d4f8482787b932f0f04 -MISC ChangeLog 4050 SHA256 dbc4c1f8cb31293a42fee7322f8b783c42c9997d6581f2400c2292126416b1bd SHA512 0d1a18b37fbb720b8dac92aba3da763df59b2e9637db2a51b5a979c1d8904a84c54e4e36bbc0e0a8835abd7b1da596668efa689b8489f5c6da13d2f3e8feb2aa WHIRLPOOL d7215b5174553b215de4d4cfd3652ef07a95793ee0bc4e24a6448c64faf9ced9a8942a3aaca86a6712df980548c290cef0e97ee0acaef0d6c5e517cfac3b3adc +EBUILD jline-2.12.1.ebuild 1363 SHA256 07bad7b601e8c1030ba0c6053d1936b3f27d21b84f9b63bfc9fc16c93a62e4bf SHA512 2689a6780fee75596984de6445e9376144fc0442f44fa159c79b48f7d2cc81faae5596b809ce6ab24d99d237c7c0cd0e31ffff511f722e1f42e2597eb6b0a617 WHIRLPOOL 957b9fb6872576416b76d4bd2d324c05743a59e9c3648c4fe88ff76723b5bfbcce0032bdae5a59506b433d6c43ba9e2d15877031b17ead79bf79eff0dd75e601 +MISC ChangeLog 4287 SHA256 0533dc5a29e9eb87594777301675651cf68833e7120d360d2a8dab0682410ec0 SHA512 99af879e46ef5b3526d70c0d47afb25e0f6d57aee01c2f4644f2c9175929e1b0e2156669ae2146369aa58194bd90d62a37242a1d3deab468899f1477e08cf45b WHIRLPOOL a47879231e669da044275ca31b2a318a2802b28bb57f40d06d622b21f66be2df2f31606d0123f85bf6e58a282913f2d957d3a81399575e8227ee431dc646bda4 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJVA21EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k5WsP/i6vlufLHFTRKDaWjcDj459O +fzbcBfiFukuD4lIPPKWC66sIsn2TGbB0norRKtxA7CjltxC7XKUcBrWY4Q7UOLpV +U3fA5Mc6xbnJMdPNQLLgdPrZPKLCG+Yn2v7albcUR57fgTqoRg/v+NQ4TcfpC7ye +6H+44fuBlThIPIMBsb39iOQTTZIQdFawlfCu7F+2B129ThPcEqbumYgdX0eNcjc8 +uzDv+oAC3kblZ0I3E2wKfA+oluVv4p1reLT+oJcqjiDg8GVIfkbtzCziwfe/AeG3 +sQl7ALjYF+KS2EZxR/JYFc5Gc0ow0GwmHtWn7yVqIVirlA4RafzGzQTLC9RM7d6b +TZdVEgEajAdXIfxZq2hZ9Nw9d/xWyu/l46Nr6vmGyoBP/nGKWkf9aEhWpRyDfXgr +EiZFSk+jJ+I3xgPwtOanqQ0jqSl9/5CxjC8juk8r932KLhjzmw9qjyW00CT0PkmN +JyTPuZchB9tLsIPh2PUzzcwHUfMgix7iRnVm0l6YPRqKdMq2PXarF7RufzQriMp1 +VXt26lI3wWlN2FwUhWAcOIbczD5FJZFTYwEGj4YWLWyMJvuwqPHFttN8jRSDQeEB +HaKwsP8CPgG11cJkkudVUigFFaE896tfLyL2YUFay2WQcMiGSwsueMo66CCWlAWR +fGNEYhdAMx0VUg7YkAvX +=jNGh +-----END PGP SIGNATURE----- diff --git a/dev-java/jline/files/jline-0.9.91-import.patch b/dev-java/jline/files/jline-0.9.91-import.patch deleted file mode 100644 index 3f49b5b6e569..000000000000 --- a/dev-java/jline/files/jline-0.9.91-import.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/src/main/java/jline/Terminal.java b/src/src/main/java/jline/Terminal.java -index b9b9061..3b22995 100644 ---- a/src/src/main/java/jline/Terminal.java -+++ b/src/src/main/java/jline/Terminal.java -@@ -8,8 +8,6 @@ package jline; - - import java.io.*; - --import com.sun.jmx.snmp.ThreadContext; -- - /** - * Representation of the input terminal for a platform. Handles - * any initialization that the platform may need to perform diff --git a/dev-java/jline/jline-2.11.ebuild b/dev-java/jline/jline-2.11.ebuild deleted file mode 100644 index bb0199d531d5..000000000000 --- a/dev-java/jline/jline-2.11.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-2.11.ebuild,v 1.1 2013/06/04 17:48:29 tomwij Exp $ - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit vcs-snapshot 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/tarball/${P} -> ${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.5 - test? ( dev-java/junit:4 )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" - -S="${WORKDIR}/${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} -} diff --git a/dev-java/jline/jline-2.11-r1.ebuild b/dev-java/jline/jline-2.12.1.ebuild similarity index 78% rename from dev-java/jline/jline-2.11-r1.ebuild rename to dev-java/jline/jline-2.12.1.ebuild index 2fddd0e35eca..25cbdd4303bc 100644 --- a/dev-java/jline/jline-2.11-r1.ebuild +++ b/dev-java/jline/jline-2.12.1.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-2.11-r1.ebuild,v 1.1 2013/08/17 09:35:01 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-2.12.1.ebuild,v 1.1 2015/03/13 23:05:32 chewi Exp $ -EAPI="5" +EAPI=5 JAVA_PKG_IUSE="doc source" -inherit vcs-snapshot java-pkg-2 java-pkg-simple +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/tarball/${P} -> ${P}.tar.gz" +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 @@ -28,7 +27,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} >=virtual/jre-1.5" -S="${WORKDIR}/${P}" +S="${WORKDIR}/${PN}2-${P}" JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH="jansi-1.11,jansi-native" -- 2.26.2