| 1 |
commit: bc310d09456377a4cbde1ec4b0bff892999bc456 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 16 20:16:19 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 16 20:16:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc310d09 |
| 7 |
|
| 8 |
sys-fs/quotatool: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/725992 |
| 11 |
Closes: https://bugs.gentoo.org/740918 |
| 12 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
...lags.patch => quotatool-1.4.13-fix-buildsystem.patch} | 16 ++++++++++++---- |
| 16 |
sys-fs/quotatool/quotatool-1.6.2.ebuild | 14 ++++++++------ |
| 17 |
2 files changed, 20 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch b/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch |
| 20 |
similarity index 58% |
| 21 |
rename from sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch |
| 22 |
rename to sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch |
| 23 |
index d73f02f8ce8..b6554298808 100644 |
| 24 |
--- a/sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch |
| 25 |
+++ b/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch |
| 26 |
@@ -1,5 +1,5 @@ |
| 27 |
---- quotatool-1.4.13/local.mk.in |
| 28 |
-+++ quotatool-1.4.13/local.mk.in |
| 29 |
+--- a/local.mk.in |
| 30 |
++++ b/local.mk.in |
| 31 |
@@ -17,7 +17,8 @@ |
| 32 |
|
| 33 |
CC := @CC@ |
| 34 |
@@ -10,8 +10,8 @@ |
| 35 |
|
| 36 |
|
| 37 |
INSTALL := @INSTALL@ |
| 38 |
---- quotatool-1.4.13/Makefile |
| 39 |
-+++ quotatool-1.4.13/Makefile |
| 40 |
+--- a/Makefile |
| 41 |
++++ b/Makefile |
| 42 |
@@ -58,7 +58,7 @@ |
| 43 |
# compile the program (and the objects) |
| 44 |
all: $(prog) |
| 45 |
@@ -21,3 +21,11 @@ |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
+--- a/tools/depend.sh |
| 50 |
++++ b/tools/depend.sh |
| 51 |
+@@ -4,4 +4,4 @@ |
| 52 |
+ # Generated automatically from depend.sh.in by configure. |
| 53 |
+ |
| 54 |
+ set -e |
| 55 |
+-gcc -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g' |
| 56 |
++${CC:-cc} -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g' |
| 57 |
|
| 58 |
diff --git a/sys-fs/quotatool/quotatool-1.6.2.ebuild b/sys-fs/quotatool/quotatool-1.6.2.ebuild |
| 59 |
index c71e452c4d9..1704f4c5ba4 100644 |
| 60 |
--- a/sys-fs/quotatool/quotatool-1.6.2.ebuild |
| 61 |
+++ b/sys-fs/quotatool/quotatool-1.6.2.ebuild |
| 62 |
@@ -1,23 +1,25 @@ |
| 63 |
# Copyright 1999-2020 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
-EAPI="4" |
| 67 |
+EAPI=7 |
| 68 |
|
| 69 |
-inherit eutils |
| 70 |
+inherit toolchain-funcs |
| 71 |
|
| 72 |
-DESCRIPTION="command-line utility for filesystem quotas" |
| 73 |
+DESCRIPTION="Command-line utility for filesystem quotas" |
| 74 |
HOMEPAGE="http://quotatool.ekenberg.se/" |
| 75 |
SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz" |
| 76 |
|
| 77 |
LICENSE="GPL-2" |
| 78 |
SLOT="0" |
| 79 |
KEYWORDS="~amd64 ppc x86" |
| 80 |
-IUSE="" |
| 81 |
|
| 82 |
RDEPEND="sys-fs/quota" |
| 83 |
|
| 84 |
-src_prepare() { |
| 85 |
- epatch "${FILESDIR}"/${PN}-1.4.13-ldflags.patch |
| 86 |
+PATCHES=( "${FILESDIR}"/${PN}-1.4.13-fix-buildsystem.patch ) |
| 87 |
+ |
| 88 |
+src_configure() { |
| 89 |
+ tc-export CC |
| 90 |
+ default |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
Archives