* [gentoo-commits] repo/gentoo:master commit in: sys-apps/zorroutils/, sys-apps/zorroutils/files/
@ 2017-12-02 14:16 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-12-02 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 35a23d32b0660422b13f49c5b30addb7b2c6d793
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 13:28:35 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 14:15:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a23d32
sys-apps/zorroutils: Port to EAPI 6
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sys-apps/zorroutils/Manifest | 2 +-
.../zorroutils/files/zorroutils-0.04-20021014.diff | 14 ++----------
.../files/zorroutils-0.04-fix-build-system.patch | 15 +++++++++++++
sys-apps/zorroutils/files/zorroutils-gentoo.diff | 5 ++---
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 dfd9a261847..c35fb560fd2 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 70edf2fce1d..9475390ff4c 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 00000000000..6e05cab86d8
--- /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 a0a7e44872b..97c545e0ed5 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 59c90eecef3..e6f9de0d160 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/zorroutils/, sys-apps/zorroutils/files/
@ 2020-04-21 20:05 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2020-04-21 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 16dea1437cb55c11a75b5b018e4ca18b501700d7
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 20:05:32 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 20:05:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16dea143
sys-apps/zorroutils: bump up to 0.05
Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/696776
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/zorroutils/Manifest | 1 +
.../files/zorroutils-0.05-fix-build-system.patch | 14 +++++++++
sys-apps/zorroutils/zorroutils-0.05.ebuild | 33 ++++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index c35fb560fd2..0150b6d219e 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -1 +1,2 @@
DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f
+DIST zorroutils-0.05.tar.gz 15428 BLAKE2B e9baa6de4da3cbc6754c52d9e0c1fe34ce735b4d5377772c1765bdd30ae988f92125a5f254fcaab797eed33d65dad59e2a385fba3fc4610a9cfb6c34c6b45e7e SHA512 5260cfc7ccf77d0a0fe012c32ab492824903cb0f1397a82cf4c52aa12df5845b9e3d53aa1f619cc3a0637dfb42e9b75f80d715e4e912c5b8f42e0588f9053421
diff --git a/sys-apps/zorroutils/files/zorroutils-0.05-fix-build-system.patch b/sys-apps/zorroutils/files/zorroutils-0.05-fix-build-system.patch
new file mode 100644
index 00000000000..3b981116b89
--- /dev/null
+++ b/sys-apps/zorroutils/files/zorroutils-0.05-fix-build-system.patch
@@ -0,0 +1,14 @@
+Respect user variables
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,9 +2,5 @@
+ # 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
+-
+ PREFIX=/usr
+
diff --git a/sys-apps/zorroutils/zorroutils-0.05.ebuild b/sys-apps/zorroutils/zorroutils-0.05.ebuild
new file mode 100644
index 00000000000..f5e28bc3f6c
--- /dev/null
+++ b/sys-apps/zorroutils/zorroutils-0.05.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="https://github.com/glaubitz/zorroutils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~m68k ~ppc"
+
+PATCHES=(
+ #"${FILESDIR}"/${PN}-0.04-20021014.diff
+ #"${FILESDIR}"/${PN}-gentoo.diff
+ "${FILESDIR}"/${PN}-0.05-fix-build-system.patch
+)
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dosbin lszorro
+ einstalldocs
+ doman *.8
+
+ insinto /usr/share/misc
+ doins zorro.ids
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/zorroutils/, sys-apps/zorroutils/files/
@ 2022-08-31 5:41 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-08-31 5:41 UTC (permalink / raw
To: gentoo-commits
commit: 977708957e4c5c82043cbae393f6430f8f8309f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 21:14:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 05:41:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97770895
sys-apps/zorroutils: drop 0.04, EAPI-6--
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-apps/zorroutils/Manifest | 1 -
.../files/zorroutils-0.04-fix-build-system.patch | 15 ----------
sys-apps/zorroutils/zorroutils-0.04.ebuild | 34 ----------------------
3 files changed, 50 deletions(-)
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index 0150b6d219e4..27c85530f9ba 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -1,2 +1 @@
-DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f
DIST zorroutils-0.05.tar.gz 15428 BLAKE2B e9baa6de4da3cbc6754c52d9e0c1fe34ce735b4d5377772c1765bdd30ae988f92125a5f254fcaab797eed33d65dad59e2a385fba3fc4610a9cfb6c34c6b45e7e SHA512 5260cfc7ccf77d0a0fe012c32ab492824903cb0f1397a82cf4c52aa12df5845b9e3d53aa1f619cc3a0637dfb42e9b75f80d715e4e912c5b8f42e0588f9053421
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
deleted file mode 100644
index 6e05cab86d81..000000000000
--- a/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/zorroutils-0.04.ebuild b/sys-apps/zorroutils/zorroutils-0.04.ebuild
deleted file mode 100644
index ed9819812d27..000000000000
--- a/sys-apps/zorroutils/zorroutils-0.04.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~m68k ~ppc"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.04-20021014.diff
- "${FILESDIR}"/${PN}-gentoo.diff
- "${FILESDIR}"/${PN}-0.04-fix-build-system.patch
-)
-
-src_configure() {
- tc-export CC
- append-cflags -Wall
-}
-
-src_install() {
- dosbin lszorro
- einstalldocs
- doman *.8
-
- insinto /usr/share/misc
- doins zorro.ids
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-31 5:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-02 14:16 [gentoo-commits] repo/gentoo:master commit in: sys-apps/zorroutils/, sys-apps/zorroutils/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-04-21 20:05 Sergei Trofimovich
2022-08-31 5:41 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox