media-sound/clementine: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

5 files changed, 0 insertions, 556 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c30a99ae890a..cc01afb77ba8 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
 DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
diff --git a/media-sound/clementine/clementine-1.2.3-r2.ebuild b/media-sound/clementine/clementine-1.2.3-r2.ebuild
deleted file mode 100644
index 7b60fa8b1cfe..000000000000
--- a/media-sound/clementine/clementine-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	>=dev-qt/qtcore-4.5:4[ssl]
-	>=dev-qt/qtgui-4.5:4
-	dbus? ( >=dev-qt/qtdbus-4.5:4 )
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4[sqlite]
-	system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
-	>=media-libs/taglib-1.8[mp4(+)]
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-libs/qjson
-	media-libs/libechonest:=[qt4(+)]
-	>=media-libs/libmygpo-qt-1.0.7[qt4(+)]
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	ayatana? ( dev-libs/libindicate-qt )
-	cdda? ( dev-libs/libcdio )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	projectm? ( >=media-libs/libprojectm-1.2.0 )
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-soup:0.10
-	media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39:=
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-qt/qttest:4
-	dev-cpp/gmock
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-	ubuntu-one? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.3-namespaces.patch"
-	"${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(cmake-utils_use dbus ENABLE_DBUS)
-		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
-		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		$(cmake-utils_use moodbar ENABLE_MOODBAR)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use box ENABLE_BOX)
-		$(cmake-utils_use dropbox ENABLE_DROPBOX)
-		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
-		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
-		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF
-		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
-		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
-		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild
deleted file mode 100644
index 7c4c9565e9a1..000000000000
--- a/media-sound/clementine/clementine-1.2.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	>=dev-qt/qtcore-4.5:4[ssl]
-	>=dev-qt/qtgui-4.5:4
-	dbus? ( >=dev-qt/qtdbus-4.5:4 )
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4[sqlite]
-	system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
-	>=media-libs/taglib-1.8[mp4(+)]
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-libs/qjson
-	media-libs/libechonest:=[qt4(+)]
-	>=media-libs/libmygpo-qt-1.0.7[qt4(+)]
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	ayatana? ( dev-libs/libindicate-qt )
-	cdda? ( dev-libs/libcdio )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:2 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	mtp? ( gnome-base/gvfs )
-	projectm? ( >=media-libs/libprojectm-1.2.0 )
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-soup:0.10
-	media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-qt/qttest:4
-	dev-cpp/gmock
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-	ubuntu-one? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.3-namespaces.patch"
-	"${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(cmake-utils_use dbus ENABLE_DBUS)
-		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
-		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		$(cmake-utils_use moodbar ENABLE_MOODBAR)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use box ENABLE_BOX)
-		$(cmake-utils_use dropbox ENABLE_DROPBOX)
-		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
-		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
-		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF
-		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
-		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
-		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
deleted file mode 100644
index c582d7a86e32..000000000000
--- a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Description: Wrap boost includes to avoid FTBFS due to qt4 moc.
-Author: Robert Bruce Park <robert.park@canonical.com>
-Bug-Debian: https://bugs.debian.org/795144
-Last-Update: <2015-04-13>
-
---- a/src/core/boundfuturewatcher.h
-+++ b/src/core/boundfuturewatcher.h
-@@ -3,7 +3,9 @@
- 
- #include <QFutureWatcher>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
- 
- template <typename T, typename D>
- class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -23,7 +23,9 @@
- #include "core/logging.h"
- #include "core/taskmanager.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scope_exit.hpp>
-+#endif
- 
- #include <QCoreApplication>
- #include <QDir>
---- a/src/core/macglobalshortcutbackend.mm
-+++ b/src/core/macglobalshortcutbackend.mm
-@@ -22,7 +22,9 @@
- #include "mac_startup.h"
- #import "mac_utilities.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
- 
- #include <QAction>
- #include <QList>
---- a/src/core/mergedproxymodel.h
-+++ b/src/core/mergedproxymodel.h
-@@ -25,10 +25,12 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
- 
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/hashed_index.hpp>
-+#endif
- 
- using boost::multi_index::multi_index_container;
- using boost::multi_index::indexed_by;
---- a/src/core/scopedtransaction.h
-+++ b/src/core/scopedtransaction.h
-@@ -18,7 +18,9 @@
- #ifndef SCOPEDTRANSACTION_H
- #define SCOPEDTRANSACTION_H
- 
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
- 
- class QSqlDatabase;
- 
---- a/src/core/signalchecker.h
-+++ b/src/core/signalchecker.h
-@@ -20,8 +20,10 @@
- 
- #include <glib-object.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/function_types/function_arity.hpp>
- #include <boost/typeof/typeof.hpp>
-+#endif
- 
- // Do not call this directly, use CHECKED_GCONNECT instead.
- bool CheckedGConnect(
---- a/src/devices/macdevicelister.mm
-+++ b/src/devices/macdevicelister.mm
-@@ -38,7 +38,9 @@
- #import <Foundation/NSString.h>
- #import <Foundation/NSURL.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scope_exit.hpp>
-+#endif
- 
- #include <libmtp.h>
- 
---- a/src/library/groupbydialog.h
-+++ b/src/library/groupbydialog.h
-@@ -25,9 +25,11 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
- 
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
-+#endif
- 
- #include "librarymodel.h"
- 
---- a/tests/database_test.cpp
-+++ b/tests/database_test.cpp
-@@ -20,7 +20,9 @@
- 
- #include "core/database.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
- 
- #include <QtDebug>
- #include <QSqlQuery>
---- a/tests/librarybackend_test.cpp
-+++ b/tests/librarybackend_test.cpp
-@@ -23,7 +23,9 @@
- #include "core/song.h"
- #include "core/database.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
- 
- #include <QFileInfo>
- #include <QSignalSpy>
---- a/tests/plsparser_test.cpp
-+++ b/tests/plsparser_test.cpp
-@@ -27,7 +27,9 @@
- #include <QUrl>
- #include <QtDebug>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
- 
- using boost::shared_ptr;
- 
---- a/tests/songloader_test.cpp
-+++ b/tests/songloader_test.cpp
-@@ -29,7 +29,10 @@
- #include <QSignalSpy>
- #include <QtDebug>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-+
- #include <cstdlib>
- 
- using ::testing::_;
---- a/tests/songplaylistitem_test.cpp
-+++ b/tests/songplaylistitem_test.cpp
-@@ -19,7 +19,10 @@
- #include "test_utils.h"
- 
- #include <gtest/gtest.h>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
- 
- #include <QTemporaryFile>
- #include <QFileInfo>
---- a/tests/utilities_test.cpp
-+++ b/tests/utilities_test.cpp
-@@ -21,7 +21,9 @@
- 
- #include "core/utilities.h"
- 
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
- 
- #include <QtDebug>
- 
diff --git a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
deleted file mode 100644
index 2240debd0e4a..000000000000
--- a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.chocobo@gmail.com>
-Date: Wed, 16 Jul 2014 15:57:25 +0200
-Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
-
----
- src/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 650fa74..775b0a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
-   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- 
--  # Hack to get it to generate interfaces without namespaces - required
--  # because otherwise org::freedesktop::UDisks and
--  # org::freedesktop::UDisks::Device conflict.
--  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
-   # MPRIS DBUS interfaces
-   qt4_add_dbus_adaptor(SOURCES
-       dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
- 
-   # DeviceKit DBUS interfaces
-   if(HAVE_DEVICEKIT)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisks)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
-     qt4_add_dbus_interface(SOURCES
-         dbus/org.freedesktop.UDisks.xml
-         dbus/udisks)