diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-java/stringtemplate | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/stringtemplate')
-rw-r--r-- | dev-java/stringtemplate/Manifest | 8 | ||||
-rw-r--r-- | dev-java/stringtemplate/files/3.2.1-test-fixes.patch | 53 | ||||
-rw-r--r-- | dev-java/stringtemplate/files/4.0.8-test-fixes.patch | 38 | ||||
-rw-r--r-- | dev-java/stringtemplate/metadata.xml | 11 | ||||
-rw-r--r-- | dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild | 61 | ||||
-rw-r--r-- | dev-java/stringtemplate/stringtemplate-4.0.8.ebuild | 70 |
6 files changed, 0 insertions, 241 deletions
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest deleted file mode 100644 index 8dc4bb360545..000000000000 --- a/dev-java/stringtemplate/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 3.2.1-test-fixes.patch 1706 BLAKE2B e3bb6f698109d0290b67221807eb8648642e40aed936502ce4c86d57c2d44355bdaa70ce5147bb8f2a86fcb8123f5e5982e61acd2fb9fcd93f7f216916def4aa SHA512 c161e28851d40e6b9615f7880f746f0a2426a1f705609cfbb10f66c1c3fc3935bc5ee6f4f76991d57e6261bba05269e3ce1eb33fe72e50e7199dab629372cee7 -AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda557442719a907145a4d9a4fa26d206b0b2d1299cc122cf4ace014d97b2d93dd9588b3a929323822af3c472594fc03a4a SHA512 505bca326ae571974c6fdec1fc0d5e66066db5175960ff6dbec682f41244502e52cbd05f2e6119029954b546e52305addc14202223e4c3f2f04118c527606b4b -DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 -DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714 -DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724 -EBUILD stringtemplate-3.2.1-r1.ebuild 1451 BLAKE2B fac962bb19d1011548ba6c7ab45744ab912deedbb9af4d27138c3d51f46f042a64f65d3404dfca3ed9104f0d3a5e2bca3ba86da5024d6a1576c7367bf0b8930e SHA512 0057643878f937518d0505511b92a8342688e3dc4f910370f07e9b856041265b482abcb249ff8ed5e44e4a5e4da3e07b5727bfe5a11e36a4d3a41768c6017498 -EBUILD stringtemplate-4.0.8.ebuild 2147 BLAKE2B 9d7a24c8b8a6e3bf6180b08207c501fc0d73e5569055ee0d0e9f69911144f17b3db8a08cb2d15df7d0a8ca0ab34ddb219818e5c0fd34778a15706428c7a6f819 SHA512 5c25aa9130785faff5d1c8454401527077b403d7522128ced29c344acddff4ddab20ce5469de0aa58c4d8db18400a2511e255fe2530ab565fe1a0ce884ff0788 -MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449 diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch deleted file mode 100644 index fd625abd0668..000000000000 --- a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/antlr/stringtemplate3/pull/3 - ---- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig 2015-09-18 22:04:18.131902875 +0100 -+++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 22:04:21.651848456 +0100 -@@ -36,6 +36,10 @@ - import java.text.SimpleDateFormat; - import java.util.*; - -+import org.junit.FixMethodOrder; -+import org.junit.runners.MethodSorters; -+ -+@FixMethodOrder(MethodSorters.NAME_ASCENDING) - public class TestStringTemplate extends TestCase { - static final String newline = System.getProperty("line.separator"); - -@@ -87,7 +91,7 @@ - assertEquals(expecting,I.toString()); - } - -- public void testNoGroupLoader() throws Exception { -+ public void testAaaNoGroupLoader() throws Exception { - // this also tests the group loader - StringTemplateErrorListener errors = new ErrorBuffer(); - String tmpdir = System.getProperty("java.io.tmpdir"); -@@ -2214,8 +2218,12 @@ - s.add("2"); - s.add("3"); - st.setAttribute("items", s); -- expecting = "<li>3</li><li>2</li><li>1</li>"; -- assertEquals(expecting, st.toString()); -+ String[] split = st.toString().split("(</?li>){1,2}"); -+ Arrays.sort(split); -+ assertEquals("", split[0]); -+ assertEquals("1", split[1]); -+ assertEquals("2", split[2]); -+ assertEquals("3", split[3]); - } - - public void testDumpMapAndSet() throws Exception { -@@ -2235,8 +2243,11 @@ - s.add("2"); - s.add("3"); - st.setAttribute("items", s); -- expecting = "3,2,1"; -- assertEquals(expecting, st.toString()); -+ String[] split = st.toString().split(","); -+ Arrays.sort(split); -+ assertEquals("1", split[0]); -+ assertEquals("2", split[1]); -+ assertEquals("3", split[2]); - } - - public class Connector3 { diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch deleted file mode 100644 index 9480abe3ed3f..000000000000 --- a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java test/org/stringtemplate/v4/test/TestGroups.java ---- test.orig/org/stringtemplate/v4/test/TestGroups.java 2014-03-25 11:55:55.000000000 +0000 -+++ test/org/stringtemplate/v4/test/TestGroups.java 2015-09-13 11:01:07.999800299 +0100 -@@ -29,6 +29,7 @@ - - import org.junit.Assert; - import org.junit.Test; -+import org.junit.Ignore; - import org.stringtemplate.v4.ST; - import org.stringtemplate.v4.STErrorListener; - import org.stringtemplate.v4.STGroup; -@@ -527,6 +528,7 @@ - assertEquals(expected, result); - } - -+ @Ignore - @Test public void testUnknownNamedArg() throws Exception { - String dir = getRandomDir(); - String groupFile = -diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java ---- test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2014-03-25 11:55:55.000000000 +0000 -+++ test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2015-09-13 11:01:05.011850826 +0100 -@@ -28,6 +28,7 @@ - package org.stringtemplate.v4.test; - - import org.junit.Test; -+import org.junit.Ignore; - import org.stringtemplate.v4.STErrorListener; - import org.stringtemplate.v4.STGroup; - import org.stringtemplate.v4.STGroupFile; -@@ -36,6 +37,7 @@ - import static org.junit.Assert.assertEquals; - - public class TestGroupSyntaxErrors extends BaseTest { -+ @Ignore - @Test public void testMissingImportString() throws Exception { - String templates = - "import\n" + diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml deleted file mode 100644 index 5757a6a3f8e7..000000000000 --- a/dev-java/stringtemplate/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">antlr/stringtemplate4</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild deleted file mode 100644 index 22164ff6a6e3..000000000000 --- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-pkg-simple - -DESCRIPTION="A Java template engine" -HOMEPAGE="http://www.stringtemplate.org/" -SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -CDEPEND=">=dev-java/antlr-2.7.7-r7:0" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.6" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.6 - test? ( >=dev-java/junit-4.11:4 )" - -S="${WORKDIR}/${P}" -JAVA_GENTOO_CLASSPATH="antlr" -JAVA_SRC_DIR="src" - -java_prepare() { - # https://github.com/antlr/stringtemplate3/pull/3 - epatch "${FILESDIR}/${PV}-test-fixes.patch" - - java-pkg_clean -} - -src_compile() { - local G; for G in action template angle.bracket.template eval group interface; do # from build.xml - antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die - done - - java-pkg-simple_src_compile -} - -src_install() { - java-pkg-simple_src_install - dodoc {CHANGES,README}.txt -} - -src_test() { - cd test || die - local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" - - local TESTS=$(find * -name "Test*.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -classpath "${CP}" $(find -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild deleted file mode 100644 index 7b0d10d82352..000000000000 --- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -ANTLR3="3.5.2" -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-pkg-simple - -DESCRIPTION="A Java template engine" -HOMEPAGE="http://www.stringtemplate.org/" -SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz - http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar" -LICENSE="BSD" -SLOT="4" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=">=virtual/jre-1.6" - -DEPEND=">=virtual/jdk-1.6 - test? ( dev-java/junit:4 )" - -# StringTemplate has a cyclic dependency on ANTLR 3. The runtime classes -# are needed at build time and runtime and the tool is also needed at -# build time. To break out of this, we use a prebuilt copy of ANTLR 3 at -# build time and manually register a dependency on the package, which -# will be present at runtime thanks to this PDEPEND. No prebuilt -# software is actually installed onto the system. -PDEPEND=">=dev-java/antlr-${ANTLR3}:3.5" - -S="${WORKDIR}/${PN}4-${PV}" -JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/antlr-${ANTLR3}-complete.jar" -JAVA_SRC_DIR="src" - -src_unpack() { - unpack ${P}.tar.gz -} - -java_prepare() { - # These tests are broken but are probably fixed in current master. - epatch "${FILESDIR}/${PV}-test-fixes.patch" - - # Some of these tests requires a graphical display. - rm -v test/org/stringtemplate/v4/test/TestEarlyEvaluation.java || die -} - -src_compile() { - java -jar "${JAVA_GENTOO_CLASSPATH_EXTRA}" -lib ${JAVA_SRC_DIR}/org/stringtemplate/v4/compiler $(find ${JAVA_SRC_DIR} -name "*.g") || die - java-pkg-simple_src_compile -} - -src_install() { - java-pkg-simple_src_install - java-pkg_register-dependency antlr-3.5 antlr-runtime.jar - dodoc {CHANGES,contributors,README}.txt -} - -src_test() { - cd test || die - local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4):${JAVA_GENTOO_CLASSPATH_EXTRA}" - - local TESTS=$(find * -name "Test*.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -classpath "${CP}" $(find -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} |