commit: b4e3a44fec7090faef9e35238f3bc9fbb41cceef Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Jan 19 17:10:55 2021 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 17:14:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e3a44f
app-admin/puppetdb: 7.0.1 stable amd64/x86 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-admin/puppetdb/Manifest | 1 - app-admin/puppetdb/puppetdb-6.12.0.ebuild | 87 ------------------------------- app-admin/puppetdb/puppetdb-7.0.1.ebuild | 4 +- 3 files changed, 2 insertions(+), 90 deletions(-) diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 440a78b7145..061be1d5976 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,3 +1,2 @@ -DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9 DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d diff --git a/app-admin/puppetdb/puppetdb-6.12.0.ebuild b/app-admin/puppetdb/puppetdb-6.12.0.ebuild deleted file mode 100644 index 784885ac312..00000000000 --- a/app-admin/puppetdb/puppetdb-6.12.0.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'" -} diff --git a/app-admin/puppetdb/puppetdb-7.0.1.ebuild b/app-admin/puppetdb/puppetdb-7.0.1.ebuild index 5a7a32bcf49..32de81f2a2e 100644 --- a/app-admin/puppetdb/puppetdb-7.0.1.ebuild +++ b/app-admin/puppetdb/puppetdb-7.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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
