| 1 |
commit: d38c5bf6dac37e543b922d8429b275a870c0771b |
| 2 |
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 24 20:16:37 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 25 14:03:27 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d38c5bf6 |
| 7 |
|
| 8 |
[libqtxdg] Remove 0.5.3 (in tree); fix 9999 and move it back to razorqt-base category. |
| 9 |
|
| 10 |
--- |
| 11 |
lxqt-base/liblxqt/liblxqt-0.7.0.ebuild | 2 +- |
| 12 |
lxqt-base/liblxqt/liblxqt-9999.ebuild | 2 +- |
| 13 |
lxqt-base/libqtxdg/Manifest | 1 - |
| 14 |
lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild | 53 ---------------------- |
| 15 |
lxqt-base/libqtxdg/libqtxdg-9999.ebuild | 51 --------------------- |
| 16 |
lxqt-base/libqtxdg/metadata.xml | 6 --- |
| 17 |
lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild | 2 +- |
| 18 |
lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 2 +- |
| 19 |
.../lxqt-lightdm-greeter-9999.ebuild | 2 +- |
| 20 |
.../lxqt-notificationd-0.7.0.ebuild | 2 +- |
| 21 |
.../lxqt-notificationd-9999.ebuild | 2 +- |
| 22 |
lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild | 2 +- |
| 23 |
lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 2 +- |
| 24 |
.../lxqt-policykit/lxqt-policykit-0.7.0.ebuild | 2 +- |
| 25 |
.../lxqt-policykit/lxqt-policykit-9999.ebuild | 2 +- |
| 26 |
.../lxqt-powermanagement-0.7.0.ebuild | 2 +- |
| 27 |
.../lxqt-powermanagement-9999.ebuild | 2 +- |
| 28 |
lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild | 2 +- |
| 29 |
lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 2 +- |
| 30 |
razorqt-base/libqtxdg/libqtxdg-9999.ebuild | 47 +++++++++++++------ |
| 31 |
razorqt-base/libqtxdg/metadata.xml | 5 ++ |
| 32 |
21 files changed, 52 insertions(+), 141 deletions(-) |
| 33 |
|
| 34 |
diff --git a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild |
| 35 |
index d89a0db..88c1630 100644 |
| 36 |
--- a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild |
| 37 |
+++ b/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild |
| 38 |
@@ -21,7 +21,7 @@ LICENSE="GPL-2 LGPL-2.1+" |
| 39 |
SLOT="0" |
| 40 |
IUSE="" |
| 41 |
|
| 42 |
-DEPEND="lxqt-base/libqtxdg |
| 43 |
+DEPEND="razorqt-base/libqtxdg |
| 44 |
x11-libs/libX11 |
| 45 |
x11-libs/libXcomposite |
| 46 |
x11-libs/libXcursor |
| 47 |
|
| 48 |
diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 49 |
index 4cbe166..0fd29d0 100644 |
| 50 |
--- a/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 51 |
+++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild |
| 52 |
@@ -21,7 +21,7 @@ LICENSE="GPL-2 LGPL-2.1+" |
| 53 |
SLOT="0" |
| 54 |
IUSE="" |
| 55 |
|
| 56 |
-DEPEND="lxqt-base/libqtxdg |
| 57 |
+DEPEND="razorqt-base/libqtxdg |
| 58 |
x11-libs/libX11 |
| 59 |
x11-libs/libXcomposite |
| 60 |
x11-libs/libXcursor |
| 61 |
|
| 62 |
diff --git a/lxqt-base/libqtxdg/Manifest b/lxqt-base/libqtxdg/Manifest |
| 63 |
deleted file mode 100644 |
| 64 |
index 6a2084f..0000000 |
| 65 |
--- a/lxqt-base/libqtxdg/Manifest |
| 66 |
+++ /dev/null |
| 67 |
@@ -1 +0,0 @@ |
| 68 |
-DIST libqtxdg-0.5.3.tar.xz 52948 SHA256 ce45c0de4f1f5c4587178cc8a1d12561b3d101461c71ce3715ed9d5d6a6ad6f4 SHA512 02211e7fd8fc5db014e642c8222a5bade95eef5da8f60c39567cac5f4da385c7b99b454d68a6c88e211981dd98bcb1d17d53c105dcf3e7b89b17b171af904ec2 WHIRLPOOL 1f4f2bc8e6731c0fbc31dcb0f8264f7aafe329f022a74f4bf43828c8016b8af02077d9dcfd1ee0a574d7441db4ba7676dfd0f431d727059b59ccefd5fbe9b216 |
| 69 |
|
| 70 |
diff --git a/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild b/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild |
| 71 |
deleted file mode 100644 |
| 72 |
index 981d2fd..0000000 |
| 73 |
--- a/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild |
| 74 |
+++ /dev/null |
| 75 |
@@ -1,53 +0,0 @@ |
| 76 |
-# Copyright 1999-2014 Gentoo Foundation |
| 77 |
-# Distributed under the terms of the GNU General Public License v2 |
| 78 |
-# $Header: $ |
| 79 |
- |
| 80 |
-EAPI=5 |
| 81 |
-inherit cmake-utils |
| 82 |
- |
| 83 |
-DESCRIPTION="A Qt implementation of XDG standards" |
| 84 |
-HOMEPAGE="http://www.lxqt.org/" |
| 85 |
- |
| 86 |
-if [[ ${PV} = *9999* ]]; then |
| 87 |
- inherit git-r3 |
| 88 |
- EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" |
| 89 |
- KEYWORDS="" |
| 90 |
-else |
| 91 |
- SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 92 |
- KEYWORDS="~amd64 ~x86" |
| 93 |
-fi |
| 94 |
- |
| 95 |
-LICENSE="LGPL-2.1" |
| 96 |
-SLOT="0" |
| 97 |
-IUSE="+qt4 qt5 test" |
| 98 |
-REQUIRED_USE="^^ ( qt4 qt5 )" |
| 99 |
- |
| 100 |
-CDEPEND=" |
| 101 |
- sys-apps/file |
| 102 |
- qt4? ( |
| 103 |
- dev-qt/qtcore:4 |
| 104 |
- dev-qt/qtgui:4 |
| 105 |
- ) |
| 106 |
- qt5? ( |
| 107 |
- dev-qt/qtcore:5 |
| 108 |
- dev-qt/qttools:5 |
| 109 |
- dev-qt/qtwidgets:5 |
| 110 |
- dev-qt/qtxml:5 |
| 111 |
- )" |
| 112 |
-DEPEND="${CDEPEND} |
| 113 |
- test? ( |
| 114 |
- qt4? ( dev-qt/qttest:4 ) |
| 115 |
- qt5? ( dev-qt/qttest:5 ) |
| 116 |
- )" |
| 117 |
-RDEPEND="${CDEPEND} |
| 118 |
- x11-misc/xdg-utils" |
| 119 |
- |
| 120 |
-S=${WORKDIR} |
| 121 |
- |
| 122 |
-src_configure() { |
| 123 |
- local mycmakeargs=( |
| 124 |
- $(cmake-utils_use_use qt5 QT5) |
| 125 |
- $(cmake-utils_use test BUILD_TESTS) |
| 126 |
- ) |
| 127 |
- cmake-utils_src_configure |
| 128 |
-} |
| 129 |
|
| 130 |
diff --git a/lxqt-base/libqtxdg/libqtxdg-9999.ebuild b/lxqt-base/libqtxdg/libqtxdg-9999.ebuild |
| 131 |
deleted file mode 100644 |
| 132 |
index 455f062..0000000 |
| 133 |
--- a/lxqt-base/libqtxdg/libqtxdg-9999.ebuild |
| 134 |
+++ /dev/null |
| 135 |
@@ -1,51 +0,0 @@ |
| 136 |
-# Copyright 1999-2014 Gentoo Foundation |
| 137 |
-# Distributed under the terms of the GNU General Public License v2 |
| 138 |
-# $Header: $ |
| 139 |
- |
| 140 |
-EAPI=5 |
| 141 |
-inherit cmake-utils |
| 142 |
- |
| 143 |
-DESCRIPTION="A Qt implementation of XDG standards" |
| 144 |
-HOMEPAGE="http://www.lxqt.org/" |
| 145 |
- |
| 146 |
-if [[ ${PV} = *9999* ]]; then |
| 147 |
- inherit git-r3 |
| 148 |
- EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" |
| 149 |
- KEYWORDS="" |
| 150 |
-else |
| 151 |
- SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2" |
| 152 |
- KEYWORDS="~amd64 ~x86" |
| 153 |
-fi |
| 154 |
- |
| 155 |
-LICENSE="LGPL-2.1" |
| 156 |
-SLOT="0" |
| 157 |
-IUSE="+qt4 qt5 test" |
| 158 |
-REQUIRED_USE="^^ ( qt4 qt5 )" |
| 159 |
- |
| 160 |
-CDEPEND=" |
| 161 |
- sys-apps/file |
| 162 |
- qt4? ( |
| 163 |
- dev-qt/qtcore:4 |
| 164 |
- dev-qt/qtgui:4 |
| 165 |
- ) |
| 166 |
- qt5? ( |
| 167 |
- dev-qt/qtcore:5 |
| 168 |
- dev-qt/qttools:5 |
| 169 |
- dev-qt/qtwidgets:5 |
| 170 |
- dev-qt/qtxml:5 |
| 171 |
- )" |
| 172 |
-DEPEND="${CDEPEND} |
| 173 |
- test? ( |
| 174 |
- qt4? ( dev-qt/qttest:4 ) |
| 175 |
- qt5? ( dev-qt/qttest:5 ) |
| 176 |
- )" |
| 177 |
-RDEPEND="${CDEPEND} |
| 178 |
- x11-misc/xdg-utils" |
| 179 |
- |
| 180 |
-src_configure() { |
| 181 |
- local mycmakeargs=( |
| 182 |
- $(cmake-utils_use_use qt5 QT5) |
| 183 |
- $(cmake-utils_use test BUILD_TESTS) |
| 184 |
- ) |
| 185 |
- cmake-utils_src_configure |
| 186 |
-} |
| 187 |
|
| 188 |
diff --git a/lxqt-base/libqtxdg/metadata.xml b/lxqt-base/libqtxdg/metadata.xml |
| 189 |
deleted file mode 100644 |
| 190 |
index c141026..0000000 |
| 191 |
--- a/lxqt-base/libqtxdg/metadata.xml |
| 192 |
+++ /dev/null |
| 193 |
@@ -1,6 +0,0 @@ |
| 194 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 195 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 196 |
-<pkgmetadata> |
| 197 |
- <herd>lxde</herd> |
| 198 |
- <herd>qt</herd> |
| 199 |
-</pkgmetadata> |
| 200 |
|
| 201 |
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild |
| 202 |
index 9e6c2fb..746287b 100644 |
| 203 |
--- a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild |
| 204 |
+++ b/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild |
| 205 |
@@ -24,7 +24,7 @@ IUSE="" |
| 206 |
RDEPEND="dev-qt/qtcore:4 |
| 207 |
dev-qt/qtgui:4 |
| 208 |
lxqt-base/liblxqt |
| 209 |
- lxqt-base/libqtxdg |
| 210 |
+ razorqt-base/libqtxdg |
| 211 |
sys-libs/zlib |
| 212 |
x11-libs/libXcursor |
| 213 |
x11-libs/libXfixes" |
| 214 |
|
| 215 |
diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 216 |
index 04be7a1..5629ee3 100644 |
| 217 |
--- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 218 |
+++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild |
| 219 |
@@ -24,7 +24,7 @@ IUSE="" |
| 220 |
RDEPEND="dev-qt/qtcore:4 |
| 221 |
dev-qt/qtgui:4 |
| 222 |
lxqt-base/liblxqt |
| 223 |
- lxqt-base/libqtxdg |
| 224 |
+ razorqt-base/libqtxdg |
| 225 |
sys-libs/zlib |
| 226 |
x11-libs/libXcursor |
| 227 |
x11-libs/libXfixes" |
| 228 |
|
| 229 |
diff --git a/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild b/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild |
| 230 |
index dcc1f6e..9a01c8b 100644 |
| 231 |
--- a/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild |
| 232 |
+++ b/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild |
| 233 |
@@ -26,7 +26,7 @@ RDEPEND="dev-qt/qtcore:4 |
| 234 |
dev-qt/qtgui:4 |
| 235 |
x11-misc/lightdm |
| 236 |
lxqt-base/liblxqt |
| 237 |
- lxqt-base/libqtxdg |
| 238 |
+ razorqt-base/libqtxdg |
| 239 |
sys-libs/zlib |
| 240 |
x11-libs/libXcursor |
| 241 |
x11-libs/libXfixes" |
| 242 |
|
| 243 |
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild |
| 244 |
index 40f6904..20d8239 100644 |
| 245 |
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild |
| 246 |
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild |
| 247 |
@@ -22,7 +22,7 @@ SLOT="0" |
| 248 |
IUSE="" |
| 249 |
|
| 250 |
DEPEND="lxqt-base/liblxqt |
| 251 |
- lxqt-base/libqtxdg |
| 252 |
+ razorqt-base/libqtxdg |
| 253 |
dev-qt/qtcore:4 |
| 254 |
dev-qt/qtdbus:4 |
| 255 |
dev-qt/qtgui:4" |
| 256 |
|
| 257 |
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 258 |
index 335ff2e..7df281d 100644 |
| 259 |
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 260 |
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild |
| 261 |
@@ -22,7 +22,7 @@ SLOT="0" |
| 262 |
IUSE="" |
| 263 |
|
| 264 |
DEPEND="lxqt-base/liblxqt |
| 265 |
- lxqt-base/libqtxdg |
| 266 |
+ razorqt-base/libqtxdg |
| 267 |
dev-qt/qtcore:4 |
| 268 |
dev-qt/qtdbus:4 |
| 269 |
dev-qt/qtgui:4" |
| 270 |
|
| 271 |
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild |
| 272 |
index dd1e6f4..e6703eb 100644 |
| 273 |
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild |
| 274 |
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild |
| 275 |
@@ -26,7 +26,7 @@ REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" |
| 276 |
|
| 277 |
DEPEND="lxqt-base/liblxqt |
| 278 |
lxqt-base/liblxqt-mount |
| 279 |
- lxqt-base/libqtxdg |
| 280 |
+ razorqt-base/libqtxdg |
| 281 |
lxqt-base/libsysstat |
| 282 |
lxqt-base/lxqt-globalkeys |
| 283 |
dev-qt/qtcore:4 |
| 284 |
|
| 285 |
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 286 |
index 4da21f4..3da8289 100644 |
| 287 |
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 288 |
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 289 |
@@ -26,7 +26,7 @@ REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" |
| 290 |
|
| 291 |
DEPEND="lxqt-base/liblxqt |
| 292 |
lxqt-base/liblxqt-mount |
| 293 |
- lxqt-base/libqtxdg |
| 294 |
+ razorqt-base/libqtxdg |
| 295 |
lxqt-base/libsysstat |
| 296 |
lxqt-base/lxqt-globalkeys |
| 297 |
dev-qt/qtcore:4 |
| 298 |
|
| 299 |
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild |
| 300 |
index de6cae2..fb4090b 100644 |
| 301 |
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild |
| 302 |
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild |
| 303 |
@@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtcore:4 |
| 304 |
dev-qt/qtdbus:4 |
| 305 |
dev-qt/qtgui:4 |
| 306 |
lxqt-base/liblxqt |
| 307 |
- lxqt-base/libqtxdg |
| 308 |
+ razorqt-base/libqtxdg |
| 309 |
sys-auth/polkit-qt |
| 310 |
x11-libs/libX11" |
| 311 |
DEPEND="${RDEPEND} |
| 312 |
|
| 313 |
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 314 |
index 443d9e1..28ac9e7 100644 |
| 315 |
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 316 |
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild |
| 317 |
@@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtcore:4 |
| 318 |
dev-qt/qtdbus:4 |
| 319 |
dev-qt/qtgui:4 |
| 320 |
lxqt-base/liblxqt |
| 321 |
- lxqt-base/libqtxdg |
| 322 |
+ razorqt-base/libqtxdg |
| 323 |
sys-auth/polkit-qt |
| 324 |
x11-libs/libX11" |
| 325 |
DEPEND="${RDEPEND} |
| 326 |
|
| 327 |
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild |
| 328 |
index 3a41ccc..b0c17c2 100644 |
| 329 |
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild |
| 330 |
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild |
| 331 |
@@ -26,7 +26,7 @@ DEPEND="dev-qt/qtcore:4 |
| 332 |
dev-qt/qtgui:4 |
| 333 |
dev-qt/qtsvg:4 |
| 334 |
lxqt-base/liblxqt |
| 335 |
- lxqt-base/libqtxdg |
| 336 |
+ razorqt-base/libqtxdg |
| 337 |
x11-libs/libX11 |
| 338 |
x11-libs/libxcb |
| 339 |
sys-power/upower" |
| 340 |
|
| 341 |
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 342 |
index 2726c6b..e96d3b6 100644 |
| 343 |
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 344 |
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild |
| 345 |
@@ -26,7 +26,7 @@ DEPEND="dev-qt/qtcore:4 |
| 346 |
dev-qt/qtgui:4 |
| 347 |
dev-qt/qtsvg:4 |
| 348 |
lxqt-base/liblxqt |
| 349 |
- lxqt-base/libqtxdg |
| 350 |
+ razorqt-base/libqtxdg |
| 351 |
x11-libs/libX11 |
| 352 |
x11-libs/libxcb |
| 353 |
sys-power/upower" |
| 354 |
|
| 355 |
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild |
| 356 |
index f50a61a..b235089 100644 |
| 357 |
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild |
| 358 |
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild |
| 359 |
@@ -22,7 +22,7 @@ SLOT="0" |
| 360 |
IUSE="" |
| 361 |
|
| 362 |
RDEPEND="lxqt-base/liblxqt |
| 363 |
- lxqt-base/libqtxdg |
| 364 |
+ razorqt-base/libqtxdg |
| 365 |
lxqt-base/lxqt-globalkeys |
| 366 |
>=lxde-base/menu-cache-0.5.1 |
| 367 |
dev-qt/qtcore:4 |
| 368 |
|
| 369 |
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 370 |
index 9c34a89..efbc268 100644 |
| 371 |
--- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 372 |
+++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild |
| 373 |
@@ -22,7 +22,7 @@ SLOT="0" |
| 374 |
IUSE="" |
| 375 |
|
| 376 |
RDEPEND="lxqt-base/liblxqt |
| 377 |
- lxqt-base/libqtxdg |
| 378 |
+ razorqt-base/libqtxdg |
| 379 |
lxqt-base/lxqt-globalkeys |
| 380 |
=lxde-base/menu-cache-9999 |
| 381 |
dev-qt/qtcore:4 |
| 382 |
|
| 383 |
diff --git a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild |
| 384 |
index 94ec2ec..42c2fad 100644 |
| 385 |
--- a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild |
| 386 |
+++ b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild |
| 387 |
@@ -2,32 +2,49 @@ |
| 388 |
# Distributed under the terms of the GNU General Public License v2 |
| 389 |
# $Header: $ |
| 390 |
|
| 391 |
-EAPI=4 |
| 392 |
+EAPI=5 |
| 393 |
inherit cmake-utils |
| 394 |
|
| 395 |
DESCRIPTION="A Qt implementation of XDG standards" |
| 396 |
-HOMEPAGE="http://razor-qt.org/" |
| 397 |
+HOMEPAGE="http://www.lxqt.org/" |
| 398 |
|
| 399 |
if [[ ${PV} = *9999* ]]; then |
| 400 |
- inherit git-2 |
| 401 |
- EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git" |
| 402 |
- EGIT_BRANCH="master" |
| 403 |
- KEYWORDS="" |
| 404 |
+ inherit git-r3 |
| 405 |
+ EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" |
| 406 |
else |
| 407 |
- SRC_URI="https://github.com/downloads/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2" |
| 408 |
+ SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" |
| 409 |
KEYWORDS="~amd64 ~x86" |
| 410 |
- S="${WORKDIR}/razorqt-${PV}" |
| 411 |
fi |
| 412 |
|
| 413 |
LICENSE="LGPL-2.1" |
| 414 |
SLOT="0" |
| 415 |
-IUSE="" |
| 416 |
+IUSE="+qt4 qt5 test" |
| 417 |
+REQUIRED_USE="^^ ( qt4 qt5 )" |
| 418 |
|
| 419 |
-DEPEND="sys-apps/file |
| 420 |
- dev-qt/qtcore:4 |
| 421 |
- dev-qt/qtgui:4 |
| 422 |
- !x11-wm/razorqt" |
| 423 |
-RDEPEND="${DEPEND} |
| 424 |
+CDEPEND=" |
| 425 |
+ sys-apps/file |
| 426 |
+ qt4? ( |
| 427 |
+ dev-qt/qtcore:4 |
| 428 |
+ dev-qt/qtgui:4 |
| 429 |
+ ) |
| 430 |
+ qt5? ( |
| 431 |
+ dev-qt/qtcore:5 |
| 432 |
+ dev-qt/qtwidgets:5 |
| 433 |
+ dev-qt/qtxml:5 |
| 434 |
+ dev-qt/linguist-tools:5 |
| 435 |
+ )" |
| 436 |
+DEPEND="${CDEPEND} |
| 437 |
+ test? ( |
| 438 |
+ qt4? ( dev-qt/qttest:4 ) |
| 439 |
+ qt5? ( dev-qt/qttest:5 ) |
| 440 |
+ )" |
| 441 |
+RDEPEND="${CDEPEND} |
| 442 |
x11-misc/xdg-utils" |
| 443 |
|
| 444 |
-CMAKE_USE_DIR=${S}/libraries/qtxdg |
| 445 |
+src_configure() { |
| 446 |
+ local mycmakeargs=( |
| 447 |
+ $(cmake-utils_use_use qt5 QT5) |
| 448 |
+ $(cmake-utils_use test BUILD_TESTS) |
| 449 |
+ ) |
| 450 |
+ cmake-utils_src_configure |
| 451 |
+} |
| 452 |
|
| 453 |
diff --git a/razorqt-base/libqtxdg/metadata.xml b/razorqt-base/libqtxdg/metadata.xml |
| 454 |
index 3cbebd8..74b39e2 100644 |
| 455 |
--- a/razorqt-base/libqtxdg/metadata.xml |
| 456 |
+++ b/razorqt-base/libqtxdg/metadata.xml |
| 457 |
@@ -1,5 +1,10 @@ |
| 458 |
<?xml version="1.0" encoding="UTF-8"?> |
| 459 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 460 |
<pkgmetadata> |
| 461 |
+ <herd>lxqt</herd> |
| 462 |
<herd>qt</herd> |
| 463 |
+ <maintainer> |
| 464 |
+ <email>jauhien@g.o</email> |
| 465 |
+ <name>Jauhien Piatlicki</name> |
| 466 |
+ </maintainer> |
| 467 |
</pkgmetadata> |
Archives