Updating liguros repo

7 files changed, 3 insertions, 106 deletions

diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 990bf57ad59d..51075d6fd153 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 55646084c580..bd5a11f1f69e 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,4 +1,2 @@
-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
+DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
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 f3c6bca0d213..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_{5,6,7,8,9} )
-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.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
index d9ce92fdeb4c..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_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no