From da6a52f691ef980bab92d003d5df8f463c623af8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Mar 2018 19:15:28 +0000 Subject: gentoo resync : 10.03.2018 --- app-admin/Manifest.gz | Bin 34734 -> 35073 bytes app-admin/bind_exporter/Manifest | 5 + .../bind_exporter-0.2.0_p20180307.ebuild | 59 ++++++++ app-admin/bind_exporter/files/bind_exporter.confd | 2 + app-admin/bind_exporter/files/bind_exporter.initd | 19 +++ app-admin/bind_exporter/metadata.xml | 11 ++ app-admin/equo/Manifest | 2 +- app-admin/equo/metadata.xml | 4 - app-admin/logrotate/Manifest | 3 + .../files/logrotate-3.14.0-ignore-hidden.patch | 14 ++ app-admin/logrotate/logrotate-3.14.0.ebuild | 98 ++++++++++++++ app-admin/matter/Manifest | 2 +- app-admin/matter/metadata.xml | 4 - app-admin/nginx-vts-exporter/Manifest | 5 + .../files/nginx-vts-exporter.confd | 2 + .../files/nginx-vts-exporter.initd | 19 +++ app-admin/nginx-vts-exporter/metadata.xml | 11 ++ .../nginx-vts-exporter-0.10.0.ebuild | 47 +++++++ app-admin/packagekit-base/Manifest | 2 +- app-admin/packagekit-base/metadata.xml | 4 - app-admin/packagekit-gtk/Manifest | 2 +- app-admin/packagekit-gtk/metadata.xml | 4 - app-admin/packagekit-qt/Manifest | 2 +- app-admin/packagekit-qt/metadata.xml | 4 - app-admin/packagekit/Manifest | 2 +- app-admin/packagekit/metadata.xml | 4 - app-admin/salt/Manifest | 9 +- app-admin/salt/salt-2016.11.8-r1.ebuild | 149 +++++++++++++++++++++ app-admin/salt/salt-2016.11.8.ebuild | 146 -------------------- app-admin/salt/salt-2016.11.9-r1.ebuild | 149 +++++++++++++++++++++ app-admin/salt/salt-2016.11.9.ebuild | 146 -------------------- app-admin/salt/salt-2017.7.2-r1.ebuild | 141 ------------------- app-admin/salt/salt-2017.7.2-r2.ebuild | 143 ++++++++++++++++++++ app-admin/salt/salt-2017.7.2.ebuild | 140 ------------------- app-admin/salt/salt-2017.7.4-r1.ebuild | 145 ++++++++++++++++++++ app-admin/salt/salt-2017.7.4.ebuild | 143 -------------------- app-admin/supernova/Manifest | 6 +- app-admin/supernova/metadata.xml | 8 +- app-admin/supernova/supernova-2.0.9.ebuild | 52 ------- app-admin/supernova/supernova-2.1.0.ebuild | 51 ------- 40 files changed, 898 insertions(+), 861 deletions(-) create mode 100644 app-admin/bind_exporter/Manifest create mode 100644 app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild create mode 100644 app-admin/bind_exporter/files/bind_exporter.confd create mode 100644 app-admin/bind_exporter/files/bind_exporter.initd create mode 100644 app-admin/bind_exporter/metadata.xml create mode 100644 app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch create mode 100644 app-admin/logrotate/logrotate-3.14.0.ebuild create mode 100644 app-admin/nginx-vts-exporter/Manifest create mode 100644 app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd create mode 100644 app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd create mode 100644 app-admin/nginx-vts-exporter/metadata.xml create mode 100644 app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild create mode 100644 app-admin/salt/salt-2016.11.8-r1.ebuild delete mode 100644 app-admin/salt/salt-2016.11.8.ebuild create mode 100644 app-admin/salt/salt-2016.11.9-r1.ebuild delete mode 100644 app-admin/salt/salt-2016.11.9.ebuild delete mode 100644 app-admin/salt/salt-2017.7.2-r1.ebuild create mode 100644 app-admin/salt/salt-2017.7.2-r2.ebuild delete mode 100644 app-admin/salt/salt-2017.7.2.ebuild create mode 100644 app-admin/salt/salt-2017.7.4-r1.ebuild delete mode 100644 app-admin/salt/salt-2017.7.4.ebuild delete mode 100644 app-admin/supernova/supernova-2.0.9.ebuild delete mode 100644 app-admin/supernova/supernova-2.1.0.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index ad35529963a8..40e6f758d3b6 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/bind_exporter/Manifest b/app-admin/bind_exporter/Manifest new file mode 100644 index 000000000000..942d8d5e4bc2 --- /dev/null +++ b/app-admin/bind_exporter/Manifest @@ -0,0 +1,5 @@ +AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c104144acea0a2489141d01e35f4899d53af1526fe0ca1ae760fef62c96a0b6849c8b8678b7693a53ac20f SHA512 54c5162993d488eecec2453b06b2cbedd5eb4599074cf43fda644e2faba4c35ad481840dbb8b05979bf1a0dcdff32edd9efa56bc779f264d81056793d1d00be0 +AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1 +DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d +EBUILD bind_exporter-0.2.0_p20180307.ebuild 1565 BLAKE2B 4ed446d4ef07c661013d29f6f5082ae01df0180864fd5367b022c36c1250e46093a58a46a61aa4935989b12cde5288bacc93ccabb35954560954b098b527b792 SHA512 317f04dc0afc7dc9f17a807e8a2f3e499832b83928e9550a0b22532fc3639706a662d3e35bfdde2ac02625d01c03fba75bf636d0e5c706d0972c499d1ec08d0d +MISC metadata.xml 336 BLAKE2B 5b39247fdfd604232cfc3025e79ef77b109e9751e5eb2221da402420058a2b54686030592b30f6337575e5d6fc7f4080b46afc133e06ca4c48408b15bfd550e9 SHA512 e66208ff143de58a4a947c7de9b1ef414211dfd68ef5d2b18529c5b23252941bb32208cd6747cd5892d01986eb4a872f96083ee8ca166d322d8bdcdbe998c7c1 diff --git a/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild b/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild new file mode 100644 index 000000000000..97396355dc6f --- /dev/null +++ b/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit user golang-build golang-vcs-snapshot + +EGO_PN="github.com/digitalocean/bind_exporter" +EXPORTER_COMMIT="38ef3a6caa68e8c42a08e72d51e90b00333e6894" +ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Elasticsearch stats exporter for Prometheus" +HOMEPAGE="https://github.com/digitalocean/bind_exporter" +SRC_URI="${ARCHIVE_URI}" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="dev-util/promu" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + default + sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die +} + +src_compile() { + pushd src/${EGO_PN} || die + mkdir -p bin || die + GOPATH="${S}" promu build -v --prefix bin || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin bin/${PN} + dodoc {README,CHANGELOG}.md + popd || die + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + elog "Make sure BIND was built with libxml2 support. You can check with the" + elog "following command: named -V | grep libxml2." + elog "Configure BIND to open a statistics channel. It's recommended to run" + elog "the bind_exporter next to BIND, so it's only necessary to open a port" + elog "locally." + elog "" + elog "statistics-channels {" + elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };" + elog "};" +} diff --git a/app-admin/bind_exporter/files/bind_exporter.confd b/app-admin/bind_exporter/files/bind_exporter.confd new file mode 100644 index 000000000000..e1cc826703e4 --- /dev/null +++ b/app-admin/bind_exporter/files/bind_exporter.confd @@ -0,0 +1,2 @@ +# arguments for prometheus bind exporter +command_args="" diff --git a/app-admin/bind_exporter/files/bind_exporter.initd b/app-admin/bind_exporter/files/bind_exporter.initd new file mode 100644 index 000000000000..1167b2430573 --- /dev/null +++ b/app-admin/bind_exporter/files/bind_exporter.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 2016-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Prometheus bind exporter" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +user=${user:-${RC_SVCNAME}} +group=${group:-${RC_SVCNAME}} + +command="/usr/bin/bind_exporter" +command_args="${command_args:-}" +command_background="true" +start_stop_daemon_args="--user ${user} --group ${group} \ + --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ + --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" + +depend() { + after net +} diff --git a/app-admin/bind_exporter/metadata.xml b/app-admin/bind_exporter/metadata.xml new file mode 100644 index 000000000000..202de383a4e7 --- /dev/null +++ b/app-admin/bind_exporter/metadata.xml @@ -0,0 +1,11 @@ + + + + + mrueg@gentoo.org + Manuel Rüger + + + digitalocean/bind_exporter + + diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest index 16ab379fff02..e1c884f95b91 100644 --- a/app-admin/equo/Manifest +++ b/app-admin/equo/Manifest @@ -1,3 +1,3 @@ DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e EBUILD equo-302.ebuild 937 BLAKE2B 3703b5d48d3744e05584c51e3ad961e436ebc0cd495d191645ddd898cfacfbb1038a6026f8e13af00072c1d3e3c223249af8adba1751c9f777b1f185024ce74b SHA512 4c9be7016d4a190812a8df5361ab3bea74a29b0a400275d7395c757867e6411c6915f723fca59a0ded43022407a61ec593487d9275f06b4b29d93c297902361b -MISC metadata.xml 359 BLAKE2B 7987fb2521bb8430b58406f7c8e23edf0d71f637202d58c924edaf68be47537cb34a7b505ef55ead988df3d5bfd435280965f11342ead07dd99330418e036e10 SHA512 b52ececf876369aa09bf3f332b5f11a457c6c61bc11af3541f55eb186c32bb844027b0d951744d21449f3386b896ee207fadcbc6b5da31885e55879bc2355201 +MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174 diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml index f6216f16666e..d396d1b7e5a1 100644 --- a/app-admin/equo/metadata.xml +++ b/app-admin/equo/metadata.xml @@ -5,8 +5,4 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index b4db77658497..62580396f993 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,5 +1,6 @@ AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71583625a0638b39c1f2d535396a88c205534353430d70fbb577093ab43bee4bec0325443cf3c233f5f28dcb20cb12 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589 +AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113 AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493 AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99 AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822 @@ -8,7 +9,9 @@ AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 +DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4 +EBUILD logrotate-3.14.0.ebuild 2525 BLAKE2B e4553d646d97e0153dd86bc7357089ab53852fe5d315b71964720463830a78fc7429915400c51112afb73562d82ed1c376d67c4c5694e02195b7248f2dd1a447 SHA512 74ddbacb17722995f34c7a55d6d4ccefd689401e34e81b123149d3798e1e6cfbcfcb7b9bd5aa9c71b6e0e88984eb5cfe79434ae90c594f82802a6ebb2bfdf685 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79 diff --git a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch new file mode 100644 index 000000000000..6745126259be --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch @@ -0,0 +1,14 @@ +diff -Nuar a/config.c b/config.c +--- a/config.c 2018-03-09 17:47:08.000000000 +0100 ++++ b/config.c 2018-03-09 19:47:42.274696766 +0100 +@@ -440,7 +440,9 @@ + int i; + + /* Check if fname is '.' or '..'; if so, return false */ +- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2]))) ++ /* Don't include 'hidden' files either; this breaks Gentoo ++ portage config file management http://bugs.gentoo.org/87683 */ ++ if (fname[0] == '.') + return 0; + + /* Check if fname is ending in a taboo-extension; if so, return false */ diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild new file mode 100644 index 000000000000..901ce887429d --- /dev/null +++ b/app-admin/logrotate/logrotate-3.14.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd + +DESCRIPTION="Rotates, compresses, and mails system logs" +HOMEPAGE="https://github.com/logrotate/logrotate" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="acl +cron selinux" + +CDEPEND=" + >=dev-libs/popt-1.5 + selinux? ( sys-libs/libselinux ) + acl? ( virtual/acl )" + +DEPEND="${CDEPEND} + >=sys-apps/sed-4" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-logrotate ) + cron? ( virtual/cron )" + +STATEFILE="/var/lib/misc/logrotate.status" +OLDSTATEFILE="/var/lib/logrotate.status" + +move_old_state_file() { + elog "logrotate state file is now located at ${STATEFILE}" + elog "See bug #357275" + if [[ -e "${OLDSTATEFILE}" ]] ; then + elog "Moving your current state file to new location: ${STATEFILE}" + mv -n "${OLDSTATEFILE}" "${STATEFILE}" + fi +} + +install_cron_file() { + exeinto /etc/cron.daily + newexe "${S}"/examples/logrotate.cron "${PN}" +} + +PATCHES=( + "${FILESDIR}/${P}-ignore-hidden.patch" +) + +src_prepare() { + sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die + eapply_user +} + +src_configure() { + econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}" +} + +src_test() { + emake test +} + +src_install() { + insinto /usr + dobin logrotate + doman logrotate.8 + dodoc ChangeLog.md examples/logrotate-default + + insinto /etc + doins "${FILESDIR}"/logrotate.conf + + use cron && install_cron_file + + systemd_dounit examples/logrotate.{service,timer} + systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf + + keepdir /etc/logrotate.d +} + +pkg_postinst() { + elog + elog "The ${PN} binary is now installed under /usr/bin. Please" + elog "update your links" + elog + move_old_state_file + elog "If you are running systemd you might need to run:" + elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf" + elog "in order to create the new location of the logrotate state file" + elog + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "If you wish to have logrotate e-mail you updates, please" + elog "emerge virtual/mailx and configure logrotate in" + elog "/etc/logrotate.conf appropriately" + elog + elog "Additionally, /etc/logrotate.conf may need to be modified" + elog "for your particular needs. See man logrotate for details." + fi +} diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest index 202a6d4daf97..69f8f243f0a4 100644 --- a/app-admin/matter/Manifest +++ b/app-admin/matter/Manifest @@ -1,3 +1,3 @@ DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e EBUILD matter-302.ebuild 903 BLAKE2B c1970417d8565c4d51b1aa6bc91e7e53a3303cbf0373a6f62aba3197b5796d19ea355d96b3d2c97923ed79976a2de4126560f9feeb3a6e39095248e6e7a9412b SHA512 5726e57bb3a94c9ca263a5be2aaf83ae2894f54b9a1f8958ceb286d13af609798f4928a498d6ade9f445d9554cbcf6d1449f303aa2c13f4e0e69058139f8c331 -MISC metadata.xml 424 BLAKE2B b4e80ffddba7b4646fb7c3df8b46698e54e1ad17e18766ee40f8da3cd0c6499e0e0f38baf2b35b4228953a1036221d6395322e7962c77991cebf7b12d085da3d SHA512 98c9bf0d8fecb4d914d83c6fe4b7be399e39f0504ad6311c68f0430c07f052df3e5948b79caa2a6c0480a55031b14c2888ee3f1c5cb47ec9e8668a6533dc93cc +MISC metadata.xml 316 BLAKE2B a4b75b27426512d6fdcc5c82017121dbbd1e2a3438ade9329957bdce4c54b1d6f4c3404c577f50cbfcf8d03c41187b9efab14189a169c655bc2f98a6f9e82495 SHA512 f4ba14f543d1d69eb89eb098013f40a1cd7d872525e7ad683a6e4f6d6f4bb9a96ed81adb32aad5011c33dfebe694e10e429440343c16ed5497f03a4515ccffe4 diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml index 211b61e3db75..975adc49c8bd 100644 --- a/app-admin/matter/metadata.xml +++ b/app-admin/matter/metadata.xml @@ -5,10 +5,6 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - Add Entropy support diff --git a/app-admin/nginx-vts-exporter/Manifest b/app-admin/nginx-vts-exporter/Manifest new file mode 100644 index 000000000000..1317f6d44c4e --- /dev/null +++ b/app-admin/nginx-vts-exporter/Manifest @@ -0,0 +1,5 @@ +AUX nginx-vts-exporter.confd 138 BLAKE2B 5276947629899f4e338324d7bbfcd7afadac604fbe9d0b9bc101fbbfc5af2bccc2d9968315abcf060932defb3a054885527dd058e6ff20594ddfb77fafc8d138 SHA512 2b41b8efdef35f4beaf8b991e77a7ccf76be55290f9ddfa1262f860dc3b57411bcd1a3332f23119d87e3f72640d23da28d9080df43902f711cb1d1bff838532f +AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae13410c9f04e0ee594874b0434fe6fc0bab029f9d5021e5ce41a67df622bd2d7dff1f014baf25deee07d3e65a22eed SHA512 75ed5cfb084022e86058e20a7daee0c9c0fed3ee68090818e6f9d9b92dd8aee86145267c6b5309ede12f0a5103f80b74c43fd2522015ec866217e927c16a3803 +DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c +EBUILD nginx-vts-exporter-0.10.0.ebuild 1120 BLAKE2B d1200212f0ae09284a27b18826a49d3a30e55334d7f55e48134d4d6cfb704fa27ec95f99c5e8d5ee8a5c40c5f92bada71092d6b2c1e5bccdd58ac5fc1452e274 SHA512 871899a662d4d6b4c3b36fcce440cdc5ef57abf36016b8d0f535b0fb3a3e78adc71aff16ffc314cc1ef99167324aa1230dfe423bab0ffab7def00650f28842c3 +MISC metadata.xml 336 BLAKE2B 1efba2e3d984ebbd079fe45c406fb14932d9eaf9275e25b62fd915c6e9216fe2af377808436f66a8f0e3167126c1dbd2667021e155906e1e880a03ab1397b9bd SHA512 4f84f5262f71494fe5edbc2e1ffd96213f856f317c732f8833a865fa8bd4ea8268b43134e5f0dbcb51f18c3d52203b9000fd7afd346c68d631c5c42d2237917f diff --git a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd new file mode 100644 index 000000000000..ae134353a235 --- /dev/null +++ b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd @@ -0,0 +1,2 @@ +# arguments for prometheus nginx virtual host traffic stats exporter +command_args="-nginx.scrape_uri=http://localhost/status/format/json" diff --git a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd new file mode 100644 index 000000000000..f61549b061d7 --- /dev/null +++ b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 2016-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Prometheus nginx virtual host traffic status exporter" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +user=${user:-${RC_SVCNAME}} +group=${group:-${RC_SVCNAME}} + +command="/usr/bin/nginx-vts-exporter" +command_args="${command_args:--nginx.scrape_uri=http://localhost/status/format/json}" +command_background="true" +start_stop_daemon_args="--user ${user} --group ${group} \ + --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ + --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" + +depend() { + after net +} diff --git a/app-admin/nginx-vts-exporter/metadata.xml b/app-admin/nginx-vts-exporter/metadata.xml new file mode 100644 index 000000000000..0baff3eb9512 --- /dev/null +++ b/app-admin/nginx-vts-exporter/metadata.xml @@ -0,0 +1,11 @@ + + + + + mrueg@gentoo.org + Manuel Rüger + + + hnlq715/nginx-vts-exporter + + diff --git a/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild b/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild new file mode 100644 index 000000000000..761f9630f63c --- /dev/null +++ b/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit user golang-build golang-vcs-snapshot + +EGO_PN="github.com/hnlq715/nginx-vts-exporter" +EXPORTER_COMMIT="f5b3491cd0a8cc2df7088470f2727b0ae39a2700" +ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus" +HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter" +SRC_URI="${ARCHIVE_URI}" +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND="dev-util/promu" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + default + sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die +} + +src_compile() { + pushd src/${EGO_PN} || die + mkdir -p bin || die + GOPATH="${S}" promu build -v --prefix bin || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin bin/${PN} + dodoc README.md + popd || die + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest index 2b788e354f92..80fdbae8a371 100644 --- a/app-admin/packagekit-base/Manifest +++ b/app-admin/packagekit-base/Manifest @@ -11,4 +11,4 @@ EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3 EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046 EBUILD packagekit-base-1.1.5-r2.ebuild 3769 BLAKE2B 0f492fd80c02c3e057d862061f39b058ea403d56c6f453f4d824b5df7b884a3c4996113419fee66c2fcaffd1403e4d86dc05e4bdafdf4ac7ea9483344daad4c9 SHA512 a750ec8210a7b052452b5f8cae6f5a21fd2123225a92ad610b757368123235c048f8022f0609971b092b038493538a078db0f00655dd159e830383a49bad7c90 EBUILD packagekit-base-1.1.7.ebuild 3600 BLAKE2B 4972be8607c5f37249007eaef0dbc37cc5063604fdc5ba7ef056ce3bf90b2518ea1011799365ced8c2396bdfa9d35d04d9ebe539ca342290b0cda30e83d1ab25 SHA512 6e8900312b7b0b8a5710433d92fad6a31448be49a6f219d4cb326bceaaad292fe2f028d6998e2a730c2f95d776af941592886dc38cfb0f3666e2601007b0aea1 -MISC metadata.xml 772 BLAKE2B e730d761ba28dd19864a0e34c6cc2fa11712d853f4a5abc05f5935d8091f4c7692735ff8e48f2bc1a6b985c1fd56ee8b6dddd072365b847b1d65d712d7c8dd89 SHA512 c6cd1b091c8da4a6b183de55f498a8ff0de459cf4c466715d10dd9bc654ae4d16f71736c26c5011412b9b0584e1b4df58a257eb55c0c7dea2c16cc99107e4248 +MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323 diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml index 82cc3319bac8..1036ab84868f 100644 --- a/app-admin/packagekit-base/metadata.xml +++ b/app-admin/packagekit-base/metadata.xml @@ -5,10 +5,6 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - gnome@gentoo.org Gentoo GNOME Desktop diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest index 6a0f07ae9b80..29525b741119 100644 --- a/app-admin/packagekit-gtk/Manifest +++ b/app-admin/packagekit-gtk/Manifest @@ -8,4 +8,4 @@ EBUILD packagekit-gtk-1.1.1.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae EBUILD packagekit-gtk-1.1.4.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e EBUILD packagekit-gtk-1.1.5.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e EBUILD packagekit-gtk-1.1.7.ebuild 1144 BLAKE2B 9f80f2b49dd5aa373c5198dfce9005d475259a0dc3842ceb8644a1170b27a3e95edd479a3feae96fe18673d463f88d6c32fa288fa1861b02c866148853c918e4 SHA512 468f8af2b8bf4b957b1f20f1ecec644ad36d3e1ed11a7ad841f4304bd9f66ec6a75b96bf935aab02844e5795b38127e23ba3ad36839cb097af7d1e7a9d4b67e2 -MISC metadata.xml 473 BLAKE2B f35c01c9b65f6b8b245d99d2c790e24df27583bbe5d82f41bbdb6ba2ec04e88c860ac1fa20cc86ab0380fdea3f279d8e8d796a905f806253ec67a9e74bb9ae9d SHA512 9f68f311e2ac50b05f30e6471276402e37309561e91824abbf7c24bb90a6cc909a8b18472341ed6da45d7982bc1f40f83898e47d5fa34d0857e9290ee7668639 +MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69 diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml index 8aab5e652f6b..66d2c6253543 100644 --- a/app-admin/packagekit-gtk/metadata.xml +++ b/app-admin/packagekit-gtk/metadata.xml @@ -5,10 +5,6 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - gnome@gentoo.org Gentoo GNOME Desktop diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest index 5233f3648023..872d7285ec6e 100644 --- a/app-admin/packagekit-qt/Manifest +++ b/app-admin/packagekit-qt/Manifest @@ -2,4 +2,4 @@ DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a EBUILD packagekit-qt-1.0.0.ebuild 571 BLAKE2B c727718b29d9defc285a177eb4eb1c3d4f31d9f153e636efbd1d9d7508b47602d425ea75ad4061b1c8ed7107c1af6a644065564764093497d456327fe03110ee SHA512 e55e2dae9a6bd9a40526eb451f1b2b0a4df166bed31a839e6857311bf25f9a5fdda748935aed51050dd4c956af35a9f70212de63f5abf0cef0f17d66f00994e7 EBUILD packagekit-qt-1.0.1.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544 -MISC metadata.xml 551 BLAKE2B 2a6881f45a4f44ea61556de150346743992c914d56673e51160a8fbf708a0cd22dfd3c0a89b272122a003af150e6f8311e7d472bd9696770481fe0c1e93778d3 SHA512 bebe5e7a9945182bf7650f762be1cd319a8ecd17a0f8822ad584ff67c363f87125e5f08b3f8a9934875f28c732451a6d9ac84b9b3b57284b799c76fa73415b70 +MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093 diff --git a/app-admin/packagekit-qt/metadata.xml b/app-admin/packagekit-qt/metadata.xml index 76dcb8cd391a..3056c869ef34 100644 --- a/app-admin/packagekit-qt/metadata.xml +++ b/app-admin/packagekit-qt/metadata.xml @@ -5,10 +5,6 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - johu@gentoo.org Johannes Huber diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest index ce0fd7ad21d2..b31162c08bd2 100644 --- a/app-admin/packagekit/Manifest +++ b/app-admin/packagekit/Manifest @@ -3,4 +3,4 @@ EBUILD packagekit-1.1.1.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905 EBUILD packagekit-1.1.4.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905c1d93116e5630ca8c938328a60fc497476ad922623181533058515df2d05aa714d539d1300e637ea7010ec76ae8 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 EBUILD packagekit-1.1.5.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f EBUILD packagekit-1.1.7.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f -MISC metadata.xml 473 BLAKE2B f35c01c9b65f6b8b245d99d2c790e24df27583bbe5d82f41bbdb6ba2ec04e88c860ac1fa20cc86ab0380fdea3f279d8e8d796a905f806253ec67a9e74bb9ae9d SHA512 9f68f311e2ac50b05f30e6471276402e37309561e91824abbf7c24bb90a6cc909a8b18472341ed6da45d7982bc1f40f83898e47d5fa34d0857e9290ee7668639 +MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69 diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml index 8aab5e652f6b..66d2c6253543 100644 --- a/app-admin/packagekit/metadata.xml +++ b/app-admin/packagekit/metadata.xml @@ -5,10 +5,6 @@ mudler@gentoo.org Ettore Di Giacinto - - lxnay@gentoo.org - Fabio Erculiani - gnome@gentoo.org Gentoo GNOME Desktop diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 21f133737c9d..07ed3f9378ff 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -35,9 +35,8 @@ DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7 DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73 -EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 -EBUILD salt-2016.11.9.ebuild 4623 BLAKE2B 921ffcd61f97d98f56c6335cd4d4f87de25fe653644736ebf4ed1c214410c395fe4462fadbbcb58ef9b8716cc5bc34bb6d0becfcb17f9f246fecee8e2ab99149 SHA512 c4f1e95a633b29d711388ccd8609a8e27cdfcac908e0686ba98e9f4b94fc6c8badd11e8d684dab70aea73730409d059e1a8757aa7605f46f18e423545c99f4bf -EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603 -EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b -EBUILD salt-2017.7.4.ebuild 4466 BLAKE2B a8364703700e39e57f6b3edfee662393b6cfa0ac5a2ed305ecdd1e4e5273389f734623bbaae847f9ec336e8343902ecffe99f5e47c7a72e8c5ee695275bfddbe SHA512 d19fd10da3d7e2a2d5bc6c4185f3cd9726aa804df44ab40ff1670a103df15a8abb08d1f87b3fa853090aad31e39aec0f64f3a7443846871b4696ab69f9392d21 +EBUILD salt-2016.11.8-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f +EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f +EBUILD salt-2017.7.2-r2.ebuild 4472 BLAKE2B 53e91df5216b70e39b0fb37d607f912f781cc784e95ad70c4ffd52dbb6d335121ea84ed77dc0067f7777362a623773332959731420db6bd45e31ff5ee7d0e852 SHA512 a77a72b91b62c7ec615c79a1634cd869d881b9fffe34d3fd5965a1a21e59a87b76298623c89f65b1e4afb590f7f75de4b20cdc47ae29fcb022d427e9ca03dd82 +EBUILD salt-2017.7.4-r1.ebuild 4557 BLAKE2B 23de9b90ef9c9727da785ac5a9dc5589dc00a4908132359282cdb952f0aa9a06f5f4130640f6f64a0c3ba47d644b980a56d59a6f95e62c3bf315db86c2f04ca7 SHA512 cf9cb9ffe381bf39c4fffa0306fd2449c1c03cf023bff256fcda365b9fdf7c51c9826ce81f83646bedae1f2b8c0b5eb5e17f8d011e02bfbb7694c778f365b95b MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 diff --git a/app-admin/salt/salt-2016.11.8-r1.ebuild b/app-admin/salt/salt-2016.11.8-r1.ebuild new file mode 100644 index 000000000000..9376c0488269 --- /dev/null +++ b/app-admin/salt/salt-2016.11.8-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://saltstack.com/community/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" + "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" + "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" +) + +python_prepare() { + # this test fails because it trys to "pip install distribute" + rm tests/unit/{modules,states}/zcbuildout_test.py \ + tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die + + # https://github.com/saltstack/salt/issues/39095 + rm tests/unit/utils/parsers_test.py + + # apparently libcloud does not know about this? + rm tests/unit/cloud/clouds/dimensiondata_test.py || die + + # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" + rm tests/unit/cloud/clouds/gce_test.py || die + + # allow the use of the renamed msgpack + sed -i '/^msgpack/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -dup /tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}"; } + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-admin/salt/salt-2016.11.8.ebuild b/app-admin/salt/salt-2016.11.8.ebuild deleted file mode 100644 index e68adad560f9..000000000000 --- a/app-admin/salt/salt-2016.11.8.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2016.11.9-r1.ebuild b/app-admin/salt/salt-2016.11.9-r1.ebuild new file mode 100644 index 000000000000..9376c0488269 --- /dev/null +++ b/app-admin/salt/salt-2016.11.9-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://saltstack.com/community/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" + "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" + "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" +) + +python_prepare() { + # this test fails because it trys to "pip install distribute" + rm tests/unit/{modules,states}/zcbuildout_test.py \ + tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die + + # https://github.com/saltstack/salt/issues/39095 + rm tests/unit/utils/parsers_test.py + + # apparently libcloud does not know about this? + rm tests/unit/cloud/clouds/dimensiondata_test.py || die + + # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" + rm tests/unit/cloud/clouds/gce_test.py || die + + # allow the use of the renamed msgpack + sed -i '/^msgpack/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -dup /tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}"; } + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-admin/salt/salt-2016.11.9.ebuild b/app-admin/salt/salt-2016.11.9.ebuild deleted file mode 100644 index c1e250c48bfb..000000000000 --- a/app-admin/salt/salt-2016.11.9.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2017.7.2-r1.ebuild b/app-admin/salt/salt-2017.7.2-r1.ebuild deleted file mode 100644 index 88f1dd3f8114..000000000000 --- a/app-admin/salt/salt-2017.7.2-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="http://saltstack.org/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-salt[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/salt-2017.7.2-fix_disk_format.patch" -) - -python_prepare() { - rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - - ( - cleanup() { - rm -f "${tempdir}" - rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2017.7.2-r2.ebuild b/app-admin/salt/salt-2017.7.2-r2.ebuild new file mode 100644 index 000000000000..19e8be7ea3d4 --- /dev/null +++ b/app-admin/salt/salt-2017.7.2-r2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="http://saltstack.org/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-salt[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/salt-2017.7.2-fix_disk_format.patch" +) + +python_prepare() { + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die + rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die + rm tests/unit/states/test_boto_vpc.py || die + # allow the use of the renamed msgpack + sed -i '/^msgpack/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + + ( + cleanup() { + rm -f "${tempdir}" + rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-admin/salt/salt-2017.7.2.ebuild b/app-admin/salt/salt-2017.7.2.ebuild deleted file mode 100644 index 48c9f23243af..000000000000 --- a/app-admin/salt/salt-2017.7.2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="http://saltstack.org/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-salt[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" -) - -python_prepare() { - rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - - ( - cleanup() { - rm -f "${tempdir}" - rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2017.7.4-r1.ebuild b/app-admin/salt/salt-2017.7.4-r1.ebuild new file mode 100644 index 000000000000..0060f77cfd57 --- /dev/null +++ b/app-admin/salt/salt-2017.7.4-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="http://saltstack.org/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + =dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-salt[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2017.7.3-tests.patch" +) + +python_prepare() { + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die + rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/unit/modules/test_kubernetes.py || die + # allow the use of the renamed msgpack + sed -i '/^msgpack/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + + ( + cleanup() { + rm -f "${tempdir}" + rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-admin/salt/salt-2017.7.4.ebuild b/app-admin/salt/salt-2017.7.4.ebuild deleted file mode 100644 index 6dd2b29b1855..000000000000 --- a/app-admin/salt/salt-2017.7.4.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="http://saltstack.org/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - =dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-salt[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2017.7.3-tests.patch" -) - -python_prepare() { - rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/unit/modules/test_kubernetes.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - - ( - cleanup() { - rm -f "${tempdir}" - rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die - } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest index 8dc3aab65869..9bebbb0df614 100644 --- a/app-admin/supernova/Manifest +++ b/app-admin/supernova/Manifest @@ -1,7 +1,3 @@ -DIST supernova-2.0.9.tar.gz 22877 BLAKE2B 02bb230c8392946bf43faedb19d8b5660a144f07b9ee4c3638f3211dcd25d2336c6a032a9c0b1006cc01ab61ea9d8e3769704ba034b676f0b115b32b39855b20 SHA512 8270f871efcf7c8741078e4658dd8413796a14bd9eb43514beb8b120462db757a5324c5c3c9e4988d8725ec9b903e7743c6ae336dd5f73536e1e0df456ba54a9 -DIST supernova-2.1.0.tar.gz 23196 BLAKE2B 70d41d42c8504075657aa869c666d6e8ec079c62535276a12e49687a139eec54d068ced7ee1f2bc18c8da708ec50edb11e2bdcdf324a36b9c309c3e134887e6d SHA512 fa4f6b3f0a3b5a19c309b507ce8c356a929c8a8cf805c45d58a8f4c1bc36f508a0d04477570cf79e7660e94d803df8a02e67206465e75eb3452e43cb6ca186aa DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063 -EBUILD supernova-2.0.9.ebuild 1255 BLAKE2B 616e906e2e6c513b8d5882b4ce209200472d53f9c237718c04be9560b880557f5d3163bd5d14320cb424eb3a8e6538560567b894214ddecf3718c42f21ed2830 SHA512 cc96e4e331c6deb1a714973d93f64d418804756fd80d27a51cbb0775d292504f96a47d038544e87bac3485f8f36cc3e2fd2a858430c22fe494b2881ec64cfcdd -EBUILD supernova-2.1.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d EBUILD supernova-2.2.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d -MISC metadata.xml 392 BLAKE2B 5b23db21278557cf725aa717947b5a49712c7524303d7762493baee979c6775b2551b6d677bdbb225305cc36d1dc20e703ef842c462f1117fd36e5c47706a216 SHA512 6dd5869a5d45116b13cffd648948305c17b0248bee5804feff4062064bf662c5e879731f5fc526320a5a28d49d290e961229085dc4e450d3a4cdf1f5fda8f158 +MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834 diff --git a/app-admin/supernova/metadata.xml b/app-admin/supernova/metadata.xml index a617f5068968..a227b41365cc 100644 --- a/app-admin/supernova/metadata.xml +++ b/app-admin/supernova/metadata.xml @@ -2,8 +2,12 @@ - alunduil@gentoo.org - Alex Brandt + prometheanfire@gentoo.org + Matthew Thode + + + openstack@gentoo.org + Openstack rackerhacker/supernova diff --git a/app-admin/supernova/supernova-2.0.9.ebuild b/app-admin/supernova/supernova-2.0.9.ebuild deleted file mode 100644 index 1ddd3b07ee06..000000000000 --- a/app-admin/supernova/supernova-2.0.9.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="novaclient wrapper for multiple nova environments" -HOMEPAGE="https://github.com/rackerhacker/supernova" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc examples test" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" -RDEPEND=" - ${CDEPEND} - dev-python/click[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}] - dev-python/python-novaclient[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -python_compile_all() { - if use doc; then - mkdocs build || die "docs failed to build" - fi -} - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}"/lib || die - py.test || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( site/. ) - use examples && local EXAMPLES=( example_configs/. ) - - distutils-r1_python_install_all - - newbashcomp contrib/${PN}-completion.bash ${PN} -} diff --git a/app-admin/supernova/supernova-2.1.0.ebuild b/app-admin/supernova/supernova-2.1.0.ebuild deleted file mode 100644 index 148043720999..000000000000 --- a/app-admin/supernova/supernova-2.1.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="novaclient wrapper for multiple nova environments" -HOMEPAGE="https://github.com/rackerhacker/supernova" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc examples test" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" -RDEPEND=" - ${CDEPEND} - dev-python/click[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}] - dev-python/python-novaclient[${PYTHON_USEDEP}] - dev-python/rackspace-novaclient[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -python_compile_all() { - if use doc; then - mkdocs build || die "docs failed to build" - fi -} - -python_test() { - py.test || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( site/. ) - use examples && local EXAMPLES=( example_configs/. ) - - distutils-r1_python_install_all - - newbashcomp contrib/${PN}-completion.bash ${PN} -} -- cgit v1.2.3