diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/maven-bin/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.2.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.3.ebuild (renamed from dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild) | 14 |
3 files changed, 21 insertions, 5 deletions
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index a2ace8a034f7..fc43320adb97 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -2,5 +2,5 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 -DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544 DIST apache-maven-3.6.2-bin.tar.gz 9142315 BLAKE2B f8b4ad4148a508b076cdb9f5ca322860157d6c3517c1ac7bd7d369066cc1567681761e1b638ea74f20461f8c111ff488e1478399a2ebfd406e91a10ace582d86 SHA512 d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee +DIST apache-maven-3.6.3-bin.tar.gz 9506321 BLAKE2B 45892ef05cc1e4578c05a794376fdda730a800070389a1be213cf58c8f8df87be5e22cb2e8fdcf718eed344eff3e133dc72a252b0bbb7dcaf4e0e184539f7b0d SHA512 c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild index 622589dbd25c..e6cf194b7619 100644 --- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild +++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,6 +30,11 @@ S="${WORKDIR}/${MY_P}" MAVEN="${PN}-${SLOT}" MAVEN_SHARE="/usr/share/${MAVEN}" +QA_FLAGS_IGNORED=( + "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so" + "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so" +) + # TODO: # We should use jars from packages, instead of what is bundled. src_install() { @@ -48,6 +53,9 @@ src_install() { # See bug #342901. echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die doenvd "${T}/25${MAVEN}" + + # remove broken useless files (bug #734906 and #704618) + rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files" } pkg_postinst() { diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.3.ebuild index 46ef90466cd5..80d5384a1aee 100644 --- a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.6.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit java-pkg-2 @@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/" LICENSE="Apache-2.0" SLOT="3.6" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DEPEND=" >=virtual/jdk-1.8 @@ -30,6 +30,11 @@ S="${WORKDIR}/${MY_P}" MAVEN="${PN}-${SLOT}" MAVEN_SHARE="/usr/share/${MAVEN}" +QA_FLAGS_IGNORED=( + "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so" + "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so" +) + # TODO: # We should use jars from packages, instead of what is bundled. src_install() { @@ -48,6 +53,9 @@ src_install() { # See bug #342901. echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die doenvd "${T}/25${MAVEN}" + + # remove broken useless files (bug #734906 and #704618) + rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files" } pkg_postinst() { |