Fixed compilation with dev-libs/libcdio-paranoia

6 files changed, 242 insertions, 15 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index e1c4913b..e4aaab76 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-video/kaffeine
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.104 2009/11/09 14:01:12 maekke Exp $
 
+*kaffeine-0.8.8-r2 (21 Mar 2013)
+
+  21 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> kaffeine-0.8.8.ebuild,
+  kaffeine-0.8.8-r1.ebuild, +kaffeine-0.8.8-r2.ebuild,
+  +files/kaffeine-0.8.8-paranoia_include_fix.patch:
+  Fixed compilation with dev-libs/libcdio-paranoia.
+
   09 Nov 2009; Markus Meier <maekke@gentoo.org> kaffeine-1.0_pre2.ebuild:
   x86 stable, bug #291876
 
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 40e37c91..515b9b74 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,10 +1,12 @@
-AUX kaffeine-0.8.5-respectcflags.patch 2554 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 SHA1 55dbe435bd6038b00cd39d367060806f5b1a39c6 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf
-AUX kaffeine-0.8.7-respectcflags.patch 2918 RMD160 6232b1b0f0203eb6f6f404ffa63bde444a6fcbd3 SHA1 99783aa52a1fcd5568c6a850f4fef33cb6fb200f SHA256 1798a5bddb992ab12fbdcaab8d0afc1e8b037ff0ff8f938973c7d7c1d766d0b2
-AUX kaffeine-0.8.8-kxinewidget.patch 397 RMD160 f1b364559ebab7d3b60998029132c72d07e8cfed SHA1 3c0ac496590788a7f3c74217e50b6bedf533ef27 SHA256 5ebff80db712c9a38877d4397c9d7cdcd04e4366a78573ef7c638dd0c900bf6b
-DIST kaffeine-0.8.6.tar.bz2 2923224 RMD160 260da3f329d76fd5e372396e52f32dc175206313 SHA1 508977f591fd31474548dfb92e1073b656cf65fa SHA256 77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
-DIST kaffeine-0.8.8.tar.bz2 2994589 RMD160 29dd310b9b726c136ad76d9aa9a8058e72fea511 SHA1 4bc04a6cca24c9765dacc5d377952583d6a06109 SHA256 d6d1e6cbdba2b60813bcc5889248a7a62b96c1def9740f807e43ecf54f796d9a
-EBUILD kaffeine-0.8.6.ebuild 2154 RMD160 a7cb26c38a8ef330e021e0c387374be63aef9361 SHA1 fc12ac61df1d4945eafbc8c8f244c22e9963ed0a SHA256 05d73975bd497acd60937f965c56c9e4ba61f136cae06360e06e93c5963038f8
-EBUILD kaffeine-0.8.8-r1.ebuild 2037 RMD160 bc373deb9fb284ba44a4562353f1d414949b4d86 SHA1 01eefa4c6e85a0e47e53e8f0fb669312fa78154e SHA256 fa65907470d95add716ea3ce587eab41f42b73fc8487a2191cf3523c4fb583a9
-EBUILD kaffeine-0.8.8.ebuild 1990 RMD160 68bbdd8a087a7c8dcefdbb782e983b5e83a0e3d1 SHA1 63db0b9e7ae919ce08f223fd13860dad11b5f274 SHA256 d026e50115660c38d3fb6922265677ba7c350ed0f2ae0225efac28fd57fdf8a8
-MISC ChangeLog 16004 RMD160 dff05bfa2265da10236fc432a9229642c3e11529 SHA1 9400cd4af5804182daca7798af7e114f3217bf58 SHA256 e39e620c09095f92457ea1f2f3ff47cb687ab23257befad6d2e574c71fc15d1e
-MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
+AUX kaffeine-0.8.5-respectcflags.patch 2554 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf SHA512 6f26ce63ca74d0dc2ec808723aceb870f681d6e51107e5ebeee95d99601b28404f9b50b8825390f2bc0f973f726a6f5cd705b6438d48fad21c53ef42f288fbbd WHIRLPOOL 2cf4243ce9240a691894a01265df6e6f02c30586b6dea34257ee66facd7bc924be7bae89ab37353b06b1c345852d7cd69ff8763a3094f5ee292a9d7e8a367870
+AUX kaffeine-0.8.7-respectcflags.patch 2918 SHA256 1798a5bddb992ab12fbdcaab8d0afc1e8b037ff0ff8f938973c7d7c1d766d0b2 SHA512 fb97baebb1b9604c2f89ae46abb853f911d944e11eb34ab00b51dace203897ac7062a690b98400b90e46228e2841d4697b0e92a6ae509c32c68503492a9fe3e1 WHIRLPOOL f876398f6e1773e9c6482236b963365455fabd3196364590f684d675b2926a3d90c683b7e2bfff909af378b5da57d1a59928b2280f8889ed2f7f3fce17c605e1
+AUX kaffeine-0.8.8-kxinewidget.patch 397 SHA256 5ebff80db712c9a38877d4397c9d7cdcd04e4366a78573ef7c638dd0c900bf6b SHA512 60974f76ce80cf016975cb5debe75d14eda1c90f789628a3fb37926f10fbc071e7f99ffc22f9a873f76d2031d1fc2db7a9df866cece71e3c5aefa7a8dc14c6e1 WHIRLPOOL 7bcacdba09ee91a0abb531c9836d9519091380b559d840943507c748d097b16fae87c2926f52a3d32e7e5e7d2055a0d01086ef09dc4f6ec661821358400d536f
+AUX kaffeine-0.8.8-paranoia_include_fix.patch 6567 SHA256 d133891b81c5078511157358eca6052aa232fc3a30475a6a10527e670edda520 SHA512 395dbd4a0d96fa9c00d371953f74308819bad04d96439a6f7e7db578dd0eb19c59c1ddfe7561d55b6543e48fac2e45ba830dbc4bfd8852d29d94f3811626d4c8 WHIRLPOOL c7096f254fb3b7c79239967ae6eacb1da9c32612e728e2e670130e0cad2af9778001c8fdb9ac0564fcfbba1494757970edccb5345b2144caa3407742057b363b
+DIST kaffeine-0.8.6.tar.bz2 2923224 SHA256 77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
+DIST kaffeine-0.8.8.tar.bz2 2994589 SHA256 d6d1e6cbdba2b60813bcc5889248a7a62b96c1def9740f807e43ecf54f796d9a
+EBUILD kaffeine-0.8.6.ebuild 2154 SHA256 05d73975bd497acd60937f965c56c9e4ba61f136cae06360e06e93c5963038f8 SHA512 b2fa026de28e43eb86760c251d0b9af327c9d738fd2083b55f36d0faea7671ac31ef9ecc3506fe7d1c78bf92ed8ce368565f96e662f6a171c9f3e568165fc414 WHIRLPOOL 86c45c1b82b9315a4bbb3e455250678b7d549f99f0bcdeedc07aad22c1b84fddb376115c2eef2317b3c7eabd0b608d5e487c0506e00d2cf0f9a82e46e381bc5f
+EBUILD kaffeine-0.8.8-r1.ebuild 2043 SHA256 52cd02ab789c201080619a7150f06785ab70ee2551dde9b544f9a380b10b9ba0 SHA512 f1f9ffc0ba6ea9a2858ea8f5657b0b02e3751016dc0415e93360a4a6d167dccc06f2560b3ce5c6acb6e0514b7ee93f2069ab72f899403c5961e292758217e235 WHIRLPOOL 8c2a371493ecc3183f6504ef856b8a8a4c20afe5f4be844af5427245d5863e0c725fc285855c1ccec502fdee203068765098276d620b062992bf6eb29037ab76
+EBUILD kaffeine-0.8.8-r2.ebuild 2110 SHA256 9425759fce0f2ba49cf997488e585926b2ede57c965d264a740779b021231d3e SHA512 0e090328cba1f8054acd1d7cb27342e231ad7e747cc4ed59c1eb397b3a3d359b426860ccf35197183ebb41d71224ee41009925b4461772e1259b9be7ff14eb26 WHIRLPOOL ca56f166349dedd10276137e0b1e37d74629b9cf64388cc63e7fbea3dfddca72dcd01969648d05a1e9c2512bd905ca5c17a13d751ecd8899d80b389240ca19d2
+EBUILD kaffeine-0.8.8.ebuild 1996 SHA256 9e6f71faa6bbe467067db2edbd2a77f295d10a082fa2b49bdfe555e17ff64a29 SHA512 8d3687ca8d3b286a8bb735a0016fd1690345f8034d711aa63c6f1e5757aa3f490c32c1a37bfb82ef6856c454c1774517f916fbda496544cbbc5396d651575b88 WHIRLPOOL 60e0329acaac182a3c35b2f3874c656932b50cc90fb4d32134862495c5975a6b48c3efa53ed11c140e649081cd34248cdd0d2a049daf7b8f68daf6179864e904
+MISC ChangeLog 16275 SHA256 0796db1a80c68a824d1157a0031ec787a8626a15f74b78f352118b9d099512ce SHA512 c0b2af4cf75e06bb83f0e32db2fa816fcdfcac352215ed8da476eacac65780c914ebbc7fb052a8e7330beb1b0b10c70677bf2db1c843290b2e0175adf2cb33f1 WHIRLPOOL afb1a0c1d517798157d5f07d9019639be8dfb16628348242d35406a4340296e50ad5dbcc731cd1c79166cbc3c86862c3bbbb9266cc191aeb08a3c02b5806674c
+MISC metadata.xml 301 SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a SHA512 e2d1ee33b33fc9d5c978b2461bfe7253ba2d7835840fb350873638d6862809bfd3a48580dce391239f4e8f485813531ca403158e6c54b42af9b128ea4efbdc85 WHIRLPOOL 674319c8c555b830c5380ebce1d86bf1c843727f6dedb003dfce3f899f54c13403862f27d30412847e5e102c939e289ab4cff1f62f0a42b88945625d0a5ff7af
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
new file mode 100644
index 00000000..4d6901a2
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch
@@ -0,0 +1,136 @@
+--- 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.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
index b8ade786..37c9bdde 100644
--- a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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 $
 
@@ -30,7 +30,7 @@ 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
+	<dev-libs/libcdio-0.90
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
 	x11-libs/libXtst"
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
new file mode 100644
index 00000000..64349e28
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
@@ -0,0 +1,82 @@
+# 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}
+	dvb? ( virtual/linuxtv-dvb-headers
+		>=sys-kernel/linux-headers-2.6.28 )
+	x11-proto/inputproto"
+
+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
index 31c39d74..8fa12d60 100644
--- a/media-video/kaffeine/kaffeine-0.8.8.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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 $
 
@@ -30,7 +30,7 @@ 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
+	<dev-libs/libcdio-0.90
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
 	x11-libs/libXtst"