| 1 |
commit: 35a23d32b0660422b13f49c5b30addb7b2c6d793 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 2 13:28:35 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 2 14:15:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a23d32 |
| 7 |
|
| 8 |
sys-apps/zorroutils: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/zorroutils/Manifest | 2 +- |
| 13 |
.../zorroutils/files/zorroutils-0.04-20021014.diff | 14 ++---------- |
| 14 |
.../files/zorroutils-0.04-fix-build-system.patch | 15 +++++++++++++ |
| 15 |
sys-apps/zorroutils/files/zorroutils-gentoo.diff | 5 ++--- |
| 16 |
sys-apps/zorroutils/zorroutils-0.04.ebuild | 26 +++++++++++----------- |
| 17 |
5 files changed, 33 insertions(+), 29 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest |
| 20 |
index dfd9a261847..c35fb560fd2 100644 |
| 21 |
--- a/sys-apps/zorroutils/Manifest |
| 22 |
+++ b/sys-apps/zorroutils/Manifest |
| 23 |
@@ -1 +1 @@ |
| 24 |
-DIST zorroutils-0.04.tar.gz 12205 SHA256 5aca30dec4f29b918d6b899d0467c95e4b9d0016dd7c647e9022bd7d4864676c SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f WHIRLPOOL ca81347f5fca3ad595b6f50556fe295f680ca160b72dd2b05b7d13ee90c502a369d31a5741ad30e81c902d1ac385ee3c39b4f7ef2d81cbc751b995d42c86c3ef |
| 25 |
+DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f |
| 26 |
|
| 27 |
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff |
| 28 |
index 70edf2fce1d..9475390ff4c 100644 |
| 29 |
--- a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff |
| 30 |
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff |
| 31 |
@@ -1,15 +1,5 @@ |
| 32 |
-diff -Nru zorroutils-0.04.orig/zorro.ids zorroutils-0.04/zorro.ids |
| 33 |
---- zorroutils-0.04.orig/zorro.ids 2000-09-28 20:45:47.000000000 +0200 |
| 34 |
-+++ zorroutils-0.04/zorro.ids 2002-10-14 15:08:58.000000000 +0200 |
| 35 |
-@@ -4,7 +4,7 @@ |
| 36 |
- # Maintained by Geert Uytterhoeven <zorro@××××××××××.org> |
| 37 |
- # If you have any new entries, please send them to the maintainer. |
| 38 |
- # |
| 39 |
--# $Id$ |
| 40 |
-+# $Id$ |
| 41 |
- # |
| 42 |
- |
| 43 |
- # Manufacturers and Products. Please keep sorted. |
| 44 |
+--- a/zorro.ids |
| 45 |
++++ b/zorro.ids |
| 46 |
@@ -42,7 +42,7 @@ |
| 47 |
5000 A2620 68020 [Accelerator and RAM Expansion] |
| 48 |
5100 A2630 68030 [Accelerator and RAM Expansion] |
| 49 |
|
| 50 |
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 |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..6e05cab86d8 |
| 53 |
--- /dev/null |
| 54 |
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch |
| 55 |
@@ -0,0 +1,15 @@ |
| 56 |
+Respect user variables |
| 57 |
+ |
| 58 |
+--- a/Makefile |
| 59 |
++++ b/Makefile |
| 60 |
+@@ -2,10 +2,6 @@ |
| 61 |
+ # Makefile for Linux Zorro Utilities |
| 62 |
+ # Copyright (C) 1998--2000 Geert Uytterhoeven <geert@××××××××××.org> |
| 63 |
+ |
| 64 |
+-CC=gcc |
| 65 |
+-OPT=-O3 -fomit-frame-pointer |
| 66 |
+-CFLAGS=$(OPT) -Wall |
| 67 |
+- |
| 68 |
+ ROOT=/ |
| 69 |
+ PREFIX=/usr |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/sys-apps/zorroutils/files/zorroutils-gentoo.diff b/sys-apps/zorroutils/files/zorroutils-gentoo.diff |
| 73 |
index a0a7e44872b..97c545e0ed5 100644 |
| 74 |
--- a/sys-apps/zorroutils/files/zorroutils-gentoo.diff |
| 75 |
+++ b/sys-apps/zorroutils/files/zorroutils-gentoo.diff |
| 76 |
@@ -1,6 +1,5 @@ |
| 77 |
-diff -Nru zorroutils-0.04.orig/zorroutils.h zorroutils-0.04/zorroutils.h |
| 78 |
---- zorroutils-0.04.orig/zorroutils.h 2000-09-28 20:46:14.000000000 +0200 |
| 79 |
-+++ zorroutils-0.04/zorroutils.h 2006-09-16 18:08:17.000000000 +0200 |
| 80 |
+--- a/zorroutils.h |
| 81 |
++++ b/zorroutils.h |
| 82 |
@@ -16,1 +16,1 @@ |
| 83 |
-#define ZORRO_ID_DB "/usr/share/zorro.ids" |
| 84 |
+#define ZORRO_ID_DB "/usr/share/misc/zorro.ids" |
| 85 |
|
| 86 |
diff --git a/sys-apps/zorroutils/zorroutils-0.04.ebuild b/sys-apps/zorroutils/zorroutils-0.04.ebuild |
| 87 |
index 59c90eecef3..e6f9de0d160 100644 |
| 88 |
--- a/sys-apps/zorroutils/zorroutils-0.04.ebuild |
| 89 |
+++ b/sys-apps/zorroutils/zorroutils-0.04.ebuild |
| 90 |
@@ -1,32 +1,32 @@ |
| 91 |
-# Copyright 1999-2009 Gentoo Foundation |
| 92 |
+# Copyright 1999-2017 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-inherit eutils toolchain-funcs |
| 96 |
+EAPI=6 |
| 97 |
+ |
| 98 |
+inherit flag-o-matic toolchain-funcs |
| 99 |
|
| 100 |
DESCRIPTION="Zorro bus utility for Amigas running 2.1 and later kernels" |
| 101 |
HOMEPAGE="http://users.telenet.be/geertu/Download/#zorro" |
| 102 |
SRC_URI="http://users.telenet.be/geertu/Download/${P}.tar.gz" |
| 103 |
-IUSE="" |
| 104 |
|
| 105 |
LICENSE="GPL-2" |
| 106 |
SLOT="0" |
| 107 |
KEYWORDS="m68k ~ppc" |
| 108 |
|
| 109 |
-DEPEND="" |
| 110 |
-RDEPEND="" |
| 111 |
- |
| 112 |
-src_unpack() { |
| 113 |
- unpack ${A} |
| 114 |
- epatch "${FILESDIR}"/${PN}-0.04-20021014.diff |
| 115 |
- epatch "${FILESDIR}"/${PN}-gentoo.diff |
| 116 |
-} |
| 117 |
+PATCHES=( |
| 118 |
+ "${FILESDIR}"/${PN}-0.04-20021014.diff |
| 119 |
+ "${FILESDIR}"/${PN}-gentoo.diff |
| 120 |
+ "${FILESDIR}"/${PN}-0.04-fix-build-system.patch |
| 121 |
+) |
| 122 |
|
| 123 |
-src_compile() { |
| 124 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die |
| 125 |
+src_configure() { |
| 126 |
+ tc-export CC |
| 127 |
+ append-cflags -Wall |
| 128 |
} |
| 129 |
|
| 130 |
src_install() { |
| 131 |
dosbin lszorro |
| 132 |
+ einstalldocs |
| 133 |
doman *.8 |
| 134 |
|
| 135 |
insinto /usr/share/misc |
Archives