| 1 |
commit: b30105639d21d6b5e2e2ed624c42527b65da5cdd |
| 2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 6 12:09:05 2016 +0000 |
| 4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 6 12:09:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3010563 |
| 7 |
|
| 8 |
media-sound/qmmp: Add missing dev-qt/qdbusviewer dependency. Clean up. Bug #575012 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
media-sound/qmmp/Manifest | 2 - |
| 13 |
media-sound/qmmp/qmmp-0.9.6.ebuild | 128 --------------------- |
| 14 |
.../{qmmp-0.9.7.ebuild => qmmp-0.9.7-r1.ebuild} | 1 + |
| 15 |
.../{qmmp-1.0.5.ebuild => qmmp-1.0.6-r1.ebuild} | 86 +++++++------- |
| 16 |
media-sound/qmmp/qmmp-9999.ebuild | 1 + |
| 17 |
5 files changed, 45 insertions(+), 173 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest |
| 20 |
index 9d21b9b..62e0bd1 100644 |
| 21 |
--- a/media-sound/qmmp/Manifest |
| 22 |
+++ b/media-sound/qmmp/Manifest |
| 23 |
@@ -1,5 +1,3 @@ |
| 24 |
DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026 |
| 25 |
-DIST qmmp-0.9.6.tar.bz2 1124762 SHA256 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b SHA512 92c240b163def08c9d68276384e34f916edfd7a9d0d2bdf0478f76c2da524119cfd20c5379329c75395f9930586b05f3c381f93328f6c50a4ea43ce106928578 WHIRLPOOL fb8db9d684e7a93923b34a8e6f2b34e4ad0716fe4b23d821440da80a5dfa06845be0808d61e541dc92751ebe58a631456369ff60db5f7e77fa9fe668521204b5 |
| 26 |
DIST qmmp-0.9.7.tar.bz2 1125295 SHA256 339f260c8fac0c1ddcf4205b852724c0633e63a39d83ee1906b9661ef821bcdc SHA512 9a64043c94eeaed62af10f93e223aff7a9e4b09b79949b864f0092f7b64a458cf98883e983e3b9f24c8af277f7382b30a139666f5c1b1c9398b7feb125e7c844 WHIRLPOOL 7a082d38e3c6997515d8132a6207d456c9a052e27671daf3fab31def325279a092c1b3cc423ef835f4d6e28e88d7f5d90f57e4aa0a9a01bcaa072d6a82baaf39 |
| 27 |
-DIST qmmp-1.0.5.tar.bz2 1105704 SHA256 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1 SHA512 b4546457d3a4127a1911572233c367255fbbc6c08470bfb38b821062e516890186b6bd31960796bcb540b9c08610c9b9fcd193362d465dee9f722d431f70e699 WHIRLPOOL 28039c4b3cb16b3a7139534f37773081f96499eeb9b9f44b5f95bc010d290718d9f0a5cc7eb5b32565d16f7736e484053b4bd0ecb9d8eeeeb9734aeae8efea49 |
| 28 |
DIST qmmp-1.0.6.tar.bz2 1107187 SHA256 e97965cb41426f0e2fc418a625b0f3097227a1414c81665a65bbd33802e77e7f SHA512 5faa68cddef230d03c5f208b46ed26abb6b88ed8d718aaeaefec368b54538f5e708827c8eef4233e69e494f1755c810da565da18fbca9a55284b7c36d74e7875 WHIRLPOOL a60fd777b72835bd630dbc082baedbb79448958eb5c3af1ce306dfa663869448548c087c81fe03c70be5d3334cb7551f0bedee3689a0cf6cbc936dd3a9123ca8 |
| 29 |
|
| 30 |
diff --git a/media-sound/qmmp/qmmp-0.9.6.ebuild b/media-sound/qmmp/qmmp-0.9.6.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index d909531..0000000 |
| 33 |
--- a/media-sound/qmmp/qmmp-0.9.6.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,128 +0,0 @@ |
| 36 |
-# Copyright 1999-2016 Gentoo Foundation |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
-# $Id$ |
| 39 |
- |
| 40 |
-EAPI="5" |
| 41 |
- |
| 42 |
-inherit cmake-utils |
| 43 |
-[ "$PV" == "9999" ] && inherit subversion |
| 44 |
- |
| 45 |
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support" |
| 46 |
-HOMEPAGE="http://qmmp.ylsoftware.com" |
| 47 |
-if [ "$PV" != "9999" ]; then |
| 48 |
- SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2" |
| 49 |
- KEYWORDS="~amd64 ~ppc ~x86" |
| 50 |
-else |
| 51 |
- SRC_URI="" |
| 52 |
- ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/" |
| 53 |
- KEYWORDS="" |
| 54 |
-fi |
| 55 |
- |
| 56 |
-LICENSE="GPL-2" |
| 57 |
-SLOT="0" |
| 58 |
-# KEYWORDS further up |
| 59 |
-IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa |
| 60 |
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss |
| 61 |
-projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack" |
| 62 |
- |
| 63 |
-RDEPEND="media-libs/taglib |
| 64 |
- dev-qt/qtgui:4 |
| 65 |
- alsa? ( media-libs/alsa-lib ) |
| 66 |
- bs2b? ( media-libs/libbs2b ) |
| 67 |
- cdda? ( dev-libs/libcdio-paranoia ) |
| 68 |
- cue? ( media-libs/libcue ) |
| 69 |
- curl? ( net-misc/curl ) |
| 70 |
- dbus? ( sys-apps/dbus ) |
| 71 |
- aac? ( media-libs/faad2 ) |
| 72 |
- enca? ( app-i18n/enca ) |
| 73 |
- flac? ( media-libs/flac ) |
| 74 |
- game? ( media-libs/game-music-emu ) |
| 75 |
- ladspa? ( media-libs/ladspa-cmt ) |
| 76 |
- libsamplerate? ( media-libs/libsamplerate ) |
| 77 |
- mad? ( media-libs/libmad ) |
| 78 |
- midi? ( media-sound/wildmidi ) |
| 79 |
- mms? ( media-libs/libmms ) |
| 80 |
- mplayer? ( media-video/mplayer ) |
| 81 |
- mpris? ( dev-qt/qtdbus:4 ) |
| 82 |
- musepack? ( >=media-sound/musepack-tools-444 ) |
| 83 |
- modplug? ( >=media-libs/libmodplug-0.8.4 ) |
| 84 |
- vorbis? ( media-libs/libvorbis |
| 85 |
- media-libs/libogg ) |
| 86 |
- jack? ( media-sound/jack-audio-connection-kit |
| 87 |
- media-libs/libsamplerate ) |
| 88 |
- ffmpeg? ( virtual/ffmpeg ) |
| 89 |
- opus? ( media-libs/opusfile ) |
| 90 |
- projectm? ( media-libs/libprojectm |
| 91 |
- dev-qt/qtopengl:4 ) |
| 92 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) |
| 93 |
- wavpack? ( media-sound/wavpack ) |
| 94 |
- scrobbler? ( net-misc/curl ) |
| 95 |
- sndfile? ( media-libs/libsndfile ) |
| 96 |
- udisks? ( sys-fs/udisks:2 )" |
| 97 |
-DEPEND="${RDEPEND}" |
| 98 |
- |
| 99 |
-DOCS="AUTHORS ChangeLog README" |
| 100 |
- |
| 101 |
-CMAKE_IN_SOURCE_BUILD="1" |
| 102 |
- |
| 103 |
-REQUIRED_USE="kde? ( dbus ) " |
| 104 |
- |
| 105 |
-src_prepare() { |
| 106 |
- if has_version dev-libs/libcdio-paranoia; then |
| 107 |
- sed -i \ |
| 108 |
- -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ |
| 109 |
- src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die |
| 110 |
- fi |
| 111 |
- |
| 112 |
- cmake-utils_src_prepare |
| 113 |
-} |
| 114 |
- |
| 115 |
-src_configure() { |
| 116 |
- mycmakeargs=( |
| 117 |
- $(cmake-utils_use_use alsa) |
| 118 |
- $(cmake-utils_use_use aac) |
| 119 |
- $(cmake-utils_use_use alsa) |
| 120 |
- $(cmake-utils_use_use analyzer) |
| 121 |
- $(cmake-utils_use_use bs2b) |
| 122 |
- $(cmake-utils_use_use cdda CDA) |
| 123 |
- $(cmake-utils_use_use crossfade) |
| 124 |
- $(cmake-utils_use_use cover) |
| 125 |
- $(cmake-utils_use_use cue) |
| 126 |
- $(cmake-utils_use_use curl) |
| 127 |
- $(cmake-utils_use_use dbus) |
| 128 |
- $(cmake-utils_use_use enca) |
| 129 |
- $(cmake-utils_use_use ffmpeg) |
| 130 |
- -DUSE_FFMPEG_LEGACY=OFF |
| 131 |
- $(cmake-utils_use_use flac) |
| 132 |
- $(cmake-utils_use_use game GME) |
| 133 |
- -DUSE_HAL=OFF |
| 134 |
- $(cmake-utils_use_use jack) |
| 135 |
- $(cmake-utils_use_use kde KDENOTIFY) |
| 136 |
- $(cmake-utils_use_use ladspa) |
| 137 |
- $(cmake-utils_use_use lyrics) |
| 138 |
- $(cmake-utils_use_use mad) |
| 139 |
- $(cmake-utils_use_use midi MIDI_WILDMIDI) |
| 140 |
- $(cmake-utils_use_use mplayer) |
| 141 |
- $(cmake-utils_use_use mms) |
| 142 |
- $(cmake-utils_use_use modplug) |
| 143 |
- $(cmake-utils_use_use mpris) |
| 144 |
- $(cmake-utils_use_use musepack MPC) |
| 145 |
- $(cmake-utils_use_use notifier) |
| 146 |
- $(cmake-utils_use_use opus) |
| 147 |
- $(cmake-utils_use_use oss) |
| 148 |
- $(cmake-utils_use_use projectm) |
| 149 |
- $(cmake-utils_use_use pulseaudio PULSE) |
| 150 |
- $(cmake-utils_use_use qsui) |
| 151 |
- $(cmake-utils_use_use scrobbler) |
| 152 |
- $(cmake-utils_use_use sndfile) |
| 153 |
- $(cmake-utils_use_use stereo) |
| 154 |
- $(cmake-utils_use_use tray STATICON) |
| 155 |
- $(cmake-utils_use_use udisks UDISKS2) |
| 156 |
- -DUSE_UDISKS=OFF |
| 157 |
- $(cmake-utils_use_use libsamplerate SRC) |
| 158 |
- $(cmake-utils_use_use vorbis) |
| 159 |
- $(cmake-utils_use_use wavpack) |
| 160 |
- ) |
| 161 |
- |
| 162 |
- cmake-utils_src_configure |
| 163 |
-} |
| 164 |
|
| 165 |
diff --git a/media-sound/qmmp/qmmp-0.9.7.ebuild b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild |
| 166 |
similarity index 99% |
| 167 |
rename from media-sound/qmmp/qmmp-0.9.7.ebuild |
| 168 |
rename to media-sound/qmmp/qmmp-0.9.7-r1.ebuild |
| 169 |
index 05b479f..9e3e826 100644 |
| 170 |
--- a/media-sound/qmmp/qmmp-0.9.7.ebuild |
| 171 |
+++ b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild |
| 172 |
@@ -27,6 +27,7 @@ projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack" |
| 173 |
|
| 174 |
RDEPEND="media-libs/taglib |
| 175 |
dev-qt/qtgui:4 |
| 176 |
+ dev-qt/qdbusviewer:4 |
| 177 |
alsa? ( media-libs/alsa-lib ) |
| 178 |
bs2b? ( media-libs/libbs2b ) |
| 179 |
cdda? ( dev-libs/libcdio-paranoia ) |
| 180 |
|
| 181 |
diff --git a/media-sound/qmmp/qmmp-1.0.5.ebuild b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild |
| 182 |
similarity index 63% |
| 183 |
rename from media-sound/qmmp/qmmp-1.0.5.ebuild |
| 184 |
rename to media-sound/qmmp/qmmp-1.0.6-r1.ebuild |
| 185 |
index 9eb2da3..ab3081c 100644 |
| 186 |
--- a/media-sound/qmmp/qmmp-1.0.5.ebuild |
| 187 |
+++ b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild |
| 188 |
@@ -2,12 +2,12 @@ |
| 189 |
# Distributed under the terms of the GNU General Public License v2 |
| 190 |
# $Id$ |
| 191 |
|
| 192 |
-EAPI="5" |
| 193 |
+EAPI=6 |
| 194 |
|
| 195 |
inherit cmake-utils |
| 196 |
[ "$PV" == "9999" ] && inherit subversion |
| 197 |
|
| 198 |
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support" |
| 199 |
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" |
| 200 |
HOMEPAGE="http://qmmp.ylsoftware.com" |
| 201 |
if [ "$PV" != "9999" ]; then |
| 202 |
SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2" |
| 203 |
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus |
| 204 |
projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack" |
| 205 |
|
| 206 |
RDEPEND="media-libs/taglib |
| 207 |
+ dev-qt/qdbusviewer:5 |
| 208 |
dev-qt/qtcore:5 |
| 209 |
dev-qt/qtdbus:5 |
| 210 |
dev-qt/qtgui:5 |
| 211 |
@@ -87,48 +88,47 @@ src_prepare() { |
| 212 |
|
| 213 |
src_configure() { |
| 214 |
mycmakeargs=( |
| 215 |
- $(cmake-utils_use_use alsa) |
| 216 |
- $(cmake-utils_use_use aac) |
| 217 |
- $(cmake-utils_use_use alsa) |
| 218 |
- $(cmake-utils_use_use analyzer) |
| 219 |
- $(cmake-utils_use_use bs2b) |
| 220 |
- $(cmake-utils_use_use cdda CDA) |
| 221 |
- $(cmake-utils_use_use crossfade) |
| 222 |
- $(cmake-utils_use_use cover) |
| 223 |
- $(cmake-utils_use_use cue) |
| 224 |
- $(cmake-utils_use_use curl) |
| 225 |
- $(cmake-utils_use_use dbus) |
| 226 |
- $(cmake-utils_use_use enca) |
| 227 |
- $(cmake-utils_use_use ffmpeg) |
| 228 |
- $(cmake-utils_use_use flac) |
| 229 |
- $(cmake-utils_use_use game GME) |
| 230 |
+ -DUSE_alsa="$(usex alsa)" |
| 231 |
+ -DUSE_aac="$(usex aac)" |
| 232 |
+ -DUSE_analyzer="$(usex analyzer)" |
| 233 |
+ -DUSE_bs2b="$(usex bs2b)" |
| 234 |
+ -DUSE_CDA="$(usex cdda)" |
| 235 |
+ -DUSE_crossfade="$(usex crossfade)" |
| 236 |
+ -DUSE_cover="$(usex cover)" |
| 237 |
+ -DUSE_cue="$(usex cue)" |
| 238 |
+ -DUSE_curl="$(usex curl)" |
| 239 |
+ -DUSE_dbus="$(usex dbus)" |
| 240 |
+ -DUSE_enca="$(usex enca)" |
| 241 |
+ -DUSE_ffmpeg="$(usex ffmpeg)" |
| 242 |
+ -DUSE_flac="$(usex flac)" |
| 243 |
+ -DUSE_GME="$(usex game)" |
| 244 |
-DUSE_HAL=OFF |
| 245 |
- $(cmake-utils_use_use jack) |
| 246 |
- $(cmake-utils_use_use kde KDENOTIFY) |
| 247 |
- $(cmake-utils_use_use ladspa) |
| 248 |
- $(cmake-utils_use_use lyrics) |
| 249 |
- $(cmake-utils_use_use mad) |
| 250 |
- $(cmake-utils_use_use midi MIDI_WILDMIDI) |
| 251 |
- $(cmake-utils_use_use mplayer) |
| 252 |
- $(cmake-utils_use_use mms) |
| 253 |
- $(cmake-utils_use_use modplug) |
| 254 |
- $(cmake-utils_use_use mpris) |
| 255 |
- $(cmake-utils_use_use musepack MPC) |
| 256 |
- $(cmake-utils_use_use notifier) |
| 257 |
- $(cmake-utils_use_use opus) |
| 258 |
- $(cmake-utils_use_use oss) |
| 259 |
- $(cmake-utils_use_use projectm) |
| 260 |
- $(cmake-utils_use_use pulseaudio PULSE) |
| 261 |
- $(cmake-utils_use_use qsui) |
| 262 |
- $(cmake-utils_use_use scrobbler) |
| 263 |
- $(cmake-utils_use_use sndfile) |
| 264 |
- $(cmake-utils_use_use stereo) |
| 265 |
- $(cmake-utils_use_use tray STATICON) |
| 266 |
- $(cmake-utils_use_use udisks UDISKS2) |
| 267 |
- $(cmake-utils_use_use libsamplerate SRC) |
| 268 |
- $(cmake-utils_use_use vorbis) |
| 269 |
- $(cmake-utils_use_use wavpack) |
| 270 |
- ) |
| 271 |
+ -DUSE_jack="$(usex jack)" |
| 272 |
+ -DUSE_KDENOTIFY="$(usex kde)" |
| 273 |
+ -DUSE_ladspa="$(usex ladspa)" |
| 274 |
+ -DUSE_lyrics="$(usex lyrics)" |
| 275 |
+ -DUSE_mad="$(usex mad)" |
| 276 |
+ -DUSE_MIDI_WILDMIDI="$(usex midi)" |
| 277 |
+ -DUSE_mplayer="$(usex mplayer)" |
| 278 |
+ -DUSE_mms="$(usex mms)" |
| 279 |
+ -DUSE_modplug="$(usex modplug)" |
| 280 |
+ -DUSE_mpris="$(usex mpris)" |
| 281 |
+ -DUSE_MPC="$(usex musepack)" |
| 282 |
+ -DUSE_notifier="$(usex notifier)" |
| 283 |
+ -DUSE_opus="$(usex opus)" |
| 284 |
+ -DUSE_oss="$(usex oss)" |
| 285 |
+ -DUSE_projectm="$(usex projectm)" |
| 286 |
+ -DUSE_PULSE="$(usex pulseaudio)" |
| 287 |
+ -DUSE_qsui="$(usex qsui)" |
| 288 |
+ -DUSE_scrobbler="$(usex scrobbler)" |
| 289 |
+ -DUSE_sndfile="$(usex sndfile)" |
| 290 |
+ -DUSE_stereo="$(usex stereo)" |
| 291 |
+ -DUSE_STATICON="$(usex tray)" |
| 292 |
+ -DUSE_UDISKS2="$(usex udisks)" |
| 293 |
+ -DUSE_SRC="$(usex libsamplerate)" |
| 294 |
+ -DUSE_vorbis="$(usex vorbis)" |
| 295 |
+ -DUSE_wavpack="$(usex wavpack)" |
| 296 |
+ ) |
| 297 |
|
| 298 |
cmake-utils_src_configure |
| 299 |
} |
| 300 |
|
| 301 |
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild |
| 302 |
index 4cba7f4..f048e0a 100644 |
| 303 |
--- a/media-sound/qmmp/qmmp-9999.ebuild |
| 304 |
+++ b/media-sound/qmmp/qmmp-9999.ebuild |
| 305 |
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus |
| 306 |
projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack" |
| 307 |
|
| 308 |
RDEPEND="media-libs/taglib |
| 309 |
+ dev-qt/qdbusviewer:5 |
| 310 |
dev-qt/qtcore:5 |
| 311 |
dev-qt/qtdbus:5 |
| 312 |
dev-qt/qtgui:5 |
Archives