1 |
commit: 21bdc12c53c76a92910a85d86f6706ac4f1eb99d |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 24 13:09:02 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 28 13:08:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bdc12c |
7 |
|
8 |
x11-wm/openbox: use 'python-single-r1_pkg_setup' and sync 9999 |
9 |
|
10 |
Also includes minor cosmetic changes, an update for the homepage, |
11 |
removal of unused eclass inherits, and a fix for installing the |
12 |
'Surreal Gentoo' theme for 9999. |
13 |
|
14 |
Closes: https://bugs.gentoo.org/705420 |
15 |
Package-Manager: Portage-2.3.95, Repoman-2.3.21 |
16 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
17 |
Closes: https://github.com/gentoo/gentoo/pull/15106 |
18 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
19 |
|
20 |
x11-wm/openbox/openbox-3.6.1-r3.ebuild | 28 ++++++++++++++------- |
21 |
x11-wm/openbox/openbox-9999.ebuild | 46 +++++++++++++++++++++++----------- |
22 |
2 files changed, 50 insertions(+), 24 deletions(-) |
23 |
|
24 |
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild |
25 |
index ac111903327..736a89bce39 100644 |
26 |
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild |
27 |
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild |
28 |
@@ -4,21 +4,21 @@ |
29 |
EAPI=7 |
30 |
|
31 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
32 |
-inherit multilib autotools python-single-r1 eutils |
33 |
+inherit autotools python-single-r1 |
34 |
|
35 |
DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager" |
36 |
-HOMEPAGE="http://openbox.org/" |
37 |
+HOMEPAGE="http://openbox.org/wiki/Main_Page" |
38 |
+ |
39 |
if [[ ${PV} == *9999* ]]; then |
40 |
inherit git-r3 |
41 |
EGIT_REPO_URI="git://git.openbox.org/dana/openbox" |
42 |
- SRC_URI="branding? ( |
43 |
- https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
44 |
else |
45 |
- SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz |
46 |
- branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
47 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" |
48 |
+ SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz" |
49 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" |
50 |
fi |
51 |
|
52 |
+SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
53 |
+ |
54 |
LICENSE="GPL-2" |
55 |
SLOT="3" |
56 |
IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" |
57 |
@@ -45,11 +45,12 @@ RDEPEND="dev-libs/glib:2 |
58 |
dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
59 |
') |
60 |
) |
61 |
- " |
62 |
+" |
63 |
DEPEND="${RDEPEND} |
64 |
sys-devel/gettext |
65 |
virtual/pkgconfig |
66 |
- x11-base/xorg-proto" |
67 |
+ x11-base/xorg-proto |
68 |
+" |
69 |
|
70 |
PATCHES=( |
71 |
"${FILESDIR}/${PN}-3.5.2-gnome-session.patch" |
72 |
@@ -57,7 +58,16 @@ PATCHES=( |
73 |
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" |
74 |
) |
75 |
|
76 |
+src_unpack() { |
77 |
+ if [[ ${PV} == *9999* ]]; then |
78 |
+ git-r3_src_unpack |
79 |
+ fi |
80 |
+ |
81 |
+ default |
82 |
+} |
83 |
+ |
84 |
src_prepare() { |
85 |
+ use xdg && python-single-r1_pkg_setup |
86 |
default |
87 |
sed -i \ |
88 |
-e "s:-O0 -ggdb ::" \ |
89 |
|
90 |
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild |
91 |
index 75bd3b71f0f..736a89bce39 100644 |
92 |
--- a/x11-wm/openbox/openbox-9999.ebuild |
93 |
+++ b/x11-wm/openbox/openbox-9999.ebuild |
94 |
@@ -1,24 +1,24 @@ |
95 |
# Copyright 1999-2020 Gentoo Authors |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
|
98 |
-EAPI=6 |
99 |
+EAPI=7 |
100 |
|
101 |
-PYTHON_COMPAT=( python2_7 ) |
102 |
-inherit multilib autotools ltprune python-r1 eutils |
103 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
104 |
+inherit autotools python-single-r1 |
105 |
|
106 |
DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager" |
107 |
-HOMEPAGE="http://openbox.org/" |
108 |
+HOMEPAGE="http://openbox.org/wiki/Main_Page" |
109 |
+ |
110 |
if [[ ${PV} == *9999* ]]; then |
111 |
inherit git-r3 |
112 |
EGIT_REPO_URI="git://git.openbox.org/dana/openbox" |
113 |
- SRC_URI="branding? ( |
114 |
- https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
115 |
else |
116 |
- SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz |
117 |
- branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
118 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" |
119 |
+ SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz" |
120 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" |
121 |
fi |
122 |
|
123 |
+SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" |
124 |
+ |
125 |
LICENSE="GPL-2" |
126 |
SLOT="3" |
127 |
IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" |
128 |
@@ -41,17 +41,33 @@ RDEPEND="dev-libs/glib:2 |
129 |
svg? ( gnome-base/librsvg:2 ) |
130 |
xdg? ( |
131 |
${PYTHON_DEPS} |
132 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
133 |
+ $(python_gen_cond_dep ' |
134 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
135 |
+ ') |
136 |
) |
137 |
- " |
138 |
+" |
139 |
DEPEND="${RDEPEND} |
140 |
sys-devel/gettext |
141 |
virtual/pkgconfig |
142 |
- x11-base/xorg-proto" |
143 |
+ x11-base/xorg-proto |
144 |
+" |
145 |
|
146 |
-PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" ) |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" |
149 |
+ # see https://github.com/danakj/openbox/pull/35 |
150 |
+ "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" |
151 |
+) |
152 |
+ |
153 |
+src_unpack() { |
154 |
+ if [[ ${PV} == *9999* ]]; then |
155 |
+ git-r3_src_unpack |
156 |
+ fi |
157 |
+ |
158 |
+ default |
159 |
+} |
160 |
|
161 |
src_prepare() { |
162 |
+ use xdg && python-single-r1_pkg_setup |
163 |
default |
164 |
sed -i \ |
165 |
-e "s:-O0 -ggdb ::" \ |
166 |
@@ -86,9 +102,9 @@ src_install() { |
167 |
"${D}"/etc/xdg/openbox/rc.xml \ |
168 |
|| die "failed to set Surreal Gentoo as the default theme" |
169 |
fi |
170 |
- use static-libs || prune_libtool_files --all |
171 |
+ use static-libs || find "${D}" -name '*.la' -delete |
172 |
if use xdg ; then |
173 |
- python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart |
174 |
+ python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart |
175 |
else |
176 |
rm "${ED}"/usr/libexec/openbox-xdg-autostart || die |
177 |
fi |