Add kio-file patch. Thanks to Sebastian Pipping <sping@gentoo.org>

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 114 insertions, 1 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index f32f95cb6c06..0092d6ed3ca7 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.25 2010/01/13 17:56:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.26 2010/01/18 17:19:38 hwoarang Exp $
+
+*qmmp-0.3.2-r1 (18 Jan 2010)
+
+  18 Jan 2010; <hwoarang@gentoo.org> +qmmp-0.3.2-r1.ebuild,
+  +files/qmmp-0.3.2-kio-file-path-fix.patch:
+  Add kio-file patch. Thanks to Sebastian Pipping <sping@gentoo.org>
 
 *qmmp-0.3.2 (13 Jan 2010)
 
diff --git a/media-sound/qmmp/files/qmmp-0.3.2-kio-file-path-fix.patch b/media-sound/qmmp/files/qmmp-0.3.2-kio-file-path-fix.patch
new file mode 100644
index 000000000000..cc0c5a99e679
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-0.3.2-kio-file-path-fix.patch
@@ -0,0 +1,19 @@
+--- src/qmmpui/filedialog.cpp_BACKUP	2010-01-17 20:05:16.000000000 +0100
++++ src/qmmpui/filedialog.cpp	2010-01-17 20:06:14.000000000 +0100
+@@ -184,13 +184,13 @@
+     QStringList paths;
+     paths << "/usr/lib/kde4/kio_file.so";
+     paths << "/usr/lib64/kde4/kio_file.so";
+-    paths << "/usr/local/kde4/lib/kde4/kio_file.so";
+-    foreach(QString path, paths)
++    foreach(const QString &path, paths)
+     {
+         if(QFile::exists(path))
+         {
+-            QLibrary *l = new QLibrary("/usr/lib/kde4/kio_file.so", qApp);
++            QLibrary *l = new QLibrary(path, qApp);
+             l->load();
++            break;
+         }
+     }
+ #endif
diff --git a/media-sound/qmmp/qmmp-0.3.2-r1.ebuild b/media-sound/qmmp/qmmp-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..ee71119bff39
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.3.2-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.3.2-r1.ebuild,v 1.1 2010/01/18 17:19:38 hwoarang Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b ffmpeg flac jack libsamplerate +mad modplug musepack oss projectm pulseaudio scrobbler sndfile +vorbis wavpack"
+
+RDEPEND="x11-libs/qt-gui:4
+	media-libs/taglib
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	flac? ( media-libs/flac )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( media-video/ffmpeg )
+	projectm? ( >=media-libs/libprojectm-2.0.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-kio-file-path-fix.patch
+)
+
+qmmp_use_enable() {
+	# uses completely non standard cmake options...
+	if use ${1}; then
+		echo "-DUSE_${2}:BOOL=TRUE"
+	else
+		echo "-DUSE_${2}:BOOL=FALSE"
+	fi
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(qmmp_use_enable alsa ALSA)
+		$(qmmp_use_enable aac AAC)
+		$(qmmp_use_enable bs2b BS2B)
+		$(qmmp_use_enable dbus DBUS)
+		$(qmmp_use_enable ffmpeg FFMPEG)
+		$(qmmp_use_enable flac FLAC)
+		$(qmmp_use_enable jack JACK)
+		$(qmmp_use_enable mad MAD)
+		$(qmmp_use_enable modplug MODPLUG)
+		$(qmmp_use_enable musepack MPC)
+		$(qmmp_use_enable oss OSS)
+		$(qmmp_use_enable projectm PROJECTM)
+		$(qmmp_use_enable pulseaudio PULSE)
+		$(qmmp_use_enable scrobbler SCROBBLER)
+		$(qmmp_use_enable sndfile SNDFILE)
+		$(qmmp_use_enable libsamplerate SRC)
+		$(qmmp_use_enable vorbis VORBIS)
+		$(qmmp_use_enable wavpack WAVPACK)"
+
+	cmake-utils_src_configure
+}