diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
| commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
| tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-java/maven-bin | |
| parent | db063b515939ab15261136b24e4bc44386335c0c (diff) | |
gentoo resync : 30.09.2020
Diffstat (limited to 'dev-java/maven-bin')
| -rw-r--r-- | dev-java/maven-bin/Manifest | 6 | ||||
| -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, 23 insertions, 7 deletions
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index bad85a2701f8..78c1eb728817 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -2,12 +2,12 @@ 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 EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114 EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992 EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62 -EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace -EBUILD maven-bin-3.6.2.ebuild 1236 BLAKE2B c2cd29540a34f506fcc8013cf59f343aaa953e2f1132a9c8324520a7320bd3e0979c3fcff2779f11e5cfbb05abae0f9ab142225fb4eee6c07dc40f09b0abcfee SHA512 09022fa6db8aac2186ef8b39bb105c7bfc265105d7a4b436fc0b0e780863dbd8b6457f4508cca3bfeb4faafb6cc19a8b10ab4269ddd4d8c115db19df062faf51 +EBUILD maven-bin-3.6.2.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661 +EBUILD maven-bin-3.6.3.ebuild 1524 BLAKE2B 98e733774ff50a1994bfdff4e00b519a3dbcca1a6b0e6d8d43d90667cfb23d4c3f226f4c66205a683b572a947d17c162fe9a9a5ddef0cbd2cc72e502025da807 SHA512 b9c54d1c00454a8a78acb7e80b473502a5672174b440eb93617ec8ca0c7a57f7093d6083034e5534a135b8a57d46c994da481ee540383f565b73e26f8fbd3fb3 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083 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() { |