Security cleanup, wrt bug #495182

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 5 insertions, 304 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index d991d88b3110..8c0e188ec4c7 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.23 2014/01/08 04:20:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.24 2014/01/20 10:37:11 pinkbyte Exp $
+
+  20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> -cantata-1.1.2.ebuild,
+  -files/cantata-1.1.2-no-taglib.patch, -cantata-1.1.3.ebuild, metadata.xml:
+  Security cleanup, wrt bug #495182
 
 *cantata-1.2.2 (08 Jan 2014)
 
diff --git a/media-sound/cantata/cantata-1.1.2.ebuild b/media-sound/cantata/cantata-1.1.2.ebuild
deleted file mode 100644
index a35c3558c4f7..000000000000
--- a/media-sound/cantata/cantata-1.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.1.2.ebuild,v 1.2 2013/09/25 18:36:20 johu Exp $
-
-EAPI=5
-KDE_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="A featureful and configurable Qt4 client for the music player daemon (MPD)"
-HOMEPAGE="https://code.google.com/p/cantata/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdparanoia kde lame mtp musicbrainz online-services phonon qt5 replaygain taglib"
-REQUIRED_USE="
-	cddb? ( cdparanoia taglib )
-	cdparanoia? ( || ( cddb musicbrainz )  )
-	lame? ( cdparanoia taglib )
-	mtp? ( taglib )
-	musicbrainz? ( cdparanoia taglib )
-	online-services? ( taglib )
-	qt5? ( !kde !phonon )
-	replaygain? ( taglib )
-"
-
-DEPEND="
-	cddb? ( media-libs/libcddb )
-	cdparanoia? ( media-sound/cdparanoia )
-	lame? ( media-sound/lame )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5 )
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	replaygain? (
-		media-libs/speex
-		media-sound/mpg123
-		virtual/ffmpeg
-	)
-	taglib? (
-		media-libs/taglib[asf,mp4]
-		media-libs/taglib-extras
-		!kde? ( sys-fs/udisks:2 )
-	)
-	dev-libs/qjson
-	sys-libs/zlib
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep oxygen-icons)
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-taglib.patch" )
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	rm -rf 3rdparty/qjson/
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable cddb)
-		$(cmake-utils_use_enable cdparanoia)
-		$(cmake-utils_use_enable kde)
-		$(cmake-utils_use_enable lame)
-		$(cmake-utils_use_enable mtp)
-		$(cmake-utils_use_enable musicbrainz)
-		$(cmake-utils_use_enable online-services ONLINE_SERVICES)
-		$(cmake-utils_use_enable phonon)
-		$(cmake-utils_use_enable qt5)
-		$(cmake-utils_use_enable replaygain FFMPEG)
-		$(cmake-utils_use_enable replaygain MPG123)
-		$(cmake-utils_use_enable replaygain SPEEXDSP)
-		$(cmake-utils_use_enable taglib)
-		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
-		-DENABLE_UDISKS2=ON
-	)
-	kde4-base_src_configure
-}
diff --git a/media-sound/cantata/cantata-1.1.3.ebuild b/media-sound/cantata/cantata-1.1.3.ebuild
deleted file mode 100644
index 9d1bfdc094db..000000000000
--- a/media-sound/cantata/cantata-1.1.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.1.3.ebuild,v 1.1 2013/10/14 20:52:14 johu Exp $
-
-EAPI=5
-KDE_REQUIRED="optional"
-KDE_LINGUAS="cs de en_GB es ko pl ru zh_CN"
-inherit kde4-base
-
-DESCRIPTION="A featureful and configurable Qt4 client for the music player daemon (MPD)"
-HOMEPAGE="https://code.google.com/p/cantata/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdparanoia kde lame mtp musicbrainz online-services phonon qt5 replaygain taglib"
-REQUIRED_USE="
-	cddb? ( cdparanoia taglib )
-	cdparanoia? ( || ( cddb musicbrainz )  )
-	lame? ( cdparanoia taglib )
-	mtp? ( taglib )
-	musicbrainz? ( cdparanoia taglib )
-	online-services? ( taglib )
-	qt5? ( !kde !phonon )
-	replaygain? ( taglib )
-"
-
-DEPEND="
-	cddb? ( media-libs/libcddb )
-	cdparanoia? ( media-sound/cdparanoia )
-	lame? ( media-sound/lame )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5 )
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	replaygain? (
-		media-libs/speex
-		media-sound/mpg123
-		virtual/ffmpeg
-	)
-	taglib? (
-		media-libs/taglib[asf,mp4]
-		media-libs/taglib-extras
-		!kde? ( sys-fs/udisks:2 )
-	)
-	dev-libs/qjson
-	sys-libs/zlib
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep oxygen-icons)
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	rm -rf 3rdparty/qjson/
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable cddb)
-		$(cmake-utils_use_enable cdparanoia)
-		$(cmake-utils_use_enable kde)
-		$(cmake-utils_use_enable lame)
-		$(cmake-utils_use_enable mtp)
-		$(cmake-utils_use_enable musicbrainz)
-		$(cmake-utils_use_enable online-services ONLINE_SERVICES)
-		$(cmake-utils_use_enable phonon)
-		$(cmake-utils_use_enable qt5)
-		$(cmake-utils_use_enable replaygain FFMPEG)
-		$(cmake-utils_use_enable replaygain MPG123)
-		$(cmake-utils_use_enable replaygain SPEEXDSP)
-		$(cmake-utils_use_enable taglib)
-		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
-		-DENABLE_UDISKS2=ON
-	)
-	kde4-base_src_configure
-}
diff --git a/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch b/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch
deleted file mode 100644
index 925f987b47e2..000000000000
--- a/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(Revision 3296)
-+++ CMakeLists.txt	(Revision 3297)
-@@ -55,7 +55,9 @@
-     models/playqueueproxymodel.cpp models/dirviewmodel.cpp models/dirviewproxymodel.cpp models/dirviewitem.cpp models/dirviewitemdir.cpp
-     models/streamsmodel.cpp models/streamsproxymodel.cpp models/albumsmodel.cpp models/albumsproxymodel.cpp models/proxymodel.cpp
-     models/actionmodel.cpp models/digitallyimported.cpp models/streamsearchmodel.cpp models/musiclibraryitem.cpp models/musicmodel.cpp
--    models/multimusicmodel.cpp
-+    models/multimusicmodel.cpp models/onlineservicesmodel.cpp
-+    online/onlineservicespage.cpp online/onlineservice.cpp online/jamendoservice.cpp online/jamendosettingsdialog.cpp
-+    online/magnatuneservice.cpp online/magnatunesettingsdialog.cpp online/soundcloudservice.cpp
-     mpd/mpdconnection.cpp mpd/mpdparseutils.cpp mpd/mpdstats.cpp mpd/mpdstatus.cpp mpd/song.cpp mpd/mpduser.cpp mpd/cuefile.cpp
-     dynamic/dynamic.cpp dynamic/dynamicpage.cpp dynamic/dynamicproxymodel.cpp dynamic/dynamicruledialog.cpp dynamic/dynamicrulesdialog.cpp
-     widgets/treeview.cpp widgets/listview.cpp widgets/itemview.cpp widgets/autohidingsplitter.cpp widgets/timeslider.cpp
-@@ -76,7 +78,10 @@
-     streams/streamspage.h streams/streamdialog.h streams/streamfetcher.h streams/digitallyimportedsettings.h
-     models/musiclibrarymodel.h models/musiclibraryproxymodel.h models/playlistsmodel.h models/playlistsproxymodel.h models/playqueuemodel.h
-     models/playqueueproxymodel.h models/dirviewmodel.h models/dirviewproxymodel.h models/albumsmodel.h models/streamsmodel.h
--    models/actionmodel.h models/digitallyimported.h models/streamsearchmodel.h models/multimusicmodel.h
-+    models/actionmodel.h models/digitallyimported.h models/streamsearchmodel.h models/multimusicmodel.h models/onlineservicesmodel.h
-+    online/onlineservice.h online/onlineservicespage.h online/jamendoservice.h online/magnatuneservice.h
-+    online/magnatunesettingsdialog.h online/magnatuneservice.h online/magnatunesettingsdialog.h
-+    online/soundcloudservice.h
-     mpd/mpdconnection.h mpd/mpdstats.h mpd/mpdstatus.h
-     dynamic/dynamic.h dynamic/dynamicpage.h dynamic/dynamicruledialog.h dynamic/dynamicrulesdialog.h
-     widgets/treeview.h widgets/listview.h widgets/itemview.h widgets/autohidingsplitter.h widgets/timeslider.h widgets/actionlabel.h
-@@ -93,7 +98,8 @@
-     streams/streamspage.ui streams/digitallyimportedsettings.ui
-     dynamic/dynamicpage.ui dynamic/dynamicrule.ui dynamic/dynamicrules.ui
-     context/togglelist.ui context/othersettings.ui
--    widgets/itemview.ui)
-+    widgets/itemview.ui
-+    online/onlineservicespage.ui)
- 
- if (ENABLE_TAGLIB)
-     set(TAGLIB_MIN_VERSION "1.6")
-@@ -123,23 +129,15 @@
-     set(CANTATA_SRCS ${CANTATA_SRCS}
-         tags/tageditor.cpp tags/trackorganiser.cpp tags/tags.cpp
-         devices/filenameschemedialog.cpp
--        http/httpserversettings.cpp http/httpserver.cpp http/httpsocket.cpp
--        online/onlineservicespage.cpp online/onlineservice.cpp online/jamendoservice.cpp online/jamendosettingsdialog.cpp
--        online/magnatuneservice.cpp online/magnatunesettingsdialog.cpp online/soundcloudservice.cpp online/onlinedevice.cpp
--        models/onlineservicesmodel.cpp)
-+        http/httpserversettings.cpp http/httpserver.cpp http/httpsocket.cpp)
-     set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS}
-         tags/tageditor.h tags/trackorganiser.h
-         http/httpserversettings.h http/httpsocket.h
--        devices/filenameschemedialog.h devices/device.h
--        online/onlineservice.h online/onlineservicespage.h online/jamendoservice.h online/magnatuneservice.h
--        online/magnatunesettingsdialog.h online/onlinedevice.h online/magnatuneservice.h online/magnatunesettingsdialog.h
--        online/onlinedevice.h online/soundcloudservice.h
--        models/onlineservicesmodel.h)
-+        devices/filenameschemedialog.h devices/device.h)
-     set(CANTATA_UIS ${CANTATA_UIS}
-         http/httpserversettings.ui
-         tags/tageditor.ui tags/trackorganiser.ui
--        devices/filenameschemedialog.ui
--         online/onlineservicespage.ui)
-+        devices/filenameschemedialog.ui)
- endif (TAGLIB_FOUND)
- 
- if (NOT WIN32)
-@@ -323,11 +321,13 @@
-                 devices/device.cpp devices/fsdevice.cpp devices/umsdevice.cpp
-                 models/devicesmodel.cpp tags/filetyperesolver.cpp devices/actiondialog.cpp devices/devicepropertieswidget.cpp
-                 devices/devicepropertiesdialog.cpp devices/encoders.cpp devices/freespaceinfo.cpp
--                devices/transcodingjob.cpp devices/valueslider.cpp devices/syncdialog.cpp devices/synccollectionwidget.cpp)
-+                devices/transcodingjob.cpp devices/valueslider.cpp devices/syncdialog.cpp devices/synccollectionwidget.cpp
-+                online/onlinedevice.cpp)
-         set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/devicespage.h devices/filejob.h
-                 devices/fsdevice.h devices/umsdevice.h models/devicesmodel.h
-                 devices/actiondialog.h devices/devicepropertieswidget.h devices/devicepropertiesdialog.h
--                devices/transcodingjob.h devices/valueslider.h devices/syncdialog.h devices/synccollectionwidget.h)
-+                devices/transcodingjob.h devices/valueslider.h devices/syncdialog.h devices/synccollectionwidget.h
-+                online/onlinedevice.h)
-         set(CANTATA_UIS ${CANTATA_UIS} devices/devicespage.ui devices/actiondialog.ui devices/devicepropertieswidget.ui
-                 devices/synccollectionwidget.ui)
- 
-@@ -567,7 +567,6 @@
- else (TAGLIB_FOUND)
- 
-     message("      Disabled features:")
--    message("        - Online services (Jamendo and Magnatune)(tag lib required)")
-     if (NOT PHONON_FOUND)
-         message("        - MPD HTTP stream playback (phonon required)")
-     endif (NOT PHONON_FOUND)
-Index: models/onlineservicesmodel.cpp
-===================================================================
---- models/onlineservicesmodel.cpp	(Revision 3296)
-+++ models/onlineservicesmodel.cpp	(Revision 3297)
-@@ -378,6 +378,7 @@
-     return mimeData;
- }
- 
-+#ifdef TAGLIB_FOUND
- Device * OnlineServicesModel::device(const QString &udi)
- {
-     if (!dev) {
-@@ -386,3 +387,5 @@
-     dev->setData(udi.mid(constUdiPrefix.length()));
-     return dev;
- }
-+#endif
-+
-Index: models/onlineservicesmodel.h
-===================================================================
---- models/onlineservicesmodel.h	(Revision 3296)
-+++ models/onlineservicesmodel.h	(Revision 3297)
-@@ -57,7 +57,9 @@
-     void stop();
-     QMimeData * mimeData(const QModelIndexList &indexes) const;
-     void setSearch(const QString &serviceName, const QString &text);
-+    #ifdef TAGLIB_FOUND
-     Device *device(const QString &udi);
-+    #endif
-     Action * configureAct() const { return configureAction; }
-     Action * refreshAct() const { return refreshAction; }
- 
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index b5cf241d94cc..0cd175cc3799 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -4,8 +4,6 @@
 	<herd>kde</herd>
 	<herd>qt</herd>
 	<use>
-		<flag name="online-services">Enable support for online services (Jamendo and Magantune)</flag>
-		<flag name="phonon">Enable support for Phonon</flag>
 		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments.</flag>
 	</use>
 </pkgmetadata>