Revision bump to fix localization bug #199909, thanks Lars for the fix.

(Portage version: 2.1.4_rc10)

3 files changed, 89 insertions, 1 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index e2f46bf61bfe..241a2a6da611 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.83 2007/11/15 20:16:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.84 2007/12/19 21:02:03 tgurr Exp $
+
+*kaffeine-0.8.5-r2 (19 Dec 2007)
+
+  19 Dec 2007; Timo Gurr <tgurr@gentoo.org> +kaffeine-0.8.5-r2.ebuild:
+  Revision bump to fix localization bug #199909, thanks Lars for the fix.
 
   15 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
   kaffeine-0.8.5-r1.ebuild:
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.5-r2 b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r2
new file mode 100644
index 000000000000..ac5adc3b3acc
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r2
@@ -0,0 +1,3 @@
+MD5 71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2 2887566
+RMD160 f32004e87b790bdd137c455234cbf3c2776fd3f3 kaffeine-0.8.5.tar.bz2 2887566
+SHA256 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97 kaffeine-0.8.5.tar.bz2 2887566
diff --git a/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild b/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild
new file mode 100644
index 000000000000..e64763dfed8c
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild,v 1.1 2007/12/19 21:02:03 tgurr 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="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb"
+
+RDEPEND=">=media-libs/xine-lib-1
+	xcb? ( >=x11-libs/libxcb-1.0
+		>=media-libs/xine-lib-1.1.5 )
+	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}
+	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-with-xcb-r1.patch
+	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}"/usr/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}"/usr/share/mimelnk/application/x-mplayer2.desktop
+}