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

Package-Manager: portage-2.1.4_rc10

4 files changed, 100 insertions, 15 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/Manifest b/media-video/kaffeine/Manifest
index 34ede8eacf62..03f6df143c69 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kaffeine-0.8.5-respectcflags.patch 2554 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 SHA1 55dbe435bd6038b00cd39d367060806f5b1a39c6 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf
 MD5 2f98a67720d51237811c6603326501f1 files/kaffeine-0.8.5-respectcflags.patch 2554
 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 files/kaffeine-0.8.5-respectcflags.patch 2554
@@ -18,14 +15,18 @@ EBUILD kaffeine-0.8.5-r1.ebuild 1994 RMD160 0be7a8cb9aa75e4ed702e1ee3318431724aa
 MD5 4a02d025ed0e4b73302271cf4e5ac3e0 kaffeine-0.8.5-r1.ebuild 1994
 RMD160 0be7a8cb9aa75e4ed702e1ee3318431724aa166c kaffeine-0.8.5-r1.ebuild 1994
 SHA256 d71551dea81355537ec2c0767cd777e86f6dafff135d77d18d024d9d55c5d498 kaffeine-0.8.5-r1.ebuild 1994
+EBUILD kaffeine-0.8.5-r2.ebuild 2179 RMD160 19f9af67aeb9567ace0bb0ddb3148744167e9782 SHA1 5ef7db3214b6e752121f754ba1660f8817b86c7c SHA256 ce68e28cb1ee1be82327b42b1b4e61ce1ea90c942a159d88d72df8e3436e1b7d
+MD5 4e3179fc43294d8c588ef4d836324460 kaffeine-0.8.5-r2.ebuild 2179
+RMD160 19f9af67aeb9567ace0bb0ddb3148744167e9782 kaffeine-0.8.5-r2.ebuild 2179
+SHA256 ce68e28cb1ee1be82327b42b1b4e61ce1ea90c942a159d88d72df8e3436e1b7d kaffeine-0.8.5-r2.ebuild 2179
 EBUILD kaffeine-0.8.5.ebuild 1817 RMD160 e79e9e99f52083fad5ed16927d6ff91767fa97cf SHA1 b8dfb62d8f86c1d9f8d37b4671a8308419dbd97f SHA256 2785d3db6e3d978448a64c2b16c82831e8ac68c3f314f20e475f01aab677ad97
 MD5 22ed8e4d1a6489e4e3c0af03c3f6c976 kaffeine-0.8.5.ebuild 1817
 RMD160 e79e9e99f52083fad5ed16927d6ff91767fa97cf kaffeine-0.8.5.ebuild 1817
 SHA256 2785d3db6e3d978448a64c2b16c82831e8ac68c3f314f20e475f01aab677ad97 kaffeine-0.8.5.ebuild 1817
-MISC ChangeLog 12562 RMD160 c27a60dbfd3d18fc3b7c34e40e8ad52a76eedf24 SHA1 a554fd422ae17dad5e2ae73cebdbed8c428e0dfa SHA256 a506124d078bf5fbe1e358eb2a2f829a583774e9aaee38beeb21af7fb9a65d62
-MD5 f3ab3acc86e2f8666d5c6403c13079be ChangeLog 12562
-RMD160 c27a60dbfd3d18fc3b7c34e40e8ad52a76eedf24 ChangeLog 12562
-SHA256 a506124d078bf5fbe1e358eb2a2f829a583774e9aaee38beeb21af7fb9a65d62 ChangeLog 12562
+MISC ChangeLog 12738 RMD160 6eddcb4553738336646b6d9c95011bafbac18163 SHA1 965ef8f2ca5ebd3578af44283c27a54d5a7cf2fb SHA256 b976339bfb76260a2ce27d2f85a0fa7156e4bf4b3694f9af24fd834acbee5f7b
+MD5 77c4e5b882460611f9289ca313e77632 ChangeLog 12738
+RMD160 6eddcb4553738336646b6d9c95011bafbac18163 ChangeLog 12738
+SHA256 b976339bfb76260a2ce27d2f85a0fa7156e4bf4b3694f9af24fd834acbee5f7b ChangeLog 12738
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 MD5 80b81e0016b1f3cb6c95459a0e35fc87 metadata.xml 301
 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 metadata.xml 301
@@ -36,10 +37,6 @@ SHA256 f4f8a815acf0d623217e9a36b4332dff3d3bedb5c63f8131aab764013fca74a5 files/di
 MD5 372ff1a48b0d9d6dba88862aa71dc01b files/digest-kaffeine-0.8.5-r1 250
 RMD160 3b2012e3259d433f6ce376d991e7002a0acc4073 files/digest-kaffeine-0.8.5-r1 250
 SHA256 f4f8a815acf0d623217e9a36b4332dff3d3bedb5c63f8131aab764013fca74a5 files/digest-kaffeine-0.8.5-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHPKgIAiZjviIA2XgRAo8YAJ9uhT/m0A4Cl69jC7CHR8jPpfhDoQCeLoPh
-uiQcA/eOsK3crPzzhqG8oIo=
-=mGRw
------END PGP SIGNATURE-----
+MD5 372ff1a48b0d9d6dba88862aa71dc01b files/digest-kaffeine-0.8.5-r2 250
+RMD160 3b2012e3259d433f6ce376d991e7002a0acc4073 files/digest-kaffeine-0.8.5-r2 250
+SHA256 f4f8a815acf0d623217e9a36b4332dff3d3bedb5c63f8131aab764013fca74a5 files/digest-kaffeine-0.8.5-r2 250
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
+}