1 |
commit: 8409d3195a71a22be4dae5cf0a661a9facb24d97 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 13 15:16:51 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 13 15:17:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8409d319 |
7 |
|
8 |
www-client/surf: EAPI 6. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
.../surf/{surf-9999.ebuild => surf-0.7-r1.ebuild} | 26 ++++++++++++++++------ |
13 |
www-client/surf/surf-9999.ebuild | 15 ++++++++----- |
14 |
2 files changed, 29 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-0.7-r1.ebuild |
17 |
similarity index 67% |
18 |
copy from www-client/surf/surf-9999.ebuild |
19 |
copy to www-client/surf/surf-0.7-r1.ebuild |
20 |
index cf2697d9a9..ea3c9d8472 100644 |
21 |
--- a/www-client/surf/surf-9999.ebuild |
22 |
+++ b/www-client/surf/surf-0.7-r1.ebuild |
23 |
@@ -1,17 +1,17 @@ |
24 |
-# Copyright 1999-2014 Gentoo Foundation |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
# $Id$ |
28 |
|
29 |
-EAPI=5 |
30 |
-inherit eutils git-2 savedconfig toolchain-funcs |
31 |
+EAPI=6 |
32 |
+inherit savedconfig toolchain-funcs |
33 |
|
34 |
DESCRIPTION="a simple web browser based on WebKit/GTK+" |
35 |
HOMEPAGE="http://surf.suckless.org/" |
36 |
-EGIT_REPO_URI="git://git.suckless.org/surf" |
37 |
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz" |
38 |
|
39 |
LICENSE="MIT" |
40 |
SLOT="0" |
41 |
-KEYWORDS="" |
42 |
+KEYWORDS="~amd64 ~x86" |
43 |
|
44 |
COMMON_DEPEND=" |
45 |
dev-libs/glib:2 |
46 |
@@ -34,6 +34,9 @@ RDEPEND=" |
47 |
x11-terms/st |
48 |
) |
49 |
" |
50 |
+PATCHES=( |
51 |
+ "${FILESDIR}"/${PN}-0.7-gentoo.patch |
52 |
+) |
53 |
|
54 |
pkg_setup() { |
55 |
if ! use savedconfig; then |
56 |
@@ -49,13 +52,22 @@ pkg_setup() { |
57 |
} |
58 |
|
59 |
src_prepare() { |
60 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
61 |
- epatch_user |
62 |
+ default |
63 |
+ |
64 |
restore_config config.h |
65 |
+ |
66 |
tc-export CC PKG_CONFIG |
67 |
} |
68 |
|
69 |
src_install() { |
70 |
default |
71 |
+ |
72 |
save_config config.h |
73 |
} |
74 |
+ |
75 |
+pkg_postinst() { |
76 |
+ if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then |
77 |
+ ewarn "Please correct the permissions of your \$HOME/.surf/ directory" |
78 |
+ ewarn "and its contents to no longer be world readable (see bug #404983)" |
79 |
+ fi |
80 |
+} |
81 |
|
82 |
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild |
83 |
index cf2697d9a9..e685de4fba 100644 |
84 |
--- a/www-client/surf/surf-9999.ebuild |
85 |
+++ b/www-client/surf/surf-9999.ebuild |
86 |
@@ -1,9 +1,9 @@ |
87 |
-# Copyright 1999-2014 Gentoo Foundation |
88 |
+# Copyright 1999-2017 Gentoo Foundation |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
# $Id$ |
91 |
|
92 |
-EAPI=5 |
93 |
-inherit eutils git-2 savedconfig toolchain-funcs |
94 |
+EAPI=6 |
95 |
+inherit git-r3 savedconfig toolchain-funcs |
96 |
|
97 |
DESCRIPTION="a simple web browser based on WebKit/GTK+" |
98 |
HOMEPAGE="http://surf.suckless.org/" |
99 |
@@ -34,6 +34,9 @@ RDEPEND=" |
100 |
x11-terms/st |
101 |
) |
102 |
" |
103 |
+PATCHES=( |
104 |
+ "${FILESDIR}"/${P}-gentoo.patch |
105 |
+) |
106 |
|
107 |
pkg_setup() { |
108 |
if ! use savedconfig; then |
109 |
@@ -49,13 +52,15 @@ pkg_setup() { |
110 |
} |
111 |
|
112 |
src_prepare() { |
113 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
114 |
- epatch_user |
115 |
+ default |
116 |
+ |
117 |
restore_config config.h |
118 |
+ |
119 |
tc-export CC PKG_CONFIG |
120 |
} |
121 |
|
122 |
src_install() { |
123 |
default |
124 |
+ |
125 |
save_config config.h |
126 |
} |