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

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 99 insertions, 3 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/Manifest b/media-video/codeine/Manifest
index 0193e28aee9f..5d584d2e4d2c 100644
--- a/media-video/codeine/Manifest
+++ b/media-video/codeine/Manifest
@@ -1,7 +1,10 @@
+AUX codeine-1.0.1.3-desktop-file.diff 800 RMD160 7da5308068b753aece0dc0245018f3d1ce49abe8 SHA1 ca349cae627d1f520b225b283760c4407ee35a2d SHA256 9585d3647627bdd7330428dcbd313390c885cd1153ee9d37603c47224a94bd17
+AUX codeine-1.0.1.3-gcc43.diff 266 RMD160 c538aa29befdf4824407811c4b570740854e7d00 SHA1 96a85860699b2002a96e2b8a329caa8d590a063d SHA256 9aed917382d79b954bf460b018d769b8d1827eff8e89497c34da8fb6bd94040b
 AUX codeine-1.0.1.3-respect-cc.patch 1171 RMD160 6afcc086b7d6a98e55ec854562ec6b1c5e98096e SHA1 5f241055d2ac731858764672b954027c811251b7 SHA256 c7b39430acdf001e1accb31759e9b48d4bda0239caab424d6366624a36759f4a
 DIST codeine-1.0.1-3.tar.bz2 168970 RMD160 6e1deeae8d51b1604314fe857d50f3ba2e35e592 SHA1 606069da00a573c15c3fb01f718ee7638d090169 SHA256 57be5b25e0f82e27526f1c29d2aa1ed11cd2635c7a45a56070598f24110ff621
 DIST codeine-1.0.tar.bz2 165129 RMD160 de4979ab02b0076ce39fadb48db637bd064d5046 SHA1 49f09517fe8ed5153f6ff95ff91763b2cc3a36ee SHA256 134cd4ec526781b568e7382e8e9ed4a61fbfd1fb142602fc65cfbdf8c2737f11
+EBUILD codeine-1.0.1.3-r1.ebuild 1458 RMD160 35d432f011c46dedf2ac1535d4151729bdd0fff5 SHA1 e0d3965f41b338c5cb86ffc0764a94b7e48c8bf6 SHA256 250d44e4d3e8ed0dcd9b00236bb07f8a57186222214ef149f95df403731a4a64
 EBUILD codeine-1.0.1.3.ebuild 1340 RMD160 378687e21b5a825ec4e2f0ac587406f53735ed05 SHA1 45feeec7a2d0670b9f01e92eaf1463f5165b0ecb SHA256 6c521fb57c67b455917b5dfda0b4c5c61f1a06ccc6370842f992403266dfeaf2
 EBUILD codeine-1.0.ebuild 921 RMD160 1d4d5e84fdc442d2c67750277ac043624abb228d SHA1 4db6d8762482a495d27f40f0c3e3c1c745c44d5c SHA256 3481eb7afbef751b34b909016f2d7e11b3bebf39a9344852cb67d0dda17868d7
-MISC ChangeLog 3443 RMD160 4aff7bba07e37ee524adeb10540318c5c80883de SHA1 f8d0fb5af3c2711f83415ab15fec58950918dc9f SHA256 5cddcf3d20182af45a1e5a6b916136de00dfacc0d51a539bcc4a047522e59aea
+MISC ChangeLog 3775 RMD160 5e1bf38da05203ff155f5ca0ccad7d08793fd46b SHA1 750e717d221f1fe111265e911ac3c55dee58f242 SHA256 088556e65b8b2e0426c938f16c29e1b92ae859c333b90cf772426e71d1621dc5
 MISC metadata.xml 299 RMD160 01521e2b1731431b7fd00a4b65f681927c800a6c SHA1 be0b794ce869e915af1f92389ecbafd4369eabf1 SHA256 ebd830ac4b479eb7493374127559348f6fb17d3598d3c265069ea936f53aa598
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
+