From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/sigh/files/, mail-filter/sigh/
Date: Mon, 28 Dec 2020 14:48:27 +0000 (UTC) [thread overview]
Message-ID: <1609166874.25f97ee3dd1be9dce10b20184754fcc25c2f4982.soap@gentoo> (raw)
commit: 25f97ee3dd1be9dce10b20184754fcc25c2f4982
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:47:54 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:47:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f97ee3
mail-filter/sigh: Port to EAPI 7 and GLEP 81
Closes: https://bugs.gentoo.org/721996
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../sigh/files/sigh-1607.1.6-fno-common.patch | 19 +++++++++
mail-filter/sigh/sigh-1607.1.6-r1.ebuild | 30 ++++++++++++++
mail-filter/sigh/sigh-1607.1.6.ebuild | 47 ----------------------
3 files changed, 49 insertions(+), 47 deletions(-)
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 00000000000..a76b102be14
--- /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 00000000000..43bef3b3b13
--- /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 b0d0ac05592..00000000000
--- 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}
-}
next reply other threads:[~2020-12-28 14:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 14:48 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-29 22:20 [gentoo-commits] repo/gentoo:master commit in: mail-filter/sigh/files/, mail-filter/sigh/ Marc Schiffbauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609166874.25f97ee3dd1be9dce10b20184754fcc25c2f4982.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox