| 1 |
commit: 62c1c99f07ffef5001eb361c1614ca67b4f44b3f |
| 2 |
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 27 03:22:00 2020 +0000 |
| 4 |
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 27 03:22:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c1c99f |
| 7 |
|
| 8 |
sys-fs/zerofree: Version bump, replace sed delimiter |
| 9 |
|
| 10 |
- Add ebuild for zerofree-1.1.1 |
| 11 |
- Replace colon sed delimiter w/ pipe to resolve #710818 |
| 12 |
- Bump to EAPI 7 |
| 13 |
- Remove useless src_compile and use the built-in default |
| 14 |
|
| 15 |
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org> |
| 16 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 17 |
|
| 18 |
sys-fs/zerofree/Manifest | 1 + |
| 19 |
sys-fs/zerofree/zerofree-1.0.4.ebuild | 18 ++++++++---------- |
| 20 |
.../{zerofree-1.0.4.ebuild => zerofree-1.1.1.ebuild} | 18 ++++++++---------- |
| 21 |
3 files changed, 17 insertions(+), 20 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest |
| 24 |
index df3f07d3c3d..7c5efcfddaa 100644 |
| 25 |
--- a/sys-fs/zerofree/Manifest |
| 26 |
+++ b/sys-fs/zerofree/Manifest |
| 27 |
@@ -1 +1,2 @@ |
| 28 |
DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b |
| 29 |
+DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c |
| 30 |
|
| 31 |
diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.0.4.ebuild |
| 32 |
index dfa87892784..6e360c833a1 100644 |
| 33 |
--- a/sys-fs/zerofree/zerofree-1.0.4.ebuild |
| 34 |
+++ b/sys-fs/zerofree/zerofree-1.0.4.ebuild |
| 35 |
@@ -1,10 +1,10 @@ |
| 36 |
-# Copyright 1999-2019 Gentoo Authors |
| 37 |
+# Copyright 1999-2020 Gentoo Authors |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
-EAPI="4" |
| 41 |
+EAPI=7 |
| 42 |
inherit eutils toolchain-funcs |
| 43 |
|
| 44 |
-DESCRIPTION="Zero's out all free space on a filesystem" |
| 45 |
+DESCRIPTION="Zeroes out all free space on a filesystem" |
| 46 |
HOMEPAGE="http://frippery.org/uml/index.html" |
| 47 |
SRC_URI="http://frippery.org/uml/${P}.tgz" |
| 48 |
|
| 49 |
@@ -18,16 +18,14 @@ RDEPEND="${DEPEND}" |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
# Honor system CFLAGS. |
| 53 |
+ # Use pipes for the sed delimiter to resolve #710818. |
| 54 |
sed -i \ |
| 55 |
- -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \ |
| 56 |
- -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \ |
| 57 |
- -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \ |
| 58 |
+ -e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \ |
| 59 |
+ -e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \ |
| 60 |
+ -e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \ |
| 61 |
Makefile || die "Failed to sed the Makefile" |
| 62 |
-} |
| 63 |
|
| 64 |
-src_compile() { |
| 65 |
- # Just a Makefile, nothing fancy. |
| 66 |
- make || die "Failed to compile ${PN}." |
| 67 |
+ eapply_user |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
| 71 |
|
| 72 |
diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild |
| 73 |
similarity index 55% |
| 74 |
copy from sys-fs/zerofree/zerofree-1.0.4.ebuild |
| 75 |
copy to sys-fs/zerofree/zerofree-1.1.1.ebuild |
| 76 |
index dfa87892784..6e360c833a1 100644 |
| 77 |
--- a/sys-fs/zerofree/zerofree-1.0.4.ebuild |
| 78 |
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild |
| 79 |
@@ -1,10 +1,10 @@ |
| 80 |
-# Copyright 1999-2019 Gentoo Authors |
| 81 |
+# Copyright 1999-2020 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
-EAPI="4" |
| 85 |
+EAPI=7 |
| 86 |
inherit eutils toolchain-funcs |
| 87 |
|
| 88 |
-DESCRIPTION="Zero's out all free space on a filesystem" |
| 89 |
+DESCRIPTION="Zeroes out all free space on a filesystem" |
| 90 |
HOMEPAGE="http://frippery.org/uml/index.html" |
| 91 |
SRC_URI="http://frippery.org/uml/${P}.tgz" |
| 92 |
|
| 93 |
@@ -18,16 +18,14 @@ RDEPEND="${DEPEND}" |
| 94 |
|
| 95 |
src_prepare() { |
| 96 |
# Honor system CFLAGS. |
| 97 |
+ # Use pipes for the sed delimiter to resolve #710818. |
| 98 |
sed -i \ |
| 99 |
- -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \ |
| 100 |
- -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \ |
| 101 |
- -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \ |
| 102 |
+ -e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \ |
| 103 |
+ -e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \ |
| 104 |
+ -e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \ |
| 105 |
Makefile || die "Failed to sed the Makefile" |
| 106 |
-} |
| 107 |
|
| 108 |
-src_compile() { |
| 109 |
- # Just a Makefile, nothing fancy. |
| 110 |
- make || die "Failed to compile ${PN}." |
| 111 |
+ eapply_user |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
Archives