gentoo resync : 31.03.2018

3 files changed, 84 insertions, 0 deletions

diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index b694acfc0008..3e60ecea71ba 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -1,3 +1,5 @@
+AUX heirloom-tools-070715-major.patch 464 BLAKE2B 7fa6c9feee0bdbda9199791369ab3565250960f08e42b4a7b8b3e9afbe0af8bf08b1c3766cb69a3f822435e1d691036899419f3cfccf8e1657483adf0197fd51 SHA512 65659c579f99c85187b001be0fea5b04e4e0b319a1791e9219127b2fdab7bb0e390d15b4f76a43d32c37695a6255e1e30ebb5274eb824535a50c6d2b429b856c
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
+EBUILD heirloom-tools-070715-r1.ebuild 1362 BLAKE2B 5f101f00c501378b7d30f57805bf86a26e796059570754d21995d166a329927fd4ff6ef87b8c08dc395dfd74058697841b481667846858e2d8db5b4037ccf1b6 SHA512 04db878021350370f7f92dc55a954aa3568a3b5087d1e1ac52ff79d55f05373c7c651e9cfb8bb13ea3a0dcbe305bc4fc3fc58a2fa08260583a181c106d8eee5c
 EBUILD heirloom-tools-070715.ebuild 1020 BLAKE2B b2e9d684c14a6fc6683cf9303387fdb0a035f648a289e730b8e6712bfffea4b426fa063235487ed833216e755b21b10490aac5c78f0f9d21c3d0d8c399913b68 SHA512 b44ea6c70d266452aec9f0f899305b84c8b87a75a11050c7c139899d591faa4652939a1db76bd4d6827cf040de8fcbcd94243255c0ddb9af9133270dc0d4bb4d
 MISC metadata.xml 325 BLAKE2B 083bcce163b0fba94ccbabdf2eedf1e9681c26d079438db220c0af26ba3a36169302476853bb42165e436bd8466678ce9f46f95d01df39e6e541d6c65d13d969 SHA512 54940bbe65218aceba90442526963ae60b9132d253d71d672d6e7fbef47de99b50249925b39702d0a1f1283cc57ccf91dfe9dd1dcfb88930176752ad46742d62
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 000000000000..82d32315d819
--- /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 000000000000..9d55edab0b49
--- /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."
+}