7 files changed, 5 insertions, 112 deletions
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 65156130865f..b81756c1de7c 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,11 +1,5 @@
-AUX javatoolkit-0.3.0-no-pyxml.patch 1128 BLAKE2B f0bad195ad20c5158f1ec84269b421f8664e46d43cff7548ab65139c9078a933d9039422be6c6c8048baec1ccdd352a9ee97e575940359a95fbc49e2690f70bd SHA512 edb135c6008a24d22bf5116bc73944fddf5a8c44354b80800425457c9c9ee8ef4f55413ca88507c991ed835945bc7d162f6b1b3a30c57fc5f41f278e0c5afe16
-AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a790d68277003713ff8dc9034adc2f4756b5f514ffcb464eb52ed827ad9d2e61d54ad5e4f401af4e7084c2a41fa591801ff0 SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c
-DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced90440fbc9f36d250be3c22a82b901b7f46486c8c7512784f9fe462bf3ab3109ecd7482bff13737a1c7dda57ef0aaf3eb SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1
-DIST javatoolkit-0.6.1.tar.bz2 26036 BLAKE2B 1e63a848ff5941e34fe5c4d449b5494cb9cc3e7a42c4654af94e602f3557775f2cfe1d2db7f96e1352c891e2c20822be973ee1246f879bccf611c4db724ca028 SHA512 ddf61c23f9a31007afc672cb762fd7a655c168d73616bc703a9a8a8c27d8a836b0340dd109af0c2a311e0237a57967785d85b09f8059187ba9b4a6ca6f2a52f3
-DIST javatoolkit-0.6.2.tar.bz2 26046 BLAKE2B 9e6eec5e055fe63191cdb67b7103c4f27df4569256da0e6231eece55f1d0c32f754b9b4784c2a7f79224404dea41d9583eace8aebab6e1e10bf0cfc875d74591 SHA512 70eede9a700fa8db48fef62116eff2cc89b637991c0691e5385a66ed1830788dff355c6f6d343533e58bd89bf1fbf017d5bcc6867f6d4cf23bd56d5ee857d145
 DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
-EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
-EBUILD javatoolkit-0.6.1.ebuild 822 BLAKE2B 1b1908a5dc168629a445b7bfbf40ee96c36bceecebae3300423b52f240d14bb6990ae104e1df4fa185dc1ac397767823ca8bf0ab4a9f065642f1d3bcc976f023 SHA512 b4e4663a7f64f3c45a63f80385d71d8d094042c7e960323a8453d623fe360bd024bb0fcde639d1b27eb294fb5db00edf049060145e43e24dcd648ad78ccaf872
-EBUILD javatoolkit-0.6.2-r1.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
-EBUILD javatoolkit-0.6.3.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
+DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
+EBUILD javatoolkit-0.6.3.ebuild 828 BLAKE2B b8284438bba4f9539b4435d98ca0aa83676f6a51ba5ea6efbfcc061990b128de0997f061f2efb0f3724729cc1079878c688f6cfa6b0159c519d5139ece1aa1a7 SHA512 a8f2167aac2ce4d33be6906250ed3e02bf2ec3a03cf28c4b6946289176581741d95c1836da783fdac9b90598e3e4552cd13b038660d8683e4e1b53d191fab0e1
+EBUILD javatoolkit-0.6.4.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
deleted file mode 100644
index 3218d1702033..000000000000
--- a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: src/py/javatoolkit/xml/DomRewriter.py
-===================================================================
---- src/py/javatoolkit/xml/DomRewriter.py	(revision 8310)
-+++ src/py/javatoolkit/xml/DomRewriter.py	(working copy)
-@@ -78,7 +78,6 @@
- 
- 
-     def write(self,stream):
--        from xml.dom.ext import PrettyPrint
--        PrettyPrint(self.document,stream)
-+        stream.write(self.document.toxml("utf-8"))
- 
- # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
-Index: src/py/javatoolkit/maven/MavenPom.py
-===================================================================
---- src/py/javatoolkit/maven/MavenPom.py	(revision 8310)
-+++ src/py/javatoolkit/maven/MavenPom.py	(working copy)
-@@ -185,10 +185,7 @@
-                     for build_node in build_nodes:
-                         build_node.appendChild(plugins_node.cloneNode(deep=True))
- 
--        from xml.dom.ext import PrettyPrint
--        self.write = self.__write
--        PrettyPrint(xmldoc,self)
--        self.write = None
-+        self.__write(xmldoc.toxml("utf-8"))
- 
- 
-     def create_element(self,xmldoc,element_name,text_value=None):
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
deleted file mode 100644
index d73c94bb6683..000000000000
--- a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr py.orig/maven-helper.py py/maven-helper.py
---- src/py.orig/maven-helper.py	2009-03-07 10:36:10.000000000 -0430
-+++ src/py/maven-helper.py	2009-03-07 10:35:25.000000000 -0430
-@@ -21,7 +21,7 @@
- import sys
- import StringIO
- from optparse import OptionParser, make_option
--from javatoolkit.maven import MavenPom
-+from javatoolkit.maven.MavenPom import MavenPom
- 
- __version__ = "$Revision: 1.1 $"[11:-2]
- 
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
deleted file mode 100644
index f85943441ca1..000000000000
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 eutils multilib prefix
-
-DESCRIPTION="Collection of Gentoo-specific tools for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-python2.6.patch"
-		"${FILESDIR}/${P}-no-pyxml.patch"
-	)
-	hprefixify src/py/buildparser src/py/findclass setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
deleted file mode 100644
index f1231d0905e5..000000000000
--- a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multilib prefix
-
-DESCRIPTION="Collection of Gentoo-specific tools for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_prepare_all() {
-	hprefixify src/py/buildparser src/py/findclass setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
index e43396d777cf..265eb8295359 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
index e43396d777cf..ce3df6ba5a07 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no