From f13ea5002842f34785a6a9d4938d6b3001d3002b Mon Sep 17 00:00:00 2001 From: Stephan Hartmann Date: Thu, 26 Mar 2020 16:34:52 +0100 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/15127 Signed-off-by: Joonas Niilola --- .../files/heirloom-tools-070715-makefile.patch | 16 +++++ .../heirloom-tools/heirloom-tools-070715-r2.ebuild | 59 ---------------- .../heirloom-tools/heirloom-tools-070715-r3.ebuild | 82 ++++++++++++++++++++++ 3 files changed, 98 insertions(+), 59 deletions(-) create mode 100644 sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch delete mode 100644 sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild create mode 100644 sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild (limited to 'sys-apps/heirloom-tools') 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 000000000000..a4ce2970589d --- /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-r2.ebuild deleted file mode 100644 index f45cc2e1c880..000000000000 --- a/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 - sys-devel/bc - virtual/pkgconfig -" -S="${WORKDIR}/heirloom-${PV}" -PATCHES=( - "${FILESDIR}"/${P}-major.patch - "${FILESDIR}"/${P}-glibc-2.30.patch - "${FILESDIR}"/${P}-glibc-2.31.patch - "${FILESDIR}"/${P}-gcc-10.patch -) - -# slightly broken -RESTRICT="test" - -src_compile() { - append-cppflags -D_GNU_SOURCE - emake -j1 \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CFLAGS2="${CFLAGS}" \ - CFLAGSS="${CFLAGS}" \ - CFLAGSU="${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." -} diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild new file mode 100644 index 000000000000..34e2e70756e4 --- /dev/null +++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 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/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 +) + +# slightly broken +RESTRICT="test" + +src_compile() { + append-cppflags -D_GNU_SOURCE + emake -j1 \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CFLAGS2="${CFLAGS}" \ + CFLAGSS="${CFLAGS}" \ + CFLAGSU="${CFLAGS}" \ + 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 -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." +} -- cgit v1.2.3-65-gdbad