Added a check for opengl. Fixes bug 192222. Thanks to Toffanin [WiredTEK] for providing a patch. Removed obsolete versions.

(Portage version: 2.1.3.9)

8 files changed, 14 insertions, 166 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index 961a643aa9c1..3e36772c2c88 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/kdetv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.33 2007/07/28 17:51:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.34 2007/09/24 17:39:52 philantrop Exp $
+
+  24 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -files/kdetv-0.8.8-bindnow.patch, -files/kdetv-0.8.8-xinerama.patch,
+  -kdetv-0.8.8.ebuild, -kdetv-0.8.8-r1.ebuild, kdetv-0.8.9.ebuild:
+  Added a check for opengl. Fixes bug 192222. Thanks to Toffanin [WiredTEK]
+  for providing a patch. Removed obsolete versions.
 
   28 Jul 2007; Raúl Porcel <armin76@gentoo.org> kdetv-0.8.9.ebuild:
   x86 stable wrt #186899
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.8 b/media-tv/kdetv/files/digest-kdetv-0.8.8
deleted file mode 100644
index 6d120583e32e..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 1184833
-RMD160 a8b577baf2ced9d2eae4c72e3bf0bd026270b8e6 kdetv-0.8.8.tar.bz2 1184833
-SHA256 f1dc7b27f82f193888d9349b93692476cc3fdde34f3ade98823541badc0e7760 kdetv-0.8.8.tar.bz2 1184833
diff --git a/media-tv/kdetv/files/digest-kdetv-0.8.8-r1 b/media-tv/kdetv/files/digest-kdetv-0.8.8-r1
deleted file mode 100644
index 6d120583e32e..000000000000
--- a/media-tv/kdetv/files/digest-kdetv-0.8.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 1184833
-RMD160 a8b577baf2ced9d2eae4c72e3bf0bd026270b8e6 kdetv-0.8.8.tar.bz2 1184833
-SHA256 f1dc7b27f82f193888d9349b93692476cc3fdde34f3ade98823541badc0e7760 kdetv-0.8.8.tar.bz2 1184833
diff --git a/media-tv/kdetv/files/kdetv-0.8.8-bindnow.patch b/media-tv/kdetv/files/kdetv-0.8.8-bindnow.patch
deleted file mode 100644
index edba44eb0a8f..000000000000
--- a/media-tv/kdetv/files/kdetv-0.8.8-bindnow.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add support for BINDNOW_FLAGS to build kdetvv4lsetup with
-non-lazy bindings, to improve security and fix installation on
-FEATURES=stricter.
-
-Requires the ebuild to export BINDNOW_FLAGS="$(bindnow-flags)".
-
-Index: kdetv-0.8.8/kdetv/kvideoio/kdetvv4lsetup/Makefile.am
-===================================================================
---- kdetv-0.8.8.orig/kdetv/kvideoio/kdetvv4lsetup/Makefile.am
-+++ kdetv-0.8.8/kdetv/kvideoio/kdetvv4lsetup/Makefile.am
-@@ -8,7 +8,7 @@ kdetvv4lsetup_SOURCES	= kdetvv4lsetup.c
- kdetvv4lsetup_CFLAGS = $(KDE_USE_FPIE)
- 
- # the library search path
--kdetvv4lsetup_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
-+kdetvv4lsetup_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(BINDNOW_FLAGS)
- 
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
diff --git a/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch b/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch
deleted file mode 100644
index d7e66efd0d84..000000000000
--- a/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: kdetv-0.8.8/kdetv/configure.in.in
-===================================================================
---- kdetv-0.8.8.orig/kdetv/configure.in.in
-+++ kdetv-0.8.8/kdetv/configure.in.in
-@@ -15,13 +15,6 @@ dnl XVideo extension
-         -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
- 
- dnl ---------------------------------------------------------------------
--dnl XVideo Motion Compensation extension
--    KDE_CHECK_LIB(XvMC, XvMCQueryExtension, 
--        KDETV_LIBS="-lXvMC $KDETV_LIBS",, 
--        -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
--
--
--dnl ---------------------------------------------------------------------
- dnl Other X extensions
- 
-     KDE_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, 
-@@ -46,10 +39,6 @@ dnl DPMSQueryExtension is included in Xl
-         KDETV_LIBS="-lXdpms $KDETV_LIBS",,
-         -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
- 
--    KDE_CHECK_LIB(Xinerama, XineramaQueryExtension,
--        KDETV_LIBS="-lXinerama $KDETV_LIBS",,
--        -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
--
- AC_SUBST(KDETV_LIBS)
- 
- if test $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension = yes; then
-@@ -60,10 +49,6 @@ if test $ac_cv_lib_Xv_XvQueryExtension =
-   AC_DEFINE(HAVE_LIBXV, 1, [If we have the XVideo extension])
- fi
- 
--if test $ac_cv_lib_XvMC_XvMCQueryExtension = yes; then
--  AC_DEFINE(HAVE_LIBXVMC, 1, [If we have the XVideo Motion Compensation extension])
--fi
--
- dnl ---------------------------------------------------------------------
- dnl Check for Linux
- AC_CHECK_HEADER(linux/vt.h,,DO_NOT_COMPILE="kdetv $DO_NOT_COMPILE")
diff --git a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
deleted file mode 100644
index aa3cd24ab18c..000000000000
--- a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 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.16 2007/07/22 09:07:56 dberkholz Exp $
-
-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"
-
-USE_KEG_PACKAGING=1
-
-inherit kde flag-o-matic
-
-DESCRIPTION="A TV application for KDE"
-HOMEPAGE="http://www.kdetv.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/libICE
-	x11-libs/libXxf86dga
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/libSM
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
-	x11-proto/videoproto
-	virtual/os-headers"
-
-need-kde 3.2
-
-PATCHES="${FILESDIR}/${P}-xinerama.patch
-	${FILESDIR}/${P}-bindnow.patch"
-
-src_compile() {
-	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)
-		$(use_with zvbi) $(use_with opengl gl)"
-	#Filtering the below on x86 and amd64 for bug #145754 and bug #153721
-	if [[ ( "$ARCH" == "x86" ) || ( "$ARCH" == "amd64" ) ]]; then
-		filter-flags -fforce-addr
-	fi
-	append-flags -fno-strict-aliasing
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-	kde_src_compile all
-}
-
-src_install() {
-	kde_src_install
-
-	# Move the .desktop file in FDO's suggested place
-	dodir /usr/share/applications/kde
-	mv ${D}/usr/share/applnk/Multimedia/kdetv.desktop \
-		${D}/usr/share/applications/kde
-}
diff --git a/media-tv/kdetv/kdetv-0.8.8.ebuild b/media-tv/kdetv/kdetv-0.8.8.ebuild
deleted file mode 100644
index 96a0680b135f..000000000000
--- a/media-tv/kdetv/kdetv-0.8.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.ebuild,v 1.3 2007/07/13 05:03:57 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="A TV application for KDE"
-HOMEPAGE="http://www.kdetv.org/"
-SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="arts lirc"
-
-DEPEND=">=media-libs/zvbi-0.2.4
-	lirc? ( app-misc/lirc )"
-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)"
-	kde_src_compile all
-}
diff --git a/media-tv/kdetv/kdetv-0.8.9.ebuild b/media-tv/kdetv/kdetv-0.8.9.ebuild
index a22dddda24fb..5f0ab95dcc43 100644
--- a/media-tv/kdetv/kdetv-0.8.9.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9.ebuild,v 1.6 2007/07/28 17:51:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9.ebuild,v 1.7 2007/09/24 17:39:52 philantrop Exp $
 
 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"
@@ -41,6 +41,12 @@ need-kde 3.2
 PATCHES="${FILESDIR}/${P}-xinerama.patch
 	${FILESDIR}/${P}-bindnow.patch"
 
+pkg_setup() {
+	if use opengl && ! built_with_use '=x11-libs/qt-3*' opengl ; then
+		die "You need to rebuild >=x11-libs/qt with 'opengl' USE flag enabled."
+	fi
+}
+
 src_compile() {
 	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)
 		$(use_with zvbi) $(use_with opengl gl)"