1 |
commit: 4d59f9f210fb49183354b0c1453c0a9c2d38d32e |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 30 21:07:13 2018 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 30 21:13:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d59f9f2 |
7 |
|
8 |
x11-wm/openbox: EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../openbox/{openbox-9999.ebuild => openbox-3.6.1-r1.ebuild} | 11 +++++------ |
13 |
x11-wm/openbox/openbox-9999.ebuild | 9 ++++----- |
14 |
2 files changed, 9 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild |
17 |
similarity index 93% |
18 |
copy from x11-wm/openbox/openbox-9999.ebuild |
19 |
copy to x11-wm/openbox/openbox-3.6.1-r1.ebuild |
20 |
index 1a98e9183a6..0c6773cef0a 100644 |
21 |
--- a/x11-wm/openbox/openbox-9999.ebuild |
22 |
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild |
23 |
@@ -1,7 +1,7 @@ |
24 |
# Copyright 1999-2018 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI="5" |
28 |
+EAPI=6 |
29 |
|
30 |
PYTHON_COMPAT=( python2_7 ) |
31 |
inherit multilib autotools python-r1 eutils |
32 |
@@ -13,12 +13,10 @@ if [[ ${PV} == *9999* ]]; then |
33 |
EGIT_REPO_URI="git://git.openbox.org/dana/openbox" |
34 |
SRC_URI="branding? ( |
35 |
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
36 |
- KEYWORDS="" |
37 |
- |
38 |
else |
39 |
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz |
40 |
branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
41 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux" |
42 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux" |
43 |
fi |
44 |
|
45 |
LICENSE="GPL-2" |
46 |
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND} |
47 |
virtual/pkgconfig |
48 |
x11-base/xorg-proto" |
49 |
|
50 |
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" ) |
51 |
+ |
52 |
src_prepare() { |
53 |
use xdg && python_export_best |
54 |
- epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch |
55 |
+ default |
56 |
sed -i \ |
57 |
-e "s:-O0 -ggdb ::" \ |
58 |
-e 's/-fno-strict-aliasing//' \ |
59 |
"${S}"/m4/openbox.m4 || die |
60 |
- epatch_user |
61 |
eautoreconf |
62 |
} |
63 |
|
64 |
|
65 |
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild |
66 |
index 1a98e9183a6..f38bbd65197 100644 |
67 |
--- a/x11-wm/openbox/openbox-9999.ebuild |
68 |
+++ b/x11-wm/openbox/openbox-9999.ebuild |
69 |
@@ -1,7 +1,7 @@ |
70 |
# Copyright 1999-2018 Gentoo Foundation |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
-EAPI="5" |
74 |
+EAPI=6 |
75 |
|
76 |
PYTHON_COMPAT=( python2_7 ) |
77 |
inherit multilib autotools python-r1 eutils |
78 |
@@ -13,8 +13,6 @@ if [[ ${PV} == *9999* ]]; then |
79 |
EGIT_REPO_URI="git://git.openbox.org/dana/openbox" |
80 |
SRC_URI="branding? ( |
81 |
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
82 |
- KEYWORDS="" |
83 |
- |
84 |
else |
85 |
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz |
86 |
branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
87 |
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND} |
88 |
virtual/pkgconfig |
89 |
x11-base/xorg-proto" |
90 |
|
91 |
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" ) |
92 |
+ |
93 |
src_prepare() { |
94 |
use xdg && python_export_best |
95 |
- epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch |
96 |
+ default |
97 |
sed -i \ |
98 |
-e "s:-O0 -ggdb ::" \ |
99 |
-e 's/-fno-strict-aliasing//' \ |
100 |
"${S}"/m4/openbox.m4 || die |
101 |
- epatch_user |
102 |
eautoreconf |
103 |
} |