commit: 5d447a12c61aca979564b05b1cc43d50a9794336 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Jun 2 00:13:05 2020 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Jun 2 00:13:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d447a12
app-admin/puppetdb: 6.10.0 stable amd64/x86 with cleanup Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-admin/puppetdb/Manifest | 1 - app-admin/puppetdb/puppetdb-6.10.0.ebuild | 2 +- app-admin/puppetdb/puppetdb-6.9.1.ebuild | 87 ------------------------------- 3 files changed, 1 insertion(+), 89 deletions(-) diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index c5cdb8121f4..9ce91c0915a 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,2 +1 @@ DIST puppetdb-6.10.0.tar.gz 44394062 BLAKE2B fee0a908518bb89e9dda1d4e8683953d305c70fc0e70a856871b0916a4ef610942db1a8f24f59b7704dde3da67ffc2bb1b25cc9254f3efa3c24408bc3a336cb8 SHA512 12ca864a5a515baf4510bbfcab23b686b66cce460908c103c96fd51ad2898f2c5a42b9d0d0c707977267cc31a517b454893ad85982b31176e1ebfa79d7f948ee -DIST puppetdb-6.9.1.tar.gz 44274016 BLAKE2B eaf1fe6ee88d2f4a1d147032db017eefd95a3edaba6fe5b114be6ac4ce37584ee58fa96c34fdac97b9b8b1aecd8abc982107024d2155bb78781d1c2c2f2112e1 SHA512 8db39c7571af597be2cff7e21ec5818d422f83f1c3188896e8eb9391e52d0f4bb1f85358a25998db599e9db2b93baec60415a43b519be3da600a9c1de0f073bc diff --git a/app-admin/puppetdb/puppetdb-6.10.0.ebuild b/app-admin/puppetdb/puppetdb-6.10.0.ebuild index 5a7a32bcf49..784885ac312 100644 --- a/app-admin/puppetdb/puppetdb-6.10.0.ebuild +++ b/app-admin/puppetdb/puppetdb-6.10.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"; LICENSE="Apache-2.0" SLOT="0" IUSE="" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND+=">=virtual/jdk-1.8.0" DEPEND+="acct-user/puppetdb diff --git a/app-admin/puppetdb/puppetdb-6.9.1.ebuild b/app-admin/puppetdb/puppetdb-6.9.1.ebuild deleted file mode 100644 index 784885ac312..00000000000 --- a/app-admin/puppetdb/puppetdb-6.9.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"; -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.8.0" -DEPEND+="acct-user/puppetdb - acct-group/puppetdb" - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -}
