1 |
commit: 1009be81becb469ad7408544c67173db79312aca |
2 |
Author: charIes17 <charles17 <AT> arcor <DOT> de> |
3 |
AuthorDate: Mon Jul 10 06:46:59 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 20 13:26:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1009be81 |
7 |
|
8 |
x11-wm/lumina: Bug 617838 and more |
9 |
|
10 |
Fix for https://bugs.gentoo.org/617838 |
11 |
|
12 |
Fix for https://bugs.gentoo.org/616590 |
13 |
|
14 |
Switch HOMEPAGE to https:// |
15 |
|
16 |
Introduce desktop-utils USE flag for Lumina's desktop utilities |
17 |
|
18 |
Use ${PV/_/-} for Lumina's patchsets |
19 |
|
20 |
Patch 1.2.0-desktop-files.patch |
21 |
|
22 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
23 |
Closes: https://github.com/gentoo/gentoo/pull/5002 |
24 |
|
25 |
x11-wm/lumina/files/1.2.0-desktop-files.patch | 33 +++++++++++++++++++++++++++ |
26 |
x11-wm/lumina/lumina-1.2.0-r1.ebuild | 27 ++++++++++++++-------- |
27 |
x11-wm/lumina/metadata.xml | 3 +++ |
28 |
3 files changed, 53 insertions(+), 10 deletions(-) |
29 |
|
30 |
diff --git a/x11-wm/lumina/files/1.2.0-desktop-files.patch b/x11-wm/lumina/files/1.2.0-desktop-files.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..f86c1c49c38 |
33 |
--- /dev/null |
34 |
+++ b/x11-wm/lumina/files/1.2.0-desktop-files.patch |
35 |
@@ -0,0 +1,33 @@ |
36 |
+--- ./src-qt5/core/lumina-info/lumina-support.desktop |
37 |
++++ ./src-qt5/core/lumina-info/lumina-support.desktop |
38 |
+@@ -2,8 +2,7 @@ |
39 |
+ Type=Link |
40 |
+ URL=https://webchat.freenode.net/?channels=%23lumina-desktop |
41 |
+ Icon=Lumina-DE |
42 |
+-Categories=System; |
43 |
+-OnlyShowIn=Lumina; |
44 |
++OnlyShowIn=X-Lumina; |
45 |
+ Name=Community Support |
46 |
+ GenericName=Get Desktop Help |
47 |
+ Comment=Ask for desktop support on the community IRC channel |
48 |
+ |
49 |
+--- ./src-qt5/core-utils/lumina-config/lumina-config.desktop |
50 |
++++ ./src-qt5/core-utils/lumina-config/lumina-config.desktop |
51 |
+@@ -7,4 +7,4 @@ |
52 |
+ Categories=Settings; |
53 |
+ Name=Desktop Configuration |
54 |
+ Comment=Modify the desktop |
55 |
+-OnlyShowIn=Lumina; |
56 |
++OnlyShowIn=X-Lumina; |
57 |
+ |
58 |
+--- ./src-qt5/core/lumina-info/lumina-info.desktop |
59 |
++++ ./src-qt5/core/lumina-info/lumina-info.desktop |
60 |
+@@ -5,7 +5,7 @@ |
61 |
+ Type=Application |
62 |
+ StartupNotify=true |
63 |
+ Categories=System; |
64 |
+-OnlyShowIn=Lumina; |
65 |
++OnlyShowIn=X-Lumina; |
66 |
+ Name=Desktop Information |
67 |
+ GenericName=Version and Legal Information |
68 |
+ Comment=View information about the Lumina Desktop Environment |
69 |
|
70 |
diff --git a/x11-wm/lumina/lumina-1.2.0-r1.ebuild b/x11-wm/lumina/lumina-1.2.0-r1.ebuild |
71 |
index a0b45fb1806..6ea490a4cf1 100644 |
72 |
--- a/x11-wm/lumina/lumina-1.2.0-r1.ebuild |
73 |
+++ b/x11-wm/lumina/lumina-1.2.0-r1.ebuild |
74 |
@@ -5,14 +5,13 @@ EAPI=6 |
75 |
|
76 |
inherit qmake-utils |
77 |
DESCRIPTION="Lumina desktop environment" |
78 |
-HOMEPAGE="http://lumina-desktop.org/" |
79 |
-I18N="161211" |
80 |
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
81 |
+HOMEPAGE="https://lumina-desktop.org/" |
82 |
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
83 |
+ |
84 |
LICENSE="BSD" |
85 |
SLOT="0" |
86 |
KEYWORDS="~amd64 ~x86" |
87 |
- |
88 |
-IUSE="" |
89 |
+IUSE="desktop-utils" |
90 |
|
91 |
COMMON_DEPEND="dev-qt/qtcore:5 |
92 |
dev-qt/qtconcurrent:5 |
93 |
@@ -37,23 +36,31 @@ RDEPEND="$COMMON_DEPEND |
94 |
sys-fs/inotify-tools |
95 |
x11-misc/numlockx |
96 |
x11-wm/fluxbox |
97 |
- x11-apps/xbacklight |
98 |
+ || ( x11-apps/xbacklight |
99 |
+ sys-power/acpilight ) |
100 |
media-sound/alsa-utils |
101 |
sys-power/acpi |
102 |
app-admin/sysstat" |
103 |
|
104 |
+S="${WORKDIR}/${P/_/-}" |
105 |
+ |
106 |
+PATCHES=( |
107 |
+ "${FILESDIR}/1.2.0-desktop-files.patch" |
108 |
+) |
109 |
+ |
110 |
src_prepare(){ |
111 |
default |
112 |
|
113 |
- rm -rf src-qt5/desktop-utils || die |
114 |
- |
115 |
- sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die |
116 |
+ if use !desktop-utils ; then |
117 |
+ rm -rf src-qt5/desktop-utils || die |
118 |
+ sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die |
119 |
+ fi |
120 |
} |
121 |
|
122 |
src_configure(){ |
123 |
eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \ |
124 |
L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
125 |
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N |
126 |
+ LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= |
127 |
} |
128 |
|
129 |
src_install(){ |
130 |
|
131 |
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml |
132 |
index b5c7881c166..22f3211032e 100644 |
133 |
--- a/x11-wm/lumina/metadata.xml |
134 |
+++ b/x11-wm/lumina/metadata.xml |
135 |
@@ -9,6 +9,9 @@ |
136 |
<email>proxy-maint@g.o</email> |
137 |
<name>Gentoo Proxy Maintainers Project</name> |
138 |
</maintainer> |
139 |
+ <use> |
140 |
+ <flag name="desktop-utils">Build and install lumina's desktop-utils</flag> |
141 |
+ </use> |
142 |
<upstream> |
143 |
<maintainer status="active"> |
144 |
<email>ken@×××××.org</email> |