| 1 |
commit: 182b079cd39004a600b9dddce6d47449574fd5fc |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 23 13:18:33 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 23 14:57:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=182b079c |
| 7 |
|
| 8 |
lxqt: sync related ebuilds/metadata with the main Gentoo repo tree |
| 9 |
|
| 10 |
With this, the metadata and 9999 ebuilds are in sync with the 0.13.0 |
| 11 |
versions found via the official Gentoo repository tree, with the |
| 12 |
following exceptions: |
| 13 |
|
| 14 |
- Polkit is optional. |
| 15 |
- Some of the USE-flags are not used/included in the metadata. |
| 16 |
- A patch for 'lxqt-config' is not needed. |
| 17 |
- The handling of translations has been changed upstream, so |
| 18 |
'lxqt-meta' does not depend on 'lxqt-l10n' due to file collisions. |
| 19 |
|
| 20 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 21 |
|
| 22 |
dev-libs/libqtxdg/libqtxdg-9999.ebuild | 24 ++--- |
| 23 |
dev-libs/libqtxdg/metadata.xml | 19 ++-- |
| 24 |
.../lxqt-build-tools/lxqt-build-tools-9999.ebuild | 16 +-- |
| 25 |
dev-util/lxqt-build-tools/metadata.xml | 11 ++- |
| 26 |
lxqt-base/liblxqt/liblxqt-9999.ebuild | 30 +++--- |
| 27 |
lxqt-base/liblxqt/metadata.xml | 11 ++- |
| 28 |
lxqt-base/libsysstat/libsysstat-9999.ebuild | 20 ++-- |
| 29 |
lxqt-base/libsysstat/metadata.xml | 11 ++- |
| 30 |
lxqt-base/lxqt-about/lxqt-about-9999.ebuild | 30 +++--- |
| 31 |
lxqt-base/lxqt-about/metadata.xml | 11 ++- |
| 32 |
lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild | 31 +++--- |
| 33 |
lxqt-base/lxqt-admin/metadata.xml | 11 ++- |
| 34 |
lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 53 +++++----- |
| 35 |
lxqt-base/lxqt-config/metadata.xml | 14 ++- |
| 36 |
.../lxqt-globalkeys/lxqt-globalkeys-9999.ebuild | 30 +++--- |
| 37 |
lxqt-base/lxqt-globalkeys/metadata.xml | 11 ++- |
| 38 |
lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild | 17 ++-- |
| 39 |
lxqt-base/lxqt-l10n/metadata.xml | 11 ++- |
| 40 |
lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild | 81 +++++++++------- |
| 41 |
lxqt-base/lxqt-meta/metadata.xml | 54 ++++++----- |
| 42 |
.../lxqt-notificationd-9999.ebuild | 26 ++--- |
| 43 |
lxqt-base/lxqt-notificationd/metadata.xml | 11 ++- |
| 44 |
.../lxqt-openssh-askpass-9999.ebuild | 27 +++--- |
| 45 |
lxqt-base/lxqt-openssh-askpass/metadata.xml | 11 ++- |
| 46 |
lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 108 ++++++++++++--------- |
| 47 |
lxqt-base/lxqt-panel/metadata.xml | 53 +++++----- |
| 48 |
.../lxqt-policykit/lxqt-policykit-9999.ebuild | 29 +++--- |
| 49 |
lxqt-base/lxqt-policykit/metadata.xml | 11 ++- |
| 50 |
.../lxqt-powermanagement-9999.ebuild | 35 ++++--- |
| 51 |
lxqt-base/lxqt-powermanagement/metadata.xml | 11 ++- |
| 52 |
lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild | 32 +++--- |
| 53 |
lxqt-base/lxqt-qtplugin/metadata.xml | 11 ++- |
| 54 |
lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 36 +++---- |
| 55 |
lxqt-base/lxqt-runner/metadata.xml | 11 ++- |
| 56 |
lxqt-base/lxqt-session/lxqt-session-9999.ebuild | 43 ++++---- |
| 57 |
lxqt-base/lxqt-session/metadata.xml | 14 ++- |
| 58 |
lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild | 30 +++--- |
| 59 |
lxqt-base/lxqt-sudo/metadata.xml | 11 ++- |
| 60 |
lxqt-base/metadata.xml | 6 +- |
| 61 |
media-gfx/lximage-qt/lximage-qt-9999.ebuild | 31 +++--- |
| 62 |
media-gfx/lximage-qt/metadata.xml | 11 ++- |
| 63 |
x11-libs/libfm-qt/libfm-qt-9999.ebuild | 34 +++---- |
| 64 |
x11-libs/libfm-qt/metadata.xml | 2 +- |
| 65 |
x11-misc/obconf-qt/metadata.xml | 11 ++- |
| 66 |
x11-misc/obconf-qt/obconf-qt-9999.ebuild | 40 ++++---- |
| 67 |
x11-misc/pcmanfm-qt/metadata.xml | 15 ++- |
| 68 |
x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild | 36 +++---- |
| 69 |
x11-themes/lxqt-themes/lxqt-themes-9999.ebuild | 21 ++-- |
| 70 |
x11-themes/lxqt-themes/metadata.xml | 11 ++- |
| 71 |
49 files changed, 666 insertions(+), 558 deletions(-) |
| 72 |
|
| 73 |
diff --git a/dev-libs/libqtxdg/libqtxdg-9999.ebuild b/dev-libs/libqtxdg/libqtxdg-9999.ebuild |
| 74 |
index 3edc5ce7..67317650 100644 |
| 75 |
--- a/dev-libs/libqtxdg/libqtxdg-9999.ebuild |
| 76 |
+++ b/dev-libs/libqtxdg/libqtxdg-9999.ebuild |
| 77 |
@@ -1,39 +1,38 @@ |
| 78 |
-# Copyright 1999-2018 Gentoo Foundation |
| 79 |
+# Copyright 1999-2018 Gentoo Authors |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
EAPI=6 |
| 83 |
+ |
| 84 |
inherit cmake-utils virtualx |
| 85 |
|
| 86 |
DESCRIPTION="A Qt implementation of XDG standards" |
| 87 |
HOMEPAGE="https://lxqt.org/" |
| 88 |
|
| 89 |
-if [[ ${PV} == *9999* ]]; then |
| 90 |
+if [[ ${PV} == *9999 ]]; then |
| 91 |
inherit git-r3 |
| 92 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 93 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 94 |
else |
| 95 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 96 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 97 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 98 |
fi |
| 99 |
|
| 100 |
-LICENSE="LGPL-2.1" |
| 101 |
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" |
| 102 |
SLOT="0" |
| 103 |
IUSE="test" |
| 104 |
|
| 105 |
-CDEPEND=" |
| 106 |
+RDEPEND=" |
| 107 |
dev-qt/qtcore:5 |
| 108 |
dev-qt/qtdbus:5 |
| 109 |
- dev-qt/qtgui:5 |
| 110 |
+ dev-qt/qtgui:5= |
| 111 |
dev-qt/qtsvg:5 |
| 112 |
dev-qt/qtwidgets:5 |
| 113 |
dev-qt/qtxml:5 |
| 114 |
+ x11-misc/xdg-utils |
| 115 |
" |
| 116 |
-DEPEND="${CDEPEND} |
| 117 |
+DEPEND="${RDEPEND} |
| 118 |
virtual/pkgconfig |
| 119 |
test? ( dev-qt/qttest:5 ) |
| 120 |
" |
| 121 |
-RDEPEND="${CDEPEND} |
| 122 |
- x11-misc/xdg-utils |
| 123 |
-" |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
local mycmakeargs=( |
| 127 |
@@ -43,5 +42,6 @@ src_configure() { |
| 128 |
} |
| 129 |
|
| 130 |
src_test() { |
| 131 |
- VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake |
| 132 |
+ # Tests don't work with C |
| 133 |
+ LC_ALL=en_US.utf8 virtx cmake-utils_src_test |
| 134 |
} |
| 135 |
|
| 136 |
diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml |
| 137 |
index 77812fec..2906ccd4 100644 |
| 138 |
--- a/dev-libs/libqtxdg/metadata.xml |
| 139 |
+++ b/dev-libs/libqtxdg/metadata.xml |
| 140 |
@@ -1,12 +1,15 @@ |
| 141 |
<?xml version="1.0" encoding="UTF-8"?> |
| 142 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 143 |
<pkgmetadata> |
| 144 |
- <maintainer type="project"> |
| 145 |
- <email>lxqt@g.o</email> |
| 146 |
- <name>LXQt</name> |
| 147 |
- </maintainer> |
| 148 |
-<maintainer type="project"> |
| 149 |
- <email>qt@g.o</email> |
| 150 |
- <name>Gentoo Qt Project</name> |
| 151 |
- </maintainer> |
| 152 |
+ <maintainer type="project"> |
| 153 |
+ <email>lxqt@g.o</email> |
| 154 |
+ <name>LXQt</name> |
| 155 |
+ </maintainer> |
| 156 |
+ <maintainer type="project"> |
| 157 |
+ <email>qt@g.o</email> |
| 158 |
+ <name>Gentoo Qt Project</name> |
| 159 |
+ </maintainer> |
| 160 |
+ <upstream> |
| 161 |
+ <remote-id type="github">lxqt/libqtxdg</remote-id> |
| 162 |
+ </upstream> |
| 163 |
</pkgmetadata> |
| 164 |
|
| 165 |
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild |
| 166 |
index a28ed1dc..da7c6f4f 100644 |
| 167 |
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild |
| 168 |
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild |
| 169 |
@@ -1,4 +1,4 @@ |
| 170 |
-# Copyright 1999-2018 Gentoo Foundation |
| 171 |
+# Copyright 1999-2018 Gentoo Authors |
| 172 |
# Distributed under the terms of the GNU General Public License v2 |
| 173 |
|
| 174 |
EAPI=6 |
| 175 |
@@ -9,17 +9,17 @@ HOMEPAGE="https://lxqt.org/" |
| 176 |
|
| 177 |
if [[ ${PV} = *9999* ]]; then |
| 178 |
inherit git-r3 |
| 179 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 180 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 181 |
else |
| 182 |
SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 183 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
| 184 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 185 |
fi |
| 186 |
|
| 187 |
LICENSE="BSD" |
| 188 |
SLOT="0" |
| 189 |
|
| 190 |
-DEPEND="dev-qt/qtcore:5" |
| 191 |
- |
| 192 |
-src_configure() { |
| 193 |
- cmake-utils_src_configure |
| 194 |
-} |
| 195 |
+RDEPEND=" |
| 196 |
+ >=dev-libs/glib-2.50.0 |
| 197 |
+ dev-qt/qtcore:5 |
| 198 |
+" |
| 199 |
+DEPEND="${RDEPEND}" |
| 200 |
|
| 201 |
diff --git a/dev-util/lxqt-build-tools/metadata.xml b/dev-util/lxqt-build-tools/metadata.xml |
| 202 |
index a40a83a9..aa0b3609 100644 |
| 203 |
--- a/dev-util/lxqt-build-tools/metadata.xml |
| 204 |
+++ b/dev-util/lxqt-build-tools/metadata.xml |
| 205 |
@@ -1,8 +1,11 @@ |
| 206 |
<?xml version="1.0" encoding="UTF-8"?> |
| 207 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 208 |
<pkgmetadata> |
| 209 |
-<maintainer type="project"> |
| 210 |
- <email>lxqt@g.o</email> |
| 211 |
- <name>LXQt</name> |
| 212 |
- </maintainer> |
| 213 |
+ <maintainer type="project"> |
| 214 |
+ <email>lxqt@g.o</email> |
| 215 |
+ <name>LXQt</name> |
| 216 |
+ </maintainer> |
| 217 |
+ <upstream> |
| 218 |
+ <remote-id type="github">lxqt/lxqt-build-tools</remote-id> |
| 219 |
+ </upstream> |
| 220 |
</pkgmetadata> |
| 221 |
|
| 222 |
diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 223 |
index 79420a8f..589d9054 100644 |
| 224 |
--- a/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 225 |
+++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 226 |
@@ -1,22 +1,23 @@ |
| 227 |
-# Copyright 1999-2018 Gentoo Foundation |
| 228 |
+# Copyright 1999-2018 Gentoo Authors |
| 229 |
# Distributed under the terms of the GNU General Public License v2 |
| 230 |
|
| 231 |
EAPI=6 |
| 232 |
-inherit cmake-utils |
| 233 |
+ |
| 234 |
+inherit cmake-utils eapi7-ver |
| 235 |
|
| 236 |
DESCRIPTION="Common base library for the LXQt desktop environment" |
| 237 |
-HOMEPAGE="http://lxqt.org/" |
| 238 |
+HOMEPAGE="https://lxqt.org/" |
| 239 |
|
| 240 |
-if [[ ${PV} == *9999* ]]; then |
| 241 |
+if [[ ${PV} = *9999* ]]; then |
| 242 |
inherit git-r3 |
| 243 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 244 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 245 |
else |
| 246 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 247 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 248 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 249 |
fi |
| 250 |
|
| 251 |
-LICENSE="|| ( BSD LGPL-2.1+ )" |
| 252 |
-SLOT="0" |
| 253 |
+LICENSE="LGPL-2.1+ BSD" |
| 254 |
+SLOT="0/$(ver_cut 1-2)" |
| 255 |
IUSE="policykit" |
| 256 |
|
| 257 |
RDEPEND=" |
| 258 |
@@ -28,27 +29,22 @@ RDEPEND=" |
| 259 |
dev-qt/qtx11extras:5 |
| 260 |
dev-qt/qtxml:5 |
| 261 |
kde-frameworks/kwindowsystem:5[X] |
| 262 |
+ x11-libs/libX11 |
| 263 |
x11-libs/libXScrnSaver |
| 264 |
" |
| 265 |
+ |
| 266 |
DEPEND="${RDEPEND} |
| 267 |
dev-qt/linguist-tools:5 |
| 268 |
- >=dev-util/lxqt-build-tools-0.4.0 |
| 269 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 270 |
policykit? ( sys-auth/polkit-qt ) |
| 271 |
" |
| 272 |
|
| 273 |
PATCHES=( "$FILESDIR/${PN}-make-polkit-optional.patch" ) |
| 274 |
|
| 275 |
-pkg_pretend() { |
| 276 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 277 |
- tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \ |
| 278 |
- die 'The active compiler needs to be gcc 4.8 (or newer)' |
| 279 |
- fi |
| 280 |
-} |
| 281 |
- |
| 282 |
src_configure() { |
| 283 |
local mycmakeargs=( |
| 284 |
- $(usex !policykit '-DBUILD_POLKIT=OFF') |
| 285 |
-DPULL_TRANSLATIONS=OFF |
| 286 |
+ $(usex !policykit '-DBUILD_POLKIT=OFF') |
| 287 |
) |
| 288 |
cmake-utils_src_configure |
| 289 |
} |
| 290 |
|
| 291 |
diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml |
| 292 |
index a40a83a9..68951bb1 100644 |
| 293 |
--- a/lxqt-base/liblxqt/metadata.xml |
| 294 |
+++ b/lxqt-base/liblxqt/metadata.xml |
| 295 |
@@ -1,8 +1,11 @@ |
| 296 |
<?xml version="1.0" encoding="UTF-8"?> |
| 297 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 298 |
<pkgmetadata> |
| 299 |
-<maintainer type="project"> |
| 300 |
- <email>lxqt@g.o</email> |
| 301 |
- <name>LXQt</name> |
| 302 |
- </maintainer> |
| 303 |
+ <maintainer type="project"> |
| 304 |
+ <email>lxqt@g.o</email> |
| 305 |
+ <name>LXQt</name> |
| 306 |
+ </maintainer> |
| 307 |
+ <upstream> |
| 308 |
+ <remote-id type="github">lxqt/liblxqt</remote-id> |
| 309 |
+ </upstream> |
| 310 |
</pkgmetadata> |
| 311 |
|
| 312 |
diff --git a/lxqt-base/libsysstat/libsysstat-9999.ebuild b/lxqt-base/libsysstat/libsysstat-9999.ebuild |
| 313 |
index d9e602ae..62ebc611 100644 |
| 314 |
--- a/lxqt-base/libsysstat/libsysstat-9999.ebuild |
| 315 |
+++ b/lxqt-base/libsysstat/libsysstat-9999.ebuild |
| 316 |
@@ -1,27 +1,25 @@ |
| 317 |
-# Copyright 1999-2017 Gentoo Foundation |
| 318 |
+# Copyright 1999-2018 Gentoo Authors |
| 319 |
# Distributed under the terms of the GNU General Public License v2 |
| 320 |
|
| 321 |
EAPI=6 |
| 322 |
+ |
| 323 |
inherit cmake-utils |
| 324 |
|
| 325 |
DESCRIPTION="A Qt-based interface to system statistics" |
| 326 |
-HOMEPAGE="http://lxqt.org/" |
| 327 |
+HOMEPAGE="https://lxqt.org/" |
| 328 |
|
| 329 |
-if [[ ${PV} == *9999* ]]; then |
| 330 |
+if [[ ${PV} = *9999* ]]; then |
| 331 |
inherit git-r3 |
| 332 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 333 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 334 |
else |
| 335 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 336 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 337 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 338 |
fi |
| 339 |
|
| 340 |
-LICENSE="LGPL-2.1+" |
| 341 |
+LICENSE="GPL-2+ LGPL-2.1+" |
| 342 |
SLOT="0" |
| 343 |
|
| 344 |
-RDEPEND=" |
| 345 |
- dev-qt/qtcore:5 |
| 346 |
-" |
| 347 |
+RDEPEND="dev-qt/qtcore:5" |
| 348 |
DEPEND="${RDEPEND} |
| 349 |
- dev-qt/linguist-tools:5 |
| 350 |
- >=dev-util/lxqt-build-tools-0.4.0 |
| 351 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 352 |
" |
| 353 |
|
| 354 |
diff --git a/lxqt-base/libsysstat/metadata.xml b/lxqt-base/libsysstat/metadata.xml |
| 355 |
index a40a83a9..38582790 100644 |
| 356 |
--- a/lxqt-base/libsysstat/metadata.xml |
| 357 |
+++ b/lxqt-base/libsysstat/metadata.xml |
| 358 |
@@ -1,8 +1,11 @@ |
| 359 |
<?xml version="1.0" encoding="UTF-8"?> |
| 360 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 361 |
<pkgmetadata> |
| 362 |
-<maintainer type="project"> |
| 363 |
- <email>lxqt@g.o</email> |
| 364 |
- <name>LXQt</name> |
| 365 |
- </maintainer> |
| 366 |
+ <maintainer type="project"> |
| 367 |
+ <email>lxqt@g.o</email> |
| 368 |
+ <name>LXQt</name> |
| 369 |
+ </maintainer> |
| 370 |
+ <upstream> |
| 371 |
+ <remote-id type="github">lxqt/libsysstat</remote-id> |
| 372 |
+ </upstream> |
| 373 |
</pkgmetadata> |
| 374 |
|
| 375 |
diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild |
| 376 |
index ee880e46..0613a2ec 100644 |
| 377 |
--- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild |
| 378 |
+++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild |
| 379 |
@@ -1,36 +1,38 @@ |
| 380 |
-# Copyright 1999-2017 Gentoo Foundation |
| 381 |
+# Copyright 1999-2018 Gentoo Authors |
| 382 |
# Distributed under the terms of the GNU General Public License v2 |
| 383 |
|
| 384 |
EAPI=6 |
| 385 |
-inherit cmake-utils |
| 386 |
+ |
| 387 |
+inherit cmake-utils eapi7-ver |
| 388 |
|
| 389 |
DESCRIPTION="LXQt about dialog" |
| 390 |
-HOMEPAGE="http://lxqt.org/" |
| 391 |
+HOMEPAGE="https://lxqt.org/" |
| 392 |
|
| 393 |
-if [[ ${PV} == *9999* ]]; then |
| 394 |
+if [[ ${PV} = *9999* ]]; then |
| 395 |
inherit git-r3 |
| 396 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 397 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 398 |
else |
| 399 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 400 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 401 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 402 |
fi |
| 403 |
|
| 404 |
LICENSE="LGPL-2.1+" |
| 405 |
SLOT="0" |
| 406 |
|
| 407 |
-DEPEND=" |
| 408 |
+RDEPEND=" |
| 409 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 410 |
dev-qt/qtcore:5 |
| 411 |
- dev-qt/qtdbus:5 |
| 412 |
dev-qt/qtgui:5 |
| 413 |
dev-qt/qtwidgets:5 |
| 414 |
- dev-qt/qtx11extras:5 |
| 415 |
- dev-qt/qtxml:5 |
| 416 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 417 |
- lxqt-base/liblxqt |
| 418 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 419 |
+" |
| 420 |
+DEPEND="${RDEPEND} |
| 421 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 422 |
" |
| 423 |
-RDEPEND="${DEPEND}" |
| 424 |
|
| 425 |
src_configure() { |
| 426 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 427 |
+ local mycmakeargs=( |
| 428 |
+ -DPULL_TRANSLATIONS=OFF |
| 429 |
+ ) |
| 430 |
cmake-utils_src_configure |
| 431 |
} |
| 432 |
|
| 433 |
diff --git a/lxqt-base/lxqt-about/metadata.xml b/lxqt-base/lxqt-about/metadata.xml |
| 434 |
index a40a83a9..fb782dbf 100644 |
| 435 |
--- a/lxqt-base/lxqt-about/metadata.xml |
| 436 |
+++ b/lxqt-base/lxqt-about/metadata.xml |
| 437 |
@@ -1,8 +1,11 @@ |
| 438 |
<?xml version="1.0" encoding="UTF-8"?> |
| 439 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 440 |
<pkgmetadata> |
| 441 |
-<maintainer type="project"> |
| 442 |
- <email>lxqt@g.o</email> |
| 443 |
- <name>LXQt</name> |
| 444 |
- </maintainer> |
| 445 |
+ <maintainer type="project"> |
| 446 |
+ <email>lxqt@g.o</email> |
| 447 |
+ <name>LXQt</name> |
| 448 |
+ </maintainer> |
| 449 |
+ <upstream> |
| 450 |
+ <remote-id type="github">lxqt/lxqt-about</remote-id> |
| 451 |
+ </upstream> |
| 452 |
</pkgmetadata> |
| 453 |
|
| 454 |
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild |
| 455 |
index a0eefb76..fb1930a7 100644 |
| 456 |
--- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild |
| 457 |
+++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild |
| 458 |
@@ -1,40 +1,39 @@ |
| 459 |
-# Copyright 1999-2017 Gentoo Foundation |
| 460 |
+# Copyright 1999-2018 Gentoo Authors |
| 461 |
# Distributed under the terms of the GNU General Public License v2 |
| 462 |
|
| 463 |
EAPI=6 |
| 464 |
-inherit cmake-utils |
| 465 |
+ |
| 466 |
+inherit cmake-utils eapi7-ver |
| 467 |
|
| 468 |
DESCRIPTION="LXQt system administration tool" |
| 469 |
-HOMEPAGE="http://lxqt.org/" |
| 470 |
+HOMEPAGE="https://lxqt.org/" |
| 471 |
|
| 472 |
-if [[ ${PV} == *9999* ]]; then |
| 473 |
+if [[ ${PV} = *9999* ]]; then |
| 474 |
inherit git-r3 |
| 475 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 476 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 477 |
else |
| 478 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 479 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 480 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 481 |
fi |
| 482 |
|
| 483 |
LICENSE="LGPL-2.1+" |
| 484 |
SLOT="0" |
| 485 |
|
| 486 |
-DEPEND=" |
| 487 |
- dev-libs/glib:2 |
| 488 |
- >=dev-libs/libqtxdg-2.0.0 |
| 489 |
+RDEPEND=" |
| 490 |
dev-qt/qtcore:5 |
| 491 |
dev-qt/qtdbus:5 |
| 492 |
dev-qt/qtgui:5 |
| 493 |
dev-qt/qtwidgets:5 |
| 494 |
- dev-qt/qtx11extras:5 |
| 495 |
- dev-qt/qtxml:5 |
| 496 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 497 |
- lxqt-base/liblxqt |
| 498 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 499 |
kde-frameworks/kwindowsystem:5 |
| 500 |
- x11-libs/libX11 |
| 501 |
" |
| 502 |
-RDEPEND="${DEPEND}" |
| 503 |
+DEPEND="${RDEPEND} |
| 504 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 505 |
+" |
| 506 |
|
| 507 |
src_configure() { |
| 508 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 509 |
+ local mycmakeargs=( |
| 510 |
+ -DPULL_TRANSLATIONS=OFF |
| 511 |
+ ) |
| 512 |
cmake-utils_src_configure |
| 513 |
} |
| 514 |
|
| 515 |
diff --git a/lxqt-base/lxqt-admin/metadata.xml b/lxqt-base/lxqt-admin/metadata.xml |
| 516 |
index a40a83a9..7d14238c 100644 |
| 517 |
--- a/lxqt-base/lxqt-admin/metadata.xml |
| 518 |
+++ b/lxqt-base/lxqt-admin/metadata.xml |
| 519 |
@@ -1,8 +1,11 @@ |
| 520 |
<?xml version="1.0" encoding="UTF-8"?> |
| 521 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 522 |
<pkgmetadata> |
| 523 |
-<maintainer type="project"> |
| 524 |
- <email>lxqt@g.o</email> |
| 525 |
- <name>LXQt</name> |
| 526 |
- </maintainer> |
| 527 |
+ <maintainer type="project"> |
| 528 |
+ <email>lxqt@g.o</email> |
| 529 |
+ <name>LXQt</name> |
| 530 |
+ </maintainer> |
| 531 |
+ <upstream> |
| 532 |
+ <remote-id type="github">lxqt/lxqt-admin</remote-id> |
| 533 |
+ </upstream> |
| 534 |
</pkgmetadata> |
| 535 |
|
| 536 |
diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 537 |
index 4960d23d..c206dbd1 100644 |
| 538 |
--- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 539 |
+++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 540 |
@@ -1,26 +1,27 @@ |
| 541 |
-# Copyright 1999-2017 Gentoo Foundation |
| 542 |
+# Copyright 1999-2018 Gentoo Authors |
| 543 |
# Distributed under the terms of the GNU General Public License v2 |
| 544 |
|
| 545 |
EAPI=6 |
| 546 |
-inherit cmake-utils |
| 547 |
+ |
| 548 |
+inherit cmake-utils gnome2-utils eapi7-ver |
| 549 |
|
| 550 |
DESCRIPTION="LXQt system configuration control center" |
| 551 |
-HOMEPAGE="http://lxqt.org/" |
| 552 |
+HOMEPAGE="https://lxqt.org/" |
| 553 |
|
| 554 |
-if [[ ${PV} == *9999* ]]; then |
| 555 |
+if [[ ${PV} = *9999* ]]; then |
| 556 |
inherit git-r3 |
| 557 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 558 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 559 |
else |
| 560 |
- SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz" |
| 561 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 562 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 563 |
fi |
| 564 |
|
| 565 |
-LICENSE="|| ( GPL-2 LGPL-2.1+ )" |
| 566 |
+LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" |
| 567 |
SLOT="0" |
| 568 |
+IUSE="+monitor" |
| 569 |
|
| 570 |
-CDEPEND=" |
| 571 |
- >=dev-libs/libqtxdg-2.0.0 |
| 572 |
- dev-qt/qtconcurrent:5 |
| 573 |
+RDEPEND=" |
| 574 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 575 |
dev-qt/qtcore:5 |
| 576 |
dev-qt/qtdbus:5 |
| 577 |
dev-qt/qtgui:5 |
| 578 |
@@ -28,31 +29,37 @@ CDEPEND=" |
| 579 |
dev-qt/qtx11extras:5 |
| 580 |
dev-qt/qtxml:5 |
| 581 |
kde-frameworks/kwindowsystem:5 |
| 582 |
- kde-plasma/libkscreen:5= |
| 583 |
- lxqt-base/liblxqt |
| 584 |
- sys-libs/zlib |
| 585 |
- x11-libs/libICE |
| 586 |
- x11-libs/libSM |
| 587 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 588 |
+ sys-libs/zlib:= |
| 589 |
+ x11-apps/setxkbmap |
| 590 |
x11-libs/libxcb:= |
| 591 |
x11-libs/libX11 |
| 592 |
x11-libs/libXcursor |
| 593 |
- x11-libs/libXext |
| 594 |
x11-libs/libXfixes |
| 595 |
+ monitor? ( kde-plasma/libkscreen:5= ) |
| 596 |
" |
| 597 |
-DEPEND="${CDEPEND} |
| 598 |
+DEPEND="${DEPEND} |
| 599 |
dev-qt/linguist-tools:5 |
| 600 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 601 |
-" |
| 602 |
-RDEPEND="${CDEPEND} |
| 603 |
- x11-apps/setxkbmap |
| 604 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 605 |
" |
| 606 |
|
| 607 |
src_configure() { |
| 608 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 609 |
+ local mycmakeargs=( |
| 610 |
+ -DPULL_TRANSLATIONS=OFF |
| 611 |
+ -DWITH_MONITOR="$(usex monitor)" |
| 612 |
+ ) |
| 613 |
cmake-utils_src_configure |
| 614 |
} |
| 615 |
|
| 616 |
-src_install(){ |
| 617 |
+src_install() { |
| 618 |
cmake-utils_src_install |
| 619 |
doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 |
| 620 |
} |
| 621 |
+ |
| 622 |
+pkg_postinst() { |
| 623 |
+ gnome2_icon_cache_update |
| 624 |
+} |
| 625 |
+ |
| 626 |
+pkg_postrm() { |
| 627 |
+ gnome2_icon_cache_update |
| 628 |
+} |
| 629 |
|
| 630 |
diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml |
| 631 |
index a40a83a9..d6f2207d 100644 |
| 632 |
--- a/lxqt-base/lxqt-config/metadata.xml |
| 633 |
+++ b/lxqt-base/lxqt-config/metadata.xml |
| 634 |
@@ -1,8 +1,14 @@ |
| 635 |
<?xml version="1.0" encoding="UTF-8"?> |
| 636 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 637 |
<pkgmetadata> |
| 638 |
-<maintainer type="project"> |
| 639 |
- <email>lxqt@g.o</email> |
| 640 |
- <name>LXQt</name> |
| 641 |
- </maintainer> |
| 642 |
+ <maintainer type="project"> |
| 643 |
+ <email>lxqt@g.o</email> |
| 644 |
+ <name>LXQt</name> |
| 645 |
+ </maintainer> |
| 646 |
+ <upstream> |
| 647 |
+ <remote-id type="github">lxqt/lxqt-config</remote-id> |
| 648 |
+ </upstream> |
| 649 |
+ <use> |
| 650 |
+ <flag name="monitor" restrict=">=lxqt-base/lxqt-config-0.13.0">Build monitor settings tool</flag> |
| 651 |
+ </use> |
| 652 |
</pkgmetadata> |
| 653 |
|
| 654 |
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild |
| 655 |
index b817adeb..4792adc6 100644 |
| 656 |
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild |
| 657 |
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild |
| 658 |
@@ -1,17 +1,18 @@ |
| 659 |
-# Copyright 1999-2017 Gentoo Foundation |
| 660 |
+# Copyright 1999-2018 Gentoo Authors |
| 661 |
# Distributed under the terms of the GNU General Public License v2 |
| 662 |
|
| 663 |
EAPI=6 |
| 664 |
-inherit cmake-utils |
| 665 |
|
| 666 |
-DESCRIPTION="Daemon used to register global keyboard shortcuts" |
| 667 |
-HOMEPAGE="http://lxqt.org/" |
| 668 |
+inherit cmake-utils eapi7-ver |
| 669 |
|
| 670 |
-if [[ ${PV} == *9999* ]]; then |
| 671 |
+DESCRIPTION="Daemon and library for global keyboard shortcuts registration" |
| 672 |
+HOMEPAGE="https://lxqt.org/" |
| 673 |
+ |
| 674 |
+if [[ ${PV} = *9999* ]]; then |
| 675 |
inherit git-r3 |
| 676 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 677 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 678 |
else |
| 679 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 680 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 681 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 682 |
fi |
| 683 |
|
| 684 |
@@ -19,25 +20,26 @@ LICENSE="LGPL-2.1+" |
| 685 |
SLOT="0" |
| 686 |
|
| 687 |
RDEPEND=" |
| 688 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 689 |
dev-qt/qtcore:5 |
| 690 |
dev-qt/qtdbus:5 |
| 691 |
dev-qt/qtgui:5 |
| 692 |
dev-qt/qtwidgets:5 |
| 693 |
dev-qt/qtx11extras:5 |
| 694 |
dev-qt/qtxml:5 |
| 695 |
- lxqt-base/liblxqt |
| 696 |
- >=dev-libs/libqtxdg-2.0.0 |
| 697 |
- x11-libs/libICE |
| 698 |
- x11-libs/libSM |
| 699 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 700 |
+ kde-frameworks/kwindowsystem:5 |
| 701 |
x11-libs/libX11 |
| 702 |
- x11-libs/libXext |
| 703 |
+ !lxqt-base/lxqt-common |
| 704 |
" |
| 705 |
DEPEND="${RDEPEND} |
| 706 |
dev-qt/linguist-tools:5 |
| 707 |
- >=dev-util/lxqt-build-tools-0.1.0 |
| 708 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 709 |
" |
| 710 |
|
| 711 |
src_configure() { |
| 712 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 713 |
+ local mycmakeargs=( |
| 714 |
+ -DPULL_TRANSLATIONS=OFF |
| 715 |
+ ) |
| 716 |
cmake-utils_src_configure |
| 717 |
} |
| 718 |
|
| 719 |
diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml b/lxqt-base/lxqt-globalkeys/metadata.xml |
| 720 |
index a40a83a9..d53f56a0 100644 |
| 721 |
--- a/lxqt-base/lxqt-globalkeys/metadata.xml |
| 722 |
+++ b/lxqt-base/lxqt-globalkeys/metadata.xml |
| 723 |
@@ -1,8 +1,11 @@ |
| 724 |
<?xml version="1.0" encoding="UTF-8"?> |
| 725 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 726 |
<pkgmetadata> |
| 727 |
-<maintainer type="project"> |
| 728 |
- <email>lxqt@g.o</email> |
| 729 |
- <name>LXQt</name> |
| 730 |
- </maintainer> |
| 731 |
+ <maintainer type="project"> |
| 732 |
+ <email>lxqt@g.o</email> |
| 733 |
+ <name>LXQt</name> |
| 734 |
+ </maintainer> |
| 735 |
+ <upstream> |
| 736 |
+ <remote-id type="github">lxqt/lxqt-globalkeys</remote-id> |
| 737 |
+ </upstream> |
| 738 |
</pkgmetadata> |
| 739 |
|
| 740 |
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild |
| 741 |
index ed24afd9..24c39ec3 100644 |
| 742 |
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild |
| 743 |
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild |
| 744 |
@@ -1,25 +1,26 @@ |
| 745 |
-# Copyright 1999-2017 Gentoo Foundation |
| 746 |
+# Copyright 1999-2018 Gentoo Authors |
| 747 |
# Distributed under the terms of the GNU General Public License v2 |
| 748 |
|
| 749 |
EAPI=6 |
| 750 |
+ |
| 751 |
inherit cmake-utils |
| 752 |
|
| 753 |
DESCRIPTION="LXQt localisation package" |
| 754 |
-HOMEPAGE="http://lxqt.org/" |
| 755 |
+HOMEPAGE="https://lxqt.org/" |
| 756 |
|
| 757 |
-if [[ ${PV} == *9999* ]]; then |
| 758 |
+if [[ ${PV} = *9999* ]]; then |
| 759 |
inherit git-r3 |
| 760 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 761 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 762 |
else |
| 763 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 764 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 765 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 766 |
fi |
| 767 |
|
| 768 |
LICENSE="LGPL-2.1+" |
| 769 |
SLOT="0" |
| 770 |
|
| 771 |
-DEPEND=" |
| 772 |
+RDEPEND="!~x11-misc/obconf-qt-0.9.0_p20150729" |
| 773 |
+DEPEND="${RDEPEND} |
| 774 |
dev-qt/linguist-tools:5 |
| 775 |
- >=dev-util/lxqt-build-tools-0.1.0 |
| 776 |
- >=lxqt-base/liblxqt-0.11.1 |
| 777 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 778 |
" |
| 779 |
|
| 780 |
diff --git a/lxqt-base/lxqt-l10n/metadata.xml b/lxqt-base/lxqt-l10n/metadata.xml |
| 781 |
index 3eaa3d72..36d625f5 100644 |
| 782 |
--- a/lxqt-base/lxqt-l10n/metadata.xml |
| 783 |
+++ b/lxqt-base/lxqt-l10n/metadata.xml |
| 784 |
@@ -1,8 +1,11 @@ |
| 785 |
<?xml version="1.0" encoding="UTF-8"?> |
| 786 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 787 |
<pkgmetadata> |
| 788 |
- <maintainer type="project"> |
| 789 |
- <email>lxqt@g.o</email> |
| 790 |
- <name>LXQt</name> |
| 791 |
- </maintainer> |
| 792 |
+ <maintainer type="project"> |
| 793 |
+ <email>lxqt@g.o</email> |
| 794 |
+ <name>LXQt</name> |
| 795 |
+ </maintainer> |
| 796 |
+ <upstream> |
| 797 |
+ <remote-id type="github">lxde/lxqt-l10n</remote-id> |
| 798 |
+ </upstream> |
| 799 |
</pkgmetadata> |
| 800 |
|
| 801 |
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild |
| 802 |
index a411b43c..657e1c17 100644 |
| 803 |
--- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild |
| 804 |
+++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild |
| 805 |
@@ -3,48 +3,55 @@ |
| 806 |
|
| 807 |
EAPI=6 |
| 808 |
|
| 809 |
+inherit eapi7-ver |
| 810 |
+ |
| 811 |
DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment" |
| 812 |
-HOMEPAGE="http://lxqt.org/" |
| 813 |
+HOMEPAGE="https://lxqt.org/" |
| 814 |
+ |
| 815 |
+MY_PV="$(ver_cut 1-2)*" |
| 816 |
+ |
| 817 |
+if [[ ${PV} = *9999* ]]; then |
| 818 |
+ KEYWORDS="-*" |
| 819 |
+else |
| 820 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 821 |
+fi |
| 822 |
|
| 823 |
LICENSE="metapackage" |
| 824 |
SLOT="0" |
| 825 |
-KEYWORDS="" |
| 826 |
-IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit |
| 827 |
- powermanagement sddm ssh-askpass sudo" |
| 828 |
-REQUIRED_USE="oxygen? ( icons )" |
| 829 |
|
| 830 |
-RDEPEND=" |
| 831 |
- >=dev-util/lxqt-build-tools-${PV} |
| 832 |
- >=lxqt-base/liblxqt-${PV} |
| 833 |
- >=lxde-base/lxmenu-data-0.1.2 |
| 834 |
- >=lxqt-base/lxqt-config-${PV} |
| 835 |
- >=lxqt-base/lxqt-globalkeys-${PV} |
| 836 |
- >=lxqt-base/lxqt-notificationd-${PV} |
| 837 |
- >=lxqt-base/lxqt-panel-${PV} |
| 838 |
- >=lxqt-base/lxqt-qtplugin-${PV} |
| 839 |
- >=lxqt-base/lxqt-runner-${PV} |
| 840 |
- >=lxqt-base/lxqt-session-${PV} |
| 841 |
- virtual/ttf-fonts |
| 842 |
- >=x11-libs/libfm-qt-${PV} |
| 843 |
- >=x11-themes/lxqt-themes-${PV} |
| 844 |
- about? ( >=lxqt-base/lxqt-about-${PV} ) |
| 845 |
- admin? ( >=lxqt-base/lxqt-admin-${PV} ) |
| 846 |
- filemanager? ( >=x11-misc/pcmanfm-qt-${PV} ) |
| 847 |
- icons? ( oxygen? ( kde-frameworks/oxygen-icons ) |
| 848 |
- !oxygen? ( virtual/freedesktop-icon-theme ) ) |
| 849 |
- lightdm? ( x11-misc/lightdm ) |
| 850 |
- lximage? ( >=media-gfx/lximage-qt-${PV} ) |
| 851 |
- !minimal? ( x11-wm/openbox |
| 852 |
- >=x11-misc/obconf-qt-${PV} ) |
| 853 |
- policykit? ( >=lxqt-base/lxqt-policykit-${PV} |
| 854 |
- || ( sys-auth/consolekit[policykit(-)] |
| 855 |
- sys-apps/systemd[policykit(-)] ) ) |
| 856 |
- powermanagement? ( >=lxqt-base/lxqt-powermanagement-${PV} ) |
| 857 |
- sddm? ( >=x11-misc/sddm-0.14.0 ) |
| 858 |
- ssh-askpass? ( >=lxqt-base/lxqt-openssh-askpass-${PV} ) |
| 859 |
- sudo? ( >=lxqt-base/lxqt-sudo-${PV} )" |
| 860 |
+IUSE="+about admin +filemanager lightdm lximage minimal nls |
| 861 |
+ +policykit powermanagement processviewer screenshot sddm |
| 862 |
+ ssh-askpass sudo terminal" |
| 863 |
|
| 864 |
# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial |
| 865 |
# install expects oxygen icons, until the user specifies otherwise (bug 543380) |
| 866 |
- |
| 867 |
-S="${WORKDIR}" |
| 868 |
+RDEPEND=" |
| 869 |
+ kde-frameworks/oxygen-icons |
| 870 |
+ >=lxde-base/lxmenu-data-0.1.5 |
| 871 |
+ =lxqt-base/lxqt-config-${MY_PV} |
| 872 |
+ =lxqt-base/lxqt-globalkeys-${MY_PV} |
| 873 |
+ =lxqt-base/lxqt-notificationd-${MY_PV} |
| 874 |
+ =lxqt-base/lxqt-panel-${MY_PV} |
| 875 |
+ =lxqt-base/lxqt-qtplugin-${MY_PV} |
| 876 |
+ =lxqt-base/lxqt-runner-${MY_PV} |
| 877 |
+ =lxqt-base/lxqt-session-${MY_PV} |
| 878 |
+ virtual/ttf-fonts |
| 879 |
+ =x11-themes/lxqt-themes-${MY_PV} |
| 880 |
+ about? ( =lxqt-base/lxqt-about-${MY_PV} ) |
| 881 |
+ admin? ( =lxqt-base/lxqt-admin-${MY_PV} ) |
| 882 |
+ filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV} ) |
| 883 |
+ lightdm? ( x11-misc/lightdm ) |
| 884 |
+ lximage? ( media-gfx/lximage-qt ) |
| 885 |
+ !minimal? ( |
| 886 |
+ x11-wm/openbox |
| 887 |
+ x11-misc/obconf-qt |
| 888 |
+ ) |
| 889 |
+ policykit? ( =lxqt-base/lxqt-policykit-${MY_PV} ) |
| 890 |
+ powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV} ) |
| 891 |
+ processviewer? ( x11-misc/qps:0 ) |
| 892 |
+ screenshot? ( x11-misc/screengrab:0 ) |
| 893 |
+ sddm? ( >=x11-misc/sddm-0.11.0 ) |
| 894 |
+ ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV} ) |
| 895 |
+ sudo? ( =lxqt-base/lxqt-sudo-${MY_PV} ) |
| 896 |
+ terminal? ( x11-terms/qterminal:0 ) |
| 897 |
+" |
| 898 |
|
| 899 |
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml |
| 900 |
index 08adc227..445b1aa6 100644 |
| 901 |
--- a/lxqt-base/lxqt-meta/metadata.xml |
| 902 |
+++ b/lxqt-base/lxqt-meta/metadata.xml |
| 903 |
@@ -1,29 +1,33 @@ |
| 904 |
<?xml version="1.0" encoding="UTF-8"?> |
| 905 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 906 |
<pkgmetadata> |
| 907 |
- <maintainer type="project"> |
| 908 |
- <email>lxqt@g.o</email> |
| 909 |
- <name>LXQt</name> |
| 910 |
- </maintainer> |
| 911 |
- <use> |
| 912 |
- <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag> |
| 913 |
- <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag> |
| 914 |
- <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> |
| 915 |
- file manager</flag> |
| 916 |
- <flag name="icons">Install an icon theme</flag> |
| 917 |
- <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg> |
| 918 |
- display manager</flag> |
| 919 |
- <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> |
| 920 |
- image viewer</flag> |
| 921 |
- <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg> |
| 922 |
- window manager</flag> |
| 923 |
- <flag name="oxygen">Prefer <pkg>kde-frameworks/oxygen-icons</pkg> (default)</flag> |
| 924 |
- <flag name="powermanagement">Install |
| 925 |
- <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> |
| 926 |
- <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> |
| 927 |
- display manager</flag> |
| 928 |
- <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> |
| 929 |
- user password prompt tool</flag> |
| 930 |
- <flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag> |
| 931 |
- </use> |
| 932 |
+ <maintainer type="project"> |
| 933 |
+ <email>lxqt@g.o</email> |
| 934 |
+ <name>LXQt</name> |
| 935 |
+ </maintainer> |
| 936 |
+ <use> |
| 937 |
+ <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag> |
| 938 |
+ <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag> |
| 939 |
+ <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> |
| 940 |
+ file manager</flag> |
| 941 |
+ <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg> |
| 942 |
+ display manager</flag> |
| 943 |
+ <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> |
| 944 |
+ image viewer</flag> |
| 945 |
+ <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg> |
| 946 |
+ window manager</flag> |
| 947 |
+ <flag name="powermanagement" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install |
| 948 |
+ <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> |
| 949 |
+ <flag name="processviewer">Install |
| 950 |
+ <pkg>x11-misc/qps</pkg> package</flag> |
| 951 |
+ <flag name="screenshot" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install |
| 952 |
+ <pkg>x11-misc/screengrab</pkg> package</flag> |
| 953 |
+ <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> |
| 954 |
+ display manager</flag> |
| 955 |
+ <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> |
| 956 |
+ user password prompt tool</flag> |
| 957 |
+ <flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag> |
| 958 |
+ <flag name="terminal" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install |
| 959 |
+ <pkg>x11-terms/qterminal</pkg> package</flag> |
| 960 |
+ </use> |
| 961 |
</pkgmetadata> |
| 962 |
|
| 963 |
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 964 |
index 74199498..7aeafddd 100644 |
| 965 |
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 966 |
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 967 |
@@ -1,17 +1,18 @@ |
| 968 |
-# Copyright 1999-2017 Gentoo Foundation |
| 969 |
+# Copyright 1999-2018 Gentoo Authors |
| 970 |
# Distributed under the terms of the GNU General Public License v2 |
| 971 |
|
| 972 |
EAPI=6 |
| 973 |
-inherit cmake-utils |
| 974 |
+ |
| 975 |
+inherit cmake-utils eapi7-ver |
| 976 |
|
| 977 |
DESCRIPTION="LXQt notification daemon and library" |
| 978 |
-HOMEPAGE="http://lxqt.org/" |
| 979 |
+HOMEPAGE="https://lxqt.org/" |
| 980 |
|
| 981 |
-if [[ ${PV} == *9999* ]]; then |
| 982 |
+if [[ ${PV} = *9999* ]]; then |
| 983 |
inherit git-r3 |
| 984 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 985 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 986 |
else |
| 987 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 988 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 989 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 990 |
fi |
| 991 |
|
| 992 |
@@ -19,22 +20,23 @@ LICENSE="LGPL-2.1+" |
| 993 |
SLOT="0" |
| 994 |
|
| 995 |
RDEPEND=" |
| 996 |
- >=dev-libs/libqtxdg-2.0.0 |
| 997 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 998 |
dev-qt/qtcore:5 |
| 999 |
dev-qt/qtdbus:5 |
| 1000 |
dev-qt/qtgui:5 |
| 1001 |
dev-qt/qtwidgets:5 |
| 1002 |
- dev-qt/qtx11extras:5 |
| 1003 |
- dev-qt/qtxml:5 |
| 1004 |
kde-frameworks/kwindowsystem:5 |
| 1005 |
- lxqt-base/liblxqt |
| 1006 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 1007 |
+ !lxqt-base/lxqt-common |
| 1008 |
" |
| 1009 |
DEPEND="${RDEPEND} |
| 1010 |
dev-qt/linguist-tools:5 |
| 1011 |
- >=dev-util/lxqt-build-tools-0.3.2 |
| 1012 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1013 |
" |
| 1014 |
|
| 1015 |
src_configure() { |
| 1016 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1017 |
+ local mycmakeargs=( |
| 1018 |
+ -DPULL_TRANSLATIONS=OFF |
| 1019 |
+ ) |
| 1020 |
cmake-utils_src_configure |
| 1021 |
} |
| 1022 |
|
| 1023 |
diff --git a/lxqt-base/lxqt-notificationd/metadata.xml b/lxqt-base/lxqt-notificationd/metadata.xml |
| 1024 |
index a40a83a9..097def32 100644 |
| 1025 |
--- a/lxqt-base/lxqt-notificationd/metadata.xml |
| 1026 |
+++ b/lxqt-base/lxqt-notificationd/metadata.xml |
| 1027 |
@@ -1,8 +1,11 @@ |
| 1028 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1029 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1030 |
<pkgmetadata> |
| 1031 |
-<maintainer type="project"> |
| 1032 |
- <email>lxqt@g.o</email> |
| 1033 |
- <name>LXQt</name> |
| 1034 |
- </maintainer> |
| 1035 |
+ <maintainer type="project"> |
| 1036 |
+ <email>lxqt@g.o</email> |
| 1037 |
+ <name>LXQt</name> |
| 1038 |
+ </maintainer> |
| 1039 |
+ <upstream> |
| 1040 |
+ <remote-id type="github">lxqt/lxqt-notifcationd</remote-id> |
| 1041 |
+ </upstream> |
| 1042 |
</pkgmetadata> |
| 1043 |
|
| 1044 |
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild |
| 1045 |
index f1a53793..196500d2 100644 |
| 1046 |
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild |
| 1047 |
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild |
| 1048 |
@@ -1,17 +1,18 @@ |
| 1049 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1050 |
+# Copyright 1999-2018 Gentoo Authors |
| 1051 |
# Distributed under the terms of the GNU General Public License v2 |
| 1052 |
|
| 1053 |
EAPI=6 |
| 1054 |
-inherit cmake-utils |
| 1055 |
+ |
| 1056 |
+inherit cmake-utils eapi7-ver |
| 1057 |
|
| 1058 |
DESCRIPTION="LXQt OpenSSH user password prompt tool" |
| 1059 |
-HOMEPAGE="http://lxqt.org/" |
| 1060 |
+HOMEPAGE="https://lxqt.org/" |
| 1061 |
|
| 1062 |
-if [[ ${PV} == *9999* ]]; then |
| 1063 |
+if [[ ${PV} = *9999* ]]; then |
| 1064 |
inherit git-r3 |
| 1065 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1066 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1067 |
else |
| 1068 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1069 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1070 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1071 |
fi |
| 1072 |
|
| 1073 |
@@ -19,23 +20,19 @@ LICENSE="LGPL-2.1+" |
| 1074 |
SLOT="0" |
| 1075 |
|
| 1076 |
RDEPEND=" |
| 1077 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1078 |
dev-qt/qtcore:5 |
| 1079 |
- dev-qt/qtdbus:5 |
| 1080 |
- dev-qt/qtgui:5 |
| 1081 |
dev-qt/qtwidgets:5 |
| 1082 |
- dev-qt/qtx11extras:5 |
| 1083 |
- dev-qt/qtxml:5 |
| 1084 |
- lxqt-base/liblxqt |
| 1085 |
- x11-libs/libX11 |
| 1086 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 1087 |
" |
| 1088 |
DEPEND="${RDEPEND} |
| 1089 |
dev-qt/linguist-tools:5 |
| 1090 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1091 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1092 |
" |
| 1093 |
|
| 1094 |
src_configure() { |
| 1095 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1096 |
+ local mycmakeargs=( |
| 1097 |
+ -DPULL_TRANSLATIONS=OFF |
| 1098 |
+ ) |
| 1099 |
cmake-utils_src_configure |
| 1100 |
} |
| 1101 |
|
| 1102 |
|
| 1103 |
diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml |
| 1104 |
index a40a83a9..1d0dffcb 100644 |
| 1105 |
--- a/lxqt-base/lxqt-openssh-askpass/metadata.xml |
| 1106 |
+++ b/lxqt-base/lxqt-openssh-askpass/metadata.xml |
| 1107 |
@@ -1,8 +1,11 @@ |
| 1108 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1109 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1110 |
<pkgmetadata> |
| 1111 |
-<maintainer type="project"> |
| 1112 |
- <email>lxqt@g.o</email> |
| 1113 |
- <name>LXQt</name> |
| 1114 |
- </maintainer> |
| 1115 |
+ <maintainer type="project"> |
| 1116 |
+ <email>lxqt@g.o</email> |
| 1117 |
+ <name>LXQt</name> |
| 1118 |
+ </maintainer> |
| 1119 |
+ <upstream> |
| 1120 |
+ <remote-id type="github">lxqt/lxqt-openssh-askpass</remote-id> |
| 1121 |
+ </upstream> |
| 1122 |
</pkgmetadata> |
| 1123 |
|
| 1124 |
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 1125 |
index 4e4f75b8..d20253a2 100644 |
| 1126 |
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 1127 |
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 1128 |
@@ -1,91 +1,105 @@ |
| 1129 |
-# Copyright 1999-2018 Gentoo Foundation |
| 1130 |
+# Copyright 1999-2018 Gentoo Authors |
| 1131 |
# Distributed under the terms of the GNU General Public License v2 |
| 1132 |
|
| 1133 |
EAPI=6 |
| 1134 |
-inherit cmake-utils |
| 1135 |
+ |
| 1136 |
+inherit cmake-utils eapi7-ver |
| 1137 |
|
| 1138 |
DESCRIPTION="LXQt desktop panel and plugins" |
| 1139 |
-HOMEPAGE="http://lxqt.org/" |
| 1140 |
+HOMEPAGE="https://lxqt.org/" |
| 1141 |
+ |
| 1142 |
+MY_PV="$(ver_cut 1-2)*" |
| 1143 |
|
| 1144 |
-if [[ ${PV} == *9999* ]]; then |
| 1145 |
+if [[ ${PV} = *9999* ]]; then |
| 1146 |
inherit git-r3 |
| 1147 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1148 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1149 |
else |
| 1150 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1151 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1152 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1153 |
fi |
| 1154 |
|
| 1155 |
LICENSE="LGPL-2.1+" |
| 1156 |
SLOT="0" |
| 1157 |
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu |
| 1158 |
+IUSE="+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu |
| 1159 |
+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop |
| 1160 |
- statusnotifier sysstat +taskbar +tray +volume worldclock" |
| 1161 |
+ +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock" |
| 1162 |
REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" |
| 1163 |
|
| 1164 |
-CDEPEND=" |
| 1165 |
- dev-libs/glib:2 |
| 1166 |
- >=dev-libs/libqtxdg-3.1.0 |
| 1167 |
+RDEPEND=" |
| 1168 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1169 |
dev-qt/qtcore:5 |
| 1170 |
dev-qt/qtdbus:5 |
| 1171 |
dev-qt/qtgui:5 |
| 1172 |
+ dev-qt/qtsvg:5 |
| 1173 |
dev-qt/qtwidgets:5 |
| 1174 |
dev-qt/qtx11extras:5 |
| 1175 |
dev-qt/qtxml:5 |
| 1176 |
- kde-frameworks/kguiaddons:5 |
| 1177 |
kde-frameworks/kwindowsystem:5[X] |
| 1178 |
- >=lxde-base/menu-cache-0.3.3 |
| 1179 |
- lxqt-base/liblxqt |
| 1180 |
- lxqt-base/lxqt-globalkeys |
| 1181 |
+ >=lxde-base/lxmenu-data-0.1.5 |
| 1182 |
+ >=lxde-base/menu-cache-1.1.0 |
| 1183 |
+ =lxqt-base/liblxqt-${MY_PV} |
| 1184 |
+ =lxqt-base/lxqt-globalkeys-${MY_PV} |
| 1185 |
x11-libs/libX11 |
| 1186 |
cpuload? ( sys-libs/libstatgrab ) |
| 1187 |
kbindicator? ( x11-libs/libxkbcommon ) |
| 1188 |
mount? ( kde-frameworks/solid:5 ) |
| 1189 |
networkmonitor? ( sys-libs/libstatgrab ) |
| 1190 |
sensors? ( sys-apps/lm_sensors ) |
| 1191 |
- statusnotifier? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r1 ) |
| 1192 |
- sysstat? ( =lxqt-base/libsysstat-0.3* ) |
| 1193 |
- tray? ( x11-libs/libXcomposite |
| 1194 |
+ statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) |
| 1195 |
+ sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) |
| 1196 |
+ tray? ( |
| 1197 |
+ x11-libs/libxcb:= |
| 1198 |
+ x11-libs/libXcomposite |
| 1199 |
x11-libs/libXdamage |
| 1200 |
- x11-libs/libXrender ) |
| 1201 |
- volume? ( alsa? ( media-libs/alsa-lib ) |
| 1202 |
- pulseaudio? ( media-sound/pulseaudio ) ) |
| 1203 |
+ x11-libs/libXrender |
| 1204 |
+ x11-libs/xcb-util |
| 1205 |
+ ) |
| 1206 |
+ volume? ( |
| 1207 |
+ alsa? ( media-libs/alsa-lib ) |
| 1208 |
+ pulseaudio? ( |
| 1209 |
+ media-sound/pavucontrol-qt |
| 1210 |
+ media-sound/pulseaudio |
| 1211 |
+ ) |
| 1212 |
+ ) |
| 1213 |
+ !lxqt-base/lxqt-common |
| 1214 |
" |
| 1215 |
-DEPEND="${CDEPEND} |
| 1216 |
+DEPEND="${RDEPEND} |
| 1217 |
dev-qt/linguist-tools:5 |
| 1218 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1219 |
-" |
| 1220 |
-RDEPEND="${CDEPEND} |
| 1221 |
- dev-qt/qtsvg:5 |
| 1222 |
- >=lxde-base/lxmenu-data-0.1.2 |
| 1223 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1224 |
+ virtual/pkgconfig |
| 1225 |
" |
| 1226 |
|
| 1227 |
src_configure() { |
| 1228 |
local mycmakeargs=( |
| 1229 |
-DPULL_TRANSLATIONS=OFF |
| 1230 |
- $(usex clock '-DCLOCK_PLUGIN=ON' '-DCLOCK_PLUGIN=OFF') |
| 1231 |
- $(usex colorpicker '-DCOLORPICKER_PLUGIN=ON' '-DCOLORPICKER_PLUGIN=OFF') |
| 1232 |
- $(usex cpuload '-DCPULOAD_PLUGIN=ON' '-DCPULOAD_PLUGIN=OFF') |
| 1233 |
- $(usex desktopswitch '-DDESKTOPSWITCH_PLUGIN=ON' '-DDESKTOPSWITCH_PLUGIN=OFF') |
| 1234 |
- $(usex dom '-DDOM_PLUGIN=ON' '-DDOM_PLUGIN=OFF') |
| 1235 |
- $(usex kbindicator '-DKBINDICATOR_PLUGIN=ON' '-DKBINDICATOR_PLUGIN=OFF') |
| 1236 |
- $(usex mainmenu '-DMAINMENU_PLUGIN=ON' '-DMAINMENU_PLUGIN=OFF') |
| 1237 |
- $(usex mount '-DMOUNT_PLUGIN=ON' '-DMOUNT_PLUGIN=OFF') |
| 1238 |
- $(usex networkmonitor '-DNETWORKMONITOR_PLUGIN=ON' '-DNETWORKMONITOR_PLUGIN=OFF') |
| 1239 |
- $(usex quicklaunch '-DQUICKLAUNCH_PLUGIN=ON' '-DQUICKLAUNCH_PLUGIN=OFF') |
| 1240 |
- $(usex sensors '-DSENSORS_PLUGIN=ON' '-DSENSORS_PLUGIN=OFF') |
| 1241 |
- $(usex showdesktop '-DSHOWDESKTOP_PLUGIN=ON' '-DSHOWDESKTOP_PLUGIN=OFF') |
| 1242 |
- $(usex statusnotifier '-DSTATUSNOTIFIER_PLUGIN=ON' '-DSTATUSNOTIFIER_PLUGIN=OFF') |
| 1243 |
- $(usex sysstat '-DSYSSTAT_PLUGIN=ON' '-DSYSSTAT_PLUGIN=OFF') |
| 1244 |
- $(usex taskbar '-DTASKBAR_PLUGIN=ON' '-DTASKBAR_PLUGIN=OFF') |
| 1245 |
- $(usex tray '-DTRAY_PLUGIN=ON' '-DTRAY_PLUGIN=OFF') |
| 1246 |
- $(usex volume '-DVOLUME_PLUGIN=ON' '-DVOLUME_PLUGIN=OFF') |
| 1247 |
- $(usex worldclock '-DWORLDCLOCK_PLUGIN=ON' '-DWORLDCLOCK_PLUGIN=OFF') |
| 1248 |
+ |
| 1249 |
+ # Plugins |
| 1250 |
+ -DCLOCK_PLUGIN=$(usex clock) |
| 1251 |
+ -DCOLORPICKER_PLUGIN=$(usex colorpicker) |
| 1252 |
+ -DCPULOAD_PLUGIN=$(usex cpuload) |
| 1253 |
+ -DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch) |
| 1254 |
+ -DDIRECTORYMENU_PLUGIN=$(usex directorymenu) |
| 1255 |
+ -DDOM_PLUGIN=$(usex dom) |
| 1256 |
+ -DKBINDICATOR_PLUGIN=$(usex kbindicator) |
| 1257 |
+ -DMAINMENU_PLUGIN=$(usex mainmenu) |
| 1258 |
+ -DMOUNT_PLUGIN=$(usex mount) |
| 1259 |
+ -DNETWORKMONITOR_PLUGIN=$(usex networkmonitor) |
| 1260 |
+ -DQUICKLAUNCH_PLUGIN=$(usex quicklaunch) |
| 1261 |
+ -DSENSORS_PLUGIN=$(usex sensors) |
| 1262 |
+ -DSHOWDESKTOP_PLUGIN=$(usex showdesktop) |
| 1263 |
+ -DSPACER_PLUGIN=$(usex spacer) |
| 1264 |
+ -DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier) |
| 1265 |
+ -DSYSSTAT_PLUGIN=$(usex sysstat) |
| 1266 |
+ -DTASKBAR_PLUGIN=$(usex taskbar) |
| 1267 |
+ -DTRAY_PLUGIN=$(usex tray) |
| 1268 |
+ -DVOLUME_PLUGIN=$(usex volume) |
| 1269 |
+ -DWORLDCLOCK_PLUGIN=$(usex worldclock) |
| 1270 |
) |
| 1271 |
|
| 1272 |
if use volume; then |
| 1273 |
mycmakeargs+=( |
| 1274 |
- $(usex alsa '-DVOLUME_USE_ALSA=ON' '-DVOLUME_USE_ALSA=OFF') |
| 1275 |
- $(usex pulseaudio '-DVOLUME_USE_PULSEAUDIO=ON' '-DVOLUME_USE_PULSEAUDIO=OFF') |
| 1276 |
+ -DVOLUME_USE_ALSA=$(usex alsa) |
| 1277 |
+ -DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio) |
| 1278 |
) |
| 1279 |
fi |
| 1280 |
|
| 1281 |
|
| 1282 |
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml |
| 1283 |
index 3dd1f2a7..389e2ab7 100644 |
| 1284 |
--- a/lxqt-base/lxqt-panel/metadata.xml |
| 1285 |
+++ b/lxqt-base/lxqt-panel/metadata.xml |
| 1286 |
@@ -1,28 +1,33 @@ |
| 1287 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1288 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1289 |
<pkgmetadata> |
| 1290 |
- <maintainer type="project"> |
| 1291 |
- <email>lxqt@g.o</email> |
| 1292 |
- <name>LXQt</name> |
| 1293 |
- </maintainer> |
| 1294 |
- <use> |
| 1295 |
- <flag name="clock">Build clock plugin</flag> |
| 1296 |
- <flag name="colorpicker">Build colorpicker plugin</flag> |
| 1297 |
- <flag name="cpuload">Build cpuload plugin</flag> |
| 1298 |
- <flag name="desktopswitch">Build desktopswitch plugin</flag> |
| 1299 |
- <flag name="dom">Build dom plugin</flag> |
| 1300 |
- <flag name="kbindicator">Build kbindicator plugin</flag> |
| 1301 |
- <flag name="mainmenu">Build mainmenu plugin</flag> |
| 1302 |
- <flag name="mount">Build mount plugin</flag> |
| 1303 |
- <flag name="networkmonitor">Build networkmonitor plugin</flag> |
| 1304 |
- <flag name="quicklaunch">Build quicklaunch plugin</flag> |
| 1305 |
- <flag name="sensors">Build sensors plugin</flag> |
| 1306 |
- <flag name="showdesktop">Build showdesktop plugin</flag> |
| 1307 |
- <flag name="statusnotifier">Build statusnotifier plugin</flag> |
| 1308 |
- <flag name="sysstat">Build sysstat plugin</flag> |
| 1309 |
- <flag name="taskbar">Build taskbar plugin</flag> |
| 1310 |
- <flag name="tray">Build tray plugin</flag> |
| 1311 |
- <flag name="volume">Build volume plugin</flag> |
| 1312 |
- <flag name="worldclock">Build worldclock plugin</flag> |
| 1313 |
- </use> |
| 1314 |
+ <maintainer type="project"> |
| 1315 |
+ <email>lxqt@g.o</email> |
| 1316 |
+ <name>LXQt</name> |
| 1317 |
+ </maintainer> |
| 1318 |
+ <use> |
| 1319 |
+ <flag name="clock">Build clock plugin</flag> |
| 1320 |
+ <flag name="colorpicker">Build colorpicker plugin</flag> |
| 1321 |
+ <flag name="cpuload">Build cpuload plugin</flag> |
| 1322 |
+ <flag name="desktopswitch">Build desktopswitch plugin</flag> |
| 1323 |
+ <flag name="directorymenu" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build directorymenu plugin</flag> |
| 1324 |
+ <flag name="dom">Build dom plugin</flag> |
| 1325 |
+ <flag name="kbindicator">Build kbindicator plugin</flag> |
| 1326 |
+ <flag name="mainmenu">Build mainmenu plugin</flag> |
| 1327 |
+ <flag name="mount">Build mount plugin</flag> |
| 1328 |
+ <flag name="networkmonitor">Build networkmonitor plugin</flag> |
| 1329 |
+ <flag name="quicklaunch">Build quicklaunch plugin</flag> |
| 1330 |
+ <flag name="sensors">Build sensors plugin</flag> |
| 1331 |
+ <flag name="showdesktop">Build showdesktop plugin</flag> |
| 1332 |
+ <flag name="statusnotifier">Build statusnotifier plugin</flag> |
| 1333 |
+ <flag name="spacer" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build spacer plugin</flag> |
| 1334 |
+ <flag name="sysstat">Build sysstat plugin</flag> |
| 1335 |
+ <flag name="taskbar">Build taskbar plugin</flag> |
| 1336 |
+ <flag name="tray">Build tray plugin</flag> |
| 1337 |
+ <flag name="volume">Build volume plugin</flag> |
| 1338 |
+ <flag name="worldclock">Build worldclock plugin</flag> |
| 1339 |
+ </use> |
| 1340 |
+ <upstream> |
| 1341 |
+ <remote-id type="github">lxqt/lxqt-panel</remote-id> |
| 1342 |
+ </upstream> |
| 1343 |
</pkgmetadata> |
| 1344 |
|
| 1345 |
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 1346 |
index dcabe098..fb71c99c 100644 |
| 1347 |
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 1348 |
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 1349 |
@@ -1,17 +1,18 @@ |
| 1350 |
-# Copyright 1999-2018 Gentoo Foundation |
| 1351 |
+# Copyright 1999-2018 Gentoo Authors |
| 1352 |
# Distributed under the terms of the GNU General Public License v2 |
| 1353 |
|
| 1354 |
EAPI=6 |
| 1355 |
-inherit cmake-utils |
| 1356 |
+ |
| 1357 |
+inherit cmake-utils eapi7-ver |
| 1358 |
|
| 1359 |
DESCRIPTION="LXQt PolKit authentication agent" |
| 1360 |
-HOMEPAGE="http://lxqt.org/" |
| 1361 |
+HOMEPAGE="https://lxqt.org/" |
| 1362 |
|
| 1363 |
-if [[ ${PV} == *9999* ]]; then |
| 1364 |
+if [[ ${PV} = *9999* ]]; then |
| 1365 |
inherit git-r3 |
| 1366 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1367 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1368 |
else |
| 1369 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1370 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1371 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1372 |
fi |
| 1373 |
|
| 1374 |
@@ -20,24 +21,24 @@ SLOT="0" |
| 1375 |
|
| 1376 |
RDEPEND=" |
| 1377 |
dev-libs/glib:2 |
| 1378 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1379 |
dev-qt/qtcore:5 |
| 1380 |
- dev-qt/qtdbus:5 |
| 1381 |
dev-qt/qtgui:5 |
| 1382 |
dev-qt/qtwidgets:5 |
| 1383 |
- dev-qt/qtx11extras:5 |
| 1384 |
- dev-qt/qtxml:5 |
| 1385 |
- lxqt-base/liblxqt |
| 1386 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1387 |
- >=sys-auth/polkit-qt-0.112.0_p20160416-r1 |
| 1388 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 1389 |
+ sys-auth/polkit-qt[qt5(+)] |
| 1390 |
+ !lxqt-base/lxqt-common |
| 1391 |
" |
| 1392 |
DEPEND="${RDEPEND} |
| 1393 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1394 |
dev-qt/linguist-tools:5 |
| 1395 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1396 |
virtual/pkgconfig |
| 1397 |
" |
| 1398 |
|
| 1399 |
src_configure() { |
| 1400 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1401 |
+ local mycmakeargs=( |
| 1402 |
+ -DPULL_TRANSLATIONS=OFF |
| 1403 |
+ ) |
| 1404 |
cmake-utils_src_configure |
| 1405 |
} |
| 1406 |
|
| 1407 |
|
| 1408 |
diff --git a/lxqt-base/lxqt-policykit/metadata.xml b/lxqt-base/lxqt-policykit/metadata.xml |
| 1409 |
index a40a83a9..77e942e4 100644 |
| 1410 |
--- a/lxqt-base/lxqt-policykit/metadata.xml |
| 1411 |
+++ b/lxqt-base/lxqt-policykit/metadata.xml |
| 1412 |
@@ -1,8 +1,11 @@ |
| 1413 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1414 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1415 |
<pkgmetadata> |
| 1416 |
-<maintainer type="project"> |
| 1417 |
- <email>lxqt@g.o</email> |
| 1418 |
- <name>LXQt</name> |
| 1419 |
- </maintainer> |
| 1420 |
+ <maintainer type="project"> |
| 1421 |
+ <email>lxqt@g.o</email> |
| 1422 |
+ <name>LXQt</name> |
| 1423 |
+ </maintainer> |
| 1424 |
+ <upstream> |
| 1425 |
+ <remote-id type="github">lxqt/lxqt-policykit</remote-id> |
| 1426 |
+ </upstream> |
| 1427 |
</pkgmetadata> |
| 1428 |
|
| 1429 |
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 1430 |
index 879b1c8e..e6419f89 100644 |
| 1431 |
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 1432 |
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 1433 |
@@ -1,25 +1,26 @@ |
| 1434 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1435 |
+# Copyright 1999-2018 Gentoo Authors |
| 1436 |
# Distributed under the terms of the GNU General Public License v2 |
| 1437 |
|
| 1438 |
EAPI=6 |
| 1439 |
-inherit cmake-utils |
| 1440 |
+ |
| 1441 |
+inherit cmake-utils eapi7-ver |
| 1442 |
|
| 1443 |
DESCRIPTION="LXQt daemon for power management and auto-suspend" |
| 1444 |
-HOMEPAGE="http://lxqt.org/" |
| 1445 |
+HOMEPAGE="https://lxqt.org/" |
| 1446 |
|
| 1447 |
-if [[ ${PV} == *9999* ]]; then |
| 1448 |
+if [[ ${PV} = *9999* ]]; then |
| 1449 |
inherit git-r3 |
| 1450 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1451 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1452 |
else |
| 1453 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1454 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1455 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1456 |
fi |
| 1457 |
|
| 1458 |
LICENSE="LGPL-2.1+" |
| 1459 |
SLOT="0" |
| 1460 |
|
| 1461 |
-CDEPEND=" |
| 1462 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1463 |
+RDEPEND=" |
| 1464 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1465 |
dev-qt/qtcore:5 |
| 1466 |
dev-qt/qtdbus:5 |
| 1467 |
dev-qt/qtgui:5 |
| 1468 |
@@ -28,18 +29,22 @@ CDEPEND=" |
| 1469 |
dev-qt/qtx11extras:5 |
| 1470 |
kde-frameworks/kidletime:5 |
| 1471 |
kde-frameworks/solid:5 |
| 1472 |
- lxqt-base/liblxqt |
| 1473 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 1474 |
+ || ( |
| 1475 |
+ sys-power/upower |
| 1476 |
+ sys-power/upower-pm-utils |
| 1477 |
+ ) |
| 1478 |
+ !lxqt-base/lxqt-common |
| 1479 |
" |
| 1480 |
-DEPEND="${CDEPEND} |
| 1481 |
+DEPEND="${RDEPEND} |
| 1482 |
dev-qt/linguist-tools:5 |
| 1483 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1484 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1485 |
virtual/pkgconfig |
| 1486 |
" |
| 1487 |
-RDEPEND="${CDEPEND} |
| 1488 |
- || ( sys-power/upower sys-power/upower-pm-utils ) |
| 1489 |
-" |
| 1490 |
|
| 1491 |
src_configure() { |
| 1492 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1493 |
+ local mycmakeargs=( |
| 1494 |
+ -DPULL_TRANSLATIONS=OFF |
| 1495 |
+ ) |
| 1496 |
cmake-utils_src_configure |
| 1497 |
} |
| 1498 |
|
| 1499 |
diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml b/lxqt-base/lxqt-powermanagement/metadata.xml |
| 1500 |
index a40a83a9..d2a33a0e 100644 |
| 1501 |
--- a/lxqt-base/lxqt-powermanagement/metadata.xml |
| 1502 |
+++ b/lxqt-base/lxqt-powermanagement/metadata.xml |
| 1503 |
@@ -1,8 +1,11 @@ |
| 1504 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1505 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1506 |
<pkgmetadata> |
| 1507 |
-<maintainer type="project"> |
| 1508 |
- <email>lxqt@g.o</email> |
| 1509 |
- <name>LXQt</name> |
| 1510 |
- </maintainer> |
| 1511 |
+ <maintainer type="project"> |
| 1512 |
+ <email>lxqt@g.o</email> |
| 1513 |
+ <name>LXQt</name> |
| 1514 |
+ </maintainer> |
| 1515 |
+ <upstream> |
| 1516 |
+ <remote-id type="github">lxqt/lxqt-powermanagement</remote-id> |
| 1517 |
+ </upstream> |
| 1518 |
</pkgmetadata> |
| 1519 |
|
| 1520 |
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild |
| 1521 |
index 3415d489..28eb8933 100644 |
| 1522 |
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild |
| 1523 |
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild |
| 1524 |
@@ -1,17 +1,18 @@ |
| 1525 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1526 |
+# Copyright 1999-2018 Gentoo Authors |
| 1527 |
# Distributed under the terms of the GNU General Public License v2 |
| 1528 |
|
| 1529 |
EAPI=6 |
| 1530 |
-inherit cmake-utils |
| 1531 |
+ |
| 1532 |
+inherit cmake-utils eapi7-ver |
| 1533 |
|
| 1534 |
DESCRIPTION="LXQt system integration plugin for Qt" |
| 1535 |
-HOMEPAGE="http://lxqt.org/" |
| 1536 |
+HOMEPAGE="https://lxqt.org/" |
| 1537 |
|
| 1538 |
-if [[ ${PV} == *9999* ]]; then |
| 1539 |
+if [[ ${PV} = *9999* ]]; then |
| 1540 |
inherit git-r3 |
| 1541 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1542 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1543 |
else |
| 1544 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1545 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1546 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1547 |
fi |
| 1548 |
|
| 1549 |
@@ -19,21 +20,16 @@ LICENSE="LGPL-2.1+" |
| 1550 |
SLOT="0" |
| 1551 |
|
| 1552 |
RDEPEND=" |
| 1553 |
- dev-libs/libdbusmenu-qt[qt5(+)] |
| 1554 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1555 |
+ dev-libs/libdbusmenu-qt:=[qt5(+)] |
| 1556 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1557 |
dev-qt/qtcore:5 |
| 1558 |
- dev-qt/qtgui:5 |
| 1559 |
+ dev-qt/qtdbus:5 |
| 1560 |
+ dev-qt/qtgui:5= |
| 1561 |
dev-qt/qtwidgets:5 |
| 1562 |
- lxqt-base/liblxqt |
| 1563 |
- x11-libs/libX11 |
| 1564 |
+ dev-qt/qtx11extras:5 |
| 1565 |
+ =x11-libs/libfm-qt-$(ver_cut 1-2)* |
| 1566 |
" |
| 1567 |
DEPEND="${RDEPEND} |
| 1568 |
dev-qt/linguist-tools:5 |
| 1569 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1570 |
- >=x11-libs/libfm-qt-${PV} |
| 1571 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1572 |
" |
| 1573 |
- |
| 1574 |
-src_configure() { |
| 1575 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1576 |
- cmake-utils_src_configure |
| 1577 |
-} |
| 1578 |
|
| 1579 |
diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml b/lxqt-base/lxqt-qtplugin/metadata.xml |
| 1580 |
index a40a83a9..11dbde39 100644 |
| 1581 |
--- a/lxqt-base/lxqt-qtplugin/metadata.xml |
| 1582 |
+++ b/lxqt-base/lxqt-qtplugin/metadata.xml |
| 1583 |
@@ -1,8 +1,11 @@ |
| 1584 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1585 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1586 |
<pkgmetadata> |
| 1587 |
-<maintainer type="project"> |
| 1588 |
- <email>lxqt@g.o</email> |
| 1589 |
- <name>LXQt</name> |
| 1590 |
- </maintainer> |
| 1591 |
+ <maintainer type="project"> |
| 1592 |
+ <email>lxqt@g.o</email> |
| 1593 |
+ <name>LXQt</name> |
| 1594 |
+ </maintainer> |
| 1595 |
+ <upstream> |
| 1596 |
+ <remote-id type="github">lxqt/lxqt-qtplugin</remote-id> |
| 1597 |
+ </upstream> |
| 1598 |
</pkgmetadata> |
| 1599 |
|
| 1600 |
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 1601 |
index 49f630a2..a28eb95f 100644 |
| 1602 |
--- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 1603 |
+++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 1604 |
@@ -1,17 +1,20 @@ |
| 1605 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1606 |
+# Copyright 1999-2018 Gentoo Authors |
| 1607 |
# Distributed under the terms of the GNU General Public License v2 |
| 1608 |
|
| 1609 |
EAPI=6 |
| 1610 |
-inherit cmake-utils |
| 1611 |
+ |
| 1612 |
+inherit cmake-utils eapi7-ver |
| 1613 |
|
| 1614 |
DESCRIPTION="LXQt quick launcher" |
| 1615 |
-HOMEPAGE="http://lxqt.org/" |
| 1616 |
+HOMEPAGE="https://lxqt.org/" |
| 1617 |
+ |
| 1618 |
+MY_PV="$(ver_cut 1-2)*" |
| 1619 |
|
| 1620 |
-if [[ ${PV} == *9999* ]]; then |
| 1621 |
+if [[ ${PV} = *9999* ]]; then |
| 1622 |
inherit git-r3 |
| 1623 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1624 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1625 |
else |
| 1626 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1627 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1628 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1629 |
fi |
| 1630 |
|
| 1631 |
@@ -19,29 +22,28 @@ LICENSE="LGPL-2.1+" |
| 1632 |
SLOT="0" |
| 1633 |
|
| 1634 |
RDEPEND=" |
| 1635 |
- >=dev-cpp/muParser-2.2.3 |
| 1636 |
- dev-libs/glib:2 |
| 1637 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1638 |
+ >=dev-cpp/muParser-2.2.3:= |
| 1639 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1640 |
dev-qt/qtcore:5 |
| 1641 |
- dev-qt/qtdbus:5 |
| 1642 |
dev-qt/qtgui:5 |
| 1643 |
dev-qt/qtwidgets:5 |
| 1644 |
- dev-qt/qtx11extras:5 |
| 1645 |
dev-qt/qtxml:5 |
| 1646 |
kde-frameworks/kwindowsystem:5 |
| 1647 |
- >=lxde-base/menu-cache-1.1.0 |
| 1648 |
- lxqt-base/liblxqt |
| 1649 |
- lxqt-base/lxqt-globalkeys |
| 1650 |
+ >=lxde-base/menu-cache-0.5.1 |
| 1651 |
+ =lxqt-base/liblxqt-${MY_PV} |
| 1652 |
+ =lxqt-base/lxqt-globalkeys-${MY_PV} |
| 1653 |
+ !lxqt-base/lxqt-common |
| 1654 |
" |
| 1655 |
DEPEND="${RDEPEND} |
| 1656 |
- >=dev-util/cmake-3.6.2 |
| 1657 |
dev-qt/linguist-tools:5 |
| 1658 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1659 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1660 |
virtual/pkgconfig |
| 1661 |
" |
| 1662 |
|
| 1663 |
src_configure() { |
| 1664 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1665 |
+ local mycmakeargs=( |
| 1666 |
+ -DPULL_TRANSLATIONS=OFF |
| 1667 |
+ ) |
| 1668 |
cmake-utils_src_configure |
| 1669 |
} |
| 1670 |
|
| 1671 |
|
| 1672 |
diff --git a/lxqt-base/lxqt-runner/metadata.xml b/lxqt-base/lxqt-runner/metadata.xml |
| 1673 |
index a40a83a9..5773e134 100644 |
| 1674 |
--- a/lxqt-base/lxqt-runner/metadata.xml |
| 1675 |
+++ b/lxqt-base/lxqt-runner/metadata.xml |
| 1676 |
@@ -1,8 +1,11 @@ |
| 1677 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1678 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1679 |
<pkgmetadata> |
| 1680 |
-<maintainer type="project"> |
| 1681 |
- <email>lxqt@g.o</email> |
| 1682 |
- <name>LXQt</name> |
| 1683 |
- </maintainer> |
| 1684 |
+ <maintainer type="project"> |
| 1685 |
+ <email>lxqt@g.o</email> |
| 1686 |
+ <name>LXQt</name> |
| 1687 |
+ </maintainer> |
| 1688 |
+ <upstream> |
| 1689 |
+ <remote-id type="github">lxqt/lxqt-runner</remote-id> |
| 1690 |
+ </upstream> |
| 1691 |
</pkgmetadata> |
| 1692 |
|
| 1693 |
diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild |
| 1694 |
index 1a65dd68..a534e6d7 100644 |
| 1695 |
--- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild |
| 1696 |
+++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild |
| 1697 |
@@ -1,51 +1,60 @@ |
| 1698 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1699 |
+# Copyright 1999-2018 Gentoo Authors |
| 1700 |
# Distributed under the terms of the GNU General Public License v2 |
| 1701 |
|
| 1702 |
EAPI=6 |
| 1703 |
-inherit cmake-utils |
| 1704 |
+ |
| 1705 |
+inherit cmake-utils eapi7-ver |
| 1706 |
|
| 1707 |
DESCRIPTION="LXQT session manager" |
| 1708 |
-HOMEPAGE="http://lxqt.org/" |
| 1709 |
+HOMEPAGE="https://lxqt.org/" |
| 1710 |
+ |
| 1711 |
+MY_PV="$(ver_cut 1-2)*" |
| 1712 |
|
| 1713 |
-if [[ ${PV} == *9999* ]]; then |
| 1714 |
+if [[ ${PV} = *9999* ]]; then |
| 1715 |
inherit git-r3 |
| 1716 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1717 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1718 |
else |
| 1719 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1720 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1721 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1722 |
fi |
| 1723 |
|
| 1724 |
+IUSE="+themes +udev" |
| 1725 |
+ |
| 1726 |
LICENSE="LGPL-2.1+" |
| 1727 |
SLOT="0" |
| 1728 |
|
| 1729 |
-CDEPEND=" |
| 1730 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1731 |
+RDEPEND=" |
| 1732 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1733 |
dev-qt/qtcore:5 |
| 1734 |
dev-qt/qtdbus:5 |
| 1735 |
dev-qt/qtgui:5 |
| 1736 |
dev-qt/qtwidgets:5 |
| 1737 |
dev-qt/qtx11extras:5 |
| 1738 |
- dev-qt/qtxml:5 |
| 1739 |
kde-frameworks/kwindowsystem:5[X] |
| 1740 |
- lxqt-base/liblxqt |
| 1741 |
+ =lxqt-base/liblxqt-${MY_PV} |
| 1742 |
x11-libs/libX11 |
| 1743 |
x11-misc/xdg-user-dirs |
| 1744 |
+ themes? ( =x11-themes/lxqt-themes-${MY_PV} ) |
| 1745 |
+ udev? ( virtual/libudev ) |
| 1746 |
+ !lxqt-base/lxqt-common |
| 1747 |
" |
| 1748 |
-DEPEND="${CDEPEND} |
| 1749 |
+DEPEND="${RDEPEND} |
| 1750 |
dev-qt/linguist-tools:5 |
| 1751 |
- dev-util/intltool |
| 1752 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1753 |
- sys-devel/gettext |
| 1754 |
- virtual/pkgconfig |
| 1755 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1756 |
" |
| 1757 |
-RDEPEND="${CDEPEND}" |
| 1758 |
|
| 1759 |
src_configure() { |
| 1760 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1761 |
+ local mycmakeargs=( |
| 1762 |
+ -DWITH_LIBUDEV=$(usex udev) |
| 1763 |
+ -DPULL_TRANSLATIONS=OFF |
| 1764 |
+ ) |
| 1765 |
cmake-utils_src_configure |
| 1766 |
} |
| 1767 |
|
| 1768 |
src_install(){ |
| 1769 |
cmake-utils_src_install |
| 1770 |
doman lxqt-config-session/man/*.1 lxqt-session/man/*.1 |
| 1771 |
+ |
| 1772 |
+ echo XDG_CONFIG_DIRS=\"${EPREFIX}/usr/share\" >> 91lxqt-config-dir |
| 1773 |
+ doenvd 91lxqt-config-dir |
| 1774 |
} |
| 1775 |
|
| 1776 |
diff --git a/lxqt-base/lxqt-session/metadata.xml b/lxqt-base/lxqt-session/metadata.xml |
| 1777 |
index a40a83a9..90404bed 100644 |
| 1778 |
--- a/lxqt-base/lxqt-session/metadata.xml |
| 1779 |
+++ b/lxqt-base/lxqt-session/metadata.xml |
| 1780 |
@@ -1,8 +1,14 @@ |
| 1781 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1782 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1783 |
<pkgmetadata> |
| 1784 |
-<maintainer type="project"> |
| 1785 |
- <email>lxqt@g.o</email> |
| 1786 |
- <name>LXQt</name> |
| 1787 |
- </maintainer> |
| 1788 |
+ <maintainer type="project"> |
| 1789 |
+ <email>lxqt@g.o</email> |
| 1790 |
+ <name>LXQt</name> |
| 1791 |
+ </maintainer> |
| 1792 |
+ <upstream> |
| 1793 |
+ <remote-id type="github">lxqt/lxqt-session</remote-id> |
| 1794 |
+ </upstream> |
| 1795 |
+ <use> |
| 1796 |
+ <flag name="themes">Install LXQt themes and graphics</flag> |
| 1797 |
+ </use> |
| 1798 |
</pkgmetadata> |
| 1799 |
|
| 1800 |
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild |
| 1801 |
index 196bfa8e..d463b183 100644 |
| 1802 |
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild |
| 1803 |
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild |
| 1804 |
@@ -1,36 +1,38 @@ |
| 1805 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1806 |
+# Copyright 1999-2018 Gentoo Authors |
| 1807 |
# Distributed under the terms of the GNU General Public License v2 |
| 1808 |
|
| 1809 |
EAPI=6 |
| 1810 |
-inherit cmake-utils |
| 1811 |
+ |
| 1812 |
+inherit cmake-utils eapi7-ver |
| 1813 |
|
| 1814 |
DESCRIPTION="LXQt GUI frontend for sudo" |
| 1815 |
-HOMEPAGE="http://lxqt.org/" |
| 1816 |
+HOMEPAGE="https://lxqt.org/" |
| 1817 |
|
| 1818 |
-if [[ ${PV} == *9999* ]]; then |
| 1819 |
+if [[ ${PV} = *9999* ]]; then |
| 1820 |
inherit git-r3 |
| 1821 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1822 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1823 |
else |
| 1824 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1825 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1826 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1827 |
fi |
| 1828 |
|
| 1829 |
LICENSE="LGPL-2.1+" |
| 1830 |
SLOT="0" |
| 1831 |
|
| 1832 |
-DEPEND=" |
| 1833 |
+RDEPEND=" |
| 1834 |
app-admin/sudo |
| 1835 |
- >=dev-libs/libqtxdg-2.0.0 |
| 1836 |
+ >=dev-libs/libqtxdg-3.0.0 |
| 1837 |
dev-qt/qtcore:5 |
| 1838 |
- dev-qt/qtdbus:5 |
| 1839 |
- dev-qt/qtgui:5 |
| 1840 |
dev-qt/qtwidgets:5 |
| 1841 |
- >=dev-util/lxqt-build-tools-0.3.1 |
| 1842 |
- lxqt-base/liblxqt |
| 1843 |
+ =lxqt-base/liblxqt-$(ver_cut 1-2)* |
| 1844 |
+" |
| 1845 |
+DEPEND="${RDEPEND} |
| 1846 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1847 |
" |
| 1848 |
-RDEPEND="${DEPEND}" |
| 1849 |
|
| 1850 |
src_configure() { |
| 1851 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 1852 |
+ local mycmakeargs=( |
| 1853 |
+ -DPULL_TRANSLATIONS=OFF |
| 1854 |
+ ) |
| 1855 |
cmake-utils_src_configure |
| 1856 |
} |
| 1857 |
|
| 1858 |
diff --git a/lxqt-base/lxqt-sudo/metadata.xml b/lxqt-base/lxqt-sudo/metadata.xml |
| 1859 |
index 3eaa3d72..34a55e64 100644 |
| 1860 |
--- a/lxqt-base/lxqt-sudo/metadata.xml |
| 1861 |
+++ b/lxqt-base/lxqt-sudo/metadata.xml |
| 1862 |
@@ -1,8 +1,11 @@ |
| 1863 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1864 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1865 |
<pkgmetadata> |
| 1866 |
- <maintainer type="project"> |
| 1867 |
- <email>lxqt@g.o</email> |
| 1868 |
- <name>LXQt</name> |
| 1869 |
- </maintainer> |
| 1870 |
+ <maintainer type="project"> |
| 1871 |
+ <email>lxqt@g.o</email> |
| 1872 |
+ <name>LXQt</name> |
| 1873 |
+ </maintainer> |
| 1874 |
+ <upstream> |
| 1875 |
+ <remote-id type="github">lxqt/lxqt-sudo</remote-id> |
| 1876 |
+ </upstream> |
| 1877 |
</pkgmetadata> |
| 1878 |
|
| 1879 |
diff --git a/lxqt-base/metadata.xml b/lxqt-base/metadata.xml |
| 1880 |
index 49b3cee9..6c47117f 100644 |
| 1881 |
--- a/lxqt-base/metadata.xml |
| 1882 |
+++ b/lxqt-base/metadata.xml |
| 1883 |
@@ -1,7 +1,7 @@ |
| 1884 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1885 |
<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1886 |
<catmetadata> |
| 1887 |
- <longdescription lang="en"> |
| 1888 |
- The lxqt-base category contains core packages for LXQt Desktop Environment. |
| 1889 |
- </longdescription> |
| 1890 |
+ <longdescription lang="en"> |
| 1891 |
+ The lxqt-base category contains core packages for LXQt Desktop Environment. |
| 1892 |
+ </longdescription> |
| 1893 |
</catmetadata> |
| 1894 |
|
| 1895 |
diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild |
| 1896 |
index 4fc151da..1fef5d10 100644 |
| 1897 |
--- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild |
| 1898 |
+++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild |
| 1899 |
@@ -1,21 +1,22 @@ |
| 1900 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1901 |
+# Copyright 1999-2018 Gentoo Authors |
| 1902 |
# Distributed under the terms of the GNU General Public License v2 |
| 1903 |
|
| 1904 |
EAPI=6 |
| 1905 |
-inherit cmake-utils xdg-utils |
| 1906 |
|
| 1907 |
-DESCRIPTION="Lightweight Qt image viewer from the LXQt Project" |
| 1908 |
-HOMEPAGE="http://lxqt.org/" |
| 1909 |
+inherit cmake-utils |
| 1910 |
|
| 1911 |
-if [[ ${PV} == *9999* ]]; then |
| 1912 |
+DESCRIPTION="LXImage Image Viewer - GPicView replacement" |
| 1913 |
+HOMEPAGE="https://lxqt.org/" |
| 1914 |
+ |
| 1915 |
+if [[ ${PV} = *9999* ]]; then |
| 1916 |
inherit git-r3 |
| 1917 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 1918 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 1919 |
else |
| 1920 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 1921 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 1922 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 1923 |
fi |
| 1924 |
|
| 1925 |
-LICENSE="|| ( GPL-2+ LGPL-2.1+ )" |
| 1926 |
+LICENSE="GPL-2+ LGPL-2.1+" |
| 1927 |
SLOT="0" |
| 1928 |
|
| 1929 |
RDEPEND=" |
| 1930 |
@@ -23,20 +24,20 @@ RDEPEND=" |
| 1931 |
dev-qt/qtcore:5 |
| 1932 |
dev-qt/qtdbus:5 |
| 1933 |
dev-qt/qtgui:5 |
| 1934 |
+ dev-qt/qtnetwork:5 |
| 1935 |
dev-qt/qtprintsupport:5 |
| 1936 |
dev-qt/qtsvg:5 |
| 1937 |
dev-qt/qtwidgets:5 |
| 1938 |
dev-qt/qtx11extras:5 |
| 1939 |
media-libs/libexif |
| 1940 |
>=x11-libs/libfm-1.2:= |
| 1941 |
- x11-libs/libfm-qt:= |
| 1942 |
+ >=x11-libs/libfm-qt-0.12.0:= |
| 1943 |
x11-libs/libX11 |
| 1944 |
x11-libs/libXfixes |
| 1945 |
" |
| 1946 |
DEPEND="${RDEPEND} |
| 1947 |
dev-qt/linguist-tools:5 |
| 1948 |
- >=dev-util/lxqt-build-tools-0.4.0 |
| 1949 |
- lxqt-base/liblxqt |
| 1950 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 1951 |
virtual/pkgconfig |
| 1952 |
" |
| 1953 |
|
| 1954 |
@@ -46,11 +47,3 @@ src_configure() { |
| 1955 |
) |
| 1956 |
cmake-utils_src_configure |
| 1957 |
} |
| 1958 |
- |
| 1959 |
-pkg_postinst() { |
| 1960 |
- xdg_desktop_database_update |
| 1961 |
-} |
| 1962 |
- |
| 1963 |
-pkg_postrm() { |
| 1964 |
- xdg_desktop_database_update |
| 1965 |
-} |
| 1966 |
|
| 1967 |
diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml |
| 1968 |
index a40a83a9..34f02d52 100644 |
| 1969 |
--- a/media-gfx/lximage-qt/metadata.xml |
| 1970 |
+++ b/media-gfx/lximage-qt/metadata.xml |
| 1971 |
@@ -1,8 +1,11 @@ |
| 1972 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1973 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1974 |
<pkgmetadata> |
| 1975 |
-<maintainer type="project"> |
| 1976 |
- <email>lxqt@g.o</email> |
| 1977 |
- <name>LXQt</name> |
| 1978 |
- </maintainer> |
| 1979 |
+ <maintainer type="project"> |
| 1980 |
+ <email>lxqt@g.o</email> |
| 1981 |
+ <name>LXQt</name> |
| 1982 |
+ </maintainer> |
| 1983 |
+ <upstream> |
| 1984 |
+ <remote-id type="github">lxqt/lximage-qt</remote-id> |
| 1985 |
+ </upstream> |
| 1986 |
</pkgmetadata> |
| 1987 |
|
| 1988 |
diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild |
| 1989 |
index 3ea33803..03b618ca 100644 |
| 1990 |
--- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild |
| 1991 |
+++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild |
| 1992 |
@@ -1,22 +1,23 @@ |
| 1993 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1994 |
+# Copyright 1999-2018 Gentoo Authors |
| 1995 |
# Distributed under the terms of the GNU General Public License v2 |
| 1996 |
|
| 1997 |
EAPI=6 |
| 1998 |
-inherit cmake-utils |
| 1999 |
|
| 2000 |
-if [[ ${PV} == *9999* ]]; then |
| 2001 |
+inherit cmake-utils eapi7-ver |
| 2002 |
+ |
| 2003 |
+DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers" |
| 2004 |
+HOMEPAGE="https://lxqt.org/" |
| 2005 |
+ |
| 2006 |
+if [[ "${PV}" == "9999" ]]; then |
| 2007 |
inherit git-r3 |
| 2008 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 2009 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 2010 |
else |
| 2011 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 2012 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
| 2013 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 2014 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 2015 |
fi |
| 2016 |
|
| 2017 |
-DESCRIPTION="Core library of PCManFM-Qt" |
| 2018 |
-HOMEPAGE="http://lxqt.org/" |
| 2019 |
- |
| 2020 |
-LICENSE="LGPL-2.1+" |
| 2021 |
-SLOT="0/3" |
| 2022 |
+LICENSE="GPL-2+ LGPL-2.1+" |
| 2023 |
+SLOT="0/5" |
| 2024 |
|
| 2025 |
RDEPEND=" |
| 2026 |
dev-libs/glib:2 |
| 2027 |
@@ -24,23 +25,20 @@ RDEPEND=" |
| 2028 |
dev-qt/qtgui:5 |
| 2029 |
dev-qt/qtwidgets:5 |
| 2030 |
dev-qt/qtx11extras:5 |
| 2031 |
- >=lxde-base/menu-cache-0.4.1 |
| 2032 |
+ >=lxde-base/menu-cache-1.1.0 |
| 2033 |
+ media-libs/libexif:= |
| 2034 |
>=x11-libs/libfm-1.2.0:= |
| 2035 |
x11-libs/libxcb:= |
| 2036 |
- !<x11-misc/pcmanfm-qt-0.11.0 |
| 2037 |
" |
| 2038 |
DEPEND="${RDEPEND} |
| 2039 |
dev-qt/linguist-tools:5 |
| 2040 |
- >=dev-util/lxqt-build-tools-0.4.0 |
| 2041 |
- lxqt-base/liblxqt |
| 2042 |
- media-libs/libexif |
| 2043 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 2044 |
virtual/pkgconfig |
| 2045 |
" |
| 2046 |
|
| 2047 |
src_configure() { |
| 2048 |
local mycmakeargs=( |
| 2049 |
- -DPULL_TRANSLATIONS=NO |
| 2050 |
+ -DPULL_TRANSLATIONS=OFF |
| 2051 |
) |
| 2052 |
- |
| 2053 |
cmake-utils_src_configure |
| 2054 |
} |
| 2055 |
|
| 2056 |
diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml |
| 2057 |
index 51d3a803..da013df6 100644 |
| 2058 |
--- a/x11-libs/libfm-qt/metadata.xml |
| 2059 |
+++ b/x11-libs/libfm-qt/metadata.xml |
| 2060 |
@@ -6,6 +6,6 @@ |
| 2061 |
<name>LXQt</name> |
| 2062 |
</maintainer> |
| 2063 |
<upstream> |
| 2064 |
- <remote-id type="github">lxde/libfm-qt</remote-id> |
| 2065 |
+ <remote-id type="github">lxqt/libfm-qt</remote-id> |
| 2066 |
</upstream> |
| 2067 |
</pkgmetadata> |
| 2068 |
|
| 2069 |
diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml |
| 2070 |
index a40a83a9..08d5c58e 100644 |
| 2071 |
--- a/x11-misc/obconf-qt/metadata.xml |
| 2072 |
+++ b/x11-misc/obconf-qt/metadata.xml |
| 2073 |
@@ -1,8 +1,11 @@ |
| 2074 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2075 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 2076 |
<pkgmetadata> |
| 2077 |
-<maintainer type="project"> |
| 2078 |
- <email>lxqt@g.o</email> |
| 2079 |
- <name>LXQt</name> |
| 2080 |
- </maintainer> |
| 2081 |
+ <maintainer type="project"> |
| 2082 |
+ <email>lxqt@g.o</email> |
| 2083 |
+ <name>LXQt</name> |
| 2084 |
+ </maintainer> |
| 2085 |
+ <upstream> |
| 2086 |
+ <remote-id type="github">lxqt/obconf-qt</remote-id> |
| 2087 |
+ </upstream> |
| 2088 |
</pkgmetadata> |
| 2089 |
|
| 2090 |
diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild |
| 2091 |
index 9b96b4ee..ad92050f 100644 |
| 2092 |
--- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild |
| 2093 |
+++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild |
| 2094 |
@@ -1,47 +1,53 @@ |
| 2095 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2096 |
+# Copyright 1999-2018 Gentoo Authors |
| 2097 |
# Distributed under the terms of the GNU General Public License v2 |
| 2098 |
|
| 2099 |
EAPI=6 |
| 2100 |
-inherit cmake-utils |
| 2101 |
+ |
| 2102 |
+inherit cmake-utils gnome2-utils xdg-utils |
| 2103 |
|
| 2104 |
DESCRIPTION="Openbox window manager configuration tool" |
| 2105 |
-HOMEPAGE="http://lxqt.org/" |
| 2106 |
+HOMEPAGE="https://lxqt.org/" |
| 2107 |
|
| 2108 |
-if [[ ${PV} == *9999* ]]; then |
| 2109 |
+if [[ ${PV} = *9999* ]]; then |
| 2110 |
inherit git-r3 |
| 2111 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 2112 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 2113 |
else |
| 2114 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 2115 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 2116 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 2117 |
fi |
| 2118 |
|
| 2119 |
-LICENSE="GPL-2" |
| 2120 |
+LICENSE="GPL-2+" |
| 2121 |
SLOT="0" |
| 2122 |
|
| 2123 |
RDEPEND=" |
| 2124 |
dev-libs/glib:2 |
| 2125 |
- dev-libs/libxml2 |
| 2126 |
dev-qt/qtcore:5 |
| 2127 |
- dev-qt/qtdbus:5 |
| 2128 |
dev-qt/qtgui:5 |
| 2129 |
dev-qt/qtwidgets:5 |
| 2130 |
dev-qt/qtx11extras:5 |
| 2131 |
- media-libs/fontconfig |
| 2132 |
- media-libs/freetype |
| 2133 |
x11-wm/openbox:3 |
| 2134 |
- x11-libs/libICE |
| 2135 |
- x11-libs/libSM |
| 2136 |
x11-libs/libX11 |
| 2137 |
- x11-libs/libXft |
| 2138 |
- x11-libs/pango |
| 2139 |
" |
| 2140 |
DEPEND="${RDEPEND} |
| 2141 |
dev-qt/linguist-tools:5 |
| 2142 |
- >=dev-util/lxqt-build-tools-0.1.0 |
| 2143 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 2144 |
+ sys-apps/sed |
| 2145 |
virtual/pkgconfig |
| 2146 |
" |
| 2147 |
|
| 2148 |
src_configure() { |
| 2149 |
- local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
| 2150 |
+ local mycmakeargs=( |
| 2151 |
+ -DPULL_TRANSLATIONS=OFF |
| 2152 |
+ ) |
| 2153 |
cmake-utils_src_configure |
| 2154 |
} |
| 2155 |
+ |
| 2156 |
+pkg_postinst() { |
| 2157 |
+ xdg_desktop_database_update |
| 2158 |
+ gnome2_icon_cache_update |
| 2159 |
+} |
| 2160 |
+ |
| 2161 |
+pkg_postrm() { |
| 2162 |
+ xdg_desktop_database_update |
| 2163 |
+ gnome2_icon_cache_update |
| 2164 |
+} |
| 2165 |
|
| 2166 |
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml |
| 2167 |
index 5a72fc7c..f0e3eb36 100644 |
| 2168 |
--- a/x11-misc/pcmanfm-qt/metadata.xml |
| 2169 |
+++ b/x11-misc/pcmanfm-qt/metadata.xml |
| 2170 |
@@ -1,12 +1,11 @@ |
| 2171 |
<?xml version='1.0' encoding='UTF-8'?> |
| 2172 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 2173 |
<pkgmetadata> |
| 2174 |
- <maintainer type="project"> |
| 2175 |
- <email>lxqt@g.o</email> |
| 2176 |
- <name>LXQt</name> |
| 2177 |
- </maintainer> |
| 2178 |
- <upstream> |
| 2179 |
- <remote-id type="sourceforge">pcmanfm</remote-id> |
| 2180 |
- <remote-id type="github">lxde/pcmanfm-qt</remote-id> |
| 2181 |
- </upstream> |
| 2182 |
+ <maintainer type="project"> |
| 2183 |
+ <email>lxqt@g.o</email> |
| 2184 |
+ <name>LXQt</name> |
| 2185 |
+ </maintainer> |
| 2186 |
+ <upstream> |
| 2187 |
+ <remote-id type="github">lxqt/pcmanfm-qt</remote-id> |
| 2188 |
+ </upstream> |
| 2189 |
</pkgmetadata> |
| 2190 |
|
| 2191 |
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild |
| 2192 |
index 7438c61a..e3344d87 100644 |
| 2193 |
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild |
| 2194 |
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild |
| 2195 |
@@ -1,51 +1,47 @@ |
| 2196 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2197 |
+# Copyright 1999-2018 Gentoo Authors |
| 2198 |
# Distributed under the terms of the GNU General Public License v2 |
| 2199 |
|
| 2200 |
EAPI=6 |
| 2201 |
-inherit cmake-utils |
| 2202 |
|
| 2203 |
-if [[ ${PV} == *9999* ]]; then |
| 2204 |
+inherit cmake-utils eapi7-ver |
| 2205 |
+ |
| 2206 |
+if [[ "${PV}" == "9999" ]]; then |
| 2207 |
inherit git-r3 |
| 2208 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 2209 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 2210 |
else |
| 2211 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 2212 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
| 2213 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 2214 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 2215 |
fi |
| 2216 |
|
| 2217 |
DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)" |
| 2218 |
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM" |
| 2219 |
+HOMEPAGE="https://lxqt.org/" |
| 2220 |
|
| 2221 |
-LICENSE="GPL-2+" |
| 2222 |
+LICENSE="GPL-2+ LGPL-2.1+" |
| 2223 |
SLOT="0" |
| 2224 |
|
| 2225 |
-CDEPEND=" |
| 2226 |
- >=dev-libs/glib-2.18:2 |
| 2227 |
+RDEPEND=" |
| 2228 |
+ dev-libs/glib:2 |
| 2229 |
dev-qt/qtcore:5 |
| 2230 |
dev-qt/qtdbus:5 |
| 2231 |
dev-qt/qtgui:5 |
| 2232 |
dev-qt/qtwidgets:5 |
| 2233 |
dev-qt/qtx11extras:5 |
| 2234 |
>=x11-libs/libfm-1.2.0:= |
| 2235 |
- >=x11-libs/libfm-qt-${PV}:= |
| 2236 |
+ =x11-libs/libfm-qt-$(ver_cut 1-2)* |
| 2237 |
x11-libs/libxcb:= |
| 2238 |
-" |
| 2239 |
-RDEPEND="${CDEPEND} |
| 2240 |
x11-misc/xdg-utils |
| 2241 |
virtual/eject |
| 2242 |
virtual/freedesktop-icon-theme |
| 2243 |
+ !lxqt-base/lxqt-common |
| 2244 |
" |
| 2245 |
-DEPEND="${CDEPEND} |
| 2246 |
+DEPEND="${RDEPEND} |
| 2247 |
dev-qt/linguist-tools:5 |
| 2248 |
- >=dev-util/intltool-0.40 |
| 2249 |
- >=dev-util/lxqt-build-tools-0.4.0 |
| 2250 |
- sys-devel/gettext |
| 2251 |
- virtual/pkgconfig |
| 2252 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 2253 |
" |
| 2254 |
|
| 2255 |
src_configure() { |
| 2256 |
local mycmakeargs=( |
| 2257 |
- -DPULL_TRANSLATIONS=NO |
| 2258 |
+ -DPULL_TRANSLATIONS=OFF |
| 2259 |
) |
| 2260 |
- |
| 2261 |
cmake-utils_src_configure |
| 2262 |
} |
| 2263 |
|
| 2264 |
diff --git a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild |
| 2265 |
index ffeba25a..4760bcad 100644 |
| 2266 |
--- a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild |
| 2267 |
+++ b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild |
| 2268 |
@@ -1,24 +1,25 @@ |
| 2269 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2270 |
+# Copyright 1999-2018 Gentoo Authors |
| 2271 |
# Distributed under the terms of the GNU General Public License v2 |
| 2272 |
|
| 2273 |
EAPI=6 |
| 2274 |
+ |
| 2275 |
inherit cmake-utils |
| 2276 |
|
| 2277 |
-DESCRIPTION="Themes, graphics, and icons for LXQt" |
| 2278 |
-HOMEPAGE="http://lxqt.org/" |
| 2279 |
+DESCRIPTION="Themes, graphics and icons for LXQt" |
| 2280 |
+HOMEPAGE="https://lxqt.org/" |
| 2281 |
|
| 2282 |
-if [[ ${PV} == *9999* ]]; then |
| 2283 |
+if [[ ${PV} = *9999* ]]; then |
| 2284 |
inherit git-r3 |
| 2285 |
- EGIT_REPO_URI="https://github.com/lxde/${PN}.git" |
| 2286 |
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" |
| 2287 |
else |
| 2288 |
- SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 2289 |
- KEYWORDS="~amd64" |
| 2290 |
+ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 2291 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 2292 |
fi |
| 2293 |
|
| 2294 |
LICENSE="LGPL-2.1+" |
| 2295 |
SLOT="0" |
| 2296 |
|
| 2297 |
-DEPEND=" |
| 2298 |
- >=dev-util/lxqt-build-tools-0.1.0 |
| 2299 |
- !!lxqt-base/lxqt-common |
| 2300 |
+RDEPEND="!lxqt-base/lxqt-common" |
| 2301 |
+DEPEND="${RDEPEND} |
| 2302 |
+ >=dev-util/lxqt-build-tools-0.5.0 |
| 2303 |
" |
| 2304 |
|
| 2305 |
diff --git a/x11-themes/lxqt-themes/metadata.xml b/x11-themes/lxqt-themes/metadata.xml |
| 2306 |
index a40a83a9..ae8df7e8 100644 |
| 2307 |
--- a/x11-themes/lxqt-themes/metadata.xml |
| 2308 |
+++ b/x11-themes/lxqt-themes/metadata.xml |
| 2309 |
@@ -1,8 +1,11 @@ |
| 2310 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2311 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 2312 |
<pkgmetadata> |
| 2313 |
-<maintainer type="project"> |
| 2314 |
- <email>lxqt@g.o</email> |
| 2315 |
- <name>LXQt</name> |
| 2316 |
- </maintainer> |
| 2317 |
+ <maintainer type="project"> |
| 2318 |
+ <email>lxqt@g.o</email> |
| 2319 |
+ <name>LXQt</name> |
| 2320 |
+ </maintainer> |
| 2321 |
+ <upstream> |
| 2322 |
+ <remote-id type="github">lxqt/lxqt-themes</remote-id> |
| 2323 |
+ </upstream> |
| 2324 |
</pkgmetadata> |
Archives