summaryrefslogtreecommitdiff
path: root/dev-java/xpp3
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-12 08:41:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-12 08:41:54 +0100
commit4df3bf9762850b34cd1ead5c80374d1a0fc3362e (patch)
tree3080c5cb7ad17abcb63776a9f21c4947845546a6 /dev-java/xpp3
parent814f4cf860e299a046b649eaee5463427984c09c (diff)
gentoo resync : 12.07.2021
Diffstat (limited to 'dev-java/xpp3')
-rw-r--r--dev-java/xpp3/Manifest3
-rw-r--r--dev-java/xpp3/xpp3-1.1.4c-r3.ebuild24
-rw-r--r--dev-java/xpp3/xpp3-1.1.4c-r5.ebuild (renamed from dev-java/xpp3/xpp3-1.1.4c-r4.ebuild)14
3 files changed, 12 insertions, 29 deletions
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index 7037fbb4829c..312dcc6c4e1e 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,3 @@
DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
-EBUILD xpp3-1.1.4c-r3.ebuild 659 BLAKE2B 20f11ffa6f50b9a4310b36733ecf2c78b1f98822d37f737577d806f5a675c1eadc3ade32dd2cc46790d809bcd337302028cc7311f234b479e132f74f13bf7e5f SHA512 5c68fb355b688dcd19666195ac83180b4f4f4d6383a7aabf0eff8ec734a7f1be04f5e9f17aa9670d8526c4554faa598327702cad125fa22e992b6ffc226de73d
-EBUILD xpp3-1.1.4c-r4.ebuild 648 BLAKE2B a1a0916c40ba9ddcbadc1114bcba6858b4cb416b867756ce3c7b8ffc5f453dcd2de3a75c8a4daa9c05a5cb097da2f1aa2f93226220174f78040426d8a12ae7ae SHA512 0c9050b2ce897b135d778c9906c405831d3defadfd8aa518e10f7da0887b8b6958e8f626336bd9cf7c9b6836652a4c29823df10b880f697e48c32a820d91f5e2
+EBUILD xpp3-1.1.4c-r5.ebuild 775 BLAKE2B 4904458b949700ab454da89f332c7e2e6e114ceaea21f53886f85d28d05d60fd0b0b515fd5c0519c408ad872c1c04d2d33748e27c0427efbcea075a697b6ee0a SHA512 85ca3d9ad08ca1f65f346593245c41d07614893a56b77d605e714f0046e15253fa953a5af9a4169854f8895e77629960ead6b81b171f28e35bda185b4566c5c5
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
deleted file mode 100644
index a52b851aeb9e..000000000000
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="An implementation of XMLPULL V1 API"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- >=virtual/jdk-1.6
- source? ( app-arch/zip )"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
index 6dc6ad5bd4e6..3f30d6b9c176 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
MAVEN_ID="xpp3:xpp3:1.1.4c"
@@ -17,5 +17,13 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+ default
+ mkdir "resources" || die
+ cp -r "META-INF" "resources" || die
+}