13 files changed, 78 insertions, 177 deletions
diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index 9b80cd916385..f58a85e4c945 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.15 2005/10/06 16:48:54 carlo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.16 2006/01/03 23:07:46 flameeyes Exp $
+
+*kdetv-0.8.8-r1 (03 Jan 2006)
+
+  03 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdetv-0.8.5-lirc.patch, -kdetv-0.8.4.ebuild, -kdetv-0.8.5.ebuild,
+  -kdetv-0.8.6.ebuild, -kdetv-0.8.7.ebuild, +kdetv-0.8.8-r1.ebuild:
+  Drop old versions, add -r1 with modular x deps and zvbi as optional dependency.
 
 *kdetv-0.8.8 (06 Oct 2005)
 
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index a819365444a6..d930a8046b7d 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,13 +1,15 @@
-MD5 b6cf6d8a2c49398b4727e0497b9981e0 kdetv-0.8.4.ebuild 1156
-MD5 92754e56fd668067e2491401c0c75318 kdetv-0.8.6.ebuild 1140
-MD5 93cd475d4d71a22fd9bd13ef80a71203 kdetv-0.8.8.ebuild 1179
-MD5 4cb530e5ad5334bd0a42b4384aadc16d kdetv-0.8.5.ebuild 1216
 MD5 ebba8383cdb23a836ffa6bf8fc8366ce ChangeLog 1858
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 837d18a6ab1b7ba4d7e6d175158cd0d3 kdetv-0.8.7.ebuild 1145
-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
 MD5 3c3c7eda0595ee969c8f46b5ec00e075 files/digest-kdetv-0.8.6 65
 MD5 3c5ec08ee21f1efc0a5f1ce8a8ab8d39 files/digest-kdetv-0.8.7 65
 MD5 ce407b1306184d33a91829ef0b8c942d files/digest-kdetv-0.8.8 65
+MD5 ce407b1306184d33a91829ef0b8c942d files/digest-kdetv-0.8.8-r1 65
+MD5 f573592ae2b974181172e56ac2a638fb files/kdetv-0.8.5-lirc.patch 1017
+MD5 b6cf6d8a2c49398b4727e0497b9981e0 kdetv-0.8.4.ebuild 1156
+MD5 4cb530e5ad5334bd0a42b4384aadc16d kdetv-0.8.5.ebuild 1216
+MD5 92754e56fd668067e2491401c0c75318 kdetv-0.8.6.ebuild 1140
+MD5 837d18a6ab1b7ba4d7e6d175158cd0d3 kdetv-0.8.7.ebuild 1145
+MD5 71a02ab7947ae384a3e6eb8cb6fcf2ac kdetv-0.8.8-r1.ebuild 1667
+MD5 93cd475d4d71a22fd9bd13ef80a71203 kdetv-0.8.8.ebuild 1179
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.4 b/media-tv/kdetv/files/digest-kdetv-0.8.4
deleted file mode 100644
index e6530af95984..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 133218749b631ca5326a189fe358d8fe kdetv-0.8.4.tar.bz2 1334756
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.5 b/media-tv/kdetv/files/digest-kdetv-0.8.5
deleted file mode 100644
index 3bd7e945c8eb..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5f1754a11d6347818554bd76d1a0717 kdetv-0.8.5.tar.bz2 1362511
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.6 b/media-tv/kdetv/files/digest-kdetv-0.8.6
deleted file mode 100644
index bde5d0d8ad67..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e197cb03985ad8a0841664589427f29d kdetv-0.8.6.tar.bz2 1136499
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.7 b/media-tv/kdetv/files/digest-kdetv-0.8.7
deleted file mode 100644
index c6404a4b5503..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e69c429497dc715b00f75fdada523fe7 kdetv-0.8.7.tar.bz2 1139728
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.8-r1 b/media-tv/kdetv/files/digest-kdetv-0.8.8-r1
new file mode 100644
index 000000000000..6c213cd90e09
--- /dev/null
+++ b/media-tv/kdetv/files/digest-kdetv-0.8.8-r1
@@ -0,0 +1 @@
+MD5 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 1184833
diff --git a/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch b/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch
deleted file mode 100644
index 373613c69e3b..000000000000
--- a/media-tv/kdetv/files/kdetv-0.8.5-lirc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.4.ebuild b/media-tv/kdetv/kdetv-0.8.4.ebuild
deleted file mode 100644
index d820c88b35ac..000000000000
--- a/media-tv/kdetv/kdetv-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +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.4.ebuild,v 1.3 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.2
-
-
-src_unpack() {
-	LANGS="bg br ca cs cy da de en_GB es et fi fr ga gl hu is it nb nl pl pt pt_BR ro ru sr sv ta tr xx"
-	LANGS_DOC="it nl pt 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"
-}
-
-src_compile() {
-	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
deleted file mode 100644
index c91567e8e7ce..000000000000
--- a/media-tv/kdetv/kdetv-0.8.5.ebuild
+++ /dev/null
@@ -1,37 +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.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
-}
diff --git a/media-tv/kdetv/kdetv-0.8.6.ebuild b/media-tv/kdetv/kdetv-0.8.6.ebuild
deleted file mode 100644
index c87c841b38fc..000000000000
--- a/media-tv/kdetv/kdetv-0.8.6.ebuild
+++ /dev/null
@@ -1,35 +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.6.ebuild,v 1.1 2005/04/18 16:30:10 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"
-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"
-	#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 -i -r -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in || die "sed for locale failed"
-	#sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = \. ${MAKE_DOC} kdetv:" ${S}/doc/Makefile.in || die "sed for locale failed"
-}
-
-src_compile() {
-	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)"
-	kde_src_compile all
-}
diff --git a/media-tv/kdetv/kdetv-0.8.7.ebuild b/media-tv/kdetv/kdetv-0.8.7.ebuild
deleted file mode 100644
index 8075d8ed137a..000000000000
--- a/media-tv/kdetv/kdetv-0.8.7.ebuild
+++ /dev/null
@@ -1,36 +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.7.ebuild,v 1.3 2005/10/06 16:48:54 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="~amd64 ~ppc x86"
-IUSE="lirc"
-
-DEPEND=">=media-libs/zvbi-0.2.4
-	lirc? ( app-misc/lirc )"
-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"
-	#LANGS_DOC="fr it nl pt ru sv"
-
-	MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
-	#MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d))
-
-	kde_src_unpack
-	sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in || die "sed for locale failed"
-	#sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = \. ${MAKE_DOC} kdetv:" ${S}/doc/Makefile.in || die "sed for locale failed"
-}
-
-src_compile() {
-	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)"
-	kde_src_compile all
-}
diff --git a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..86595beba3be
--- /dev/null
+++ b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.1 2006/01/03 23:07:46 flameeyes 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="~amd64 ~ppc ~x86"
+IUSE="arts lirc zvbi opengl"
+
+RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl )
+	media-libs/alsa-lib
+	|| ( ( x11-libs/libXinerama
+		x11-libs/libICE
+		x11-libs/libXxf86dga
+		x11-libs/libXrandr
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXvMC
+		x11-libs/libSM
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-libs/libXrender
+		) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/videoproto
+		x11-proto/xproto
+		x11-proto/xextproto
+		) virtual/x11 )
+	virtual/os-headers"
+
+need-kde 3.2
+
+src_unpack() {
+	LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
+	LANGS_DOC="da et fr it nl pt ru sv"
+
+	MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
+	MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d))
+
+	kde_src_unpack
+	sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in || die "sed for locale failed"
+	sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = \. ${MAKE_DOC} kdetv:" ${S}/doc/Makefile.in || die "sed for locale failed"
+}
+
+src_compile() {
+	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)
+		$(use_with zvbi) $(use_with opengl gl)"
+	kde_src_compile all
+}