[gentoo-commits] repo/gentoo:master commit in: app-text/tabler/files/, app-text/tabler/

[gentoo-commits] repo/gentoo:master commit in: app-text/tabler/files/, app-text/tabler/

[Jeroen Roovers]

commit:     7e549ea5c9ac67bd3d7f0620ed36501a2e1fda44
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 12:26:47 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 17 12:27:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e549ea5

app-text/tabler: Fix building with CFLAGS=-fno-common

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://bugs.gentoo.org/706932
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 app-text/tabler/files/tabler-2-fno-common.patch | 22 ++++++++++++++++++++++
 app-text/tabler/tabler-2-r1.ebuild              | 16 ++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app-text/tabler/files/tabler-2-fno-common.patch b/app-text/tabler/files/tabler-2-fno-common.patch
new file mode 100644
index 00000000000..b334880e5ec
--- /dev/null
+++ b/app-text/tabler/files/tabler-2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/util.h
++++ b/util.h
+@@ -35,7 +35,7 @@
+ int digits(int n, int base);
+ char *replace_backslashed(char *string);
+ 
+-char *_strregtok_previous_end;
++extern char *_strregtok_previous_end;
+ char *strregtok(char *string, const regex_t *seperator);
+ 
+ #endif /* UTIL_H */
+--- a/util.c
++++ b/util.c
+@@ -32,6 +32,8 @@
+ #include "conf.h"
+ #include "util.h"
+ 
++char *_strregtok_previous_end;
++
+ /* replace_backslashed
+  *
+  * Replaces, within the given string, certain backslashed characters with the

diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild
index f727d216278..e39e7e2835a 100644
--- a/app-text/tabler/tabler-2-r1.ebuild
+++ b/app-text/tabler/tabler-2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A utility to create text art tables from delimited input"
 HOMEPAGE="https://sourceforge.net/projects/tabler/"
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+DOCS=(
+	AUTHORS ChangeLog README
+)