diff options
| author |   David Seifert <soap@gentoo.org> | 2017-12-02 14:28:35 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-12-02 15:15:34 +0100 |
| commit | 35a23d32b0660422b13f49c5b30addb7b2c6d793 (patch) | |
| tree | 1b387106919fea26aca1a08c071a147d47708fb7 /sys-apps | |
| parent | dev-libs/libuv: Version bump. (diff) | |
| download | gentoo-35a23d32b0660422b13f49c5b30addb7b2c6d793.tar.gz gentoo-35a23d32b0660422b13f49c5b30addb7b2c6d793.tar.bz2 gentoo-35a23d32b0660422b13f49c5b30addb7b2c6d793.zip | |
sys-apps/zorroutils: Port to EAPI 6
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/zorroutils/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff | 14 | ||||
| -rw-r--r-- | sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch | 15 | ||||
| -rw-r--r-- | sys-apps/zorroutils/files/zorroutils-gentoo.diff | 5 | ||||
| -rw-r--r-- | sys-apps/zorroutils/zorroutils-0.04.ebuild | 26 |
5 files changed, 33 insertions, 29 deletions
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest index dfd9a261847a..c35fb560fd29 100644 --- a/sys-apps/zorroutils/Manifest +++ b/sys-apps/zorroutils/Manifest @@ -1 +1 @@ -DIST zorroutils-0.04.tar.gz 12205 SHA256 5aca30dec4f29b918d6b899d0467c95e4b9d0016dd7c647e9022bd7d4864676c SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f WHIRLPOOL ca81347f5fca3ad595b6f50556fe295f680ca160b72dd2b05b7d13ee90c502a369d31a5741ad30e81c902d1ac385ee3c39b4f7ef2d81cbc751b995d42c86c3ef +DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f 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 |