[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 07b7e021b3014fb1b0eb9714883b41e885e3f6ad
Author: Sam James gentoo org>
AuthorDate: Mon Jan 8 09:39:08 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 8 09:42:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b7e021
sys-apps/heirloom-tools: sys-devel/bc -> app-alternatives/bc
All of these will be using app-alternatives/bc anyway as they're not calling
bc-reference, so make the dep reflect reality.
Signed-off-by: Sam James gentoo.org>
sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
index 5901908c1d1c..f3749259531a 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
sys-apps/ed
- sys-devel/bc
+ app-alternatives/bc
virtual/pkgconfig
"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 16aac351b251a242541745e88098702bbaf33c61
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Aug 17 09:29:27 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Thu Aug 17 09:32:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16aac351
sys-apps/heirloom-tools: update LICENSE
Signed-off-by: Ulrich Müller gentoo.org>
sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
index 56460a596197..2408c41d6a73 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://heirloom.sourceforge.net/tools.html;
SRC_URI="mirror://sourceforge/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
S="${WORKDIR}/heirloom-${PV}"
-LICENSE="CDDL GPL-2+ LGPL-2.1+ LPL-1.2 ZLIB"
+LICENSE="ZLIB BSD BSD-4 CDDL GPL-2+ LGPL-2.1+ LPL-1.2 Info-ZIP public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# slightly broken
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 6880f4bcceda4e799eb25190f25cd6ef28550d4d
Author: Ulrich Müller gentoo org>
AuthorDate: Wed Aug 16 18:39:22 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Thu Aug 17 08:13:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880f4bc
sys-apps/heirloom-tools: Don't create subdirs in /usr/bin
The FHS says that /usr/bin has no subdirectories:
https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s04.html#requirements9a
Therefore, install the binaries in /usr/lib instead.
EAPI 8. Inherit and use readme.gentoo-r1.eclass. Update HOMEPAGE and
SRC_URI. Specify LICENSE more precisely ("or later" for GPL and LGPL).
Other minor QA fixes.
Signed-off-by: Ulrich Müller gentoo.org>
.../heirloom-tools/heirloom-tools-070715-r4.ebuild | 94 -
.../heirloom-tools/heirloom-tools-070715-r5.ebuild | 98 ++
2 files changed, 98 insertions(+), 94 deletions(-)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
deleted file mode 100644
index c91cfdb53b42..
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/ncurses:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-apps/ed
- sys-devel/bc
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/heirloom-${PV}"
-
-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
-)
-
-# slightly broken
-RESTRICT="test"
-
-src_prepare() {
- default
-
- sed -i "s/\bar\b/$(tc-getAR)/g" libwchar/Makefile.mk || die
-}
-
-src_compile() {
- 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}" \
- DEFBIN="/usr/bin/${PN}/5bin" \
- DEFSBIN="/usr/bin/${PN}/5bin" \
- SV3BIN="/usr/bin/${PN}/5bin" \
- S42BIN="/usr/bin/${PN}/5bin/s42" \
- SUSBIN="/usr/bin/${PN}/5bin/posix" \
- UCBBIN="/usr/bin/${PN}/ucb" \
- CCSBIN="/usr/bin/${PN}/ccs/bin" \
- SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
- DEFLIB="/usr/bin/${PN}/5lib" \
- LIBZ=-lz
-}
-
-src_install() {
- # we don't want to strip here, so use "true" as noop
- emake -j1 \
- STRIP="true" \
- ROOT="${ED}" \
- DEFBIN="/usr/bin/${PN}/5bin" \
- DEFSBIN="/usr/bin/${PN}/5bin" \
- SV3BIN="/usr/bin/${PN}/5bin" \
- S42BIN="/usr/bin/${PN}/5bin/s42" \
- SUSBIN="/usr/bin/${PN}/5bin/posix" \
- UCBBIN="/usr/bin/${PN}/ucb" \
- CCSBIN="/usr/bin/${PN}/ccs/bin" \
- SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
- DEFLIB="/usr/bin/${PN}/5lib" \
- install
-}
-
-pkg_postinst() {
- elog "You may want to adjust your \$PATH, to enable "
- elog "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."
-}
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
new file mode 100644
index ..62c7605beca7
--- /dev/null
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 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="mirror://sourceforge/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
+S="${WORKDIR}/heirloom-${PV}"
+
+LICENSE="CDDL GPL-2+ LGPL-2.1+ 9base ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# slightly broken
+RESTRICT="test"
+
+RDEPEND="
+ sys-libs/ncurses:=
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 68b95672216946c6c3fe26d231290282f7a4628a
Author: Sam James gentoo org>
AuthorDate: Fri Jun 11 00:16:51 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 11 00:29:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b95672
sys-apps/heirloom-tools: fix VariableScope (ED) in src_compile
Signed-off-by: Sam James gentoo.org>
sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 1374a47e858..1b9569f940f 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Heirloom toolchest - original Unix tools"
@@ -53,7 +54,6 @@ src_compile() {
CPPFLAGS="${CPPFLAGS}" \
LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
LDFLAGS="${LDFLAGS}" \
- ROOT="${ED}" \
DEFBIN="/usr/bin/${PN}/5bin" \
DEFSBIN="/usr/bin/${PN}/5bin" \
SV3BIN="/usr/bin/${PN}/5bin" \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: adcae1c8aa0f3af454895cff8c8eda59f48dd5da
Author: Stephan Hartmann gentoo org>
AuthorDate: Sat Sep 12 15:37:28 2020 +
Commit: Stephan Hartmann gentoo org>
CommitDate: Sat Sep 12 16:57:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcae1c8
sys-apps/heirloom-tools: respect AR/RANLIB
Closes: https://bugs.gentoo.org/725712
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann gentoo.org>
sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild | 8
1 file changed, 8 insertions(+)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 2c6c2ef1876..1374a47e858 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -34,10 +34,18 @@ PATCHES=(
# slightly broken
RESTRICT="test"
+src_prepare() {
+ default
+
+ sed -i "s/\bar\b/$(tc-getAR)/g" libwchar/Makefile.mk || die
+}
+
src_compile() {
append-cppflags -D_GNU_SOURCE
emake -j1 \
CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
CFLAGS="${CFLAGS}" \
CFLAGS2="${CFLAGS}" \
CFLAGSS="${CFLAGS}" \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
commit: ab8cd0d32bfb1548eefa27b8567b27e84a1a31d3
Author: Stephan Hartmann gentoo org>
AuthorDate: Sat Sep 12 15:11:39 2020 +
Commit: Stephan Hartmann gentoo org>
CommitDate: Sat Sep 12 15:12:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8cd0d3
sys-apps/heirloom-tools: fix building with clang
Closes: https://bugs.gentoo.org/741819
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann gentoo.org>
.../heirloom-tools/files/heirloom-tools-070715-clang.patch | 13 +
sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
new file mode 100644
index 000..54831eef080
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/nawk/main.c b/nawk/main.c
+index 938..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/heirloom-tools-070715-r3.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 34e2e70756e..2c6c2ef1876 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${P}-glibc-2.30.patch
"${FILESDIR}"/${P}-glibc-2.31.patch
"${FILESDIR}"/${P}-gcc-10.patch
+ "${FILESDIR}"/${P}-clang.patch
)
# slightly broken
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
commit: f13ea5002842f34785a6a9d4938d6b3001d3002b
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 15:34:52 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Mar 26 17:46:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13ea500
sys-apps/heirloom-tools: fix some QA issues, EAPI 7
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/15127
Signed-off-by: Joonas Niilola gentoo.org>
.../files/heirloom-tools-070715-makefile.patch | 16 ++
...5-r2.ebuild => heirloom-tools-070715-r3.ebuild} | 35 ++
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
new file mode 100644
index 000..a4ce2970589
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
@@ -0,0 +1,16 @@
+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-r2.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
similarity index 57%
rename from sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
rename to sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index f45cc2e1c88..34e2e70756e 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Heirloom toolchest - original Unix tools"
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
sys-libs/zlib
"
-DEPEND="
- ${RDEPEND}
+DEPEND=${RDEPEND}
+BDEPEND="
sys-apps/ed
sys-devel/bc
virtual/pkgconfig
@@ -24,6 +24,7 @@ DEPEND="
S="${WORKDIR}/heirloom-${PV}"
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
@@ -43,17 +44,39 @@ src_compile() {
CPPFLAGS="${CPPFLAGS}" \
LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
LDFLAGS="${LDFLAGS}" \
+ ROOT="${ED}" \
+ DEFBIN="/usr/bin/${PN}/5bin" \
+ DEFSBIN="/usr/bin/${PN}/5bin" \
+ SV3BIN="/usr/bin/${PN}/5bin" \
+ S42BIN="/usr/bin/${PN}/5bin/s42" \
+ SUSBIN="/usr/bin/${PN}/5bin/posix" \
+ UCBBIN="/usr/bin/${PN}/ucb" \
+ CCSBIN="/usr/bin/${PN}/ccs/bin" \
+ SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+ DEFLIB="/usr/bin/${PN}/5lib" \
LIBZ=-lz
}
src_install() {
# we don't want to strip here, so use "true" as noop
- emake STRIP="true" ROOT="${D}" -j1 install
+ emake -j1 \
+ STRIP="true" \
+ ROOT="${ED}" \
+ DEFBIN="/usr/bin/${PN}/5bin" \
+ DEFSBIN="/usr/bin/${PN}/5bin" \
+ SV3BIN="/usr/bin/${PN}/5bin" \
+ S42BIN="/usr/bin/${PN}/5bin/s42" \
+ SUSBIN="/usr/bin/${PN}/5bin/posix" \
+ UCBBIN="/usr/bin/${PN}/ucb" \
+ CCSBIN="/usr/bin/${PN}/ccs/bin" \
+ SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+ DEFLIB="/usr/bin/${PN}/5lib" \
+ 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 "You may want to adjust your \$PATH, to enable "
+ elog "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/files/
commit: eb01d723940418fcba8538c36859a07e76a4b4fc
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 14:21:40 2020 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 26 14:21:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb01d723
sys-apps/heirloom-tools: more -fno-common fixes
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann googlemail.com>
Signed-off-by: David Seifert gentoo.org>
.../files/heirloom-tools-070715-gcc-10.patch | 173 +
1 file changed, 173 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
index 38de3216085..ce0c2bdc5be 100644
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
@@ -103,3 +103,176 @@
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 intopt;
+
+ #define D_NORMAL0 /* 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 intaflag; /* diff binary files */
++extern inttflag; /* expand tabs on output */
++extern intpflag; /* 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 inthflag; /* -h, use halfhearted DIFFH */
++extern intbflag; /* ignore blanks in comparisons */
++extern intwflag; /* totally ignore blanks in comparisons
*/
++extern intiflag; /* ignore case in comparisons */
++extern intBflag; /* 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 intlflag; /* long output format with header */
++extern intrflag; /* recursively trace directories */
++extern intsflag; /* announce files which are same */
++extern intNflag; /* 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 intwantelses; /* -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 intcontext;/* lines of context to be printed */
+
+ /*
+ * State for exit status.
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 8bce04fadab13f253fad9ba5c7378910522c5b58
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 14:21:43 2020 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 26 14:21:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bce04fa
sys-apps/heirloom-tools: respect CFLAGS
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/15124
Signed-off-by: Stephan Hartmann googlemail.com>
Signed-off-by: David Seifert gentoo.org>
...heirloom-tools-070715-r1.ebuild => heirloom-tools-070715-r2.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
similarity index 94%
rename from sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
rename to sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
index 0f7cbc127f3..f45cc2e1c88 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
@@ -37,6 +37,9 @@ src_compile() {
emake -j1 \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
+ CFLAGS2="${CFLAGS}" \
+ CFLAGSS="${CFLAGS}" \
+ CFLAGSU="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" \
LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
LDFLAGS="${LDFLAGS}" \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: cf4ed02e7440ce2ccc904d9e59592802c46c162d
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 09:21:59 2020 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 26 09:21:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf4ed02e
sys-apps/heirloom-tools: add depend on sys-devel/bc
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/15113
Signed-off-by: Stephan Hartmann googlemail.com>
Signed-off-by: David Seifert gentoo.org>
sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index b3b27bdab68..0f7cbc127f3 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
sys-apps/ed
+ sys-devel/bc
virtual/pkgconfig
"
S="${WORKDIR}/heirloom-${PV}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/, sys-apps/heirloom-tools/files/
commit: e1b706046abcfd31c9ecd1e950a185c5cbf6068d
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 09:21:56 2020 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 26 09:21:56 2020 +
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 googlemail.com>
Signed-off-by: David Seifert 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 000..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 017
+
++enum fmttypefmttype;
+ 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 intformatforced; /* -k -i -Hfmt forces a format */
+ static long long lineno; /* input line number */
+
++enum paxpax;
++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
+ #include
+
+-enum {
++enum fmttype {
+ FMT_NONE= , /* no format chosen yet */
+
+ TYP_PAX = 0010, /* uses pax-like extended headers */
+@@ -70,7 +70,8 @@ enum {
+ FMT_BAR = 0041, /* bar format type */
+
+ FMT_ZIP = 0100 /* 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 intpax_dflag;
+ extern intpax_kflag;
+ extern intpax_nflag;
+@@ -185,14 +187,15 @@ extern int pax_sflag;
+ extern intpax_uflag;
+ extern intpax_Xflag;
+
+-enum {
++enum pax_preserve {
+ PAX_P_NONE = ,
+ 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
+ #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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
commit: fc98ef6d53fe28b690ca2b67d96cde766d1432c6
Author: Stephan Hartmann googlemail com>
AuthorDate: Thu Mar 26 09:21:53 2020 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 26 09:21:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc98ef6d
sys-apps/heirloom-tools: fix build with glibc 2.31
Closes: https://bugs.gentoo.org/709410
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann googlemail.com>
Signed-off-by: David Seifert gentoo.org>
.../files/heirloom-tools-070715-glibc-2.31.patch | 41 ++
.../heirloom-tools/heirloom-tools-070715-r1.ebuild | 1 +
2 files changed, 42 insertions(+)
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
new file mode 100644
index 000..5186aa1cc2e
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
@@ -0,0 +1,41 @@
+--- 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(, 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(, 0, sizeof before);
+ memset(, 0, sizeof after);
+@@ -164,7 +151,9 @@ settime(char *op)
+ if ((newtime = timeop(op)) == (time_t)-1)
+ badconv();
+ gettimeofday(_tv, NULL);
+- if (stime() < 0) {
++ tv.tv_sec = newtime;
++ tv.tv_usec = 0;
++ if (settimeofday(, NULL) < 0) {
+ fprintf(stderr, "%s: no permission\n", progname);
+ exit(1);
+ }
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 80d2232221a..26da82f5c8b 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -24,6 +24,7 @@ S="${WORKDIR}/heirloom-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-major.patch
"${FILESDIR}"/${P}-glibc-2.30.patch
+ "${FILESDIR}"/${P}-glibc-2.31.patch
)
# slightly broken
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 2ba332126f596a5e33a78eb4c021046cc97b4862 Author: Mike Gilbert gentoo org> AuthorDate: Wed Mar 25 18:37:08 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Mar 25 18:38:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba33212 sys-apps/heirloom-tools: remove patrick as maintainer Signed-off-by: Mike Gilbert gentoo.org> sys-apps/heirloom-tools/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-apps/heirloom-tools/metadata.xml b/sys-apps/heirloom-tools/metadata.xml index 104a871f1a1..b6887e34071 100644 --- a/sys-apps/heirloom-tools/metadata.xml +++ b/sys-apps/heirloom-tools/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - patr...@gentoo.org - Patrick Lauer - + heirloom
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
commit: 18402f2ef1d009c5141c7dd628ab1cc7edea2d91
Author: Stephan Hartmann googlemail com>
AuthorDate: Tue Feb 18 15:31:45 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Mar 10 19:35:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18402f2e
sys-apps/heirloom-tools: fix building with glibc 2.30
While at it, fix patching with fuzz.
Closes: https://bugs.gentoo.org/692770
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14693
Signed-off-by: Sergei Trofimovich gentoo.org>
.../files/heirloom-tools-070715-glibc-2.30.patch | 13
.../files/heirloom-tools-070715-major.patch| 70 +-
.../heirloom-tools/heirloom-tools-070715-r1.ebuild | 8 +--
3 files changed, 82 insertions(+), 9 deletions(-)
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
new file mode 100644
index 000..19b90cea6d2
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
@@ -0,0 +1,13 @@
+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
+ #include
+ #include
+-#if !defined (__dietlibc__) && !defined (__UCLIBC__)
++#if !defined (__dietlibc__) && !defined (__UCLIBC__) && !defined(__linux__)
+ #include
+ #endif
+ #include
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
index 82d32315d81..81e6755e7e3 100644
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
@@ -1,6 +1,8 @@
+diff --git a/cpio/cpio.c b/cpio/cpio.c
+index 89c5cbc..210287b 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
-@@ -91,9 +91,9 @@
+@@ -91,11 +91,12 @@
#include
#include
@@ -10,11 +12,45 @@
-#endif/* _AIX */
+#endif/* _AIX || __GLIBC__ */
- #ifndef major
+-#ifndef major
++#include
++#if 0
#include
+ #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
+ #include
+ #include
+-#ifndef major
++#include
++#if 0
+ #include
+ #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
+ #endif
+-#ifndef major
++#include
++#if 0
+ #include
+ #endif
+ #if __NetBSD_Version__>= 3
+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 @@
+@@ -119,7 +119,7 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";
#include
#endif/* USE_TERMCAP */
@@ -23,3 +59,31 @@
#include
#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
+ #include
+ #include
+-#ifndef major
++#include
++#if 0
+ #include
+ #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.sl1.177
(gritter) 4/14/07";
+ #include
+ #endif
+
+-#ifndef major
++#include
++#if 0
+ #include
+ #endif/* !major */
+
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 9d55edab0b4..80d2232221a 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,16 +23,12 @@ DEPEND="
S="${WORKDIR}/heirloom-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-major.patch
+ "${FILESDIR}"/${P}-glibc-2.30.patch
)
# slightly broken
RESTRICT="test"
-src_prepare() {
- find . -name '*.c' -exec sed -i -e 's|#ifndef[[:space:]]*major|#include
\n#if 0|g' {} + || die
-
- default
-}
src_compile() {
append-cppflags -D_GNU_SOURCE
emake -j1 \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/
commit: 70e4459a8f2e6b44e406fc08c5c6e51e8f646f81
Author: Stephan Hartmann googlemail com>
AuthorDate: Tue Feb 18 15:33:19 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Mar 10 19:35:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e4459a
sys-apps/heirloom-tools: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann googlemail.com>
Signed-off-by: Sergei Trofimovich gentoo.org>
.../heirloom-tools/heirloom-tools-070715.ebuild| 41 --
1 file changed, 41 deletions(-)
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
deleted file mode 100644
index 00037ab30d2..000
--- a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs
-
-# slightly broken
-RESTRICT="test"
-
-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"
-IUSE=""
-
-DEPEND="sys-apps/ed
- sys-libs/zlib[static-libs]"
-RDEPEND=""
-
-S="${WORKDIR}/heirloom-${PV}"
-
-src_compile() {
- append-cppflags -D_GNU_SOURCE
- emake -j1
-}
-
-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/
commit: 94132bac4609f09fab26fa59b9769a2bda95034f
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Mar 29 15:10:31 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Mar 29 15:10:48 2018 +
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 000..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
+ #include
+
+-#ifdef_AIX
++#if defined (_AIX) || defined (__GLIBC__)
+ #include
+-#endif/* _AIX */
++#endif/* _AIX || __GLIBC__ */
+
+ #ifndef major
+ #include
+--- a/ls/ls.c
b/ls/ls.c
+@@ -119,7 +119,7 @@
+ #include
+ #endif/* USE_TERMCAP */
+
+-#ifdef_AIX
++#if defined (_AIX) || defined (__GLIBC__)
+ #include
+ #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 000..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
\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."
+}
