| 1 |
commit: 1a787194357b749a50ab7c60eed5efbd874ba86b |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 22 15:02:29 2017 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 22 15:05:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a787194 |
| 7 |
|
| 8 |
app-text/csvfix: update to EAPI 6 |
| 9 |
|
| 10 |
app-text/csvfix/csvfix-1.6.ebuild | 20 +++++++++++++------- |
| 11 |
app-text/csvfix/metadata.xml | 1 - |
| 12 |
2 files changed, 13 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild |
| 15 |
index 50b599f4355..e79e239ef7d 100644 |
| 16 |
--- a/app-text/csvfix/csvfix-1.6.ebuild |
| 17 |
+++ b/app-text/csvfix/csvfix-1.6.ebuild |
| 18 |
@@ -1,9 +1,9 @@ |
| 19 |
-# Copyright 1999-2014 Gentoo Foundation |
| 20 |
+# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
-inherit eutils toolchain-funcs versionator vcs-snapshot |
| 27 |
+inherit toolchain-funcs versionator vcs-snapshot |
| 28 |
|
| 29 |
MY_PV="$(delete_all_version_separators)" |
| 30 |
DESCRIPTION="A stream editor for manipulating CSV files" |
| 31 |
@@ -20,10 +20,13 @@ RDEPEND="dev-libs/expat" |
| 32 |
DEPEND="${RDEPEND} |
| 33 |
doc? ( app-arch/unzip )" |
| 34 |
|
| 35 |
-src_prepare() { |
| 36 |
- epatch "${FILESDIR}"/${P}-makefile.patch |
| 37 |
- epatch "${FILESDIR}"/${PN}-1.10a-tests.patch |
| 38 |
+PATCHES=( |
| 39 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 40 |
+ "${FILESDIR}"/${PN}-1.10a-tests.patch |
| 41 |
+) |
| 42 |
|
| 43 |
+src_prepare() { |
| 44 |
+ default |
| 45 |
edos2unix $(find csvfix/tests -type f) |
| 46 |
} |
| 47 |
|
| 48 |
@@ -39,5 +42,8 @@ src_test() { |
| 49 |
|
| 50 |
src_install() { |
| 51 |
dobin csvfix/bin/csvfix |
| 52 |
- use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}/* |
| 53 |
+ if use doc; then |
| 54 |
+ docinto html |
| 55 |
+ dodoc -r "${WORKDIR}"/${PN}${MY_PV}/* |
| 56 |
+ fi |
| 57 |
} |
| 58 |
|
| 59 |
diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml |
| 60 |
index 85df0b57fb4..8aaa5d2f678 100644 |
| 61 |
--- a/app-text/csvfix/metadata.xml |
| 62 |
+++ b/app-text/csvfix/metadata.xml |
| 63 |
@@ -6,7 +6,6 @@ |
| 64 |
<name>Tim Harder</name> |
| 65 |
</maintainer> |
| 66 |
<upstream> |
| 67 |
- <remote-id type="google-code">csvfix</remote-id> |
| 68 |
<remote-id type="bitbucket">neilb/csvfix</remote-id> |
| 69 |
</upstream> |
| 70 |
</pkgmetadata> |
Archives