commit:     3585fb2af9f610f7d917f897e06dd1a2ea2ee93d
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Feb 14 10:32:39 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:32:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3585fb2a

app-text/crm114: Port to EAPI 7

Closes: https://bugs.gentoo.org/707278
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-text/crm114/crm114-20100106-r1.ebuild | 16 ++++++----------
 app-text/crm114/metadata.xml              | 27 ++++++++++++---------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/app-text/crm114/crm114-20100106-r1.ebuild 
b/app-text/crm114/crm114-20100106-r1.ebuild
index c141b5c7c51..5a800a9ab6e 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
 MY_P="${P}-BlameMichelson.src"
-
 DESCRIPTION="A powerful text processing tool, mainly used for spam filtering"
 HOMEPAGE="http://crm114.sourceforge.net/";
 SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz";
@@ -14,12 +13,11 @@ 
SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples mew mimencode nls normalizemime static test"
+IUSE="examples mew mimencode nls normalizemime test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-       static? ( dev-libs/tre[static-libs] )
-       !static? ( dev-libs/tre )
+       dev-libs/tre
        mew? ( app-emacs/mew )
        mimencode? ( net-mail/metamail )
        normalizemime? ( mail-filter/normalizemime )"
@@ -49,9 +47,7 @@ src_prepare() {
 src_compile() {
        # Restore GNU89 inline semantics to
        # emit external symbols, bug 571062
-       append-cflags -std=gnu89
-
-       use static && append-ldflags -static -static-libgcc
+       append-cflags -std=gnu89 -fcommon
 
        emake CC="$(tc-getCC)"
 }
@@ -77,5 +73,5 @@ src_install() {
 }
 
 pkg_postinst() {
-       elog "The spam-filter CRM files are installed in 
${EROOT%/}/usr/share/${PN}."
+       elog "The spam-filter CRM files are installed in 
${EROOT}/usr/share/${PN}."
 }

diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index e7411c45f7b..6948a216bce 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <use>
-    <flag name="mew">Add support for using the mewdecode mime decoder
-    (<pkg>app-emacs/mew</pkg>)</flag>
-    <flag name="mimencode">Add support for using the mimencode mime
-    (<pkg>net-mail/metamail</pkg>)</flag>
-    <flag name="normalizemime">Add support for using the normalizemime
-    (<pkg>mail-filter/normalizemime</pkg>)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">crm114</remote-id>
-  </upstream>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Shell Tools Project</name>
+       </maintainer>
+       <use>
+               <flag name="mew">Add support for using the mewdecode mime 
decoder (<pkg>app-emacs/mew</pkg>)</flag>
+               <flag name="mimencode">Add support for using the mimencode mime 
(<pkg>net-mail/metamail</pkg>)</flag>
+               <flag name="normalizemime">Add support for using the 
normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag>
+       </use>
+       <upstream>
+               <remote-id type="sourceforge">crm114</remote-id>
+       </upstream>
 </pkgmetadata>

Reply via email to