| 1 |
commit: 74cb78ba9e2a2ede0c725bd649674aa26e73e008 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 11:54:13 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 13:16:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74cb78ba |
| 7 |
|
| 8 |
app-arch/tapeutils: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../tapeutils/files/tapeutils-0.4-fix-C-decl.patch | 31 ++++++++++++++++++++++ |
| 13 |
.../files/tapeutils-0.4-fix-build-system.patch | 11 ++++++++ |
| 14 |
app-arch/tapeutils/tapeutils-0.4.ebuild | 16 ++++++++--- |
| 15 |
3 files changed, 54 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..ee07c252d16 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch |
| 22 |
@@ -0,0 +1,31 @@ |
| 23 |
+--- a/tapecopy.c |
| 24 |
++++ b/tapecopy.c |
| 25 |
+@@ -26,6 +26,8 @@ |
| 26 |
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 |
+ */ |
| 28 |
+ |
| 29 |
++#include <stdlib.h> |
| 30 |
++ |
| 31 |
+ #include "tapeio.h" |
| 32 |
+ #include "stdio.h" |
| 33 |
+ #include "stdarg.h" |
| 34 |
+--- a/tapedump.c |
| 35 |
++++ b/tapedump.c |
| 36 |
+@@ -26,6 +26,8 @@ |
| 37 |
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 38 |
+ */ |
| 39 |
+ |
| 40 |
++#include <stdlib.h> |
| 41 |
++ |
| 42 |
+ #include "tapeio.h" |
| 43 |
+ #include "stdio.h" |
| 44 |
+ #include "stdarg.h" |
| 45 |
+@@ -158,7 +160,7 @@ |
| 46 |
+ len = getrec (src, buf, MAX_REC_LEN); |
| 47 |
+ if (len == 0) |
| 48 |
+ { |
| 49 |
+- printf ("total length of file %d = %d records, %d bytes\n", |
| 50 |
++ printf ("total length of file %d = %d records, %lu bytes\n", |
| 51 |
+ file, record, filebytes); |
| 52 |
+ tapebytes += filebytes; |
| 53 |
+ file++; |
| 54 |
|
| 55 |
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch |
| 56 |
new file mode 100644 |
| 57 |
index 00000000000..e1670a47fe2 |
| 58 |
--- /dev/null |
| 59 |
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch |
| 60 |
@@ -0,0 +1,11 @@ |
| 61 |
+--- a/Makefile |
| 62 |
++++ b/Makefile |
| 63 |
+@@ -20,8 +20,6 @@ |
| 64 |
+ # options |
| 65 |
+ # ----------------------------------------------------------------------------- |
| 66 |
+ |
| 67 |
+-CFLAGS = -O2 |
| 68 |
+-LDFLAGS = |
| 69 |
+ |
| 70 |
+ # CFLAGS = -g |
| 71 |
+ # LDFLAGS = -g |
| 72 |
|
| 73 |
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4.ebuild |
| 74 |
index b70a469e36d..50e3aac7274 100644 |
| 75 |
--- a/app-arch/tapeutils/tapeutils-0.4.ebuild |
| 76 |
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild |
| 77 |
@@ -1,6 +1,8 @@ |
| 78 |
-# Copyright 1999-2010 Gentoo Foundation |
| 79 |
+# Copyright 1999-2017 Gentoo Foundation |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
+EAPI=6 |
| 83 |
+ |
| 84 |
inherit toolchain-funcs |
| 85 |
|
| 86 |
DESCRIPTION="Utilities for manipulation of tapes and tape image files" |
| 87 |
@@ -12,13 +14,19 @@ SLOT="0" |
| 88 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 89 |
IUSE="" |
| 90 |
|
| 91 |
+DEPEND="" |
| 92 |
RDEPEND="!app-emulation/hercules" |
| 93 |
|
| 94 |
-src_compile() { |
| 95 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die |
| 96 |
+PATCHES=( |
| 97 |
+ "${FILESDIR}"/${PN}-0.4-fix-build-system.patch |
| 98 |
+ "${FILESDIR}"/${PN}-0.4-fix-C-decl.patch |
| 99 |
+) |
| 100 |
+ |
| 101 |
+src_configure() { |
| 102 |
+ tc-export CC |
| 103 |
} |
| 104 |
|
| 105 |
src_install() { |
| 106 |
- dobin tapecopy tapedump || die |
| 107 |
+ dobin tapecopy tapedump |
| 108 |
# no docs to install |
| 109 |
} |
Archives