1 |
commit: df82048efd2f0db0a9a2263e19c517eb17d1e14d |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 19 17:46:39 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 19 17:46:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df82048e |
7 |
|
8 |
media-video/griffith: EAPI-7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
media-video/griffith/files/0.10-fix_lib_path.patch | 4 ++-- |
14 |
.../griffith/files/griffith-0.13-validators.patch | 4 ++-- |
15 |
media-video/griffith/griffith-0.13-r2.ebuild | 20 +++++++++++++------- |
16 |
3 files changed, 17 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch |
19 |
index 952448f0f01..9c918b25f48 100644 |
20 |
--- a/media-video/griffith/files/0.10-fix_lib_path.patch |
21 |
+++ b/media-video/griffith/files/0.10-fix_lib_path.patch |
22 |
@@ -1,7 +1,7 @@ |
23 |
Index: lib/initialize.py |
24 |
=================================================================== |
25 |
---- lib.orig/initialize.py |
26 |
-+++ lib/initialize.py |
27 |
+--- a/lib/initialize.py |
28 |
++++ b/lib/initialize.py |
29 |
@@ -73,7 +73,7 @@ def locations(self, home_dir): |
30 |
os.environ['LANG'] = lang |
31 |
|
32 |
|
33 |
diff --git a/media-video/griffith/files/griffith-0.13-validators.patch b/media-video/griffith/files/griffith-0.13-validators.patch |
34 |
index f94275f3c17..9c39feec009 100644 |
35 |
--- a/media-video/griffith/files/griffith-0.13-validators.patch |
36 |
+++ b/media-video/griffith/files/griffith-0.13-validators.patch |
37 |
@@ -1,5 +1,5 @@ |
38 |
---- a/griffith-0.13/lib/db/validators.py 2018-09-02 00:37:03.052248916 +0300 |
39 |
-+++ b/griffith-0.13/lib/db/validators.py 2018-09-02 00:37:22.462248580 +0300 |
40 |
+--- griffith-0.13/lib/db/validators.py |
41 |
++++ griffith-0.13/lib/db/validators.py |
42 |
@@ -23,7 +23,13 @@ |
43 |
|
44 |
import logging |
45 |
|
46 |
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild |
47 |
index 788a9f95c7e..a4a8911d4db 100644 |
48 |
--- a/media-video/griffith/griffith-0.13-r2.ebuild |
49 |
+++ b/media-video/griffith/griffith-0.13-r2.ebuild |
50 |
@@ -1,12 +1,12 @@ |
51 |
# Copyright 1999-2019 Gentoo Authors |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
|
54 |
-EAPI=5 |
55 |
+EAPI=7 |
56 |
|
57 |
PYTHON_COMPAT=( python2_7 ) |
58 |
PYTHON_REQ_USE='sqlite' |
59 |
|
60 |
-inherit versionator python-single-r1 multilib |
61 |
+inherit python-single-r1 |
62 |
|
63 |
ARTWORK_PV="0.9.4" |
64 |
|
65 |
@@ -31,6 +31,11 @@ RDEPEND=" |
66 |
DEPEND="${RDEPEND} |
67 |
doc? ( app-text/docbook2X )" |
68 |
|
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}/0.10-fix_lib_path.patch" |
71 |
+ "${FILESDIR}/griffith-0.13-validators.patch" |
72 |
+) |
73 |
+ |
74 |
pkg_setup() { |
75 |
python-single-r1_pkg_setup |
76 |
} |
77 |
@@ -45,8 +50,7 @@ src_prepare() { |
78 |
-e 's/ISO-8859-1/UTF-8/' \ |
79 |
"${S}"/lib/gconsole.py || die "sed failed" |
80 |
|
81 |
- epatch "${FILESDIR}/0.10-fix_lib_path.patch" |
82 |
- epatch "${FILESDIR}/griffith-0.13-validators.patch" |
83 |
+ default |
84 |
} |
85 |
|
86 |
src_compile() { |
87 |
@@ -55,17 +59,19 @@ src_compile() { |
88 |
} |
89 |
|
90 |
src_install() { |
91 |
- use doc || { sed -i -e '/docs/d' Makefile || die ; } |
92 |
+ if ! use doc ; then |
93 |
+ sed -i -e '/docs/d' Makefile || die |
94 |
+ fi |
95 |
|
96 |
emake \ |
97 |
LIBDIR="${D}/usr/$(get_libdir)/griffith" \ |
98 |
DESTDIR="${D}" DOC2MAN=docbook2man.pl install |
99 |
dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS |
100 |
|
101 |
- cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" |
102 |
+ cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die |
103 |
emake DESTDIR="${D}" install |
104 |
# This carries over from -0.13 but appears to have no effect. |
105 |
- python_optimize "${D}"usr/share/${PN} |
106 |
+ python_optimize "${ED}"usr/share/${PN} |
107 |
} |
108 |
|
109 |
pkg_postinst() { |