Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-libs/libsystemd-qt/
Date: Sat, 28 Sep 2013 18:03:08
Message-Id: 1380391342.4eea7e5af8aaaefcdba5517ba4ccee48c8e0f88a.pesa@gentoo
1 commit: 4eea7e5af8aaaefcdba5517ba4ccee48c8e0f88a
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 28 18:02:22 2013 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 28 18:02:22 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4eea7e5a
7
8 [dev-libs/libsystemd-qt] Minor cleanups.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 dev-libs/libsystemd-qt/libsystemd-qt-207.ebuild | 20 +++++++++++---------
14 dev-libs/libsystemd-qt/libsystemd-qt-9999.ebuild | 21 +++++++++++----------
15 2 files changed, 22 insertions(+), 19 deletions(-)
16
17 diff --git a/dev-libs/libsystemd-qt/libsystemd-qt-207.ebuild b/dev-libs/libsystemd-qt/libsystemd-qt-207.ebuild
18 index 3e48754..8384130 100644
19 --- a/dev-libs/libsystemd-qt/libsystemd-qt-207.ebuild
20 +++ b/dev-libs/libsystemd-qt/libsystemd-qt-207.ebuild
21 @@ -4,19 +4,19 @@
22
23 EAPI=5
24
25 -if [ ${PV} == "9999" ] ; then
26 - EGIT_ECLASS="git-2"
27 - EGIT_REPO_URI="https://github.com/scarpin0/${PN}.git git://github.com/scarpin0/${PN}.git"
28 - SYSTEMD_VERSION=">=sys-apps/systemd-207"
29 +inherit cmake-utils
30 +
31 +if [[ ${PV} == 9999* ]]; then
32 + EGIT_REPO_URI="https://github.com/scarpin0/${PN}.git"
33 + inherit git-2
34 KEYWORDS=""
35 + SYSTEMD_VERSION=">=sys-apps/systemd-207"
36 else
37 - SYSTEMD_VERSION="~sys-apps/systemd-${PV}"
38 SRC_URI="https://github.com/scarpin0/libsystemd-qt/archive/${PV}.zip -> ${P}.zip"
39 KEYWORDS="~amd64"
40 + SYSTEMD_VERSION="~sys-apps/systemd-${PV}"
41 fi
42
43 -inherit cmake-utils ${EGIT_ECLASS}
44 -
45 DESCRIPTION="Qt wrapper for systemd API"
46 HOMEPAGE="https://github.com/scarpin0/libsystemd-qt"
47
48 @@ -28,9 +28,11 @@ RDEPEND="
49 ${SYSTEMD_VERSION}
50 dev-qt/qtdbus:4
51 dev-qt/qtcore:5
52 - qml? ( dev-qt/qtdeclarative:5 )"
53 + qml? ( dev-qt/qtdeclarative:5 )
54 +"
55 DEPEND="${RDEPEND}
56 - test? ( dev-qt/qttest:5 )"
57 + test? ( dev-qt/qttest:5 )
58 +"
59
60 DOCS=( README.md )
61
62
63 diff --git a/dev-libs/libsystemd-qt/libsystemd-qt-9999.ebuild b/dev-libs/libsystemd-qt/libsystemd-qt-9999.ebuild
64 index eea4d0e..b2d6cae 100644
65 --- a/dev-libs/libsystemd-qt/libsystemd-qt-9999.ebuild
66 +++ b/dev-libs/libsystemd-qt/libsystemd-qt-9999.ebuild
67 @@ -4,19 +4,19 @@
68
69 EAPI=5
70
71 -if [ ${PV} == "9999" ] ; then
72 - EGIT_ECLASS="git-2"
73 - EGIT_REPO_URI="https://github.com/scarpin0/${PN}.git git://github.com/scarpin0/${PN}.git"
74 - SYSTEMD_VERSION=">=sys-apps/systemd-207"
75 +inherit cmake-utils
76 +
77 +if [[ ${PV} == 9999* ]]; then
78 + EGIT_REPO_URI="https://github.com/scarpin0/${PN}.git"
79 + inherit git-2
80 KEYWORDS=""
81 + SYSTEMD_VERSION=">=sys-apps/systemd-207"
82 else
83 - SYSTEMD_VERSION="~sys-apps/systemd-${PV}"
84 SRC_URI="https://github.com/scarpin0/libsystemd-qt/archive/${PV}.zip -> ${P}.zip"
85 KEYWORDS="~amd64"
86 + SYSTEMD_VERSION="~sys-apps/systemd-${PV}"
87 fi
88
89 -inherit cmake-utils ${EGIT_ECLASS}
90 -
91 DESCRIPTION="Qt wrapper for systemd API"
92 HOMEPAGE="https://github.com/scarpin0/libsystemd-qt"
93
94 @@ -30,13 +30,14 @@ RDEPEND="
95 qt5? (
96 dev-qt/qtcore:5
97 qml? ( dev-qt/qtdeclarative:5 )
98 - )"
99 + )
100 +"
101 DEPEND="${RDEPEND}
102 test? (
103 qt4? ( dev-qt/qttest:4 )
104 qt5? ( dev-qt/qttest:5 )
105 - )"
106 -
107 + )
108 +"
109 REQUIRED_USE="
110 ^^ ( qt4 qt5 )
111 qml? ( qt5 )