gentoo resync : 29.12.2022

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 660e4539f82c..9ed980eb1f4e 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,4 +1,3 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
-EBUILD relaxng-datatype-1.0-r2.ebuild 769 BLAKE2B c61b24730f52dd084a71f4b73e8a98799485d999ec475dde01d1e574934b71cfbd806af385c36dceb597ff8db83ad3431af28a3cc78571c858197753ac8b92c4 SHA512 eb96c8295349207944862348b12222ce8d14c15b05e0c109422b65410756f71cea24f8401a3847c5979879cacb14df529aaf6b426c0694ebb14c5e2f3d824eac
-EBUILD relaxng-datatype-1.0-r3.ebuild 762 BLAKE2B 187ca366dbb47f45ba21308811faaae5e017e800feffb0a37c58d1cee18748215038438b43d2e4d4d014c598ecbd17e28bb202c52d52df895165d11e603aa8e8 SHA512 c35c8ba4adf80b377fedca05d6d5da66ac1b8ab7f8e6bc10917c7b8e02324dfa6d2b7e47bf91073dc3e3b71adb72926e4f170b870bfe02a7b6f8274116bef954
+EBUILD relaxng-datatype-1.0-r3.ebuild 758 BLAKE2B 726072e839e86eca4f30a3724bcffed7ce847f303225d2470cb6402924e8f7c1f259bfb6112602e80f8398fb20c2d7cade39e4d7ada6585f7ca10e7812f9050b SHA512 62dffd6aeedcaefc42206eec82649577a52bcfb2b3fe094ddab4adeda5ec35d88d6b755bb819afe78c921c0d84012c7aa02464eca67932e71c1dcc7814b85657
 MISC metadata.xml 314 BLAKE2B 3c7bd8a6004758af05fccf02d2636fa62e2dea9e653c89600b37ce223d10c6f24b03df605db96ab55a5177994ee1eddca450df7a1d6e9fc86c50573c7da9e4a6 SHA512 eaa99aa2ba88d8a70bc38924266c1e33a264274ab13dbb88d9a73d278c03c872a56d8ed122cc4a44e84ef9436e6c016310c38ad05fa9976300018472b43780b8
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
deleted file mode 100644
index c7357a9ad076..000000000000
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="relaxngDatatype"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
-HOMEPAGE="https://relaxng.org/"
-SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.7
-"
-RDEPEND=">=virtual/jre-1.7"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
index 5886aafc3e3f..082bf9631a73 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
 HOMEPAGE="https://relaxng.org/"
 SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="BSD"
 SLOT="0"