gentoo resync : 04.05.2018

4 files changed, 66 insertions, 48 deletions

diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 4d54d4efdf19..e599ef85b70a 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -1,10 +1,9 @@
 AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
-DIST dehydrated-0.3.1.tar.gz 71375 BLAKE2B 9ab014d0a4cc744081bd8aa134c460408da7f9936f1c41ef890bcebc70282fa61828620be3850cbb02f5b59b4e4fd32bdc41395340aa3673f906f154ca0877b9 SHA512 34b57edc6ab950c2c0163795ef45d6fa104dcf02978bbfa325da63f7d844176ecf20cb8d7604cfedc6b2f47d8c12ce1db5b37f532eda7fffa194b4603e4ee3b9
 DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738
 DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad
-EBUILD dehydrated-0.3.1.ebuild 527 BLAKE2B 7056d444f51071a33e9cceb697785bcdca60f493594cc7e5e230814a8276cc47b9efa4cdb7f58f7992bae031ae787a9e9f153f2453b6d76e3bdd2c0a0750e65c SHA512 33a13b923a48fdd5e78456f2bc1825dc858a175198af802ab4ff6fee35a3470cce6c2424eedba6970fe4611aba82c0c72983f7b6dc7e22410d58d7a0062b211e
+DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
 EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
-EBUILD dehydrated-0.4.0.ebuild 523 BLAKE2B 4d32728d01f30828247ae56db687f3da0b768c7c0c67e113af2a95fda3db905a87d8270a3380dc65fba0288d48b2f5bc8abb6b1b521a17748e64705043567344 SHA512 1be1cd3bf9e5f4c78b5506ab33c8189e73ddd9c322334c993a85247770d6c647aef5460a7f2aca55434b90effb0ceb8a3f6b4c19c42cd5a6edcca88793f56d17
 EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
+EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
 MISC metadata.xml 415 BLAKE2B 8d9bb04264444c4647ec70e1b95fa7acdad4fa8fd2fa05ebe2c34133b58c0b11f8c534e5649ce8a3a311008f6adc00d68e1229a7ee0fd4d7028d0fad969f26de SHA512 06c66b6a1e1b2378876bf3c1ed29dfd5915c189128e3723f46c07df6366888c6d5eb0a9c84c0387482fdec06d5c687b7f88ec0aec658859bb9c23ee82846e61b
diff --git a/app-crypt/dehydrated/dehydrated-0.3.1.ebuild b/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
deleted file mode 100644
index 9034d53551a7..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-shells/bash"
-
-src_install() {
-	dobin dehydrated
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-	default
-
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.4.0.ebuild b/app-crypt/dehydrated/dehydrated-0.4.0.ebuild
deleted file mode 100644
index 33ae0d078c0e..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-shells/bash"
-
-src_install() {
-	dobin "${PN}"
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-	default
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
new file mode 100644
index 000000000000..a04c83040fd4
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/cron"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	insinto "/etc/cron.d"
+	newins "${FILESDIR}"/cron "${PN}"
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}