From 697923b095032aaa0a6de280ce4322e499dd829d Mon Sep 17 00:00:00 2001
From: Micha Glave <gentoo@migmedia.de>
Date: Mon, 3 Jun 2019 15:06:04 +0200
Subject: [PATCH] version bump apache-archiva-2.2.4

---
 dev-java/apache-archiva/Manifest              | 10 ++-
 .../apache-archiva-2.2.4.ebuild               | 76 +++++++++++++++++++
 .../files/apache-archiva.init.d               |  2 +-
 3 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 dev-java/apache-archiva/apache-archiva-2.2.4.ebuild

diff --git a/dev-java/apache-archiva/Manifest b/dev-java/apache-archiva/Manifest
index a50d425..2ae45a1 100644
--- a/dev-java/apache-archiva/Manifest
+++ b/dev-java/apache-archiva/Manifest
@@ -1,4 +1,6 @@
-AUX apache-archiva.conf.d 159 SHA256 2f93d2d9732b71b0249032ab38a5d22185e763ff929f5929ad1f388b599c3677 SHA512 7cb55ba630c1ff9eb13085fa5344b87ee0b028f5524f6ab2474cc41d31b721bdf60add45f6bb5efb33968ccd4f66e4bb4e46da4908ca7396567409020aba95e0 WHIRLPOOL c60399d3c5f3ae5e611fdd9f7bc678067b6aab8a15f5adbee2b77f70552777698e925c72535051db2a22b154881fc53ee9af9aa84465f34c58466e0fdb94c29d
-AUX apache-archiva.init.d 687 SHA256 8c104904591131451f1e966ac530ffb53ebe2ad143760ce0325fc5f203d9e853 SHA512 75ddebeb63d9ff1993a67189434035a43237e3d48c1ac88b51a6e291cc2e1a2df16cd85a72cc9850063402f0b51d477e6c152db2bb2e2f2734e87da7dfeb1711 WHIRLPOOL 0edf71d89a61c63727bc7bf52d641450fb49392ef9ad946fd68fa7bde9aa0eecef3165b47c04b61266a759bcb53dd7e5d27969e1d296ab750caa8c053f39a48e
-DIST apache-archiva-2.2.3-bin.tar.gz 69995241 SHA256 cf90d097e7c2763f6ff8df458b64be0348b35847de8b238c3e1e28e006da8bad SHA512 939b677f423c8ea1c77d865d5116f1ec0b4966d6629517f2cd58e3144a475c9081f5891964da7354921299b05d00267740cae4d2f08f70e0c209adda6f714645 WHIRLPOOL 04db1fefc2e490e122d380e34d5a396f28f976a65ab82344ee62527d15cb4143f4aba80a7e31a5f63fe9823864c797f29464bb516f089127f39d94b5f3b117d1
-EBUILD apache-archiva-2.2.3.ebuild 1746 SHA256 e64420ea527a53ebe5dbfd082879f8415d3512aebcc60c75a7fee10815c80c88 SHA512 ff9755da6a4d44f1e8f4e539b0be65ded6347b8849adf3576f8b29400dccb0ea7db4b94ba7cba843830c39d73ed2a7b66a2b363c3465ca4ed3f58eb7907676ef WHIRLPOOL 989c575fea6a76aad2d5ee655eba53b42228f694584986ddab07f9e8f14343cd0a045d883232dd1c4fa5bf5393233946bfe8c515b5ceb9ebf2b8037a31f78d7c
+AUX apache-archiva.conf.d 159 BLAKE2B 324fff87d15ae4c85a80832a2e2fb18d8740ce3697193f1f81f807d8d85f21dba35a75d6e14e28d33cb8554d6b67cb2014290ec83252edee0c7d2b2f50f4cb03 SHA512 7cb55ba630c1ff9eb13085fa5344b87ee0b028f5524f6ab2474cc41d31b721bdf60add45f6bb5efb33968ccd4f66e4bb4e46da4908ca7396567409020aba95e0
+AUX apache-archiva.init.d 687 BLAKE2B 20fb1098b3fc5b38dbeb5e16041da870159366098b3b8a0b12ce63216b71285f47317e9a4e615d2780b2cf0b6fca390e87c5f7438e3af3b62f9a8d5a77b82d79 SHA512 7507c4a54cb867d4bf65d3b4bc42ce1be33dd995d76ac22d32d9b503a74e4893621ddf6ee49113ea083cf9b8f71f0523853d5ca7759c09b57a30afbbca5f5485
+DIST apache-archiva-2.2.3-bin.tar.gz 69995241 BLAKE2B b3654a229871a58f7efffa4c4707f267006978ee9a9e7d9ef272d4583290ff4da873db336bfa97cabd42e05fecc48b02558b556620f5150b73333f693934d7ab SHA512 939b677f423c8ea1c77d865d5116f1ec0b4966d6629517f2cd58e3144a475c9081f5891964da7354921299b05d00267740cae4d2f08f70e0c209adda6f714645
+DIST apache-archiva-2.2.4-bin.tar.gz 69999678 BLAKE2B 4ee40f6e04cca722fa1791995036b1ac0000e822bf2e54776508c2e68287d9dbd21d5dd88ac66c6051c545ddd19cb90952bc5552db1312372b6b81a694a677ca SHA512 e44b17c133b97426cf316dd79cbe2241662cb16e152d2e80d196fbf97dc5584d211e9382236ba8cacb16aea826d7d8fa58215f6b3baa48fa8da55cc0fedab270
+EBUILD apache-archiva-2.2.3.ebuild 1746 BLAKE2B eb7b9b8d897a9e10214102771910f20785caad60d8a2fc285ea3d30e342edbe9e433fbaa0635a7596e7ef645a3751191d4083027d39380266aacbd93b2cd97bd SHA512 ff9755da6a4d44f1e8f4e539b0be65ded6347b8849adf3576f8b29400dccb0ea7db4b94ba7cba843830c39d73ed2a7b66a2b363c3465ca4ed3f58eb7907676ef
+EBUILD apache-archiva-2.2.4.ebuild 1746 BLAKE2B 74c14356f11fa1c03e36e14bbd29aa10db7c8c664c467a907fa85d0a6360de4f4fda5aa02d3f06c1f12667598eb1956e99e77cfa0032c76058d8c0fcb8b00e9b SHA512 8c5c516023585cbd024269c678a09b6778d88165679553985b5229d5465d2a9dd570d855ba4c5e42afccdcdbabe4bf71873fd73967015e42fd5613b9eb25b7fd
diff --git a/dev-java/apache-archiva/apache-archiva-2.2.4.ebuild b/dev-java/apache-archiva/apache-archiva-2.2.4.ebuild
new file mode 100644
index 0000000..0f3f59c
--- /dev/null
+++ b/dev-java/apache-archiva/apache-archiva-2.2.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 user
+
+DESCRIPTION="The Build Artifact Repository Manager"
+ARCHBASEPAGE="http://archiva.apache.org/"
+SRC_URI="mirror://apache/archiva/${PV}/binaries/${P}-bin.tar.gz"
+HOMEPAGE="https://archiva.apache.org/"
+
+LICENSE="apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="mysql"
+
+COMMON_DEP="mysql? ( dev-java/jdbc-mysql )
+	"
+
+RDEPEND=">=virtual/jre-1.7
+  ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.7
+  app-arch/unzip
+  ${COMMON_DEP}"
+
+EANT_BUILD_TARGET=""
+EANT_DOC_TARGET=""
+ARCHBASE="/var/lib/${PN}"
+
+pkg_setup() {
+  enewgroup archiva
+  enewuser archiva -1 /bin/sh ${ARCHBASE} archiva
+}
+
+src_prepare() {
+  rm lib/{*.dll,*-solaris-*,*-macosx-*}
+  rm bin/{*.bat,*-windows-*,*-solaris-*,*-macosx-*}
+  rm lib/libwrapper-linux-x86-32.so
+
+  sed -i \
+     -e "s!set.default.ARCHIVA_BASE=.*!set.default.ARCHIVA_BASE=${ARCHBASE}!g" \
+     -e "s!wrapper\.working\.dir=.*!wrapper.working.dir=/opt/${P}!g" \
+	 conf/wrapper.conf
+  
+  sed -i -e "s!uname -p!uname -m!g" bin/archiva
+}
+
+src_install() {
+  diropts -m0775 -o archiva -g archiva 
+  keepdir ${ARCHBASE}/{data,temp}
+  keepdir /var/log/${PN}
+
+  insinto /etc/${PN}
+  doins conf/*
+  chown archiva:archiva conf/archiva.xml
+
+  dosym /etc/${PN} ${ARCHBASE}/conf
+  dosym /var/log/${PN}  ${ARCHBASE}/logs
+
+  insinto /opt/${P}
+  doins -r apps contexts lib 
+  doins LICENSE NOTICE
+
+  exeinto /opt/${P}/bin
+  doexe bin/{wrapper-linux-x86-64,archiva}
+  
+  sed -e "s!##ARCHIVA##!${P}!g" \
+      -e "s!##ARCHBASE##!${ARCHBASE}!g" \
+    ${FILESDIR}/apache-archiva.conf.d > apache-archiva.conf.d
+
+  newinitd ${FILESDIR}/apache-archiva.init.d ${PN}
+  newconfd apache-archiva.conf.d ${PN} 
+}
diff --git a/dev-java/apache-archiva/files/apache-archiva.init.d b/dev-java/apache-archiva/files/apache-archiva.init.d
index fc02ec3..086de7e 100755
--- a/dev-java/apache-archiva/files/apache-archiva.init.d
+++ b/dev-java/apache-archiva/files/apache-archiva.init.d
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $