media-sound/qmmp: Disable qtgui[-gles2] for projectm. Bug #562846

Package-Manager: portage-2.2.23

diff --git a/media-sound/qmmp/qmmp-1.0.0.ebuild b/media-sound/qmmp/qmmp-1.0.0-r1.ebuild
similarity index 98%
rename from media-sound/qmmp/qmmp-1.0.0.ebuild
rename to media-sound/qmmp/qmmp-1.0.0-r1.ebuild
index f91be1d98a10b53d18e5d089bfa6fd3a37a74c59..4e7eb0cc418c0a36c5f11183b77e25f607c908ca 100644 (file)
--- a/media-sound/qmmp/qmmp-1.0.0.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.0-r1.ebuild
@@ -58,7 +58,8 @@ RDEPEND="media-libs/taglib
        ffmpeg? ( virtual/ffmpeg )
        opus? ( media-libs/opusfile )
        projectm? ( media-libs/libprojectm
-               dev-qt/qtopengl:5 )
+               dev-qt/qtopengl:5
+               dev-qt/qtgui:5[-gles2] )
        pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
        wavpack? ( media-sound/wavpack )
        scrobbler? ( net-misc/curl )

diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 5f82a4d0c1648f0ba858c6c5d7131ff4a9769beb..4e7eb0cc418c0a36c5f11183b77e25f607c908ca 100644 (file)
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
 HOMEPAGE="http://qmmp.ylsoftware.com"
 if [ "$PV" != "9999" ]; then
        SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-       KEYWORDS="~amd64 ~ppc ~x86"
+       KEYWORDS="~amd64 ~x86"
 else
        SRC_URI=""
        ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
@@ -26,7 +26,12 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus
 projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
 
 RDEPEND="media-libs/taglib
-       dev-qt/qtgui:4
+       dev-qt/qtcore:5
+       dev-qt/qtdbus:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtx11extras:5
        alsa? ( media-libs/alsa-lib )
        bs2b? ( media-libs/libbs2b )
        cdda? ( dev-libs/libcdio-paranoia )
@@ -43,7 +48,7 @@ RDEPEND="media-libs/taglib
        midi? ( media-sound/wildmidi )
        mms? ( media-libs/libmms )
        mplayer? ( media-video/mplayer )
-       mpris? ( dev-qt/qtdbus:4 )
+       mpris? ( dev-qt/qtdbus:5 )
        musepack? ( >=media-sound/musepack-tools-444 )
        modplug? ( >=media-libs/libmodplug-0.8.4 )
        vorbis? ( media-libs/libvorbis
@@ -53,13 +58,15 @@ RDEPEND="media-libs/taglib
        ffmpeg? ( virtual/ffmpeg )
        opus? ( media-libs/opusfile )
        projectm? ( media-libs/libprojectm
-               dev-qt/qtopengl:4 )
+               dev-qt/qtopengl:5
+               dev-qt/qtgui:5[-gles2] )
        pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
        wavpack? ( media-sound/wavpack )
        scrobbler? ( net-misc/curl )
        sndfile? ( media-libs/libsndfile )
        udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       dev-qt/linguist-tools:5"
 
 DOCS="AUTHORS ChangeLog README"
 
@@ -92,7 +99,6 @@ src_configure() {
                $(cmake-utils_use_use dbus)
                $(cmake-utils_use_use enca)
                $(cmake-utils_use_use ffmpeg)
-               -DUSE_FFMPEG_LEGACY=OFF
                $(cmake-utils_use_use flac)
                $(cmake-utils_use_use game GME)
                -DUSE_HAL=OFF
@@ -118,7 +124,6 @@ src_configure() {
                $(cmake-utils_use_use stereo)
                $(cmake-utils_use_use tray STATICON)
                $(cmake-utils_use_use udisks UDISKS2)
-               -DUSE_UDISKS=OFF
                $(cmake-utils_use_use libsamplerate SRC)
                $(cmake-utils_use_use vorbis)
                $(cmake-utils_use_use wavpack)