9 files changed, 1 insertions, 591 deletions
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 7258db35..0cc6e494 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1 @@
-DIST kaffeine-0.8.6.tar.bz2 2923224 SHA256 77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
-DIST kaffeine-0.8.8.tar.bz2 2994589 SHA256 d6d1e6cbdba2b60813bcc5889248a7a62b96c1def9740f807e43ecf54f796d9a
-DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471 WHIRLPOOL 49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea
+DIST kaffeine-1.3.1.tar.gz 1011607 BLAKE2B 087a722d1713fe446774ef9fd8fb146ba31f1685952d3de2942ca6d24ad39b33b57d711316438b0856554d115b1d7619d5657e54d01d30375f3d04de43e8f953 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471
diff --git a/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch b/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch
deleted file mode 100644
index 7ee3a07b..00000000
--- a/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Don't overwrite the user variable CFLAGS< use AM_CFLAGS or nothing.
-
-Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-===================================================================
---- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-+++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-@@ -7,5 +7,3 @@ libdvbapi_la_SOURCES = diseqc.c \
-            dvbdemux.c \
-            dvbfe.c \
-            dvbnet.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-===================================================================
---- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-+++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
-            en50221_session.c \
-            en50221_transport.c 
- 
--CFLAGS  = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS  = -DLOG_LEVEL=1
-Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-===================================================================
---- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-+++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-@@ -15,5 +15,3 @@ libdvbdvb_la_SOURCES = bat_section.c \
-            tot_section.c \
-            tva_container_section.c \
-            types.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-===================================================================
---- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-+++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-@@ -13,5 +13,3 @@ libucsi_la_LDFLAGS = ./mpeg \
- 
- libucsi_la_LIBADD   = ./mpeg/libdvbmpeg.la \
- 	./dvb/libdvbdvb.la
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-===================================================================
---- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-+++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-@@ -8,5 +8,3 @@ libdvbmpeg_la_SOURCES = cat_section.c \
-            pat_section.c \
-            pmt_section.c \
-            tsdt_section.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff --git a/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch b/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch
deleted file mode 100644
index 79bcd0ce..00000000
--- a/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Don't overwrite the user variable CFLAGS< use AM_CFLAGS or nothing.
-
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
-@@ -8,5 +8,3 @@
-            dvbfe.c \
-            dvbnet.c \
-            dvbvideo.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
-@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
-            en50221_session.c \
-            en50221_transport.c 
- 
--CFLAGS  = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS  = -DLOG_LEVEL=1
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
-@@ -15,5 +15,3 @@ libdvbdvb_la_SOURCES = bat_section.c \
-            tot_section.c \
-            tva_container_section.c \
-            types.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
-@@ -16,4 +16,3 @@
-        ./dvb/libdvbdvb.la \
-        ./atsc/libdvbatsc.la
-
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
-@@ -8,5 +8,3 @@ libdvbmpeg_la_SOURCES = cat_section.c \
-            pat_section.c \
-            pmt_section.c \
-            tsdt_section.c
--
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
-===================================================================
---- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
-@@ -14,4 +14,3 @@
-                tvct_section.c \
-                types.c
-
--CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff --git a/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch b/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
deleted file mode 100644
index c160bb93..00000000
--- a/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~	2009-05-15 16:16:26.000000000 +0100
-+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp	2012-02-25 23:45:45.000000000 +0000
-@@ -2638,7 +2638,7 @@
- 	int num;
- 	int i = 0;
- 
--	urls = xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
-+	urls = (char**)xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
- 
- 	if (urls)
- 	{
diff --git a/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch b/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch
deleted file mode 100644
index 4d6901a2..00000000
--- a/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- kaffeine-0.8.8/configure
-+++ kaffeine-0.8.8/configure
-@@ -34206,8 +34206,8 @@
- 
- 
-    if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for cdio/cdda.h" >&5
--$as_echo_n "checking for cdio/cdda.h... " >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for cdio/paranoia/cdda.h" >&5
-+$as_echo_n "checking for cdio/paranoia/cdda.h... " >&6; }
- if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
-@@ -34215,8 +34215,8 @@
- $as_echo "$ac_cv_header_cdio_cdda_h" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking cdio/cdda.h usability" >&5
--$as_echo_n "checking cdio/cdda.h usability... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking cdio/paranoia/cdda.h usability" >&5
-+$as_echo_n "checking cdio/paranoia/cdda.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -34224,7 +34224,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -34257,15 +34257,15 @@
- $as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking cdio/cdda.h presence" >&5
--$as_echo_n "checking cdio/cdda.h presence... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking cdio/paranoia/cdda.h presence" >&5
-+$as_echo_n "checking cdio/paranoia/cdda.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-@@ -34299,30 +34299,30 @@
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: cdio/cdda.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for cdio/cdda.h" >&5
--$as_echo_n "checking for cdio/cdda.h... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for cdio/paranoia/cdda.h" >&5
-+$as_echo_n "checking for cdio/paranoia/cdda.h... " >&6; }
- if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
---- kaffeine-0.8.8/configure.in
-+++ kaffeine-0.8.8/configure.in
-@@ -300,7 +300,7 @@
- dnl check for cdparanoia
- dnl --------------------
- 
--KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
-+KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
- 
- if test "$with_cdparanoia" != "yes" ; then
- 	echo ""
---- kaffeine-0.8.8/kaffeine/configure.in.in
-+++ kaffeine-0.8.8/kaffeine/configure.in.in
-@@ -220,7 +220,7 @@
- dnl check for cdparanoia
- dnl --------------------
- 
--KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
-+KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
- 
- if test "$with_cdparanoia" != "yes" ; then
- 	echo ""
---- kaffeine-0.8.8/kaffeine/src/input/disc/paranoia.h
-+++ kaffeine-0.8.8/kaffeine/src/input/disc/paranoia.h
-@@ -32,8 +32,8 @@
- 
- extern "C"
- {
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- }
- 
- class KiloConfig : public ParanoiaSettings
diff --git a/media-video/kaffeine/kaffeine-0.8.6.ebuild b/media-video/kaffeine/kaffeine-0.8.6.ebuild
deleted file mode 100644
index b915477b..00000000
--- a/media-video/kaffeine/kaffeine-0.8.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.6.ebuild,v 1.12 2009/06/09 14:16:40 tampakrap Exp $
-
-inherit eutils kde flag-o-matic
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="dvb gstreamer xinerama vorbis encode xcb"
-# kdehiddenvisibility removed due to bug 207002.
-
-RDEPEND=">=media-libs/xine-lib-1.1.9
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	media-sound/cdparanoia
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	dvb? ( media-tv/linuxtv-dvb-headers )"
-
-need-kde 3.5.4
-
-pkg_setup() {
-	if use xcb && ! built_with_use --missing false media-libs/xine-lib xcb; then
-		eerror "To enable the xcb useflag on this package you need"
-		eerror "the useflag xcb enabled on media-libs/xine-lib."
-		eerror "Please emerge media-libs/xine-lib again with the xcb useflag"
-		eerror "enabled."
-		die "Missing xcb useflag on media-libs/xine-lib."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/kaffeine-0.8.5-respectcflags.patch
-	rm -f "${S}"/configure
-}
-
-src_compile() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	# workaround bug #198973
-	local save_CXXFLAGS="${CXXFLAGS}"
-	append-flags -std=gnu89
-	export CXXFLAGS="${save_CXXFLAGS}"
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# fix localization, bug #199909
-	for mofile in "${D}${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
-		mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
-			|| die "fixing mo files failed"
-	done
-
-	# remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
deleted file mode 100644
index f0ae670d..00000000
--- a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
-
-EAPI="2"
-
-ARTS_REQUIRED="never"
-
-USE_KEG_PACKAGING="1"
-
-LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka \
-	km lt mk nb nl nn pa pl pt_BR pt ru se sk sr@Latn sr sv tg tr \
-	uk uz zh_CN zh_TW"
-
-LANGS_DOC=""
-
-inherit eutils kde flag-o-matic
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="http://hftom.free.fr/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dvb gstreamer xinerama vorbis encode xcb"
-# kdehiddenvisibility removed due to bug 207002.
-
-RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	<dev-libs/libcdio-0.90
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	dvb? (
-		virtual/linuxtv-dvb-headers
-		>=sys-kernel/linux-headers-2.6.28
-	)"
-
-need-kde 3.5.4
-
-PATCHES=(
-	"${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
-	"${FILESDIR}/kaffeine-0.8.8-kxinewidget.patch"
-	)
-
-src_configure() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	# workaround bug #198973
-	local save_CXXFLAGS="${CXXFLAGS}"
-	append-flags -std=gnu89
-	export CXXFLAGS="${save_CXXFLAGS}"
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_configure
-}
-
-src_install() {
-	kde_src_install
-
-	# fix localization, bug #199909
-	for mofile in "${D}/${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
-		mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
-			|| die "fixing mo files failed"
-	done
-
-	# remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
deleted file mode 100644
index 0e13e0e2..00000000
--- a/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
-
-EAPI="2"
-
-ARTS_REQUIRED="never"
-
-USE_KEG_PACKAGING="1"
-
-LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka \
-	km lt mk nb nl nn pa pl pt_BR pt ru se sk sr@Latn sr sv tg tr \
-	uk uz zh_CN zh_TW"
-
-LANGS_DOC=""
-
-inherit eutils kde flag-o-matic
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="http://hftom.free.fr/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dvb gstreamer xinerama vorbis encode xcb"
-# kdehiddenvisibility removed due to bug 207002.
-
-RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	>=dev-libs/libcdio-paranoia-0.90
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	dvb? (
-		virtual/linuxtv-dvb-headers
-		>=sys-kernel/linux-headers-2.6.28
-	)"
-
-need-kde 3.5.4
-
-PATCHES=(
-	"${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
-	"${FILESDIR}/kaffeine-0.8.8-kxinewidget.patch"
-	"${FILESDIR}/kaffeine-0.8.8-paranoia_include_fix.patch"
-	)
-
-src_configure() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	# workaround bug #198973
-	local save_CXXFLAGS="${CXXFLAGS}"
-	append-flags -std=gnu89
-	export CXXFLAGS="${save_CXXFLAGS}"
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_configure
-}
-
-src_install() {
-	kde_src_install
-
-	# fix localization, bug #199909
-	for mofile in "${D}/${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
-		mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
-			|| die "fixing mo files failed"
-	done
-
-	# remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.8.ebuild b/media-video/kaffeine/kaffeine-0.8.8.ebuild
deleted file mode 100644
index 2b6b4899..00000000
--- a/media-video/kaffeine/kaffeine-0.8.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
-
-EAPI="2"
-
-ARTS_REQUIRED="never"
-
-USE_KEG_PACKAGING="1"
-
-LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka \
-	km lt mk nb nl nn pa pl pt_BR pt ru se sk sr@Latn sr sv tg tr \
-	uk uz zh_CN zh_TW"
-
-LANGS_DOC=""
-
-inherit eutils kde flag-o-matic
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="http://hftom.free.fr/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dvb gstreamer xinerama vorbis encode xcb"
-# kdehiddenvisibility removed due to bug 207002.
-
-RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	<dev-libs/libcdio-0.90
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	dvb? (
-		media-tv/linuxtv-dvb-headers
-		>=sys-kernel/linux-headers-2.6.28
-	)"
-
-need-kde 3.5.4
-
-PATCHES=(
-	"${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
-	)
-
-src_configure() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	# workaround bug #198973
-	local save_CXXFLAGS="${CXXFLAGS}"
-	append-flags -std=gnu89
-	export CXXFLAGS="${save_CXXFLAGS}"
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_configure
-}
-
-src_install() {
-	kde_src_install
-
-	# fix localization, bug #199909
-	for mofile in "${D}/${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
-		mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
-			|| die "fixing mo files failed"
-	done
-
-	# remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
-}