gentoo resync : 02.01.2018

3 files changed, 85 insertions, 0 deletions

diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 3ba0746a3765..2e828f825e0b 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,5 +1,8 @@
 AUX audioctl.init 455 BLAKE2B 5e449ba3910ded2550dbbd367a2a4f63e3964a65b48d228078a30205a731c0270bd96d7bf4105d833b67fcbd2f0ae98de414f5b77f495172dac741498d94183d SHA512 6ae87679c9e51876551babfaa35126a7ae94c15edc21c630154130652a1f9f754c489c5406c9c3166157a45495d05668bb06bce79ab34053a0b74c34b19c16a5
+AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
 DIST sparc-utils_1.9-3.diff.gz 10337 BLAKE2B 03ee7ca15c4e736955fa08c66bbd1db2ec39764b4334fbec3838f5bcea3945d22c7a3148c00ab43a67324827af473739d014d7a6a895dbbd58c43ba13cbb1efe SHA512 c6eba75261ffee55cc49e3da71ad3a2f12e04574158975c69db0bbd94d7c22ca4dec50f3140cf0bf9f35bb547865deca3cfd3e28e76c70b9173926bc0b8f34ee
+DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
 EBUILD sparc-utils-1.9-r4.ebuild 2304 BLAKE2B 16c4932eff08538320f9e624f942a779fcf6c9011922b0deb52b9abf5595f1274a9cec075756cf29ba81c8b0b5b572d13ccf07e46b6ba8865bc50c8090eea7e9 SHA512 8d72473fb064d0a2c2fc5e4334d23f2af904fa9d7ff4c406193d9dd2f45c4728ed696bc842c6a558958623a5bf89109b37ce25ad7d071d16036ce17807390166
+EBUILD sparc-utils-1.9-r5.ebuild 1547 BLAKE2B 876ab391f3920f7743f1ccccc071012b227322137da087e3ec76afab891485449813bc7797fc8f3f4fe5f3d61cec1cec78516972ee38004afd6a3687e03c1078 SHA512 34e081d48ad5f862db79e2654d7b0ff2020358438770697629f1a19318b864ced425c7b9779314ba23703e8d43803540bd59e400297ce24ad382a4ff74eeca79
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
new file mode 100644
index 000000000000..567edd3c6113
--- /dev/null
+++ b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
@@ -0,0 +1,21 @@
+diff --git a/prtconf-1.3/eeprom.c b/prtconf-1.3/eeprom.c
+index b801f95..b15e74c 100644
+--- a/prtconf-1.3/eeprom.c
++++ b/prtconf-1.3/eeprom.c
+@@ -33,4 +33,6 @@
+ #include <dirent.h>
+ #include <pwd.h>
++#include <ctype.h> /* isdigit() */
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
+diff --git a/prtconf-1.3/prtconf.c b/prtconf-1.3/prtconf.c
+index b9d8c89..c9b54be 100644
+--- a/prtconf-1.3/prtconf.c
++++ b/prtconf-1.3/prtconf.c
+@@ -30,4 +30,5 @@
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
new file mode 100644
index 000000000000..80f6a939f0df
--- /dev/null
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
+HOMEPAGE="https://packages.debian.org/sparc-utils"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-4.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND=">=sys-apps/util-linux-2.13-r1"
+
+S=${WORKDIR}/${P}.orig
+
+PATCHES=(
+	"${WORKDIR}/${PN}_${PV}-4.diff"
+	"${FILESDIR}"/${P}-no-implicit.patch
+)
+
+src_compile() {
+	emake -C elftoaout-2.3 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C src piggyback piggyback64 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C prtconf-1.3 all \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	# since the debian/piggyback64.1 manpage is a pointer to the
+	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
+	# debian/piggyback64.1
+
+	cp "${S}"/debian/piggyback.1 "${S}"/debian/piggyback64.1 || die
+
+	dobin elftoaout-2.3/elftoaout
+	dobin src/piggyback
+	dobin src/piggyback64
+	dosbin prtconf-1.3/prtconf
+	dosbin prtconf-1.3/eeprom
+
+	doman elftoaout-2.3/elftoaout.1
+	doman prtconf-1.3/prtconf.8
+	doman prtconf-1.3/eeprom.8
+	doman debian/piggyback.1
+	doman debian/piggyback64.1
+}
+
+pkg_postinst() {
+	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
+	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
+	ewarn "module (and that the module is loaded)."
+}