commit: d38c5bf6dac37e543b922d8429b275a870c0771b
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 20:16:37 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 25 14:03:27 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d38c5bf6
[libqtxdg] Remove 0.5.3 (in tree); fix 9999 and move it back to razorqt-base
category.
---
lxqt-base/liblxqt/liblxqt-0.7.0.ebuild | 2 +-
lxqt-base/liblxqt/liblxqt-9999.ebuild | 2 +-
lxqt-base/libqtxdg/Manifest | 1 -
lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild | 53 ----------------------
lxqt-base/libqtxdg/libqtxdg-9999.ebuild | 51 ---------------------
lxqt-base/libqtxdg/metadata.xml | 6 ---
lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild | 2 +-
lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 2 +-
.../lxqt-lightdm-greeter-9999.ebuild | 2 +-
.../lxqt-notificationd-0.7.0.ebuild | 2 +-
.../lxqt-notificationd-9999.ebuild | 2 +-
lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild | 2 +-
lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 2 +-
.../lxqt-policykit/lxqt-policykit-0.7.0.ebuild | 2 +-
.../lxqt-policykit/lxqt-policykit-9999.ebuild | 2 +-
.../lxqt-powermanagement-0.7.0.ebuild | 2 +-
.../lxqt-powermanagement-9999.ebuild | 2 +-
lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild | 2 +-
lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 2 +-
razorqt-base/libqtxdg/libqtxdg-9999.ebuild | 47 +++++++++++++------
razorqt-base/libqtxdg/metadata.xml | 5 ++
21 files changed, 52 insertions(+), 141 deletions(-)
diff --git a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
b/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
index d89a0db..88c1630 100644
--- a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 LGPL-2.1+"
SLOT="0"
IUSE=""
-DEPEND="lxqt-base/libqtxdg
+DEPEND="razorqt-base/libqtxdg
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild
b/lxqt-base/liblxqt/liblxqt-9999.ebuild
index 4cbe166..0fd29d0 100644
--- a/lxqt-base/liblxqt/liblxqt-9999.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 LGPL-2.1+"
SLOT="0"
IUSE=""
-DEPEND="lxqt-base/libqtxdg
+DEPEND="razorqt-base/libqtxdg
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
diff --git a/lxqt-base/libqtxdg/Manifest b/lxqt-base/libqtxdg/Manifest
deleted file mode 100644
index 6a2084f..0000000
--- a/lxqt-base/libqtxdg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libqtxdg-0.5.3.tar.xz 52948 SHA256
ce45c0de4f1f5c4587178cc8a1d12561b3d101461c71ce3715ed9d5d6a6ad6f4 SHA512
02211e7fd8fc5db014e642c8222a5bade95eef5da8f60c39567cac5f4da385c7b99b454d68a6c88e211981dd98bcb1d17d53c105dcf3e7b89b17b171af904ec2
WHIRLPOOL
1f4f2bc8e6731c0fbc31dcb0f8264f7aafe329f022a74f4bf43828c8016b8af02077d9dcfd1ee0a574d7441db4ba7676dfd0f431d727059b59ccefd5fbe9b216
diff --git a/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild
b/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild
deleted file mode 100644
index 981d2fd..0000000
--- a/lxqt-base/libqtxdg/libqtxdg-0.5.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://www.lxqt.org/";
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz";
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+qt4 qt5 test"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-CDEPEND="
- sys-apps/file
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qttools:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )"
-DEPEND="${CDEPEND}
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils"
-
-S=${WORKDIR}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5 QT5)
- $(cmake-utils_use test BUILD_TESTS)
- )
- cmake-utils_src_configure
-}
diff --git a/lxqt-base/libqtxdg/libqtxdg-9999.ebuild
b/lxqt-base/libqtxdg/libqtxdg-9999.ebuild
deleted file mode 100644
index 455f062..0000000
--- a/lxqt-base/libqtxdg/libqtxdg-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://www.lxqt.org/";
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+qt4 qt5 test"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-CDEPEND="
- sys-apps/file
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qttools:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )"
-DEPEND="${CDEPEND}
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5 QT5)
- $(cmake-utils_use test BUILD_TESTS)
- )
- cmake-utils_src_configure
-}
diff --git a/lxqt-base/libqtxdg/metadata.xml b/lxqt-base/libqtxdg/metadata.xml
deleted file mode 100644
index c141026..0000000
--- a/lxqt-base/libqtxdg/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>lxde</herd>
- <herd>qt</herd>
-</pkgmetadata>
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
b/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
index 9e6c2fb..746287b 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
@@ -24,7 +24,7 @@ IUSE=""
RDEPEND="dev-qt/qtcore:4
dev-qt/qtgui:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
sys-libs/zlib
x11-libs/libXcursor
x11-libs/libXfixes"
diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
index 04be7a1..5629ee3 100644
--- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
@@ -24,7 +24,7 @@ IUSE=""
RDEPEND="dev-qt/qtcore:4
dev-qt/qtgui:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
sys-libs/zlib
x11-libs/libXcursor
x11-libs/libXfixes"
diff --git a/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild
b/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild
index dcc1f6e..9a01c8b 100644
--- a/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild
+++ b/lxqt-base/lxqt-lightdm-greeter/lxqt-lightdm-greeter-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="dev-qt/qtcore:4
dev-qt/qtgui:4
x11-misc/lightdm
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
sys-libs/zlib
x11-libs/libXcursor
x11-libs/libXfixes"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
index 40f6904..20d8239 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE=""
DEPEND="lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
index 335ff2e..7df281d 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE=""
DEPEND="lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4"
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
b/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
index dd1e6f4..e6703eb 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
DEPEND="lxqt-base/liblxqt
lxqt-base/liblxqt-mount
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
lxqt-base/libsysstat
lxqt-base/lxqt-globalkeys
dev-qt/qtcore:4
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
index 4da21f4..3da8289 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
DEPEND="lxqt-base/liblxqt
lxqt-base/liblxqt-mount
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
lxqt-base/libsysstat
lxqt-base/lxqt-globalkeys
dev-qt/qtcore:4
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
b/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
index de6cae2..fb4090b 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
sys-auth/polkit-qt
x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
index 443d9e1..28ac9e7 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
sys-auth/polkit-qt
x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
index 3a41ccc..b0c17c2 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsvg:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
x11-libs/libX11
x11-libs/libxcb
sys-power/upower"
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
index 2726c6b..e96d3b6 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsvg:4
lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
x11-libs/libX11
x11-libs/libxcb
sys-power/upower"
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
b/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
index f50a61a..b235089 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE=""
RDEPEND="lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
lxqt-base/lxqt-globalkeys
>=lxde-base/menu-cache-0.5.1
dev-qt/qtcore:4
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
index 9c34a89..efbc268 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE=""
RDEPEND="lxqt-base/liblxqt
- lxqt-base/libqtxdg
+ razorqt-base/libqtxdg
lxqt-base/lxqt-globalkeys
=lxde-base/menu-cache-9999
dev-qt/qtcore:4
diff --git a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
index 94ec2ec..42c2fad 100644
--- a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
+++ b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
@@ -2,32 +2,49 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit cmake-utils
DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://razor-qt.org/";
+HOMEPAGE="http://www.lxqt.org/";
if [[ ${PV} = *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git"
- EGIT_BRANCH="master"
- KEYWORDS=""
+ inherit git-r3
+ EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
else
-
SRC_URI="https://github.com/downloads/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2";
+ SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz";
KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/razorqt-${PV}"
fi
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE=""
+IUSE="+qt4 qt5 test"
+REQUIRED_USE="^^ ( qt4 qt5 )"
-DEPEND="sys-apps/file
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- !x11-wm/razorqt"
-RDEPEND="${DEPEND}
+CDEPEND="
+ sys-apps/file
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/linguist-tools:5
+ )"
+DEPEND="${CDEPEND}
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )"
+RDEPEND="${CDEPEND}
x11-misc/xdg-utils"
-CMAKE_USE_DIR=${S}/libraries/qtxdg
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5 QT5)
+ $(cmake-utils_use test BUILD_TESTS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/razorqt-base/libqtxdg/metadata.xml
b/razorqt-base/libqtxdg/metadata.xml
index 3cbebd8..74b39e2 100644
--- a/razorqt-base/libqtxdg/metadata.xml
+++ b/razorqt-base/libqtxdg/metadata.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
+ <herd>lxqt</herd>
<herd>qt</herd>
+ <maintainer>
+ <email>jauh...@gentoo.org</email>
+ <name>Jauhien Piatlicki</name>
+ </maintainer>
</pkgmetadata>
