[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/

2020-10-19 Thread Sam James
commit: c013d42c7115f13d2b56163015e0912c14ddc65b
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 04:09:59 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 04:09:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c013d42c

dev-java/xp: MissingUnpackerDep

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 dev-java/xp/xp-0.5-r4.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
index c39c99adaa5..ae0095ad000 100644
--- a/dev-java/xp/xp-0.5-r4.ebuild
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+   app-arch/unzip
+   >=virtual/jdk-1.6
+"
 
 PATCHES=(
"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/

2017-11-01 Thread Patrice Clement
commit: 21e875fabac1cf8781c90e3972adbed40d3c8f15
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Nov  1 22:30:16 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Nov  1 22:30:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e875fa

dev-java/xp: clean up old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/xp/xp-0.5-r3.ebuild | 33 -
 1 file changed, 33 deletions(-)

diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
deleted file mode 100644
index 93637e006ad..000
--- a/dev-java/xp/xp-0.5-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XP is an XML 1.0 parser written in Java"
-HOMEPAGE="http://www.jclark.com/xml/xp;
-SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=virtual/jre-1.6"
-
-DEPEND="
-   source? ( app-arch/zip )
-   >=virtual/jdk-1.6"
-
-PATCHES=(
-   "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
-)
-
-java_prepare() {
-   java-pkg_clean
-   epatch "${PATCHES[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/

2017-11-01 Thread Patrice Clement
commit: cf0344d760c057a15d5caf2a25003d31590d6c8a
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Nov  1 21:54:42 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Nov  1 21:54:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0344d7

dev-java/xp: stable for amd64+x86.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/xp/xp-0.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
index 0792ca0805b..c39c99adaa5 100644
--- a/dev-java/xp/xp-0.5-r4.ebuild
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/

2017-10-28 Thread Patrice Clement
commit: 80d46c4fc13c9bfff2b7b1f73b16323439880bb2
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct 28 20:51:34 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct 28 20:51:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d46c4f

dev-java/xp: EAPI 6 bump.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/xp/xp-0.5-r4.ebuild | 28 
 1 file changed, 28 insertions(+)

diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
new file mode 100644
index 000..0792ca0805b
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp;
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+PATCHES=(
+   "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+src_prepare() {
+   default
+   java-pkg_clean
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/files/, dev-java/xp/

2016-03-26 Thread Patrice Clement
commit: e36fe38ce9d31300af1f6febf648189b212cc622
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Mar 26 22:35:43 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Mar 26 23:03:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36fe38c

dev-java/xp: Clean up old.

Package-Manager: portage-2.2.26

 dev-java/xp/Manifest |  1 -
 dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch | 30 
 dev-java/xp/files/build.xml  | 12 
 dev-java/xp/xp-0.5-r2.ebuild | 41 
 4 files changed, 84 deletions(-)

diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index b557fa2..b84c99a 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1,2 +1 @@
 DIST xp-0.5.zip 281324 SHA256 
38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 
5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
 WHIRLPOOL 
677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
-DIST xp.zip 281324 SHA256 
38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 
5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
 WHIRLPOOL 
677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5

diff --git a/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch 
b/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
deleted file mode 100644
index d2c11ab..000
--- a/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
-index 2b0d90a..d1efd3e 100644
 a/com/jclark/xml/sax/Driver.java
-+++ b/com/jclark/xml/sax/Driver.java
-@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
- 
- DTD dtd = event.getDTD();
- 
--for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
--   enum.hasMoreElements(); ) {
--  String name = (String)enum.nextElement();
-+for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
-+   enumx.hasMoreElements(); ) {
-+  String name = (String)enumx.nextElement();
-   Entity entity = dtd.getEntity(DTD.NOTATION, name);
-   String systemId = entity.getSystemId();
-   if (systemId != null) {
-@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
-   }
-   dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
- }
--for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
--   enum.hasMoreElements();) {
--  String name = (String)enum.nextElement();
-+for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
-+   enumx.hasMoreElements();) {
-+  String name = (String)enumx.nextElement();
-   Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
-   String notationName = entity.getNotationName();
-   if (notationName != null) {

diff --git a/dev-java/xp/files/build.xml b/dev-java/xp/files/build.xml
deleted file mode 100644
index cea20e9..000
--- a/dev-java/xp/files/build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-   
-   
-   
-   
-
-   
-   
-   
-

diff --git a/dev-java/xp/xp-0.5-r2.ebuild b/dev-java/xp/xp-0.5-r2.ebuild
deleted file mode 100644
index b97e9ad..000
--- a/dev-java/xp/xp-0.5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XP is an XML 1.0 parser written in Java"
-HOMEPAGE="http://www.jclark.com/xml/xp;
-SRC_URI="ftp://ftp.jclark.com/pub/xml/xp.zip;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-   app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-java_prepare() {
-   rm -v xp.jar || die
-   cp "${FILESDIR}/build.xml" . || die
-   epatch "${FILESDIR}"/${PV}-*.patch
-}
-
-#premade javadocs
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_dojar xp.jar
-   dodoc docs/copying.txt
-   #has index.html and javadocs here
-   use doc && java-pkg_dohtml -r docs/*
-   use source && java-pkg_dosrc com
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/

2016-03-26 Thread Patrice Clement
commit: 3f1071a348cfadb75380bd6877dbb0397be06e2a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Mar 26 22:35:13 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Mar 26 23:03:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1071a3

dev-java/xp: Stable for amd64+x86.

Package-Manager: portage-2.2.26

 dev-java/xp/xp-0.5-r3.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
index c1e0a46..a699704 100644
--- a/dev-java/xp/xp-0.5-r3.ebuild
+++ b/dev-java/xp/xp-0.5-r3.ebuild
@@ -14,17 +14,15 @@ SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
>=virtual/jre-1.6"
 
 DEPEND="
-   >=virtual/jdk-1.6
-   app-arch/unzip"
-
-S="${WORKDIR}"
+   source? ( app-arch/zip )
+   >=virtual/jdk-1.6"
 
 PATCHES=(
"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xp/files/, dev-java/xp/

2016-02-19 Thread Patrice Clement
commit: 3d43557288bdb9311b5dc3a920714981b493267f
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Feb 19 15:52:36 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Feb 19 20:04:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d435572

dev-java/xp: Switch to java-pkg-simple.

Package-Manager: portage-2.2.26

 dev-java/xp/Manifest|  1 +
 dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch | 30 +
 dev-java/xp/xp-0.5-r3.ebuild| 36 +
 3 files changed, 67 insertions(+)

diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 7c79dc5..b557fa2 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1 +1,2 @@
+DIST xp-0.5.zip 281324 SHA256 
38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 
5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
 WHIRLPOOL 
677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 DIST xp.zip 281324 SHA256 
38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 
5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
 WHIRLPOOL 
677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5

diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch 
b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
new file mode 100644
index 000..d2c11ab
--- /dev/null
+++ b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
@@ -0,0 +1,30 @@
+diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
+index 2b0d90a..d1efd3e 100644
+--- a/com/jclark/xml/sax/Driver.java
 b/com/jclark/xml/sax/Driver.java
+@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
+ 
+ DTD dtd = event.getDTD();
+ 
+-for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
+-   enum.hasMoreElements(); ) {
+-  String name = (String)enum.nextElement();
++for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
++   enumx.hasMoreElements(); ) {
++  String name = (String)enumx.nextElement();
+   Entity entity = dtd.getEntity(DTD.NOTATION, name);
+   String systemId = entity.getSystemId();
+   if (systemId != null) {
+@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
+   }
+   dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
+ }
+-for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
+-   enum.hasMoreElements();) {
+-  String name = (String)enum.nextElement();
++for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
++   enumx.hasMoreElements();) {
++  String name = (String)enumx.nextElement();
+   Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
+   String notationName = entity.getNotationName();
+   if (notationName != null) {

diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
new file mode 100644
index 000..c1e0a46
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp;
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=virtual/jre-1.6"
+
+DEPEND="
+   >=virtual/jdk-1.6
+   app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+java_prepare() {
+   java-pkg_clean
+   epatch "${PATCHES[@]}"
+}