[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/, sys-apps/heirloom-tools/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/, sys-apps/heirloom-tools/files/

[Jeroen Roovers]

commit:     94132bac4609f09fab26fa59b9769a2bda95034f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 15:10:31 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 15:10:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94132bac

sys-apps/heirloom-tools: Fix many bugs (also bug #649788).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/heirloom-tools-070715-major.patch        | 25 ++++++++++
 .../heirloom-tools/heirloom-tools-070715-r1.ebuild | 57 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
new file mode 100644
index 00000000000..82d32315d81
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
@@ -0,0 +1,25 @@
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -91,9 +91,9 @@
+ #include <sfile.h>
+ #include <atoll.h>
+ 
+-#ifdef	_AIX
++#if defined (_AIX) || defined (__GLIBC__)
+ #include <sys/sysmacros.h>
+-#endif	/* _AIX */
++#endif	/* _AIX || __GLIBC__ */
+ 
+ #ifndef	major
+ #include <sys/mkdev.h>
+--- a/ls/ls.c
++++ b/ls/ls.c
+@@ -119,7 +119,7 @@
+ #include <termcap.h>
+ #endif	/* USE_TERMCAP */
+ 
+-#ifdef	_AIX
++#if defined (_AIX) || defined (__GLIBC__)
+ #include <sys/sysmacros.h>
+ #endif
+ 

diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
new file mode 100644
index 00000000000..9d55edab0b4
--- /dev/null
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Heirloom toolchest - original Unix tools"
+HOMEPAGE="http://heirloom.sourceforge.net/tools.html"
+SRC_URI="http://downloads.sourceforge.net/project/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
+
+LICENSE="CDDL GPL-2 LGPL-2.1 9base ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/ed
+	virtual/pkgconfig
+"
+S="${WORKDIR}/heirloom-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${P}-major.patch
+)
+
+# slightly broken
+RESTRICT="test"
+
+src_prepare() {
+	find . -name '*.c' -exec sed -i -e 's|#ifndef[[:space:]]*major|#include <sys/sysmacros.h>\n#if 0|g' {} + || die
+
+	default
+}
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBZ=-lz
+}
+
+src_install() {
+	# we don't want to strip here, so use "true" as noop
+	emake STRIP="true" ROOT="${D}" -j1 install
+}
+
+pkg_postinst() {
+	elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
+	elog "to enable using the apps of heirloom toolchest by default."
+	elog "Man pages are installed in /usr/share/man/5man/"
+	elog "You may need to set \$MANPATH to access them."
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/, sys-apps/heirloom-tools/files/

[David Seifert]

commit:     e1b706046abcfd31c9ecd1e950a185c5cbf6068d
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Mar 26 09:21:56 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 09:21:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b70604

sys-apps/heirloom-tools: fix build with -fno-common

Closes: https://bugs.gentoo.org/707218
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/heirloom-tools-070715-gcc-10.patch       | 105 +++++++++++++++++++++
 .../heirloom-tools/heirloom-tools-070715-r1.ebuild |   1 +
 2 files changed, 106 insertions(+)

diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
new file mode 100644
index 00000000000..38de3216085
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
@@ -0,0 +1,105 @@
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -748,6 +748,7 @@ static struct stat	globst;
+  */
+ #define			SANELIMIT	0177777
+ 
++enum fmttype            fmttype;
+ char			*progname;	/* argv[0] to main() */
+ static struct dslot	*devices;	/* devices table */
+ static struct dslot	*markeddevs;	/* unusable device numbers */
+@@ -826,6 +827,9 @@ static int		compressed_bar;	/* this is a compressed bar archive */
+ static int		formatforced;	/* -k -i -Hfmt forces a format */
+ static long long	lineno;		/* input line number */
+ 
++enum pax                pax;
++enum pax_preserve       pax_preserve;
++
+ int			pax_dflag;	/* directory matches only itself */
+ int			pax_kflag;	/* do not overwrite files */
+ int			pax_nflag;	/* select first archive member only */
+--- a/cpio/cpio.h
++++ b/cpio/cpio.h
+@@ -31,7 +31,7 @@
+ #include <sys/stat.h>
+ #include <inttypes.h>
+ 
+-enum	{
++enum fmttype {
+ 	FMT_NONE	= 00000000,	/* no format chosen yet */
+ 
+ 	TYP_PAX		= 00000010,	/* uses pax-like extended headers */
+@@ -70,7 +70,8 @@ enum	{
+ 	FMT_BAR		= 00400001,	/* bar format type */
+ 
+ 	FMT_ZIP		= 01000000	/* zip format */
+-} fmttype;
++};
++extern enum fmttype fmttype;
+ 
+ /*
+  * Zip compression method.
+@@ -173,11 +174,12 @@ extern int		printsev;
+ extern char		*progname;
+ extern struct glist	*patterns;
+ 
+-enum {			/* type of pax command this is */
++enum pax {			/* type of pax command this is */
+ 	PAX_TYPE_CPIO		= 0,	/* not a pax command */
+ 	PAX_TYPE_PAX1992	= 1,	/* POSIX.2 pax command */
+ 	PAX_TYPE_PAX2001	= 2	/* POSIX.1-2001 pax command */
+-} pax;
++};
++extern enum pax         pax;
+ extern int		pax_dflag;
+ extern int		pax_kflag;
+ extern int		pax_nflag;
+@@ -185,14 +187,15 @@ extern int		pax_sflag;
+ extern int		pax_uflag;
+ extern int		pax_Xflag;
+ 
+-enum {
++enum pax_preserve {
+ 	PAX_P_NONE	= 0000,
+ 	PAX_P_ATIME	= 0001,
+ 	PAX_P_MTIME	= 0004,
+ 	PAX_P_OWNER	= 0010,
+ 	PAX_P_MODE	= 0020,
+ 	PAX_P_EVERY	= 0400
+-} pax_preserve;
++};
++extern enum pax_preserve pax_preserve;
+ 
+ extern size_t		(*ofiles)(char **, size_t *);
+ extern void		(*prtime)(time_t);
+--- a/tabs/tabspec.c
++++ b/tabs/tabspec.c
+@@ -36,6 +36,8 @@
+ #include	<blank.h>
+ #include	"tabspec.h"
+ 
++enum taberrno taberrno;
++
+ static const struct {
+ 	const char	*c_nam;
+ 	const char	*c_str;
+--- a/tabs/tabspec.h
++++ b/tabs/tabspec.h
+@@ -34,14 +34,15 @@ struct	tabulator {
+ 	int	t_rep;			/* repetitive tab count */
+ };
+ 
+-enum {
++enum taberrno {
+ 	TABERR_NONE,
+ 	TABERR_CANTOP,	/* can't open */
+ 	TABERR_FILIND,	/* file indirection */
+ 	TABERR_UNKTAB,	/* unknown tab code */
+ 	TABERR_ILLINC,	/* illegal increment */
+ 	TABERR_ILLTAB	/* illegal tabs */
+-} taberrno;
++};
++extern enum taberrno taberrno;
+ 
+ extern void		*scalloc(size_t nmemb, size_t size);
+ extern struct tabulator	*tabstops(const char *s, int cols);

diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 26da82f5c8b..b3b27bdab68 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-major.patch
 	"${FILESDIR}"/${P}-glibc-2.30.patch
 	"${FILESDIR}"/${P}-glibc-2.31.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 # slightly broken