commit: d48464f3b2570aa750d5ef6557d556d29b165bda Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Sat Apr 21 03:56:37 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Sat Apr 21 04:12:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48464f3
app-admin/puppetdb: 5.2.2 bup, 5.2.1 stable with cleanup Package-Manager: Portage-2.3.27, Repoman-2.3.9 app-admin/puppetdb/Manifest | 3 +- app-admin/puppetdb/puppetdb-5.1.3.ebuild | 92 ---------------------- app-admin/puppetdb/puppetdb-5.1.4.ebuild | 92 ---------------------- app-admin/puppetdb/puppetdb-5.2.1.ebuild | 2 +- ...puppetdb-5.2.1.ebuild => puppetdb-5.2.2.ebuild} | 0 5 files changed, 2 insertions(+), 187 deletions(-) diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 69ea5a0b5ae..06ff4aba5d8 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,3 +1,2 @@ -DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0 -DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308 DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103 +DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456 diff --git a/app-admin/puppetdb/puppetdb-5.1.3.ebuild b/app-admin/puppetdb/puppetdb-5.1.3.ebuild deleted file mode 100644 index f9227ac7708..00000000000 --- a/app-admin/puppetdb/puppetdb-5.1.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib systemd user - -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="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "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" 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-5.1.4.ebuild b/app-admin/puppetdb/puppetdb-5.1.4.ebuild deleted file mode 100644 index e2e9e4db500..00000000000 --- a/app-admin/puppetdb/puppetdb-5.1.4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib systemd user - -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="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "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" 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-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.1.ebuild index 5c45e1c342f..e2e9e4db500 100644 --- a/app-admin/puppetdb/puppetdb-5.2.1.ebuild +++ b/app-admin/puppetdb/puppetdb-5.2.1.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="" # will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND+=">=virtual/jdk-1.7.0" DEPEND+="" diff --git a/app-admin/puppetdb/puppetdb-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.2.ebuild similarity index 100% copy from app-admin/puppetdb/puppetdb-5.2.1.ebuild copy to app-admin/puppetdb/puppetdb-5.2.2.ebuild