gentoo resync : 03.12.2017

5 files changed, 37 insertions, 32 deletions

diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index 1981a1527f21..d66a7a840b5c 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -1,5 +1,6 @@
-AUX zorroutils-0.04-20021014.diff 2181 BLAKE2B feea4843c87ff8e44e53bfbbfb4a3ff647609244196e692bf8af6ac53421650fd6ca8282f1144bf157580595ef7b545a30c099c3e80823dcf53e71326d6357de SHA512 f517be553f9be801dbdd21fa886df63fb1a10c151e8687d48c4efe66a202daf2cd3714f3d18167a6ced33fa7a9ae6c6e75fe0f7ee0e804f4ed1683bccc443599
-AUX zorroutils-gentoo.diff 327 BLAKE2B 0af58b11528b079562b7dfe29ca36e8083b5324e87217c981aa239a1ffd24b4ae70ce3f45dd62f95988cf36a45c0e25c50493ed2a634fae394ebc1f6f718b61c SHA512 c8ef49ae4438140c1336e0cbf9381a5e42b39f310eeda9be5101b85a19c595a1bfb97fac451c4757596cd49d5b2410c9d999bbff0d36b6ada9828ae278d57497
-DIST zorroutils-0.04.tar.gz 12205 SHA256 5aca30dec4f29b918d6b899d0467c95e4b9d0016dd7c647e9022bd7d4864676c SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f WHIRLPOOL ca81347f5fca3ad595b6f50556fe295f680ca160b72dd2b05b7d13ee90c502a369d31a5741ad30e81c902d1ac385ee3c39b4f7ef2d81cbc751b995d42c86c3ef
-EBUILD zorroutils-0.04.ebuild 686 BLAKE2B c53426b6dbacfb6cc4a1db7422080df31fa0598ea2cf7602f914e6c4331f3596aebc35a74c2be3a79d96961d3e695a9e135f3bdd4b2ed901411341214d69c803 SHA512 5c715f1f987fdec565743c59ee5e7518c4fc9214b7112d9f19182c467922292aa24b06d16ac24034c5487001c084a9fac26757c83b124309925ff25633ce4b18
+AUX zorroutils-0.04-20021014.diff 1791 BLAKE2B c2b3f27d3f7b1fd54ca53fe2e32df05e59a6b7d2e1b925fd4e1b50e35b2ff172bedb705608489c8cf805b83cb338f159e73633ad7e242107432891881c376529 SHA512 b64ac785ddada0b48b11f824b4a0e68a1d2e3113dcff160f53c8031fa6abe202562d84ba43a8ef9201531071cbb127a0b2d015bfeffd4cde36def3541036a13e
+AUX zorroutils-0.04-fix-build-system.patch 265 BLAKE2B ed4e654654f1e589fbdc9800811d0fcbabc482a5ef9f2612325ad008ed482e33c2143c9024bafdf979ba2cf43949a2b0351c40022a54516facd790a57d828174 SHA512 60c1d4d30cc2715be3cb749640df4a30445fbc2e25fd10c474bed59a30fc5c7fce6cdffe613304685693c1ea7c3765c3e66b640c92facfbdc43ed9831ed9452f
+AUX zorroutils-gentoo.diff 149 BLAKE2B 362923537fe56671c793bebbd82962362af13a97caace6bc37b7b99a07cdb6bfbaa6a0570e245c7c8e8ec688d5cf188f07d1bdc6f3447b935beeb8fe8ca1249a SHA512 fb6262cf297ad57a423bc9f7b160bc25f5fa2134694c8adaf38d3c6ed17c652ab79473f9d0139bb29692d0ec5a24ad80b94f1b6d03a21329697d0e4d996633d7
+DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f
+EBUILD zorroutils-0.04.ebuild 688 BLAKE2B 2452a8f3bf3006825208d24007da5cbcdd6c861dfb9740e6f63c8b75446fcd27cb8cc1306cd54f89a7c4f504491f2192c8c213dd05a53e33f38ca6634ad2d766 SHA512 8269199e9badc67052b86aa8eedaaf1c6de4ba6b80645303867dfce5740396ea71088e7edf098dfb533e117d5139b58f541f0ac1fd75b19862f9eb4e9c1a7031
 MISC metadata.xml 430 BLAKE2B 6394dd99f4248b05a48e72b7f5b499f6e403f38ff6f43236bccaea69ccbfd352f094b9a5e9a09db8f5741d46104ba44243784570bd4fc654a77a4e96ca8d6bb6 SHA512 8e8419f4e429758c2d1d42405505da55f47fc3ea7e30c69c994d825aeb6e45d8639533f8cf276d44e1d272062d6d8058f27651c8b38eae7f7ac8c5844523318b
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
index 70edf2fce1d7..9475390ff4ce 100644
--- a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
@@ -1,15 +1,5 @@
-diff -Nru zorroutils-0.04.orig/zorro.ids zorroutils-0.04/zorro.ids
---- zorroutils-0.04.orig/zorro.ids	2000-09-28 20:45:47.000000000 +0200
-+++ zorroutils-0.04/zorro.ids	2002-10-14 15:08:58.000000000 +0200
-@@ -4,7 +4,7 @@
- #	Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
- #	If you have any new entries, please send them to the maintainer.
- #
--#	$Id$
-+#	$Id$
- #
- 
- # Manufacturers and Products. Please keep sorted.
+--- a/zorro.ids
++++ b/zorro.ids
 @@ -42,7 +42,7 @@
  	5000  A2620 68020 [Accelerator and RAM Expansion]
  	5100  A2630 68030 [Accelerator and RAM Expansion]
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch
new file mode 100644
index 000000000000..6e05cab86d81
--- /dev/null
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch
@@ -0,0 +1,15 @@
+Respect user variables
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,10 +2,6 @@
+ # Makefile for Linux Zorro Utilities
+ # Copyright (C) 1998--2000 Geert Uytterhoeven <geert@linux-m68k.org>
+ 
+-CC=gcc
+-OPT=-O3 -fomit-frame-pointer
+-CFLAGS=$(OPT) -Wall
+-
+ ROOT=/
+ PREFIX=/usr
+ 
diff --git a/sys-apps/zorroutils/files/zorroutils-gentoo.diff b/sys-apps/zorroutils/files/zorroutils-gentoo.diff
index a0a7e44872bc..97c545e0ed5d 100644
--- a/sys-apps/zorroutils/files/zorroutils-gentoo.diff
+++ b/sys-apps/zorroutils/files/zorroutils-gentoo.diff
@@ -1,6 +1,5 @@
-diff -Nru zorroutils-0.04.orig/zorroutils.h zorroutils-0.04/zorroutils.h
---- zorroutils-0.04.orig/zorroutils.h	2000-09-28 20:46:14.000000000 +0200
-+++ zorroutils-0.04/zorroutils.h	2006-09-16 18:08:17.000000000 +0200
+--- a/zorroutils.h
++++ b/zorroutils.h
 @@ -16,1 +16,1 @@
 -#define ZORRO_ID_DB "/usr/share/zorro.ids"
 +#define ZORRO_ID_DB "/usr/share/misc/zorro.ids"
diff --git a/sys-apps/zorroutils/zorroutils-0.04.ebuild b/sys-apps/zorroutils/zorroutils-0.04.ebuild
index 59c90eecef3d..e6f9de0d1603 100644
--- a/sys-apps/zorroutils/zorroutils-0.04.ebuild
+++ b/sys-apps/zorroutils/zorroutils-0.04.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Zorro bus utility for Amigas running 2.1 and later kernels"
 HOMEPAGE="http://users.telenet.be/geertu/Download/#zorro"
 SRC_URI="http://users.telenet.be/geertu/Download/${P}.tar.gz"
-IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="m68k ~ppc"
 
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.04-20021014.diff
-	epatch "${FILESDIR}"/${PN}-gentoo.diff
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.04-20021014.diff
+	"${FILESDIR}"/${PN}-gentoo.diff
+	"${FILESDIR}"/${PN}-0.04-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+src_configure() {
+	tc-export CC
+	append-cflags -Wall
 }
 
 src_install() {
 	dosbin lszorro
+	einstalldocs
 	doman *.8
 
 	insinto /usr/share/misc