From 5b5b65571633147530070898b01089b9e732e224 Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Thu, 22 Jul 2021 09:27:25 +0200 Subject: [PATCH] new version apache-archiva, slit up acct-*/archiva ebuilds. --- acct-group/archiva/Manifest | 2 + acct-group/archiva/archiva-0.ebuild | 10 +++ acct-group/archiva/metadata.xml | 5 ++ acct-user/archiva/Manifest | 2 + acct-user/archiva/archiva-0.ebuild | 15 ++++ acct-user/archiva/metadata.xml | 5 ++ dev-java/apache-archiva/Manifest | 6 +- .../apache-archiva-2.2.3.ebuild | 76 ------------------- .../apache-archiva-2.2.4.ebuild | 76 ------------------- .../apache-archiva-2.2.5.ebuild | 75 ++++++++++++++++++ 10 files changed, 116 insertions(+), 156 deletions(-) create mode 100644 acct-group/archiva/Manifest create mode 100644 acct-group/archiva/archiva-0.ebuild create mode 100644 acct-group/archiva/metadata.xml create mode 100644 acct-user/archiva/Manifest create mode 100644 acct-user/archiva/archiva-0.ebuild create mode 100644 acct-user/archiva/metadata.xml delete mode 100644 dev-java/apache-archiva/apache-archiva-2.2.3.ebuild delete mode 100644 dev-java/apache-archiva/apache-archiva-2.2.4.ebuild create mode 100644 dev-java/apache-archiva/apache-archiva-2.2.5.ebuild diff --git a/acct-group/archiva/Manifest b/acct-group/archiva/Manifest new file mode 100644 index 0000000..893c104 --- /dev/null +++ b/acct-group/archiva/Manifest @@ -0,0 +1,2 @@ +EBUILD archiva-0.ebuild 202 BLAKE2B 4b322483a6f56f1262643eab1412940b7095abbef8405ce5d92cd2685056d9ea63f8b8a80f923ded771001f097618518c836c4a1bd118565ae7960909123e68a SHA512 54c9ab4fb699193bb05d08e3675eac6b95d043ea2ced68739e4aba3026648993d014946cce724aac1644ac4c6b748ea24d63af3d3ca8401ea024f80823dff524 +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/acct-group/archiva/archiva-0.ebuild b/acct-group/archiva/archiva-0.ebuild new file mode 100644 index 0000000..9de2151 --- /dev/null +++ b/acct-group/archiva/archiva-0.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-group + +DESCRIPTION="Group for dev-java/apache-archiva" + +ACCT_GROUP_ID="241" diff --git a/acct-group/archiva/metadata.xml b/acct-group/archiva/metadata.xml new file mode 100644 index 0000000..7a38bb9 --- /dev/null +++ b/acct-group/archiva/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/acct-user/archiva/Manifest b/acct-user/archiva/Manifest new file mode 100644 index 0000000..5545374 --- /dev/null +++ b/acct-user/archiva/Manifest @@ -0,0 +1,2 @@ +EBUILD archiva-0.ebuild 317 BLAKE2B e353b85bdda797965b1497554c06357bae7c545cd960a9a04ce1d4190e61ef4824c4641456a4738b32696b32f771fcaaaa3e5170744c077ae01ac91d865570b6 SHA512 ce4faad58e090524dee29338f2b9b319a53dea83cd7c5d09ae50a389499467642d2a3a910f749fd170f7d9ffc0a086afa10d3f8e11e574755bd8c4e3022280b1 +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/acct-user/archiva/archiva-0.ebuild b/acct-user/archiva/archiva-0.ebuild new file mode 100644 index 0000000..ba59abc --- /dev/null +++ b/acct-user/archiva/archiva-0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-user + +DESCRIPTION="User for dev-java/apache-archiva" + +ACCT_USER_GROUPS=( "archiva" ) +ACCT_USER_ID="105" +ACCT_USER_SHELL="/bin/sh" +ACCT_USER_HOME="/var/lib/apache-archiva" + +acct-user_add_deps diff --git a/acct-user/archiva/metadata.xml b/acct-user/archiva/metadata.xml new file mode 100644 index 0000000..7a38bb9 --- /dev/null +++ b/acct-user/archiva/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/dev-java/apache-archiva/Manifest b/dev-java/apache-archiva/Manifest index 2ae45a1..efbf793 100644 --- a/dev-java/apache-archiva/Manifest +++ b/dev-java/apache-archiva/Manifest @@ -1,6 +1,4 @@ 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 +DIST apache-archiva-2.2.5-bin.tar.gz 67177470 BLAKE2B 56589f3b202ec0e932b7678731682fccd3ebba356740c17fda32427c96919977c23f3afa1ad63eebc06ca55b52ab32e65c8bde020f06dfbecba8ac881b4a1378 SHA512 bfa2dadfb7f91455b97b9e52e2531e67344c7f146d01daa422a4f5cdda81c33fe7095df0399cbf0ac126d4829b3edd5fb632c3631d21b63a4a3e516dc287b021 +EBUILD apache-archiva-2.2.5.ebuild 1614 BLAKE2B 04b7e000ec0ba1d17392b42320906cd95b13cf1c249656a2ba80ce9023afa8eb141238f9090b950e0b3c85b5bde7e683016061d365de2ca7f99e51952424e46a SHA512 934448631e6c6293311ef90c9f3cf19c9bcae15c5aceab4f65a8c289c1e0109cac389ea9bb95e294d9a14e1d8109f285abced565eb9326ed63148bf7a247fd35 diff --git a/dev-java/apache-archiva/apache-archiva-2.2.3.ebuild b/dev-java/apache-archiva/apache-archiva-2.2.3.ebuild deleted file mode 100644 index 99f79c9..0000000 --- a/dev-java/apache-archiva/apache-archiva-2.2.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 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/apache-archiva-2.2.4.ebuild b/dev-java/apache-archiva/apache-archiva-2.2.4.ebuild deleted file mode 100644 index 0f3f59c..0000000 --- a/dev-java/apache-archiva/apache-archiva-2.2.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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/apache-archiva-2.2.5.ebuild b/dev-java/apache-archiva/apache-archiva-2.2.5.ebuild new file mode 100644 index 0000000..4c89e9c --- /dev/null +++ b/dev-java/apache-archiva/apache-archiva-2.2.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=7 + +inherit java-pkg-2 + +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" + +DEPEND=" + acct-group/archiva + acct-user/archiva + mysql? ( dev-java/jdbc-mysql ) + app-arch/unzip + >=virtual/jre-1.7 + " + +RDEPEND=" + ${DEPEND} + " + +EANT_BUILD_TARGET="" +EANT_DOC_TARGET="" +ARCHBASE="/var/lib/${PN}" + +src_prepare() { + default + 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} +}