1 |
commit: 64b3191d12885b12923680de6f943476cad70a2f |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Sun Aug 12 17:43:32 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 4 20:49:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b3191d |
7 |
|
8 |
sci-geosciences/gpsd: fix USE=qt5, add USE=cxx |
9 |
|
10 |
Closes: https://bugs.gentoo.org/663458 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/9551 |
12 |
|
13 |
.../gpsd/{gpsd-9999.ebuild => gpsd-3.17-r3.ebuild} | 26 +++++++++------------- |
14 |
sci-geosciences/gpsd/gpsd-9999.ebuild | 9 ++++---- |
15 |
2 files changed, 16 insertions(+), 19 deletions(-) |
16 |
|
17 |
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild |
18 |
similarity index 88% |
19 |
copy from sci-geosciences/gpsd/gpsd-9999.ebuild |
20 |
copy to sci-geosciences/gpsd/gpsd-3.17-r3.ebuild |
21 |
index 98fba863a5a..4a84dbffcc3 100644 |
22 |
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild |
23 |
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2017 Gentoo Foundation |
26 |
+# Copyright 1999-2018 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=5 |
30 |
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then |
31 |
inherit git-2 |
32 |
else |
33 |
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
34 |
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
35 |
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86" |
36 |
fi |
37 |
|
38 |
DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" |
39 |
@@ -30,10 +30,11 @@ GPSD_PROTOCOLS=( |
40 |
tripmate tsip ublox |
41 |
) |
42 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
43 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
44 |
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
45 |
REQUIRED_USE="X? ( python ) |
46 |
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
47 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
48 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
49 |
+ qt5? ( cxx )" |
50 |
|
51 |
RDEPEND=" |
52 |
bluetooth? ( net-wireless/bluez ) |
53 |
@@ -52,7 +53,7 @@ RDEPEND=" |
54 |
) |
55 |
python? ( ${PYTHON_DEPS} ) |
56 |
usb? ( virtual/libusb:1 ) |
57 |
- X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )" |
58 |
+ X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" |
59 |
DEPEND="${RDEPEND} |
60 |
virtual/pkgconfig |
61 |
test? ( sys-devel/bc )" |
62 |
@@ -114,11 +115,10 @@ src_configure() { |
63 |
gpsd_user=gpsd |
64 |
gpsd_group=uucp |
65 |
nostrip=True |
66 |
- python=False |
67 |
- libgpsmm=True |
68 |
manbuild=False |
69 |
shared=$(usex !static True False) |
70 |
$(use_scons bluetooth bluez) |
71 |
+ $(use_scons cxx libgpsmm) |
72 |
$(use_scons debug clientdebug) |
73 |
$(use_scons dbus dbus_export) |
74 |
$(use_scons ipv6) |
75 |
@@ -126,12 +126,14 @@ src_configure() { |
76 |
$(use_scons ncurses) |
77 |
$(use_scons ntp ntpshm) |
78 |
$(use_scons ntp pps) |
79 |
- $(use_scons qt5 libQgpsmm) |
80 |
+ $(use_scons X python) |
81 |
+ $(use_scons qt5 qt) |
82 |
$(use_scons shm shm_export) |
83 |
$(use_scons sockets socket_export) |
84 |
$(use_scons usb) |
85 |
) |
86 |
|
87 |
+ use X && myesconsargs+=( xgps=1 ) |
88 |
use qt5 && myesconsargs+=( qt_versioned=5 ) |
89 |
|
90 |
# enable specified protocols |
91 |
@@ -156,13 +158,7 @@ src_install() { |
92 |
newconfd "${FILESDIR}"/gpsd.conf-2 gpsd |
93 |
newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
94 |
|
95 |
- if use python ; then |
96 |
- distutils-r1_src_install |
97 |
- # Delete all X related packages if user doesn't want them |
98 |
- if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then |
99 |
- rm "${ED%/}"/usr/bin/xgps* || die |
100 |
- fi |
101 |
- fi |
102 |
+ use python && distutils-r1_src_install |
103 |
} |
104 |
|
105 |
pkg_preinst() { |
106 |
|
107 |
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild |
108 |
index 98fba863a5a..e3db55c44b0 100644 |
109 |
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild |
110 |
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild |
111 |
@@ -30,10 +30,11 @@ GPSD_PROTOCOLS=( |
112 |
tripmate tsip ublox |
113 |
) |
114 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
115 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
116 |
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
117 |
REQUIRED_USE="X? ( python ) |
118 |
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
119 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
120 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
121 |
+ qt5? ( cxx )" |
122 |
|
123 |
RDEPEND=" |
124 |
bluetooth? ( net-wireless/bluez ) |
125 |
@@ -115,10 +116,10 @@ src_configure() { |
126 |
gpsd_group=uucp |
127 |
nostrip=True |
128 |
python=False |
129 |
- libgpsmm=True |
130 |
manbuild=False |
131 |
shared=$(usex !static True False) |
132 |
$(use_scons bluetooth bluez) |
133 |
+ $(use_scons cxx libgpsmm) |
134 |
$(use_scons debug clientdebug) |
135 |
$(use_scons dbus dbus_export) |
136 |
$(use_scons ipv6) |
137 |
@@ -126,7 +127,7 @@ src_configure() { |
138 |
$(use_scons ncurses) |
139 |
$(use_scons ntp ntpshm) |
140 |
$(use_scons ntp pps) |
141 |
- $(use_scons qt5 libQgpsmm) |
142 |
+ $(use_scons qt5 qt) |
143 |
$(use_scons shm shm_export) |
144 |
$(use_scons sockets socket_export) |
145 |
$(use_scons usb) |