diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
commit | b17a3ef12038de50228bade1f05502c74e135321 (patch) | |
tree | 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-java/joda-convert | |
parent | 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff) |
gentoo resync : 02.09.2020
Diffstat (limited to 'dev-java/joda-convert')
-rw-r--r-- | dev-java/joda-convert/Manifest | 2 | ||||
-rw-r--r-- | dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild (renamed from dev-java/joda-convert/joda-convert-1.3.1.ebuild) | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest index e82122019a84..6671bde6b09d 100644 --- a/dev-java/joda-convert/Manifest +++ b/dev-java/joda-convert/Manifest @@ -1,4 +1,4 @@ AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 -EBUILD joda-convert-1.3.1.ebuild 927 BLAKE2B 5d013236441dd750f515439280200c45984a5e8d9ecf1bbdcfedc326b4e40b06a97f1650c65bb2817f7ff477803af6903319c7502ded60b4ce3a7ff0c77258c9 SHA512 92630d102052b71a644894835c5def32b4bb6155b5109e3dc1c253d606f5c2780b7a2d4e6adb8b6379d9dda94675f4600e53b67276593b99529ad73ccec483c1 +EBUILD joda-convert-1.3.1-r1.ebuild 931 BLAKE2B 2f74298f6d5641fe6f251075943a70a918e4e46b36a4430c01832bb52d81dda5282764c39c1834ff6fd77815049f8c1ba17c0cb8645cda4c90c4adff30c7e8b4 SHA512 7a7c44975ff1a890e1fe79860b08fe5e77a0aaca31947d7b72807744598ae169b3900f0652d21d0f3f25b02cf21905e82d795e1166556ce47e28f470dab8bb63 MISC metadata.xml 318 BLAKE2B 2222c7e9955b61b5a3369476bfdaa1087b8381846f325d3218768a672b594d64cadc6998d13012653c89df816133be237f97c9f1b2949712c4f120cd107c0a15 SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030 diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild index ed172701ffa4..80b986790cd2 100644 --- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild +++ b/dev-java/joda-convert/joda-convert-1.3.1-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 JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 @@ -14,18 +14,19 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc64 x86" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.8 test? ( dev-java/junit:4 dev-java/ant-junit:0 )" -RDEPEND=">=virtual/jre-1.6" +RDEPEND=">=virtual/jre-1.8" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_TEST_GENTOO_CLASSPATH="junit-4" EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" -java_prepare() { +src_prepare() { + default cp "${FILESDIR}"/${P}-build.xml build.xml || die } |