From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F93113835B for ; Fri, 28 May 2021 15:52:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62CDEE0A76; Fri, 28 May 2021 15:52:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32C3EE0A76 for ; Fri, 28 May 2021 15:52:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1591D340DE9 for ; Fri, 28 May 2021 15:52:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8843379A for ; Fri, 28 May 2021 15:52:04 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1622217118.4d386b66df7746f67c2e0c21ce5e42c5ea702927.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppetdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppetdb/Manifest app-admin/puppetdb/puppetdb-7.0.1.ebuild app-admin/puppetdb/puppetdb-7.3.1.ebuild X-VCS-Directories: app-admin/puppetdb/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 4d386b66df7746f67c2e0c21ce5e42c5ea702927 X-VCS-Branch: master Date: Fri, 28 May 2021 15:52:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a0fc2854-2e39-4e6e-8b02-36e821a3dba5 X-Archives-Hash: efff8a06b5296a701b3995e9df2e5b14 commit: 4d386b66df7746f67c2e0c21ce5e42c5ea702927 Author: Matthew Thode gentoo org> AuthorDate: Fri May 28 15:49:48 2021 +0000 Commit: Matthew Thode gentoo org> CommitDate: Fri May 28 15:51:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d386b66 app-admin/puppetdb: 7.3.1 stable amd64 / x86 with 7.0.1 cleanup Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Matthew Thode gentoo.org> app-admin/puppetdb/Manifest | 1 - app-admin/puppetdb/puppetdb-7.0.1.ebuild | 87 -------------------------------- app-admin/puppetdb/puppetdb-7.3.1.ebuild | 2 +- 3 files changed, 1 insertion(+), 89 deletions(-) diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index f3b46df84c7..4233fc47581 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,4 +1,3 @@ DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9 -DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d DIST puppetdb-7.2.0.tar.gz 47126306 BLAKE2B aa9213b3a6e7438f7f70c73d14d5a264fe8d45f41d15a21eb457f4264599d4ffc02339b1109aeba713b7afb09780a7ce66786fc03d27e49cd0786cc81042d36c SHA512 872ebc8caf5c9c2f9509f603809c942ef8b3fc0bab96dd39a51558cae88b07318fadb81aa2f8477d231c7caac513b304c6aa178deb3aa56a4a5f7a9f1917d90c DIST puppetdb-7.3.1.tar.gz 47173502 BLAKE2B e9f57300585cb556f75975c4a20c35c0789816a9f141a3979348200e28e24352870109fc3597a44d075b490b9da2308e963a24e64e37552f7124205beb87aae8 SHA512 aa15aebec2f7a24a2da125078017baabe054d741ee651b91219074a274400ae54862c38d3e253e904fe26165f4fc34fb3eb021937aa9ee4304b7e83bc3f5d0dc diff --git a/app-admin/puppetdb/puppetdb-7.0.1.ebuild b/app-admin/puppetdb/puppetdb-7.0.1.ebuild deleted file mode 100644 index 06b2986213b..00000000000 --- a/app-admin/puppetdb/puppetdb-7.0.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd tmpfiles - -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 - newtmpfiles 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.3.1.ebuild b/app-admin/puppetdb/puppetdb-7.3.1.ebuild index 78bd75a0264..06b2986213b 100644 --- a/app-admin/puppetdb/puppetdb-7.3.1.ebuild +++ b/app-admin/puppetdb/puppetdb-7.3.1.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