Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/
Date: Tue, 20 Apr 2021 13:29:00
Message-Id: 1618925327.0e1512935b1d94930bcefdb5045b9daf050d3a58.polynomial-c@gentoo
1 commit: 0e1512935b1d94930bcefdb5045b9daf050d3a58
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 20 13:26:46 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 20 13:28:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e151293
7
8 media-sound/strawberry: USE="dbus" is no longer optional under Linux
9
10 Dropped the USE flag.
11
12 Thanks-to: Joonas Niilola <juippis <AT> gentoo.org>
13 Closes: https://bugs.gentoo.org/784404
14 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
15
16 media-sound/strawberry/strawberry-0.8.5.ebuild | 5 ++---
17 media-sound/strawberry/strawberry-0.9.2.ebuild | 5 ++---
18 media-sound/strawberry/strawberry-0.9.3.ebuild | 5 ++---
19 media-sound/strawberry/strawberry-9999.ebuild | 5 ++---
20 4 files changed, 8 insertions(+), 12 deletions(-)
21
22 diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
23 index 103a1e6068f..c75fb8287c1 100644
24 --- a/media-sound/strawberry/strawberry-0.8.5.ebuild
25 +++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
26 @@ -19,7 +19,7 @@ fi
27
28 LICENSE="GPL-3"
29 SLOT="0"
30 -IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
31 +IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
32
33 REQUIRED_USE="
34 udisks? ( dbus )
35 @@ -38,6 +38,7 @@ COMMON_DEPEND="
36 dev-libs/protobuf:=
37 dev-qt/qtconcurrent:5
38 dev-qt/qtcore:5
39 + dev-qt/qtdbus:5
40 dev-qt/qtgui:5
41 dev-qt/qtnetwork:5[ssl]
42 dev-qt/qtsql:5[sqlite]
43 @@ -50,7 +51,6 @@ COMMON_DEPEND="
44 virtual/glu
45 x11-libs/libX11
46 cdda? ( dev-libs/libcdio:= )
47 - dbus? ( dev-qt/qtdbus:5 )
48 gstreamer? (
49 media-libs/gstreamer:1.0
50 media-libs/gst-plugins-base:1.0
51 @@ -100,7 +100,6 @@ src_configure() {
52 -DENABLE_GIO=ON
53 -DLINGUAS="$(l10n_get_locales)"
54 -DENABLE_AUDIOCD="$(usex cdda)"
55 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
56 -DENABLE_GSTREAMER="$(usex gstreamer)"
57 -DENABLE_LIBGPOD="$(usex ipod)"
58 -DENABLE_LIBMTP="$(usex mtp)"
59
60 diff --git a/media-sound/strawberry/strawberry-0.9.2.ebuild b/media-sound/strawberry/strawberry-0.9.2.ebuild
61 index be8135080fd..9735f0e9a08 100644
62 --- a/media-sound/strawberry/strawberry-0.9.2.ebuild
63 +++ b/media-sound/strawberry/strawberry-0.9.2.ebuild
64 @@ -19,7 +19,7 @@ fi
65
66 LICENSE="GPL-3"
67 SLOT="0"
68 -IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
69 +IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
70
71 REQUIRED_USE="
72 udisks? ( dbus )
73 @@ -38,6 +38,7 @@ COMMON_DEPEND="
74 dev-libs/protobuf:=
75 dev-qt/qtconcurrent:5
76 dev-qt/qtcore:5
77 + dev-qt/qtdbus:5
78 dev-qt/qtgui:5
79 dev-qt/qtnetwork:5[ssl]
80 dev-qt/qtsql:5[sqlite]
81 @@ -50,7 +51,6 @@ COMMON_DEPEND="
82 virtual/glu
83 x11-libs/libX11
84 cdda? ( dev-libs/libcdio:= )
85 - dbus? ( dev-qt/qtdbus:5 )
86 gstreamer? (
87 media-libs/gstreamer:1.0
88 media-libs/gst-plugins-base:1.0
89 @@ -100,7 +100,6 @@ src_configure() {
90 -DENABLE_GIO=ON
91 -DLINGUAS="$(l10n_get_locales)"
92 -DENABLE_AUDIOCD="$(usex cdda)"
93 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
94 -DENABLE_GSTREAMER="$(usex gstreamer)"
95 -DENABLE_LIBGPOD="$(usex ipod)"
96 -DENABLE_LIBMTP="$(usex mtp)"
97
98 diff --git a/media-sound/strawberry/strawberry-0.9.3.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild
99 index be8135080fd..9735f0e9a08 100644
100 --- a/media-sound/strawberry/strawberry-0.9.3.ebuild
101 +++ b/media-sound/strawberry/strawberry-0.9.3.ebuild
102 @@ -19,7 +19,7 @@ fi
103
104 LICENSE="GPL-3"
105 SLOT="0"
106 -IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
107 +IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
108
109 REQUIRED_USE="
110 udisks? ( dbus )
111 @@ -38,6 +38,7 @@ COMMON_DEPEND="
112 dev-libs/protobuf:=
113 dev-qt/qtconcurrent:5
114 dev-qt/qtcore:5
115 + dev-qt/qtdbus:5
116 dev-qt/qtgui:5
117 dev-qt/qtnetwork:5[ssl]
118 dev-qt/qtsql:5[sqlite]
119 @@ -50,7 +51,6 @@ COMMON_DEPEND="
120 virtual/glu
121 x11-libs/libX11
122 cdda? ( dev-libs/libcdio:= )
123 - dbus? ( dev-qt/qtdbus:5 )
124 gstreamer? (
125 media-libs/gstreamer:1.0
126 media-libs/gst-plugins-base:1.0
127 @@ -100,7 +100,6 @@ src_configure() {
128 -DENABLE_GIO=ON
129 -DLINGUAS="$(l10n_get_locales)"
130 -DENABLE_AUDIOCD="$(usex cdda)"
131 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
132 -DENABLE_GSTREAMER="$(usex gstreamer)"
133 -DENABLE_LIBGPOD="$(usex ipod)"
134 -DENABLE_LIBMTP="$(usex mtp)"
135
136 diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
137 index be8135080fd..9735f0e9a08 100644
138 --- a/media-sound/strawberry/strawberry-9999.ebuild
139 +++ b/media-sound/strawberry/strawberry-9999.ebuild
140 @@ -19,7 +19,7 @@ fi
141
142 LICENSE="GPL-3"
143 SLOT="0"
144 -IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
145 +IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
146
147 REQUIRED_USE="
148 udisks? ( dbus )
149 @@ -38,6 +38,7 @@ COMMON_DEPEND="
150 dev-libs/protobuf:=
151 dev-qt/qtconcurrent:5
152 dev-qt/qtcore:5
153 + dev-qt/qtdbus:5
154 dev-qt/qtgui:5
155 dev-qt/qtnetwork:5[ssl]
156 dev-qt/qtsql:5[sqlite]
157 @@ -50,7 +51,6 @@ COMMON_DEPEND="
158 virtual/glu
159 x11-libs/libX11
160 cdda? ( dev-libs/libcdio:= )
161 - dbus? ( dev-qt/qtdbus:5 )
162 gstreamer? (
163 media-libs/gstreamer:1.0
164 media-libs/gst-plugins-base:1.0
165 @@ -100,7 +100,6 @@ src_configure() {
166 -DENABLE_GIO=ON
167 -DLINGUAS="$(l10n_get_locales)"
168 -DENABLE_AUDIOCD="$(usex cdda)"
169 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
170 -DENABLE_GSTREAMER="$(usex gstreamer)"
171 -DENABLE_LIBGPOD="$(usex ipod)"
172 -DENABLE_LIBMTP="$(usex mtp)"