From 91ebfeaafb12a21f0c04b7bb7a2371129c275994 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 19 Mar 2017 11:00:52 +0100 Subject: dev-java/javatoolkit: migrate to gx86 --- dev-java/javatoolkit/Manifest | 1 - dev-java/javatoolkit/files/0.3.0-prefix.patch | 43 ---------------------- .../files/javatoolkit-0.3.0-no-pyxml.patch | 29 --------------- .../files/javatoolkit-0.3.0-python2.6.patch | 12 ------ dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild | 33 ----------------- dev-java/javatoolkit/metadata.xml | 8 ---- 6 files changed, 126 deletions(-) delete mode 100644 dev-java/javatoolkit/Manifest delete mode 100644 dev-java/javatoolkit/files/0.3.0-prefix.patch delete mode 100644 dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch delete mode 100644 dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch delete mode 100644 dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild delete mode 100644 dev-java/javatoolkit/metadata.xml diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest deleted file mode 100644 index 071901b215..0000000000 --- a/dev-java/javatoolkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST javatoolkit-0.3.0.tar.bz2 16823 SHA256 47bf8aad2ec58b2d850e8cbe57fe2707859d800b215b24387c7652a50353677c SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1 WHIRLPOOL a9b1034939a0e22c49620bb29d3652e8f5e6a8e71645556fe00463aabc0c1ff2ac2b666f59fd0ceea8ea5dc18579d90cc11a07ba341028831e3b8dd1e8a0e9ce diff --git a/dev-java/javatoolkit/files/0.3.0-prefix.patch b/dev-java/javatoolkit/files/0.3.0-prefix.patch deleted file mode 100644 index 63b572f2ec..0000000000 --- a/dev-java/javatoolkit/files/0.3.0-prefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur src.orig/py/buildparser src/py/buildparser ---- src.orig/py/buildparser 2008-06-17 10:18:57.000000000 +0200 -+++ src/py/buildparser 2008-06-22 19:08:36.861548159 +0200 -@@ -11,7 +11,7 @@ - import sys - from optparse import OptionParser - --sys.path.insert(0, "/usr/share/javatoolkit/pym") -+sys.path.insert(0, "@GENTOO_PORTAGE_EPREFIX@/usr/share/javatoolkit/pym") - - from javatoolkit.parser.parser import Parser - from javatoolkit.parser.buildproperties import BuildPropertiesParser -diff -ur src.orig/py/findclass src/py/findclass ---- src.orig/py/findclass 2008-06-17 10:18:57.000000000 +0200 -+++ src/py/findclass 2008-06-22 19:09:43.859991165 +0200 -@@ -64,13 +64,13 @@ - - def get_all_packages(): - -- pkg = glob.glob('/usr/share/*/package.env') -+ pkg = glob.glob('@GENTOO_PORTAGE_EPREFIX@/usr/share/*/package.env') - pkg = [os.path.basename(os.path.dirname(i)) for i in pkg] - -- classpath = glob.glob('/usr/share/*/classpath.env') -+ classpath = glob.glob('@GENTOO_PORTAGE_EPREFIX@/usr/share/*/classpath.env') - classpath = [os.path.basename(os.path.dirname(i)) for i in classpath] - -- dir = glob.glob('/usr/share/java/packages/*') -+ dir = glob.glob('@GENTOO_PORTAGE_EPREFIX@/usr/share/java/packages/*') - dir = [os.path.basename(i) for i in dir] - - pkg.extend(classpath) ---- setup.py.orig 2008-06-21 14:38:45.000000000 +0200 -+++ setup.py 2008-06-23 12:37:19.000000000 +0200 -@@ -26,7 +26,7 @@ - "src/py/build-xml-rewrite", - "src/py/jarjarclean" - ], -- data_files = [ ( '/usr/share/man/man1', ['src/man/findclass.1'] ) ] -+ data_files = [ ( '@GENTOO_PORTAGE_EPREFIX@/usr/share/man/man1', ['src/man/findclass.1'] ) ] - ) - - #set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap 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 3218d17020..0000000000 --- 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 d73c94bb66..0000000000 --- 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 15cfa2fc8c..0000000000 --- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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="~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/metadata.xml b/dev-java/javatoolkit/metadata.xml deleted file mode 100644 index 952a4b9b60..0000000000 --- a/dev-java/javatoolkit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - -- cgit v1.2.3-65-gdbad