gentoo new year resync : 01.01.2021

4 files changed, 51 insertions, 48 deletions

diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 72c9cf128e23..3ff85689d633 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -1,6 +1,7 @@
+AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718a293cda0e0106ee0f96219d7183542cd7a363ae2b7cddcb85026a14cf60f9870247d8024822e8ebb57f99c956955e84 SHA512 4a80085b4da8df37bc8577d598f0966be402be77fed26f7d59e47c2c5836c45e0fba83bf00dc5b5e52be53e54eaa670364244f5405cf52653f41904347987523
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
 DIST sigh-1607.1.2.tar.gz 57662 BLAKE2B 288430b3016483340f7bb6c69060f6c2f38efee525b45d505e965c12e84c66d241d0a90c8a3f55e0b9bf801d8686ee1d2fa5eb03afad4795df620e594468afd9 SHA512 410883b55072b6476fc454440cf5f0e048587853a5095fddd7870b0efb5eca82e257f34ddef821f1a1968e1859207e7972e645922675fddaa2bf05b314bf5f60
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
 EBUILD sigh-1607.1.2.ebuild 824 BLAKE2B 450f88ec31ccb9904bf61d019b70a9dfde190a5601420547d0229ea0bb5e7c21a26febe06f895cbe648fc729e5bac7771b6b45e8e2b2cd0d00e5fc7826f28789 SHA512 c53474a0a48bd3e3fc26874da3896bd2282de2b4a2365b69b6a1ec8eda87b6fb0592767899859dacb84d367cf06557c30c08c6f61f65fffb666b600cf9150203
-EBUILD sigh-1607.1.6.ebuild 824 BLAKE2B 7d304bf4be564a1cff6c28c15cfc795f14a4d8e333b69dcc3ec17ed12134cf268c32c529fc06939fd707c1a4d17d124bd7a3ef54db9596dbb5fd5fd9d5487e6c SHA512 9acaced78dddf9bd4060429fbad09fcf8c9d7f0711337a1cc0668c4cfc5d2586a82a4f84505040b2420dade826863bc50745f4fb0b21842c975d4c8b6b954dc7
+EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
 MISC metadata.xml 554 BLAKE2B a5d8c99d19476f1bb337117ec670d81fca6ec22198276eb2d81831c787652acbed6b4f2c895f337e78e54b7870fd13d34a55c4ba783fcc086b48ff6b341760f4 SHA512 756248356f113ab607ace3d3b4688f09d5e1d4e908bd65b1bbdedef9ed607cac6b458c43fd6db8abf21874e1a8e0bc04d0c5b480c29ea96ff559ffd2d1c65bf3
diff --git a/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch
new file mode 100644
index 000000000000..a76b102be147
--- /dev/null
+++ b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -28,14 +28,14 @@ namespace util {
+      * @param x A string literal
+      * @return A pointer to char
+      */
+-    auto ccp = [](const std::string &str) {
++    inline auto ccp = [](const std::string &str) {
+         return const_cast<char *> (str.c_str());
+     };
+ 
+     /*!
+      * @brief Data structure for each client connection
+      */
+-    auto mlfipriv = [](SMFICTX *ctx) {
++    inline auto mlfipriv = [](SMFICTX *ctx) {
+         return static_cast<mlt::Client *> (smfi_getpriv(ctx));
+     };
+ }  // namespace util
diff --git a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
new file mode 100644
index 000000000000..43bef3b3b138
--- /dev/null
+++ b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake
+
+DESCRIPTION="S/MIME signing milter"
+HOMEPAGE="https://signing-milter.org/"
+SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/sigh
+	acct-user/sigh
+	dev-libs/boost
+	dev-libs/openssl:0=
+	mail-filter/libmilter"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
diff --git a/mail-filter/sigh/sigh-1607.1.6.ebuild b/mail-filter/sigh/sigh-1607.1.6.ebuild
deleted file mode 100644
index b0d0ac055922..000000000000
--- a/mail-filter/sigh/sigh-1607.1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils user
-
-DESCRIPTION="S/MIME signing milter"
-HOMEPAGE="https://signing-milter.org/"
-SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="mail-filter/libmilter
-	dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.build AUTHORS LICENSE )
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	enewgroup sigh
-	enewuser sigh -1 -1 /var/lib/sigh sigh
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc "${DOCS[@]}"
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}