1 |
commit: 27197097a91a887a8ba3b9a3a0515e9eeea72836 |
2 |
Author: charIes17 <charles17 <AT> arcor <DOT> de> |
3 |
AuthorDate: Thu Jul 27 17:09:30 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 30 15:13:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27197097 |
7 |
|
8 |
x11-misc/pcmanfm: Bump live ebuild to EAPI 6 |
9 |
|
10 |
* Remove unused pcmanfm-1.2.4-fix-no-common.patch |
11 |
* Adjust eclass to readme.gentoo-r1 |
12 |
* Adjust SRC_URI same as in 1.2.5 |
13 |
* Remove old lines for Bug #382265, #382265, #421101 |
14 |
|
15 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
16 |
Closes: https://github.com/gentoo/gentoo/pull/5118 |
17 |
|
18 |
.../files/pcmanfm-1.2.4-fix-no-common.patch | 11 ------- |
19 |
x11-misc/pcmanfm/pcmanfm-9999.ebuild | 34 ++++++++++++---------- |
20 |
2 files changed, 19 insertions(+), 26 deletions(-) |
21 |
|
22 |
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch |
23 |
deleted file mode 100644 |
24 |
index 46b0ac876f9..00000000000 |
25 |
--- a/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch |
26 |
+++ /dev/null |
27 |
@@ -1,11 +0,0 @@ |
28 |
---- a/src/tab-page.h 2014-08-24 00:46:28.000000000 +0200 |
29 |
-+++ b/src/tab-page.h 2016-08-21 18:12:33.509482924 +0200 |
30 |
-@@ -147,7 +147,7 @@ |
31 |
- #if FM_CHECK_VERSION(1, 2, 0) |
32 |
- #include "pcmanfm-modules.h" |
33 |
- |
34 |
--GList *_tab_page_modules; /* in pcmanfm.c */ |
35 |
-+extern GList *_tab_page_modules; /* in pcmanfm.c */ |
36 |
- #endif |
37 |
- |
38 |
- G_END_DECLS |
39 |
|
40 |
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild |
41 |
index 5edc83ba4c0..d721dbfcaf5 100644 |
42 |
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild |
43 |
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild |
44 |
@@ -1,20 +1,21 @@ |
45 |
# Copyright 1999-2017 Gentoo Foundation |
46 |
# Distributed under the terms of the GNU General Public License v2 |
47 |
|
48 |
-EAPI="5" |
49 |
+EAPI=6 |
50 |
+ |
51 |
PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id |
52 |
is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv |
53 |
te th tr tt_RU ug uk vi zh_CN zh_TW" |
54 |
PLOCALE_BACKUP="en_GB" |
55 |
|
56 |
-inherit autotools eutils fdo-mime l10n readme.gentoo |
57 |
+inherit autotools eutils fdo-mime l10n readme.gentoo-r1 |
58 |
|
59 |
if [[ ${PV} == *9999* ]]; then |
60 |
EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}" |
61 |
inherit git-r3 |
62 |
KEYWORDS="" |
63 |
else |
64 |
- SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz" |
65 |
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
66 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
67 |
fi |
68 |
|
69 |
@@ -43,25 +44,28 @@ DEPEND="${RDEPEND} |
70 |
|
71 |
S="${WORKDIR}"/${MY_P} |
72 |
|
73 |
-DOCS=( AUTHORS ) |
74 |
- |
75 |
-DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ |
76 |
- location. You should install lxde-base/lxmenu-data for that functionality." |
77 |
- |
78 |
src_prepare() { |
79 |
+ default |
80 |
+ |
81 |
intltoolize --force --copy --automake || die |
82 |
- # drop -O0 -g. Bug #382265 and #382265 |
83 |
- sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die |
84 |
- #Remove -Werror for automake-1.12. Bug #421101 |
85 |
- sed -i "s:-Werror::" configure.ac || die |
86 |
eautoreconf |
87 |
+ |
88 |
export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}" |
89 |
- l10n_get_locales > "${S}"/po/LINGUAS |
90 |
- epatch_user |
91 |
+ l10n_get_locales > po/LINGUAS || die |
92 |
} |
93 |
|
94 |
src_configure() { |
95 |
- econf --sysconfdir="${EPREFIX}/etc" $(use_enable debug) |
96 |
+ econf \ |
97 |
+ --sysconfdir="${EPREFIX}"/etc \ |
98 |
+ $(use_enable debug) |
99 |
+} |
100 |
+ |
101 |
+src_install() { |
102 |
+ default |
103 |
+ |
104 |
+ local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ |
105 |
+ location. You should install lxde-base/lxmenu-data for that functionality." |
106 |
+ readme.gentoo_create_doc |
107 |
} |
108 |
|
109 |
pkg_postinst() { |