Use kde-functions.eclass, to get rid of pointless use flags and invalid dependencies. Fix desktop file. GCC 4.3 build fix, bug #251267.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 95 insertions, 2 deletions

diff --git a/media-video/codeine/ChangeLog b/media-video/codeine/ChangeLog
index 515e6b574171..a2c9d24d91fe 100644
--- a/media-video/codeine/ChangeLog
+++ b/media-video/codeine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/codeine
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.19 2007/07/28 17:26:44 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.20 2009/02/15 17:10:09 carlo Exp $
+
+*codeine-1.0.1.3-r1 (15 Feb 2009)
+
+  15 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/codeine-1.0.1.3-desktop-file.diff,
+  +files/codeine-1.0.1.3-gcc43.diff, +codeine-1.0.1.3-r1.ebuild:
+  Use kde-functions.eclass, to get rid of pointless use flags and invalid
+  dependencies. Fix desktop file. GCC 4.3 build fix, bug #251267.
 
   28 Jul 2007; Raúl Porcel <armin76@gentoo.org> codeine-1.0.1.3.ebuild:
   x86 stable wrt #186894
diff --git a/media-video/codeine/codeine-1.0.1.3-r1.ebuild b/media-video/codeine/codeine-1.0.1.3-r1.ebuild
new file mode 100644
index 000000000000..751edafb6cc3
--- /dev/null
+++ b/media-video/codeine/codeine-1.0.1.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.1.3-r1.ebuild,v 1.1 2009/02/15 17:10:09 carlo Exp $
+
+inherit kde-functions multilib versionator toolchain-funcs
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+DESCRIPTION="Simple KDE frontend for xine-lib."
+HOMEPAGE="http://kde-apps.org/content/show.php?content=17161"
+SRC_URI="http://www.methylblue.com/codeine/${PN}-$(replace_version_separator 3 -).tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/xine-lib
+	x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+need-kde 3.5
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-respect-cc.patch"
+	epatch "${FILESDIR}/codeine-1.0.1.3-desktop-file.diff"
+	epatch "${FILESDIR}/codeine-1.0.1.3-gcc43.diff"
+}
+
+src_compile() {
+	local myconf="prefix=/usr"
+	# Fix multilib issue.
+	myconf="${myconf} libdir=/usr/$(get_libdir)
+			qtlibs=${QTDIR}/$(get_libdir)"
+
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+	[[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
+
+	tc-export CC CXX
+
+	scons configure ${myconf} \
+		|| die "scons configure failed, if you report this please attach ${S}/configure.log"
+	scons ${sconsopts} || die "scons make failed"
+}
+
+src_install() {
+	DESTDIR="${D}" scons install || die
+	dodoc README ChangeLog VERSION
+}
diff --git a/media-video/codeine/files/codeine-1.0.1.3-desktop-file.diff b/media-video/codeine/files/codeine-1.0.1.3-desktop-file.diff
new file mode 100644
index 000000000000..4a44abdb3c79
--- /dev/null
+++ b/media-video/codeine/files/codeine-1.0.1.3-desktop-file.diff
@@ -0,0 +1,20 @@
+--- misc/codeine.desktop.o	2009-02-14 23:46:03.000000000 +0100
++++ misc/codeine.desktop	2009-02-14 23:48:32.000000000 +0100
+@@ -1,9 +1,8 @@
+-[Desktop Entry]

+-Name=Codeine

+-Exec=codeine %u

+-Icon=codeine

+-Type=Application

+-Encoding=UTF-8

+-MimeType=video/x-theora;video/x-ogm;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;

+-Categories=Qt;KDE;AudioVideo;Player

+-GenericName=Video Player

++[Desktop Entry]
++Name=Codeine
++Exec=codeine %u
++Icon=codeine
++Type=Application
++MimeType=video/x-theora;video/x-ogm;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;
++Categories=Qt;KDE;AudioVideo;Player;
++GenericName=Video Player
diff --git a/media-video/codeine/files/codeine-1.0.1.3-gcc43.diff b/media-video/codeine/files/codeine-1.0.1.3-gcc43.diff
new file mode 100644
index 000000000000..d3775dfb8c0a
--- /dev/null
+++ b/media-video/codeine/files/codeine-1.0.1.3-gcc43.diff
@@ -0,0 +1,11 @@
+--- src/app/xineEngine.cpp.o	2009-02-15 00:15:57.000000000 +0100
++++ src/app/xineEngine.cpp	2009-02-15 00:22:41.000000000 +0100
+@@ -18,7 +18,7 @@
+ #include <xine.h>
+ #include "xineEngine.h"
+ #include "xineScope.h"
+-
++#include <cstdlib>
+ 
+ #define XINE_SAFE_MODE 1
+