diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-java/antlr | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-java/antlr')
| -rw-r--r-- | dev-java/antlr/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/antlr/antlr-3.5.2-r1.ebuild (renamed from dev-java/antlr/antlr-3.5.2.ebuild) | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest index cad284ad52d2..a5c26cd476e3 100644 --- a/dev-java/antlr/Manifest +++ b/dev-java/antlr/Manifest @@ -13,7 +13,7 @@ DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af19947857 EBUILD antlr-2.7.7-r7.ebuild 1087 BLAKE2B e866bec6a53c4476202468cdb009b266a3ef0748b5ed79c71e6baa2d30da07572804ebe59e332a569b2afdb97073268b0947e0747421140f792425bf61868152 SHA512 c06da2c925aae9677b26a216f3e3fc297bc40212f7255ad7b19b303895ef13a0905588b02b3f9c2521b03b82092f6692d28517bdabcefcfaf7d87e32b88fa16c EBUILD antlr-2.7.7-r8.ebuild 1098 BLAKE2B 4ac646f7bac4b5ef9c614436eb39f0fbb83629ef2861e1875d0901aa48f28ad0d618ab3476be5efa2c4de8c31a7d0d6428ed99923f6d8e4025b6d12fd67d442f SHA512 92e22ad8ef1ca16072bf1d436779a868149bffcc2e9e5c1ca7b9c6ac3b10a0fceafd40f33ec2e0195c422174d9929abd50e5c3d17610a63c03adb6cb5033aa3b EBUILD antlr-3.2.ebuild 3269 BLAKE2B 235e24e79fcc6548e1663f4ab04b28d990c9bf326ae6ba34a6360edb9ea85fba98aa150b0f191d7c98919fc8c96bf9ff003eaac44dbb12c5d22fc23bbf85cb35 SHA512 6baafe3168efbc63d11e36d719550a36b9c2c2d36c955d52502113142a7fa51b30928de00d2ac3cdb17669652966aa81427ed70f82e5abedb0569cd3dda46ffa -EBUILD antlr-3.5.2.ebuild 3028 BLAKE2B c446dcfab240b878e5d93a88f4cede8cf32c145f74522906d4291d17da93b1e4bbb4c23c7e86b68295d4a4ed1f22eba9610927b257e18ee0d629a8d76ae7102f SHA512 0b3611e506b785d8326e78602b439da96ff4db75ff72f723d34aec8196ba2356b7c03c4c71561e956fdb6d05e543ec03de1d7b16bcd7043660718d019b43705f +EBUILD antlr-3.5.2-r1.ebuild 3040 BLAKE2B 65aad4afa41608181e02aa61a43cc5b4cc9b5ed5131bf6a7ddd57ed7e3655514d2bbff5ec1343f8aba38788aff04ad25126d847c4f41daae63a089acb70e7f0a SHA512 f61b63f4907050c442a963ac35227714985e401b8dc0a6f8ccdaf4d29a3df0cf3e538774b1363ae765ca2d4aa5db199ecdb2841cd4b4eefc86ff9e92c95ebf0c EBUILD antlr-4.5.1.ebuild 2478 BLAKE2B e36feaf0bf7eb33d4e5fcc7e1f9c498b937e037a5a72e2049eaab57269f09dc20cb7e9a5ddb57055611bb7e1aadeb91173129fda355351d3e26e12c4db245157 SHA512 51e8489bb173e237ba78be7bd9b3667a6c5522583d64ecf88b902b20006c089e4134bf278369a30f32507680ed1628321c672b06f4dacc7e9f89d0f1caa26b11 EBUILD antlr-4.5.3.ebuild 2488 BLAKE2B 04c6919146076e7340c99045b99ac44f0afa0bb46ed26e03f644498ebbcd3d925f6468eb019ebcce23eae0afa3e969a1558668e8939da23877cde5d249f7a99b SHA512 34671e7dda01baadec294a388dca769e6e05710a3522f61bd9beec931e57c5b9d627bf0beb36bca06aa25cc36af485ec0bec53144437712509f40128b9377439 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57 diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild index 43986264fbcd..72eaa9b7c8be 100644 --- a/dev-java/antlr/antlr-3.5.2.ebuild +++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit eutils java-pkg-2 java-pkg-simple @@ -18,21 +18,26 @@ RESTRICT="!test? ( test )" CDEPEND="dev-java/stringtemplate:4" RDEPEND="${CDEPEND} - >=virtual/jre-1.6" + >=virtual/jre-1.8" DEPEND="${CDEPEND} - >=virtual/jdk-1.6 + >=virtual/jdk-1.8 test? ( dev-java/junit:4 )" S="${WORKDIR}/${PN}3-${PV}" JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar" JAVA_GENTOO_CLASSPATH="stringtemplate-4" +PATCHES=( + "${FILESDIR}/${PV}-test-fixes.patch" +) src_unpack() { unpack ${P}.tar.gz } -java_prepare() { +src_prepare() { + default + java-pkg_clean # This requires StringTemplate v3 and is only needed for @@ -42,7 +47,6 @@ java_prepare() { # Some tests have to be removed as a result. rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die - epatch "${FILESDIR}/${PV}-test-fixes.patch" # Some tests fail under Java 8 in ways that probably aren't limited # to the tests. This is bad but upstream is never going to update |