version bump, clean up

(Portage version: 2.0.51-r15)

11 files changed, 70 insertions, 82 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index ade93869a856..b60f59589af8 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/kdetv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.10 2005/01/12 22:00:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.11 2005/01/30 16:31:58 carlo Exp $
+
+*kdetv-0.8.5 (30 Jan 2005)
+
+  30 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdetv-0.8.5-lirc.patch, -kdetv-0.8.0.ebuild, -kdetv-0.8.2.ebuild,
+  -kdetv-0.8.3.ebuild, +kdetv-0.8.5.ebuild:
+  version bump, clean up
 
   12 Jan 2005; Carsten Lohrke <carlo@gentoo.org> kdetv-0.8.4.ebuild:
   stable on x86
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index 192ac66ab425..625451f0a25c 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,10 +1,7 @@
 MD5 b6cf6d8a2c49398b4727e0497b9981e0 kdetv-0.8.4.ebuild 1156
-MD5 d7bd50f94c57e1ac7317b787e8bacfb9 kdetv-0.8.3.ebuild 827
-MD5 b45a0228144c43223c195066689d3744 kdetv-0.8.0.ebuild 463
-MD5 8cd0ece63e39fddc74d8f6ac12489048 ChangeLog 1186
+MD5 a7c30c6e187c256369d039d1bc6efebd kdetv-0.8.5.ebuild 1122
+MD5 61220031f1ca4ca15442a5f25d72f647 ChangeLog 1408
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 132d81c551daa603c2383cd40b5ac48a kdetv-0.8.2.ebuild 827
-MD5 2da879018c033e27525474c0baf414bd files/digest-kdetv-0.8.0 64
-MD5 cf2e35190fbfe5e369ced358f87bc46c files/digest-kdetv-0.8.2 65
-MD5 b2c663165cb668f942f26ee7a81f125f files/digest-kdetv-0.8.3 65
+MD5 f573592ae2b974181172e56ac2a638fb files/kdetv-0.8.5-lirc.patch 1017
 MD5 a03f5410e7006427407efcd931cbdfd0 files/digest-kdetv-0.8.4 65
+MD5 6081bc2ee04dd68b0c6cc772d6480768 files/digest-kdetv-0.8.5 65
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.0 b/media-tv/kdetv/files/digest-kdetv-0.8.0
deleted file mode 100644
index f1d7566a82dc..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edfb30f60385d5d75e97d2a0318135e9 kdetv-0.8.0.tar.bz2 909757
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.2 b/media-tv/kdetv/files/digest-kdetv-0.8.2
deleted file mode 100644
index 86f192b15f5a..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7bbc76fff6ab202f6853ea19cbd5900 kdetv-0.8.2.tar.bz2 1067924
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.3 b/media-tv/kdetv/files/digest-kdetv-0.8.3
deleted file mode 100644
index 2ed5f7a7eb62..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fe6b0d6e65a51a0b408d4c0dbb7c896 kdetv-0.8.3.tar.bz2 1149420
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.5 b/media-tv/kdetv/files/digest-kdetv-0.8.5
new file mode 100644
index 000000000000..3bd7e945c8eb
--- /dev/null
+++ b/media-tv/kdetv/files/digest-kdetv-0.8.5
@@ -0,0 +1 @@
+MD5 b5f1754a11d6347818554bd76d1a0717 kdetv-0.8.5.tar.bz2 1362511
diff --git a/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch b/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch
new file mode 100644
index 000000000000..373613c69e3b
--- /dev/null
+++ b/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch
@@ -0,0 +1,20 @@
+--- kdetv/libkdetv/lirc.cpp.orig	2005-01-30 16:52:51.000000000 +0100
++++ kdetv/libkdetv/lirc.cpp	2005-01-30 16:53:09.000000000 +0100
+@@ -82,7 +82,7 @@
+             while (lirc_code2char(_config,code,&cmd)==0 && cmd != NULL) {
+                 kdDebug() << "lirc: cmd '" << cmd << "'" << endl;
+                 if (0 == strcasecmp(cmd, "default")) {
+-                    QMap<QString, QString>::const_iterator val = _keymap.constFind(event);
++                    QMap<QString, QString>::const_iterator val = _keymap.find(event);
+                     if ( val != _keymap.constEnd())
+                         emit command(*val, repeat);
+                     else
+@@ -93,7 +93,7 @@
+             }
+         } else {
+             /* standalone mode */
+-            QMap<QString, QString>::const_iterator val = _keymap.constFind(event);
++            QMap<QString, QString>::const_iterator val = _keymap.find(event);
+             if ( val != _keymap.constEnd())
+                 emit command(*val, repeat);
+             else
diff --git a/media-tv/kdetv/kdetv-0.8.0.ebuild b/media-tv/kdetv/kdetv-0.8.0.ebuild
deleted file mode 100644
index 8b699eb69934..000000000000
--- a/media-tv/kdetv/kdetv-0.8.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.0.ebuild,v 1.6 2005/01/12 22:00:12 carlo Exp $
-
-inherit kde
-DEPEND=">=media-libs/zvbi-0.2.4"
-need-kde 3
-
-DESCRIPTION="A TV application for KDE"
-HOMEPAGE="http://www.kwintv.org/"
-SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
diff --git a/media-tv/kdetv/kdetv-0.8.2.ebuild b/media-tv/kdetv/kdetv-0.8.2.ebuild
deleted file mode 100644
index aa9295a15937..000000000000
--- a/media-tv/kdetv/kdetv-0.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.2.ebuild,v 1.2 2005/01/12 22:00:12 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="A TV application for KDE"
-HOMEPAGE="http://www.kwintv.org/"
-SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="arts lirc"
-
-DEPEND=">=media-libs/zvbi-0.2.4"
-RDEPEND=">=media-libs/zvbi-0.2.4"
-need-kde 3
-
-LANGS="bg ca cs da de en_GB es et fr hu is it nb nl pt pt_BR ro ru sv ta tr xx"
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d)
-
-src_compile() {
-	sed -ier "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)"
-	kde_src_compile all
-}
diff --git a/media-tv/kdetv/kdetv-0.8.3.ebuild b/media-tv/kdetv/kdetv-0.8.3.ebuild
deleted file mode 100644
index f3c12da1bd2b..000000000000
--- a/media-tv/kdetv/kdetv-0.8.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.3.ebuild,v 1.2 2005/01/12 22:00:12 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="A TV application for KDE"
-HOMEPAGE="http://www.kwintv.org/"
-SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="arts lirc"
-
-DEPEND=">=media-libs/zvbi-0.2.4"
-RDEPEND=">=media-libs/zvbi-0.2.4"
-need-kde 3
-
-LANGS="bg ca cs da de en_GB es et fr hu is it nb nl pt pt_BR ro ru sv ta tr xx"
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d)
-
-src_compile() {
-	sed -ier "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)"
-	kde_src_compile all
-}
diff --git a/media-tv/kdetv/kdetv-0.8.5.ebuild b/media-tv/kdetv/kdetv-0.8.5.ebuild
new file mode 100644
index 000000000000..c91567e8e7ce
--- /dev/null
+++ b/media-tv/kdetv/kdetv-0.8.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.5.ebuild,v 1.1 2005/01/30 16:31:58 carlo Exp $
+
+inherit kde eutils
+
+DESCRIPTION="A TV application for KDE"
+HOMEPAGE="http://www.kwintv.org/"
+SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="arts lirc"
+
+DEPEND=">=media-libs/zvbi-0.2.4"
+RDEPEND=">=media-libs/zvbi-0.2.4"
+need-kde 3.2
+
+
+src_unpack() {
+	LANGS="bg br ca cs cy da de en_GB es et fi fr ga gl hu is it lt nb nl pl pt pt_BR ro ru sr sv ta tr xx"
+	LANGS_DOC="fr it nl pt ru sv"
+
+	MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
+	MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
+
+	kde_src_unpack
+	sed -ier "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in || die "sed for locale failed"
+	sed -ier "s:^SUBDIRS =.*:SUBDIRS = \. ${MAKE_DOC} kdetv:" ${S}/doc/Makefile.in || die "sed for locale failed"
+	epatch ${FILESDIR}/kdetv-0.8.5-lirc.patch
+}
+
+src_compile() {
+	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)"
+	kde_src_compile all
+}