gentoo resync : 22.05.2021

3 files changed, 2 insertions, 71 deletions

diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index e99a35ffbbe0..b0a561cd1efc 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,5 +1,3 @@
-DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-1.7-r2.ebuild 1199 BLAKE2B 9f49ea54fd948039507d236e2b1cc9519212d9ed3b3075dd8b209974ed4ddbe6190d22b5b5a6621a890d8b6eed04853f78d028fc4029c6626c3e18924a372a9c SHA512 39d3fa723ec7dfb4c98c91025364836b8e0c3ec03cc19de744aca2504960fab9f4aefe37828df14dee8377096067c1573f99568dd9941d64d38525dc116a4ea1
-EBUILD velocity-2.3.ebuild 5213 BLAKE2B 3a159172994cbaf4d0ef6c3e5150ffaf64eb34b11a41133ca1e11254f007351a309419bdbfd16827049c076ae255d1549c4ec3dbb42c7b495cda5fe37cc67b17 SHA512 de97e153f3fe9d807791a0a7e01abd35d0888828ca15c19c25371669088c63c678f4dcc18a88041d4c8cd2f5f327f1117482cdcad94bfae987b21f4de4721e7e
+EBUILD velocity-2.3.ebuild 5211 BLAKE2B 888ca363c1ff75907d25741d4805df26734c8b9e1cf0364e93ee71fbd5c5f1a21c24556cea107e102a6c4b6013612a4b12346534e03f9038b4659e5ac41b6ba6 SHA512 d1785107bd8363fc501246e8dc09ce9a3572e9f2b2e617248f49f5b9441c21547cb566c2b0b007881dac2d2e5bff1e7ddb223369454bb697667890a2171e5fd7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
deleted file mode 100644
index facc1a8d7f55..000000000000
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="examples doc source"
-MAVEN_ID="org.apache.velocity:velocity:1.7"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java framework for easy creation/rendering of documents"
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/log4j:0
-	dev-java/ant-core:0
-	dev-java/werken-xpath:0
-	dev-java/jakarta-oro:2.0
-	dev-java/avalon-logkit:2.0
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/commons-collections:0
-	java-virtuals/servlet-api:2.3
-"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-"
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jdom
-	log4j
-	ant-core
-	werken-xpath
-	jakarta-oro-2.0
-	servlet-api-2.3
-	commons-logging
-	commons-lang-2.1
-	avalon-logkit-2.0
-	commons-collections
-"
-
-JAVA_SRC_DIR="src"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
-	java-pkg_clean
-	rm -rv test src/test || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 495e3056411d..d26c79aa3f66 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Common dependencies
 # POM: pom.xml