Adding metadata

12 files changed, 0 insertions, 1226 deletions

diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
deleted file mode 100644
index 72439096abdc..000000000000
--- a/sys-apps/heirloom-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
deleted file mode 100644
index 54831eef0805..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/nawk/main.c b/nawk/main.c
-index 9666638..b50b283 100644
---- a/nawk/main.c
-+++ b/nawk/main.c
-@@ -66,7 +66,7 @@ int	mb_cur_max;	/* MB_CUR_MAX, for acceleration */
- 
- extern const char badopen[];
- 
--int main(int argc, unsigned char *argv[], unsigned char *envp[])
-+int main(int argc, char *argv[], char *envp[])
- {
- 	unsigned char *fs = NULL;
- 	char label[MAXLABEL+1];	/* Space for the catalogue label */
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
deleted file mode 100644
index ce0c2bdc5be5..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
+++ /dev/null
@@ -1,278 +0,0 @@
---- 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);
---- a/diff/diff.c
-+++ b/diff/diff.c
-@@ -92,6 +92,23 @@ static void	usage(void);
- static void	xadd(const char *);
- static void	Xadd(const char *);
- 
-+char *ifdef1;
-+char *ifdef2;
-+int   wantelses;
-+char *file1, *file2;
-+char *tempfile1, *tempfile2;
-+char **diffargv;
-+struct stat stb1, stb2;
-+jmp_buf recenv;
-+const char *start;
-+struct xclusion *xflag;
-+struct stackblk *curstack;
-+int hflag,tflag,aflag,lflag,Nflag,sflag,rflag,Bflag,iflag,wflag,bflag,pflag;
-+int mb_cur_max;
-+int opt;
-+int context;
-+int status;
-+
- int
- main(int argc, char **argv)
- {
---- a/diff/diff.h
-+++ b/diff/diff.h
-@@ -106,7 +106,7 @@
- /*
-  * Output format options
-  */
--int	opt;
-+extern int	opt;
- 
- #define	D_NORMAL	0	/* Normal output */
- #define	D_EDIT		-1	/* Editor script out */
-@@ -117,66 +117,66 @@ int	opt;
- 				   lines and no trailing . */
- #define	D_UNIFIED	5	/* Unified diff */
- 
--int	aflag;			/* diff binary files */
--int	tflag;			/* expand tabs on output */
--int	pflag;			/* show surrounding C function */
-+extern int	aflag;			/* diff binary files */
-+extern int	tflag;			/* expand tabs on output */
-+extern int	pflag;			/* show surrounding C function */
- 
- /*
-  * Algorithm related options
-  */
--int	hflag;			/* -h, use halfhearted DIFFH */
--int	bflag;			/* ignore blanks in comparisons */
--int	wflag;			/* totally ignore blanks in comparisons */
--int	iflag;			/* ignore case in comparisons */
--int	Bflag;			/* ignore changes that consist of blank lines */
-+extern int	hflag;			/* -h, use halfhearted DIFFH */
-+extern int	bflag;			/* ignore blanks in comparisons */
-+extern int	wflag;			/* totally ignore blanks in comparisons */
-+extern int	iflag;			/* ignore case in comparisons */
-+extern int	Bflag;			/* ignore changes that consist of blank lines */
- 
- /*
-  * Options on hierarchical diffs.
-  */
--int	lflag;			/* long output format with header */
--int	rflag;			/* recursively trace directories */
--int	sflag;			/* announce files which are same */
--int	Nflag;			/* write text of nonexistant files */
--const char	*start;		/* do file only if name >= this */
-+extern int	lflag;			/* long output format with header */
-+extern int	rflag;			/* recursively trace directories */
-+extern int	sflag;			/* announce files which are same */
-+extern int	Nflag;			/* write text of nonexistant files */
-+extern const char	*start;		/* do file only if name >= this */
- 
- struct xclusion {
- 	struct xclusion	*x_nxt;
- 	const char	*x_pat;
--}	*xflag;			/* patterns to exclude from comparison */
-+};
-+extern struct xclusion	*xflag;			/* patterns to exclude from comparison */
- 
- /*
-  * Variables for -I D_IFDEF option.
-  */
--int	wantelses;		/* -E */
--char	*ifdef1;		/* String for -1 */
--char	*ifdef2;		/* String for -2 */
--char	*endifname;		/* What we will print on next #endif */
--int	inifdef;
-+extern int	wantelses;		/* -E */
-+extern char	*ifdef1;		/* String for -1 */
-+extern char	*ifdef2;		/* String for -2 */
- 
- /*
-  * Variables for -c context option.
-  */
--int	context;		/* lines of context to be printed */
-+extern int	context;		/* lines of context to be printed */
- 
- /*
-  * State for exit status.
-  */
--int	status;
--int	anychange;
--char	*tempfile1;		/* used when comparing against std input */
--char	*tempfile2;		/* used when comparing against std input */
-+extern int	status;
-+extern int	anychange;
-+extern char	*tempfile1;		/* used when comparing against std input */
-+extern char	*tempfile2;		/* used when comparing against std input */
- 
- /*
-  * Variables for diffdir.
-  */
--char	**diffargv;		/* option list to pass to recursive diffs */
--int	recdepth;		/* recursion depth */
--jmp_buf	recenv;			/* jump stack on error */
-+extern char	**diffargv;		/* option list to pass to recursive diffs */
-+extern int	recdepth;		/* recursion depth */
-+extern jmp_buf	recenv;			/* jump stack on error */
- 
- struct stackblk {
- 	struct stackblk	*s_prev;
- 	struct stackblk	*s_next;
--} *curstack;
-+};
-+extern struct stackblk *curstack;
- 
- /*
-  * Input file names.
-@@ -184,13 +184,13 @@ struct stackblk {
-  * and padded with a '/', and then efile0 and efile1 point after
-  * the '/'.
-  */
--char	*file1, *file2, *efile1, *efile2;
--struct	stat stb1, stb2;
-+extern char	*file1, *file2;
-+extern struct	stat stb1, stb2;
- 
- extern	const char diffh[], diff[], pr[];
- extern	const char *argv0;
- extern	const char *progname;
--int	mb_cur_max;
-+extern int	mb_cur_max;
- extern int	sysv3;
- 
- /* diff.c */
---- a/diff/diffdir.c
-+++ b/diff/diffdir.c
-@@ -142,6 +142,10 @@ static char	*mkpath(const char *, const char *);
- static void	mktitle(void);
- static int	xclude(const char *);
- 
-+int anychange;
-+int recdepth;
-+static char *efile1, *efile2;
-+
- void
- diffdir(char **argv)
- {
---- a/diff/diffreg.c
-+++ b/diff/diffreg.c
-@@ -186,6 +186,8 @@ static int	(*chrtran)(int);/* translation for case-folding */
- static long	pstart;		/* start of last search for -p */
- static long	plast;		/* match of last search for -p */
- static long	*saveJ;		/* saved J for -p */
-+static char	*endifname;	/* What we will print on next #endif */
-+static int	inifdef;
- 
- /* chrtran points to one of 3 translation functions:
-  *	cup2low if folding upper to lower case
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch
deleted file mode 100644
index 4d42212d620d..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-Port to C99/C23. Correct usage of timeval in utmp, rename reserved keywords
-Also cast pointers to pointers to signed chars to unsigned chars
-It's that or redo multiple functions from unsigned chars to signed chars
-and unsigned chars with implicit cast worked so far.
-https://bugs.gentoo.org/919459
-https://bugs.gentoo.org/946205
---- a/date/date.c
-+++ b/date/date.c
-@@ -141,6 +141,7 @@
- 	const char wtmpxfile[] = "/var/log/wtmp";
- 	time_t newtime;
- 	struct timeval	tv;
-+	struct timeval before_tv, after_tv;
- 
- 	memset(&before, 0, sizeof before);
- 	memset(&after, 0, sizeof after);
-@@ -150,14 +151,19 @@
- 	strcpy(after.ut_line, "new time");
- 	if ((newtime = timeop(op)) == (time_t)-1)
- 		badconv();
--	gettimeofday(&before.ut_tv, NULL);
-+	gettimeofday(&before_tv, NULL);
-+	before.ut_tv.tv_sec = before_tv.tv_sec;
-+	before.ut_tv.tv_usec = before_tv.tv_usec;
- 	tv.tv_sec = newtime;
- 	tv.tv_usec = 0;
- 	if (settimeofday(&tv, NULL) < 0) {
- 		fprintf(stderr, "%s: no permission\n", progname);
- 		exit(1);
- 	}
--	gettimeofday(&after.ut_tv, NULL);
-+	gettimeofday(&after_tv, NULL);
-+	after.ut_tv.tv_sec = after_tv.tv_sec;
-+	after.ut_tv.tv_usec = after_tv.tv_usec;
-+
- #ifdef	__linux__
- 	system("/sbin/hwclock -w >/dev/null 2>&1");
- #endif	/* __linux__ */
---- a/nawk/main.c
-+++ b/nawk/main.c
-@@ -168,18 +168,18 @@
- 	}
- 	/* hold leading name=val arguments until just after BEGIN */
- 	if (posix && argc > 1 && isclvar(argv[1])) {
--		start_delayed = &argv[0];
-+		start_delayed = (unsigned char **)&argv[0];
- 		do {
- 			argv[0] = argv[1];
- 			argv++;
- 		} while (--argc > 1 && isclvar(argv[1]));
--		after_delayed = &argv[0];
-+		after_delayed = (unsigned char **)&argv[0];
- 	}
- 	compile_time = 1;
- 	argv[0] = cmdname;	/* put prog name at front of arglist */
- 	dprintf( ("argc=%d, argv[0]=%s\n", argc, argv[0]) );
--	arginit(argc, argv);
--	envinit(envp);
-+	arginit(argc, (unsigned char **)argv);
-+	envinit((unsigned char **)envp);
- 	yyparse();
- 	if (fs)
- 		*FS = tostring(qstring(fs, '\0'));
---- a/nawk/run.c
-+++ b/nawk/run.c
-@@ -61,9 +61,9 @@
- Cell	*tmps;
- 
- static Cell	truecell	={ OBOOL, BTRUE, 0, 0, 1.0, NUM };
--Cell	*true	= &truecell;
-+Cell	*trueval	= &truecell;
- static Cell	falsecell	={ OBOOL, BFALSE, 0, 0, 0.0, NUM };
--Cell	*false	= &falsecell;
-+Cell	*falseval	= &falsecell;
- static Cell	breakcell	={ OJUMP, JBREAK, 0, 0, 0.0, NUM };
- Cell	*jbreak	= &breakcell;
- static Cell	contcell	={ OJUMP, JCONT, 0, 0, 0.0, NUM };
-@@ -108,7 +108,7 @@
- 	register Node *a;
- 
- 	if (u == NULL)
--		return(true);
-+		return(trueval);
- 	for (a = u; ; a = a->nnext) {
- 		curnode = a;
- 		if (isvalue(a)) {
-@@ -148,7 +148,7 @@
- 	if (a[0]) {		/* BEGIN */
- 		x = execute(a[0]);
- 		if (isexit(x))
--			return(true);
-+			return(trueval);
- 		if (isjump(x))
- 			error(MM_ERROR,
- 				":44:Illegal break, continue or next from BEGIN");
-@@ -174,7 +174,7 @@
- 		if(x != 0) { tempfree(x, ""); }
- 	}
-   ex1:
--	return(true);
-+	return(trueval);
- }
- 
- struct Frame {
-@@ -461,7 +461,7 @@
- 
- 	x = execute(a[0]);	/* Cell* for symbol table */
- 	if (!isarr(x))
--		return true;
-+		return trueval;
- 	subseplen = strlen((char *)*SUBSEP);
- 	growbuf(&buf, &bufsz, CHUNK, NULL, "delete");
- 	buf[0] = 0;
-@@ -479,7 +479,7 @@
- 	freeelem(x, buf);
- 	tempfree(x, "");
- 	free(buf);
--	return true;
-+	return trueval;
- }
- 
- Cell *intest(Node **a, int n)
-@@ -511,9 +511,9 @@
- 	tempfree(ap, "");
- 	free(buf);
- 	if (k == NULL)
--		return(false);
-+		return(falseval);
- 	else
--		return(true);
-+		return(trueval);
- }
- 
- 
-@@ -557,9 +557,9 @@
- 		x->fval = start;
- 		return x;
- 	} else if ((n == MATCH && i == 1) || (n == NOTMATCH && i == 0))
--		return(true);
-+		return(trueval);
- 	else
--		return(false);
-+		return(falseval);
- }
- 
- 
-@@ -573,22 +573,22 @@
- 	tempfree(x, "");
- 	switch (n) {
- 	case BOR:
--		if (i) return(true);
-+		if (i) return(trueval);
- 		y = execute(a[1]);
- 		i = istrue(y);
- 		tempfree(y, "");
--		if (i) return(true);
--		else return(false);
-+		if (i) return(trueval);
-+		else return(falseval);
- 	case AND:
--		if ( !i ) return(false);
-+		if ( !i ) return(falseval);
- 		y = execute(a[1]);
- 		i = istrue(y);
- 		tempfree(y, "");
--		if (i) return(true);
--		else return(false);
-+		if (i) return(trueval);
-+		else return(falseval);
- 	case NOT:
--		if (i) return(false);
--		else return(true);
-+		if (i) return(falseval);
-+		else return(trueval);
- 	default:	/* can't happen */
- 		error(MM_ERROR, ":55:Unknown boolean operator %d", n);
- 	}
-@@ -613,18 +613,18 @@
- 	tempfree(x, "");
- 	tempfree(y, "");
- 	switch (n) {
--	case LT:	if (i<0) return(true);
--			else return(false);
--	case LE:	if (i<=0) return(true);
--			else return(false);
--	case NE:	if (i!=0) return(true);
--			else return(false);
--	case EQ:	if (i == 0) return(true);
--			else return(false);
--	case GE:	if (i>=0) return(true);
--			else return(false);
--	case GT:	if (i>0) return(true);
--			else return(false);
-+	case LT:	if (i<0) return(trueval);
-+			else return(falseval);
-+	case LE:	if (i<=0) return(trueval);
-+			else return(falseval);
-+	case NE:	if (i!=0) return(trueval);
-+			else return(falseval);
-+	case EQ:	if (i == 0) return(trueval);
-+			else return(falseval);
-+	case GE:	if (i>=0) return(trueval);
-+			else return(falseval);
-+	case GT:	if (i>0) return(trueval);
-+			else return(falseval);
- 	default:	/* can't happen */
- 		error(MM_ERROR, ":56:Unknown relational operator %d", n);
- 	}
-@@ -944,7 +944,7 @@
- 		}
- 		free(buf);
- 	}
--	return(true);
-+	return(trueval);
- }
- 
- Cell *arith(Node **a, int n)
-@@ -1155,7 +1155,7 @@
- 		x = execute(a[2]);
- 		return(x);
- 	}
--	return(false);
-+	return(falseval);
- }
- 
- Cell *split(Node **a, int nnn)
-@@ -1312,7 +1312,7 @@
- 		tempfree(x, "");
- 		x = execute(a[1]);
- 		if (isbreak(x)) {
--			x = true;
-+			x = trueval;
- 			in_loop--;
- 			return(x);
- 		}
-@@ -1334,7 +1334,7 @@
- 		x = execute(a[0]);
- 		if (isbreak(x)) {
- 			in_loop--;
--			return true;
-+			return trueval;
- 		}
- 		if (isnext(x) || isexit(x) || isret(x)) {
- 			in_loop--;
-@@ -1371,7 +1371,7 @@
- 		x = execute(a[3]);
- 		if (isbreak(x)) {		/* turn off break */
- 			in_loop--;
--			return true;
-+			return trueval;
- 		}
- 		if (isnext(x) || isexit(x) || isret(x)) {
- 			in_loop--;
-@@ -1405,7 +1405,7 @@
- 			if (isbreak(x)) {
- 				tempfree(vp, "");
- 				in_loop--;
--				return true;
-+				return trueval;
- 			}
- 			if (isnext(x) || isexit(x) || isret(x)) {
- 				tempfree(vp, "");
-@@ -1416,7 +1416,7 @@
- 		}
- 	}
- 	in_loop--;
--	return true;
-+	return trueval;
- }
- 
- static int closefile(const char *a);
-@@ -1552,7 +1552,7 @@
- 	}
- 	if (a[1] != 0)
- 		fflush(fp);
--	return(true);
-+	return(trueval);
- }
- 
- /*ARGSUSED*/
-@@ -1694,7 +1694,7 @@
- 		tempfree(y, "");
- 	}
- 	y = execute(a[2]);	/* replacement string */
--	result = false;
-+	result = falseval;
- 	if (pmatch(pfa, t)) {
- 		growbuf(&buf, &bufsize, CHUNK, NULL, "sub");
- 		pb = buf;
-@@ -1730,7 +1730,7 @@
- 							"sub");
- 			}
- 		setsval(x, buf);
--		result = true;;
-+		result = trueval;;
- 		free(buf);
- 	}
- 	tempfree(x, "");
---- a/oawk/awk.def
-+++ b/oawk/awk.def
-@@ -215,7 +215,7 @@
- #define NPA2	4
- 
- extern obj	(*proctab[])(node **, int);
--extern obj	true, false;
-+extern obj	trueval, falseval;
- extern int	pairstack[], paircnt;
- 
- #define cantexec(n)	(n->ntype == NVALUE)
---- a/oawk/run.c
-+++ b/oawk/run.c
-@@ -96,8 +96,8 @@
- #define MAXTMP 20
- cell tmps[MAXTMP];
- static cell nullval ={EMPTY,EMPTY,0.0,NUM,0};
--obj	true	={ OBOOL, BTRUE, 0 };
--obj	false	={ OBOOL, BFALSE, 0 };
-+obj	trueval	={ OBOOL, BTRUE, 0 };
-+obj	falseval	={ OBOOL, BFALSE, 0 };
- 
- int chrlen(const char *s);
- int chrdist(const char *s, const char *end);
-@@ -125,7 +125,7 @@
- 	node *a;
- 
- 	if (u==(node *)NULL)
--		return(true);
-+		return(trueval);
- 	for (a = u; ; a = a->nnext) {
- 		if (cantexec(a))
- 			return(nodetoobj(a));
-@@ -156,7 +156,7 @@
- 	if (a[0] != NULL) {
- 		x = execute(a[0]);
- 		if (isexit(x))
--			return(true);
-+			return(trueval);
- 		if (isjump(x))
- 			error(FATAL, "unexpected break, continue or next");
- 		tempfree(x);
-@@ -173,7 +173,7 @@
- 			error(FATAL, "unexpected break, continue or next");
- 		tempfree(x);
- 	}
--	return(true);
-+	return(trueval);
- }
- 
- /*ARGSUSED*/
-@@ -228,9 +228,9 @@
- 	tempfree(x);
- 	i = match((struct fa *)a[1], s);
- 	if (n==MATCH && i==1 || n==NOTMATCH && i==0)
--		return(true);
-+		return(trueval);
- 	else
--		return(false);
-+		return(falseval);
- }
- 
- obj boolop(node **a,int n)
-@@ -245,22 +245,22 @@
- 	default:
- 		error(FATAL, "unknown boolean operator %d", n);
- 	case BOR:
--		if (i) return(true);
-+		if (i) return(trueval);
- 		y = execute(a[1]);
- 		i = istrue(y);
- 		tempfree(y);
--		if (i) return(true);
--		else return(false);
-+		if (i) return(trueval);
-+		else return(falseval);
- 	case AND:
--		if ( !i ) return(false);
-+		if ( !i ) return(falseval);
- 		y = execute(a[1]);
- 		i = istrue(y);
- 		tempfree(y);
--		if (i) return(true);
--		else return(false);
-+		if (i) return(trueval);
-+		else return(falseval);
- 	case NOT:
--		if (i) return(false);
--		else return(true);
-+		if (i) return(falseval);
-+		else return(trueval);
- 	}
- }
- 
-@@ -283,18 +283,18 @@
- 	switch (n) {
- 	default:
- 		error(FATAL, "unknown relational operator %d", n);
--	case LT:	if (i<0) return(true);
--			else return(false);
--	case LE:	if (i<=0) return(true);
--			else return(false);
--	case NE:	if (i!=0) return(true);
--			else return(false);
--	case EQ:	if (i==0) return(true);
--			else return(false);
--	case GE:	if (i>=0) return(true);
--			else return(false);
--	case GT:	if (i>0) return(true);
--			else return(false);
-+	case LT:	if (i<0) return(trueval);
-+			else return(falseval);
-+	case LE:	if (i<=0) return(trueval);
-+			else return(falseval);
-+	case NE:	if (i!=0) return(trueval);
-+			else return(falseval);
-+	case EQ:	if (i==0) return(trueval);
-+			else return(falseval);
-+	case GE:	if (i>=0) return(trueval);
-+			else return(falseval);
-+	case GT:	if (i>0) return(trueval);
-+			else return(falseval);
- 	}
- }
- 
-@@ -675,7 +675,7 @@
- 	obj x;
- 
- 	if (a[0]==nullstat)
--		x = true;
-+		x = trueval;
- 	else
- 		x = execute(a[0]);
- 	if (istrue(x)) {
-@@ -703,7 +703,7 @@
- 		x = execute(a[2]);
- 		return(x);
- 	}
--	return(false);
-+	return(falseval);
- }
- 
- obj aprintf(node **a,int n)
-@@ -714,7 +714,7 @@
- 	if (a[1]==NULL) {
- 		printf("%s", x.optr->sval);
- 		tempfree(x);
--		return(true);
-+		return(trueval);
- 	}
- 	redirprint(x.optr->sval, (intptr_t)a[1], a[2]);
- 	return(x);
-@@ -823,7 +823,7 @@
- 		tempfree(x);
- 		x = execute(a[1]);
- 		if (isbreak(x)) {
--			x = true;
-+			x = trueval;
- 			return(x);
- 		}
- 		if (isnext(x) || isexit(x))
-@@ -845,7 +845,7 @@
- 		}
- 		x = execute(a[3]);
- 		if (isbreak(x)) {	/* turn off break */
--			x = true;
-+			x = trueval;
- 			return(x);
- 		}
- 		if (isnext(x) || isexit(x))
-@@ -871,7 +871,7 @@
- 			setsval(vp, cp->nval);
- 			x = execute(a[2]);
- 			if (isbreak(x)) {
--				x = true;
-+				x = trueval;
- 				return(x);
- 			}
- 			if (isnext(x) || isexit(x))
-@@ -879,7 +879,7 @@
- 			tempfree(x);
- 		}
- 	}
--	return (true);
-+	return (trueval);
- }
- 
- obj jump(node **a,int n)
-@@ -971,14 +971,14 @@
- 	}
- 	if (a[1]==nullstat) {
- 		printf("%s", s);
--		return(true);
-+		return(trueval);
- 	}
- 	redirprint(s, (intptr_t)a[1], a[2]);
--	return(false);
-+	return(falseval);
- }
- 
- /*ARGSUSED*/
--obj nullproc(node **a, int n) {return(true);}
-+obj nullproc(node **a, int n) {return(trueval);}
- 
- obj nodetoobj(node *a)
- {
---- a/shl/shl.c
-+++ b/shl/shl.c
-@@ -322,13 +322,16 @@
- 	 */
- 	struct passwd *pwd = getpwuid(myuid);
- 	struct utmpx utx;
-+	struct timeval tv;
- 	char *id;
- 
- 	memset(&utx, 0, sizeof utx);
- 	strncpy(utx.ut_line, l->l_line + 5, sizeof utx.ut_line);
- 	strncpy(utx.ut_user, pwd->pw_name, sizeof utx.ut_user);
- 	utx.ut_pid = l->l_pid;
--	gettimeofday(&utx.ut_tv, NULL);
-+	gettimeofday(&tv, NULL);
-+	utx.ut_tv.tv_sec = tv.tv_sec;
-+	utx.ut_tv.tv_usec = tv.tv_usec;
- 	if ((id = strrchr(l->l_line, '/')) != NULL)
- 		strncpy(utx.ut_id, id, sizeof utx.ut_id);
- 	switch (action) {
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
deleted file mode 100644
index 19b90cea6d2a..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/shl/shl.c b/shl/shl.c
-index 6f5c2df..30d296c 100644
---- a/shl/shl.c
-+++ b/shl/shl.c
-@@ -86,7 +86,7 @@ extern int	sysv3;
- #include	<libgen.h>
- #include	<limits.h>
- #include	<stdarg.h>
--#if !defined (__dietlibc__) && !defined (__UCLIBC__)
-+#if !defined (__dietlibc__) && !defined (__UCLIBC__) && !defined(__linux__)
- #include	<stropts.h>
- #endif
- #include	<poll.h>
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
deleted file mode 100644
index 5186aa1cc2e1..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/date/date.c
-+++ b/date/date.c
-@@ -134,26 +134,13 @@ badtime:
- 	return (time_t)-1;
- }
- 
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || \
--	defined (__DragonFly__) || defined (__APPLE__)
--static int
--stime(time_t *t)
--{
--	struct timeval	tv;
--
--	tv.tv_sec = *t;
--	tv.tv_usec = 0;
--
--	return settimeofday(&tv, NULL);
--}
--#endif	/* __FreeBSD__, __NetBSD__, __OpenBSD__, __DragonFly__, __APPLE__ */
--
- static void
- settime(char *op)
- {
- 	struct utmpx before, after;
- 	const char wtmpxfile[] = "/var/log/wtmp";
- 	time_t newtime;
-+	struct timeval	tv;
- 
- 	memset(&before, 0, sizeof before);
- 	memset(&after, 0, sizeof after);
-@@ -164,7 +151,9 @@ settime(char *op)
- 	if ((newtime = timeop(op)) == (time_t)-1)
- 		badconv();
- 	gettimeofday(&before.ut_tv, NULL);
--	if (stime(&newtime) < 0) {
-+	tv.tv_sec = newtime;
-+	tv.tv_usec = 0;
-+	if (settimeofday(&tv, NULL) < 0) {
- 		fprintf(stderr, "%s: no permission\n", progname);
- 		exit(1);
- 	}
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
deleted file mode 100644
index 81e6755e7e32..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/cpio/cpio.c b/cpio/cpio.c
-index 89c5cbc..210287b 100644
---- a/cpio/cpio.c
-+++ b/cpio/cpio.c
-@@ -91,11 +91,12 @@
- #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/sysmacros.h>
-+#if 0
- #include <sys/mkdev.h>
- #endif	/* !major */
- 
-diff --git a/file/file.c b/file/file.c
-index 6609734..d90af86 100644
---- a/file/file.c
-+++ b/file/file.c
-@@ -66,7 +66,8 @@ static const char sccsid[] USED = "@(#)file.sl	1.33 (gritter) 4/14/06";
- #include <fcntl.h>
- #include <libgen.h>
- #include <inttypes.h>
--#ifndef	major
-+#include <sys/sysmacros.h>
-+#if 0
- #include <sys/mkdev.h>
- #endif
- #include "iblok.h"
-diff --git a/find/find.c b/find/find.c
-index fac70f0..28e1b7f 100644
---- a/find/find.c
-+++ b/find/find.c
-@@ -83,7 +83,8 @@ static const char sccsid[] USED = "@(#)find.sl	1.45 (gritter) 5/8/06";
- #ifdef	_AIX
- #include <sys/sysmacros.h>
- #endif
--#ifndef	major
-+#include <sys/sysmacros.h>
-+#if 0
- #include <sys/mkdev.h>
- #endif
- #if __NetBSD_Version__>= 300000000
-diff --git a/ls/ls.c b/ls/ls.c
-index e4480d0..17186ba 100644
---- a/ls/ls.c
-+++ b/ls/ls.c
-@@ -119,7 +119,7 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";
- #include <termcap.h>
- #endif	/* USE_TERMCAP */
- 
--#ifdef	_AIX
-+#if defined (_AIX) || defined (__GLIBC__)
- #include <sys/sysmacros.h>
- #endif
- 
-diff --git a/mknod/mknod.c b/mknod/mknod.c
-index b772b88..f465883 100644
---- a/mknod/mknod.c
-+++ b/mknod/mknod.c
-@@ -45,7 +45,8 @@ static const char sccsid[] USED = "@(#)mknod.sl	1.8 (gritter) 5/29/05";
- #include	<string.h>
- #include	<limits.h>
- #include	<unistd.h>
--#ifndef	major
-+#include <sys/sysmacros.h>
-+#if 0
- #include	<sys/mkdev.h>
- #endif	/* !major */
- 
-diff --git a/tar/tar.c b/tar/tar.c
-index 2d3dada..a8f1ccb 100644
---- a/tar/tar.c
-+++ b/tar/tar.c
-@@ -98,7 +98,8 @@ static const char sccsid[] USED = "@(#)tar.sl	1.177 (gritter) 4/14/07";
- #include <sys/sysmacros.h>
- #endif
- 
--#ifndef	major
-+#include <sys/sysmacros.h>
-+#if 0
- #include <sys/mkdev.h>
- #endif	/* !major */
- 
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch
deleted file mode 100644
index 64fefef616c2..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-y.tab.h is side-product of different rule. Explicitly add it to rulesets so
-shuffle and friends won't break graph ordering.
-config.h  and awk.h are just a missing dependency.
-https://bugs.gentoo.org/880189
-https://bugs.gentoo.org/896314
---- a/nawk/Makefile.mk
-+++ b/nawk/Makefile.mk
-@@ -17,6 +17,8 @@
- 	(echo '1i'; echo '#include <inttypes.h>'; echo '.'; echo 'w';) | \
- 		ed -s y.tab.h
- 
-+y.tab.h: awk.g.c
-+
- awk.g.2001.c: awk.g.2001.y awk.g.c
- 	$(YACC) awk.g.2001.y
- 	mv -f y.tab.c awk.g.2001.c
---- a/grep/Makefile.mk
-+++ b/grep/Makefile.mk
-@@ -104,5 +104,5 @@
- svid3.o: grep.h config.h
- sus.o: grep.h config.h alloc.h
- su3.o: grep.h config.h alloc.h
--ac.o: alloc.h grep.h
-+ac.o: alloc.h grep.h config.h
- rcomp.o: grep.h config.h alloc.h
---- a/oawk/Makefile.mk
-+++ b/oawk/Makefile.mk
-@@ -43,7 +43,7 @@
- lib.o: lib.c
- 	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c lib.c
- 
--main.o: main.c
-+main.o: main.c awk.h
- 	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c main.c
- 
- parse.o: parse.c
-@@ -55,7 +55,7 @@
- run.o: run.c
- 	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c run.c
- 
--tran.o: tran.c
-+tran.o: tran.c awk.h
- 	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c tran.c
- 
- token.o: token.c
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
deleted file mode 100644
index a4ce2970589d..000000000000
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.mk b/Makefile.mk
-index 28a20f1..1cf36b8 100644
---- a/Makefile.mk
-+++ b/Makefile.mk
-@@ -73,11 +73,6 @@ links:
- 	sh build/crossln $(ROOT)$(SV3BIN)/more $(ROOT)$(UCBBIN)/more $(ROOT)
- 	rm -f $(ROOT)$(UCBBIN)/catman
- 	sh build/crossln $(ROOT)$(DEFSBIN)/catman $(ROOT)$(UCBBIN)/catman $(ROOT)
--	for i in sccs prt; \
--	do \
--		rm -f $(ROOT)$(UCBBIN)/$$i; \
--		sh build/crossln $(ROOT)$(CCSBIN)/$$i $(ROOT)$(UCBBIN)/$$i $(ROOT); \
--	done
- 	rm -f $(ROOT)$(SV3BIN)/awk
- 	sh build/crossln $(ROOT)$(DEFBIN)/oawk $(ROOT)$(SV3BIN)/awk $(ROOT)
- 	rm -f $(ROOT)$(S42BIN)/awk
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
deleted file mode 100644
index 7224251c8341..000000000000
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Heirloom toolchest - original Unix tools"
-HOMEPAGE="https://heirloom.sourceforge.net/tools.html"
-SRC_URI="https://downloads.sourceforge.net/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
-S="${WORKDIR}/heirloom-${PV}"
-
-LICENSE="ZLIB BSD BSD-4 CDDL GPL-2+ LGPL-2.1+ LPL-1.02 Info-ZIP public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# slightly broken
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/zlib:=
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/ed
-	app-alternatives/bc
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-major.patch
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-glibc-2.30.patch
-	"${FILESDIR}"/${P}-glibc-2.31.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:\bar\b:$(tc-getAR):g" libwchar/Makefile.mk || die
-}
-
-src_compile() {
-	mypaths=(
-		DEFBIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		SV3BIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		S42BIN="${EPREFIX}/usr/lib/${PN}/5bin/s42"
-		SUSBIN="${EPREFIX}/usr/lib/${PN}/5bin/posix"
-		SU3BIN="${EPREFIX}/usr/lib/${PN}/5bin/posix2001"
-		UCBBIN="${EPREFIX}/usr/lib/${PN}/ucb"
-		CCSBIN="${EPREFIX}/usr/lib/${PN}/ccs/bin"
-		DEFLIB="${EPREFIX}/usr/lib/${PN}/5lib"
-		DEFSBIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		MANDIR="${EPREFIX}/usr/share/man/5man"
-		DFLDIR="${EPREFIX}/etc/default"
-		SPELLHIST="/dev/null"
-		SULOG="${EPREFIX}/var/log/sulog"
-	)
-
-	append-cppflags -D_GNU_SOURCE
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS}" \
-		CFLAGS2="${CFLAGS}" \
-		CFLAGSS="${CFLAGS}" \
-		CFLAGSU="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LCURS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBZ="-lz" \
-		"${mypaths[@]}"
-}
-
-src_install() {
-	# we don't want to strip here, so use "true" as noop
-	emake -j1 \
-		STRIP="true" \
-		ROOT="${D}" \
-		"${mypaths[@]}" \
-		install
-	rm -r "${D}/dev" || die
-
-	dodoc CHANGES README
-
-	local DOC_CONTENTS="You may want to adjust your PATH, to enable
-		using the apps of ${PN} by default.
-		\\n\\nMan pages are installed in /usr/share/man/5man/.
-		You may need to set MANPATH to access them."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild
deleted file mode 100644
index 24178f60f06e..000000000000
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Heirloom toolchest - original Unix tools"
-HOMEPAGE="https://heirloom.sourceforge.net/tools.html"
-SRC_URI="https://downloads.sourceforge.net/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
-S="${WORKDIR}/heirloom-${PV}"
-
-LICENSE="ZLIB BSD BSD-4 CDDL GPL-2+ LGPL-2.1+ LPL-1.02 Info-ZIP public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-# slightly broken
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/zlib:=
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/ed
-	app-alternatives/bc
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-major.patch
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-glibc-2.30.patch
-	"${FILESDIR}"/${P}-glibc-2.31.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-gcc-15.patch
-	"${FILESDIR}"/${P}-make-ordering.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:\bar\b:$(tc-getAR):g" libwchar/Makefile.mk || die
-}
-
-src_compile() {
-	mypaths=(
-		DEFBIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		SV3BIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		S42BIN="${EPREFIX}/usr/lib/${PN}/5bin/s42"
-		SUSBIN="${EPREFIX}/usr/lib/${PN}/5bin/posix"
-		SU3BIN="${EPREFIX}/usr/lib/${PN}/5bin/posix2001"
-		UCBBIN="${EPREFIX}/usr/lib/${PN}/ucb"
-		CCSBIN="${EPREFIX}/usr/lib/${PN}/ccs/bin"
-		DEFLIB="${EPREFIX}/usr/lib/${PN}/5lib"
-		DEFSBIN="${EPREFIX}/usr/lib/${PN}/5bin"
-		MANDIR="${EPREFIX}/usr/share/man/5man"
-		DFLDIR="${EPREFIX}/etc/default"
-		SPELLHIST="/dev/null"
-		SULOG="${EPREFIX}/var/log/sulog"
-	)
-
-	append-cppflags -D_GNU_SOURCE
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS}" \
-		CFLAGS2="${CFLAGS}" \
-		CFLAGSS="${CFLAGS}" \
-		CFLAGSU="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LCURS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBZ="-lz" \
-		"${mypaths[@]}"
-}
-
-src_install() {
-	# we don't want to strip here, so use "true" as noop
-	emake -j1 \
-		STRIP="true" \
-		ROOT="${D}" \
-		"${mypaths[@]}" \
-		install
-	rm -r "${D}/dev" || die
-
-	dodoc CHANGES README
-
-	local DOC_CONTENTS="You may want to adjust your PATH, to enable
-		using the apps of ${PN} by default.
-		\\n\\nMan pages are installed in /usr/share/man/5man/.
-		You may need to set MANPATH to access them."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/heirloom-tools/metadata.xml b/sys-apps/heirloom-tools/metadata.xml
deleted file mode 100644
index 2cdf55106bc5..000000000000
--- a/sys-apps/heirloom-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">heirloom</remote-id>
-	</upstream>
-</pkgmetadata>