gentoo resync : 11.01.2018

19 files changed, 185 insertions, 616 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 18ca70897164..adcb658e3876 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
deleted file mode 100644
index fddcb84f18c0..000000000000
--- a/media-sound/amarok/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX amarok-2.8.0-taglib110.patch 1537 BLAKE2B 9f1d85fdf761d5048ddef1fc971bf32fd95b597876113a235e3d1e3abbee7d190c2651d5458258296f66506996a5f3f6a79b03badffe0890d07443318a686b4c SHA512 b15456d5c297a92860306492f51449040504763c0862475a8ecdb732c3cdccab4b0f0d1bc6b9d62a7a01e2a5faa212200c5aba5ac703c267bada830d8033bac6
-AUX amarok-2.8.90-ffmpeg3.patch 2606 BLAKE2B d4a44bbf962ca8e971c832f37d3e3c15268e67669d9e3c22917a58054bb0de04de811adac35daa516abd7bbc768c5a5d89755e69f0922732aee8d9842903063c SHA512 f2c6df1ec6aa526b3def250a11f7ef22d990d753d35dc9d6e8c29c426da63483ea7299d1e93466757ff1e2c645c41c2c69f7470c7a0d77e4c0ffec5e76006e59
-AUX amarok-2.8.90-gcc6.patch 1322 BLAKE2B 0d2bf0da58ee2a763e3946cd0faf5676861c179e980c2b36a209d1678b96c45bc83a15fe68cac790d856b87b30640463f1a37dd94520b67f02a2af74871f535c SHA512 a8a361387c524ff72c8a788048b5b713a6e18bc2976cab6784f8b3e413d21652f861b2b7c92f667abf98a638d7d012f4500afb1f8ea0b5cba8c86e4270eafe7f
-AUX amarok-2.8.90-mysql-embedded.patch 1224 BLAKE2B acc4b0abb2a7e000c76e0a07a10919ceb3122139251558c072f515099f6ae6244c75a2dfa6c1c240a92b56ba3b58e604713a9c51c2215f015316213df3aefd11 SHA512 ead9d9d0dc141113d4144326dab525e6e58427f8c3e2d5f8441a87e7d0787199b2947e08a6ff445255f0b1154e23182336403266d8b4e0a040a6b658f0d57155
-AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f7595e05aad139e65357c004e748f7edf3f41af54c5e3c823904dd4e44c4c2f92c6fc8db0087856967cba699206143f05f9a0 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5
-AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707
-AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d
-DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
-EBUILD amarok-2.8.90-r5.ebuild 3618 BLAKE2B a1bcecf2af44d27aba2607f76f2af2728914e3280616bba9cd059c52b35952ccb359d017f499c102a2b770480abd344760c5ca1d7aa1a7391752fc8d7621e57f SHA512 cb34b69ac4111008af9534e372608538b5b43b4c237d4ecf44f34766a6028dc0cea6f24c498955ceb5cfa4e096795d3233a1da2e5f861ead03aecda1486a385e
-MISC metadata.xml 1159 BLAKE2B b986025a8d81ead2cc821ebc5a9bc6f447d4356615127b1795b337068f0457c1a5ee15b380822ef7fcf5eea6f24ef9e48d93329df0947c500a519978db6b1b31 SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e
diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
deleted file mode 100644
index ee89cf93d54e..000000000000
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT+=" test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	$(add_kdeapps_dep kdebase-kioslaves)
-	app-crypt/qca:2[qt4]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=kde-frameworks/kdelibs-4.14.37:4[plasma]
-	>=media-libs/taglib-1.7[asf(+),mp4(+)]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=x11-libs/qtscriptgenerator-0.1.0
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl:0
-		>=dev-qt/qtcore-4.8.4:4[glib]
-		net-libs/loudmouth
-		net-misc/curl
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
-	"${FILESDIR}/${P}-mysql-embedded.patch"
-	"${FILESDIR}/${P}-mysqld-rpath.patch"
-	"${FILESDIR}/${P}-scriptconsole.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-no-webkit.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# requires qtwebkit
-	sed -i -e "s/wikipedia,//" data/amarok_homerc || die
-
-	sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \
-		CMakeLists.txt \
-		|| die "failed to remove QT_QTOPENGL detection"
-
-	sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
-		src/context/applets/CMakeLists.txt \
-		|| die "failed to sed out QT_QTOPENGL_FOUND"
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_NepomukCore=OFF
-		-DWITH_Soprano=OFF
-		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
-		-DWITH_IPOD=$(usex ipod)
-		-DWITH_LibLastFm=$(usex lastfm)
-		-DWITH_MP3Tunes=$(usex mp3tunes)
-		-DWITH_Mtp=$(usex mtp)
-		-DWITH_LibOFA=$(usex ofa)
-		-DWITH_UTILITIES=$(usex utils)
-	)
-
-	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
-	use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
-
-	# bug 581554: add libmysqld location for rpath patch
-	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-		fi
-	fi
-}
diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
deleted file mode 100644
index 093481659fa6..000000000000
--- a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Omar Plummer <omarplummer@imergetechnologies.com>
-Date: Thu, 06 Aug 2015 22:24:27 +0000
-Subject: Fix TagLib version check.
-X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904
----
-Fix TagLib version check.
-
-The version check compared version strings lexicographically, so "1.7"
-(the min version) compared as greater than "1.10.0".
-
-BUG: 351013
-REVIEW: 124639
----
-
-
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)
-
diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
deleted file mode 100644
index 31feca0831fe..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://git.reviewboard.kde.org/r/129626
-
-Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp
-===================================================================
---- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
-+++ amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp
-@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QStr
-             {
-                 if( !decodedFrame )
-                 {
--                    decodedFrame = avcodec_alloc_frame();
-+                    decodedFrame = av_frame_alloc();
-                     if( !decodedFrame )
-                     {
-                         warning() << "Unable to allocate enough memory to decode file.";
-@@ -231,7 +231,7 @@ MusicDNSAudioDecoder::decode( const QStr
-                         break;
-                     }
-                     else
--                        avcodec_get_frame_defaults( decodedFrame );
-+		    	av_frame_unref ( decodedFrame );
-                 }
- 
-                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
-@@ -341,7 +341,7 @@ MusicDNSAudioDecoder::decode( const QStr
-             {
-                 if( !decodedFrame )
-                 {
--                    decodedFrame = avcodec_alloc_frame();
-+                    decodedFrame = av_frame_alloc();
-                     if( !decodedFrame )
-                     {
-                         warning() << "Unable to allocate enough memory to decode file.";
-@@ -349,7 +349,7 @@ MusicDNSAudioDecoder::decode( const QStr
-                         break;
-                     }
-                     else
--                        avcodec_get_frame_defaults( decodedFrame );
-+		    	av_frame_unref( decodedFrame );
-                 }
- 
-                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
-@@ -459,7 +459,7 @@ MusicDNSAudioDecoder::decode( const QStr
-             {
-                 if( !decodedFrame )
-                 {
--                    decodedFrame = avcodec_alloc_frame();
-+                    decodedFrame = av_frame_alloc();
-                     if( !decodedFrame )
-                     {
-                         warning() << "Unable to allocate enough memory to decode file.";
-@@ -467,7 +467,7 @@ MusicDNSAudioDecoder::decode( const QStr
-                         break;
-                     }
-                     else
--                        avcodec_get_frame_defaults( decodedFrame );
-+		    	av_frame_unref( decodedFrame );
-                 }
- 
-                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
deleted file mode 100644
index bad936a6645a..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Wed, 1 Jun 2016 13:58:26 -0500
-Subject: [PATCH] gcc6 buildfix
-
-courtesy of opensuse, thx
-
-BUG: 363054
----
- src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
-index 4bdb9b9..e327354 100644
---- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
-+++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
-@@ -28,6 +28,7 @@
- #include "playlist/PlaylistModelStack.h"
- 
- using namespace Playlists;
-+using namespace Playlist;
- 
- XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
-     : PlaylistFile( url, provider )
-@@ -101,7 +102,7 @@ XSPFPlaylist::load()
-     //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist
-     if( m_autoAppendAfterLoad )
-         The::playlistController()->insertPlaylist(
--                    ::Playlist::ModelStack::instance()->bottom()->rowCount(),
-+                    ModelStack::instance()->bottom()->rowCount(),
-                     Playlists::PlaylistPtr( this )
-                 );
- }
--- 
-2.8.3
-
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
deleted file mode 100644
index b03aa1897cc4..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <kde@mattwhitlock.name>
-Date: Tue, 29 Mar 2016 12:22:41 -0400
-Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
- WITH_MYSQL_EMBEDDED
-
-REVIEW: 127523
----
- src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-index 244cde1..4c618fc 100644
---- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-+++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
-     ${KDE4_KDECORE_LIBS}
-     ${QT_QTCORE_LIBRARY}
-     ${QT_QTGUI_LIBRARY}
--    ${MYSQL_EMBEDDED_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     ${ZLIB_LIBRARIES}
- )
- 
-+if(WITH_MYSQL_EMBEDDED)
-+    target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
-+endif(WITH_MYSQL_EMBEDDED)
-+
- if(NOT WIN32 AND NOT APPLE)
-     target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
- endif(NOT WIN32 AND NOT APPLE)
--- 
-2.8.1
-
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
deleted file mode 100644
index c84975df7f2f..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old	2016-05-04 11:01:25.000000000 -0400
-+++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt	2016-05-04 11:05:24.216625165 -0400
-@@ -28,6 +28,9 @@
-     ${ZLIB_LIBRARIES}
- )
- 
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}")
-+
- if(NOT WIN32 AND NOT APPLE)
-     target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
- endif(NOT WIN32 AND NOT APPLE)
diff --git a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
deleted file mode 100644
index 91686b1f6545..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Borrowed from Arch Linux.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ include_directories(
-     ${CMAKE_CURRENT_BINARY_DIR}/shared
- )
- 
--find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
-+find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
- find_package( KDE4 4.8.4 REQUIRED )
- 
- include( KDE4Defaults )
-diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
-index f4d5456d9f..cad9036681 100644
---- a/src/context/applets/CMakeLists.txt
-+++ b/src/context/applets/CMakeLists.txt
-@@ -1,18 +1,18 @@
- add_subdirectory( albums )
- add_subdirectory( currenttrack )
--add_subdirectory( info )
-+# add_subdirectory( info )
- add_subdirectory( labels )
- add_subdirectory( lyrics )
- add_subdirectory( photos )
- add_subdirectory( tabs )
--add_subdirectory( wikipedia )
-+# add_subdirectory( wikipedia )
- 
- if( QT_QTOPENGL_FOUND )
-     add_subdirectory( analyzer )
- endif()
- 
- if( LIBLASTFM_FOUND )
--    add_subdirectory( upcomingevents )
-+#    add_subdirectory( upcomingevents )
-     add_subdirectory( similarartists )
- endif()
- 
diff --git a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch
deleted file mode 100644
index 455146bdb5d1..000000000000
--- a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2900fe47adde10999a6c0f907d73b00a1c1bd5b1 Mon Sep 17 00:00:00 2001
-From: Myriam Schweingruber <myriam@kde.org>
-Date: Wed, 18 May 2016 21:59:17 +0200
-Subject: [PATCH] Fix a crash in amarok when opening the Script Console
-
-The script console tries to write to a system folder instead of a user
- folder. Note to devs: always make sure to test a system installation,
- not just a local build.
-
-Thanks to Johannes Huber for the quick fix suggestion.
-
-BUG: 363176
-FIXED-IN: 2.9
----
- src/scripting/scriptconsole/ScriptConsole.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp
-index 6edd9a2..e4e0fab 100644
---- a/src/scripting/scriptconsole/ScriptConsole.cpp
-+++ b/src/scripting/scriptconsole/ScriptConsole.cpp
-@@ -161,7 +161,7 @@ ScriptConsole::ScriptConsole( QWidget *parent )
-     settings.endGroup();
- 
-     if( m_savePath.isEmpty() )
--        m_savePath = KUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path();
-+        m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path();
- 
-     slotNewScript();
-     connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) );
--- 
-2.8.2
-
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
deleted file mode 100644
index 6ebc711247fd..000000000000
--- a/media-sound/amarok/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>jmbsvicetto@gentoo.org</email>
-	<name>Jorge Manuel B. S. Vicetto</name>
-</maintainer>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<use>
-	<flag name="embedded">Use libmysqld, MySQL embedded server library.
-		Try disabling this if you encounter -PIC related in amarok,
-		it will make amarok rely only on standalone MySQL server.
-	</flag>
-	<flag name="lastfm">Enable Last.fm streaming services support through
-		<pkg>media-libs/liblastfm</pkg>
-	</flag>
-	<flag name="mp3tunes">Enable mp3tunes integration</flag>
-	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
-	</flag>
-	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
-		fingerprints (used by MusicBrainz)
-	</flag>
-	<flag name="utils">Build the utils - old media-sound/amarok-utils
-	</flag>
-</use>
-</pkgmetadata>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3a494a5c8138..11484b929ef6 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,6 +1,7 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
+AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.54.tar.gz 17068093 BLAKE2B ebc3100a55affd9b89fa93abf32c7c74cf1fc3f3b026c77d7893d7cd622079a236f5690692a98bf258bea4f3cfd764307c730a1896da0b853eddda6498414d00 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b
 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
@@ -8,6 +9,7 @@ DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224
 EBUILD lilypond-2.18.2-r3.ebuild 3218 BLAKE2B b0ae7fcd18dbc5801139b982c9e7b14992b811a115e20319de1742ae6dcf9090f5dc64a70c000ca17b840dc4564de6eec918489fed41159b81de403d99a75c76 SHA512 fd882d95c2b3ca3c74bbe361082cf4eaf56caf59965d4e5c42c20a8f8de1742b4d6cd733e29d7ebcbe4b036d20169a62d03a23914d3b3df9bb70fee54a64ecda
 EBUILD lilypond-2.19.54.ebuild 3405 BLAKE2B 11cda4b12db9ffd74848b34dd67631b99c3e0081b38f5d45454d3cb41674eb0b95e309feb4abb7cc2563e6df2818473a96bfc2d17da3bc3fb8e2ded8e869286b SHA512 bc36d734846b06d50496d92a90f716733ae9cc458df000c88c9e53cbcc4f273b376487de298f8c3b365e3e6b1882fd9d693fa722cfd9f13256c5c124bbc342b3
 EBUILD lilypond-2.19.64.ebuild 3412 BLAKE2B 9123385f5ee2db9cc62a1d3c2d624c656d85704d240ee0fcf7d84bed6eb3b3f8d146287a9485006e737912d21e932ed83c72bf55886c025f80886bf4fda47f5e SHA512 572971acf6aeef2c1b61caf0588fa66e1d63d9a5b4a3b1c43af3e515817f50816be698f9e6c910cd16bf854d4a19a1a8c06711c7b515fbaa2fddb45ed25935a6
+EBUILD lilypond-2.19.80-r1.ebuild 3309 BLAKE2B 25c1bd50f48201552a27feddb85f27c11bf85c0706273c9489ce568bf5fcc5c5d23b69dc7b258db1890eb66da203443e2d5df562c189c33564a0784bcf132edc SHA512 f22a2d7f16cbe85580c19e62ec7fc64fe2314e05bceb63b8af617ef4e6c76bcf18fd1c44474ba4fb0601cd9e687df3e5095400613f6397f0943c7a5a6598eb32
 EBUILD lilypond-2.19.80.ebuild 3412 BLAKE2B 1dfd0e40c1bf89ce8203d4423110e3c2b307ef9a0ef40989ac86dccd34322120de6335f989a14d429a25ece14f57ae6c3acd0dccae5e887f2044000a6f37c60d SHA512 b10abfa1293fd20f275949690509c1076d007161b92551887da975e22667f92fd364228c9b85090d234709ade9410cce428f5f7b6a61b900aebc9d4283d4ba14
 EBUILD lilypond-9999.ebuild 3424 BLAKE2B 0b665ab80334b220921ee30b04b45156b7e871c349b34fae85f87e268760a7a6d6d5c403a440b437328ffe34f1a56daf783425f3361e9e74d9cb22c75afc837d SHA512 3fe435e2ea515617d03e11074b8c35176d30a78d344525cfec1fc4cae84d69086081de180c9e51cbfbf41cbc723f028a1e7acd92e8bde1e794ad7b9dbbf72fdc
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
new file mode 100644
index 000000000000..d21b0a413a12
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
@@ -0,0 +1,39 @@
+diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc
+--- a/lily/general-scheme.cc	2017-10-15 17:42:11.000000000 +0100
++++ b/lily/general-scheme.cc	2018-01-10 16:20:08.129066507 +0000
+@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension
+ /*
+   Debugging mem leaks:
+ */
++
++/*
+ LY_DEFINE (ly_protects, "ly:protects",
+            0, 0, 0, (),
+            "Return hash of protected objects.")
+@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+   return programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
++*/
+ 
+ LY_DEFINE (ly_gettext, "ly:gettext",
+            1, 0, 0, (SCM original),
+diff -purN a/scm/lily.scm b/scm/lily.scm
+--- a/scm/lily.scm	2017-10-15 17:42:11.000000000 +0100
++++ b/scm/lily.scm	2018-01-10 16:22:54.914457450 +0000
+@@ -836,10 +836,11 @@ messages into errors.")
+ 
+ (define-public (dump-gc-protects)
+   (set! gc-protect-stat-count (1+ gc-protect-stat-count))
+-  (let* ((protects (sort (hash-table->alist (ly:protects))
+-                         (lambda (a b)
+-                           (< (object-address (car a))
+-                              (object-address (car b))))))
++  (let* (;(protects (sort (hash-table->alist (ly:protects))
++         ;                (lambda (a b)
++         ;                  (< (object-address (car a))
++         ;                     (object-address (car b))))))
++         (protects '())
+          (out-file-name (string-append
+                          "gcstat-" (number->string gc-protect-stat-count)
+                          ".scm"))
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
new file mode 100644
index 000000000000..7bada7ba83ea
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+IUSE="debug emacs guile2 profile vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	# respect AR
+	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/vdramgw/Manifest b/media-sound/vdramgw/Manifest
deleted file mode 100644
index befe35700a74..000000000000
--- a/media-sound/vdramgw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX vdramgw-0.0.2-gcc43.patch 997 BLAKE2B 04d445b6a9e97aa5b0d8264ae7df4e834ca25bb57096641e00e17c532cbce993a69f590e22a5ea766031300cbe72fab8f0e6027acc9496c8c1893993f07c74de SHA512 8daf61dab69325189952d652108fac8ed5505a0a04065a0e8531f07f5e7eaf0d63afc4c91b0fdc1e4d6e7c5b114805051ea98572d896264ba6a6720968a44c10
-AUX vdramgw-0.0.2_gcc-4.7.diff 2297 BLAKE2B c60e0c8873fc5aeec5b54d0822d408f9bb6039f3c4acc0a2f09ee720a80fd0c38fd51179b79e74084dc97149be0388cb593526fc530eaec40c005eaa3c381a1e SHA512 4891c2bcb18e49f26765c15daf1abacc69afc6a347c95dd1e047184cdeafef8c886c142132864f74c743a82598ea6e91d544ab7a9fe9a65c66c27092e570e67d
-DIST vdr-amarok-0.0.2.tar.bz2 51816 BLAKE2B bc1918065d7a5731f9f7cef7fe22f7c6d6f94c0d4cf35b234115f15682f4b490c5ec1ad280cfde77d9a0e8ce3e388b61cbf4ae80830e2fb5ca1db8168eb58242 SHA512 217eadf28174c0bafc610068a784bdce0a8657c9a11690f0ac52da265271e601f3e48c8654930c693e6ca869307e68046093f7a88a024574e3cc2804a2f60ca3
-EBUILD vdramgw-0.0.2.ebuild 901 BLAKE2B 962f784307cabfd94123d43923a1aff53dbe3cc85e0f086fa4911df98777105d449a72464e735d75b91be13e48e0dba3a9320adc632706cbb17b0ade894b9956 SHA512 22ddd42819cfb902f29387a8e4ccad14e22f75bbb480747256577cc16a44bae0e52428f288d40a6291156ebf9e13a72bf00a2a36ddfe87ace9240bed68084660
-MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch b/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch
deleted file mode 100644
index 8c3ac7452aae..000000000000
--- a/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur amarok-0.0.2.orig/Sockets.cpp amarok-0.0.2/Sockets.cpp
---- amarok-0.0.2.orig/Sockets.cpp	2006-05-15 14:03:23.000000000 +0300
-+++ amarok-0.0.2/Sockets.cpp	2009-07-30 14:02:49.000000000 +0300
-@@ -15,6 +15,7 @@
- 
- #include "Sockets.h"
- 
-+#include <cstring>
- #include <sstream>
- 
- #ifndef WIN32
-diff -ur amarok-0.0.2.orig/vdramgw/Sockets.cpp amarok-0.0.2/vdramgw/Sockets.cpp
---- amarok-0.0.2.orig/vdramgw/Sockets.cpp	2006-05-15 12:52:44.000000000 +0300
-+++ amarok-0.0.2/vdramgw/Sockets.cpp	2009-07-30 14:02:57.000000000 +0300
-@@ -15,6 +15,7 @@
- 
- #include "Sockets.h"
- 
-+#include <cstring>
- #include <sstream>
- 
- #ifndef WIN32
-diff -ur amarok-0.0.2.orig/vdramgw/vdramgw.cpp amarok-0.0.2/vdramgw/vdramgw.cpp
---- amarok-0.0.2.orig/vdramgw/vdramgw.cpp	2006-12-14 01:25:52.000000000 +0200
-+++ amarok-0.0.2/vdramgw/vdramgw.cpp	2009-07-30 14:02:40.000000000 +0300
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
- 
--
-+#include <cstring>
- #include <unistd.h>
- #include <getopt.h>
- #include <iostream>
diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff b/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff
deleted file mode 100644
index c5182cfd33d6..000000000000
--- a/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-gcc-4.7 compile fix
-https://bugs.gentoo.org/show_bug.cgi?id=424101
-
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/30/06)
-diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h
---- amarok-0.0.2.orig/Sockets.h	2012-06-30 17:40:27.000000000 +0200
-+++ amarok-0.0.2/Sockets.h	2012-06-30 17:43:21.000000000 +0200
-@@ -182,8 +182,8 @@
- 	{
- 		if (this->gptr() == NULL)
- 		{
--			setg(s, s + n, s + n);
--			setp(s, s + n);
-+			this->setg(s, s + n, s + n);
-+			this->setp(s, s + n);
- 			inbuf_ = s;
- 			outbuf_ = s;
- 			bufsize_ = n;
-@@ -215,9 +215,9 @@
- 		{
- 			_flush();
- 		}
--		setp(outbuf_, outbuf_ + bufsize_);
-+		this->setp(outbuf_, outbuf_ + bufsize_);
- 		if (c != traits::eof())
--			sputc(traits::to_char_type(c));
-+			this->sputc(traits::to_char_type(c));
- 		return 0;
- 	}
- 
-@@ -225,7 +225,7 @@
- 	{
- 		// just flush the put area
- 		_flush();
--		setp(outbuf_, outbuf_ + bufsize_);
-+		this->setp(outbuf_, outbuf_ + bufsize_);
- 		return 0;
- 	}
- 
-@@ -256,7 +256,7 @@
- 			return traits::eof();
- 
- 		size_t totalbytes = readn + remained_;
--		setg(inbuf_, inbuf_,
-+		this->setg(inbuf_, inbuf_,
- 			inbuf_ + totalbytes / sizeof(char_type));
- 
- 		remained_ = totalbytes % sizeof(char_type);
-diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h
---- amarok-0.0.2.orig/vdramgw/Sockets.h	2012-06-30 17:40:27.000000000 +0200
-+++ amarok-0.0.2/vdramgw/Sockets.h	2012-06-30 17:41:52.000000000 +0200
-@@ -182,8 +182,8 @@
- 	{
- 		if (this->gptr() == NULL)
- 		{
--			setg(s, s + n, s + n);
--			setp(s, s + n);
-+			this->setg(s, s + n, s + n);
-+			this->setp(s, s + n);
- 			inbuf_ = s;
- 			outbuf_ = s;
- 			bufsize_ = n;
-@@ -215,9 +215,9 @@
- 		{
- 			_flush();
- 		}
--		setp(outbuf_, outbuf_ + bufsize_);
-+		this->setp(outbuf_, outbuf_ + bufsize_);
- 		if (c != traits::eof())
--			sputc(traits::to_char_type(c));
-+			this->sputc(traits::to_char_type(c));
- 		return 0;
- 	}
- 
-@@ -225,7 +225,7 @@
- 	{
- 		// just flush the put area
- 		_flush();
--		setp(outbuf_, outbuf_ + bufsize_);
-+		this->setp(outbuf_, outbuf_ + bufsize_);
- 		return 0;
- 	}
- 
-@@ -256,7 +256,7 @@
- 			return traits::eof();
- 
- 		size_t totalbytes = readn + remained_;
--		setg(inbuf_, inbuf_,
-+		this->setg(inbuf_, inbuf_,
- 			inbuf_ + totalbytes / sizeof(char_type));
- 
- 		remained_ = totalbytes % sizeof(char_type);
diff --git a/media-sound/vdramgw/metadata.xml b/media-sound/vdramgw/metadata.xml
deleted file mode 100644
index 984a01fab265..000000000000
--- a/media-sound/vdramgw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-sound/vdramgw/vdramgw-0.0.2.ebuild b/media-sound/vdramgw/vdramgw-0.0.2.ebuild
deleted file mode 100644
index 8dbabdf71fa1..000000000000
--- a/media-sound/vdramgw/vdramgw-0.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-MY_P=vdr-amarok-${PV}
-
-DESCRIPTION="vdr to amarok gateway - allows vdr-amarok to access amarok"
-HOMEPAGE="http://irimi.ir.ohost.de/"
-SRC_URI="http://irimi.ir.ohost.de/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-RDEPEND="media-sound/amarok"
-
-S="${WORKDIR}/${MY_P#vdr-}/${PN}"
-
-src_prepare() {
-	# Respect CC,CXXFLAGS, LDFLAGS
-	sed -i -e "/^CXX /s:?=.*:= $(tc-getCXX):" \
-		-e "/^CXXFLAGS/s:?=.*:= ${CFLAGS}:" \
-		-e "s:\$(CXXFLAGS):& \$(LDFLAGS) :" "${S}"/Makefile
-
-	cd "${WORKDIR}/${MY_P#vdr-}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}/${P}_gcc-4.7.diff"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-	newdoc ../README README.vdr-amarok
-
-	insinto /etc
-	doins ${PN}.conf
-}