Block dev-db/xbase (bug #208596). Fix DEPEND.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

9 files changed, 55 insertions, 29 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 08983c0bdd77..3d3c49b59626 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.40 2008/03/17 11:19:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.41 2008/11/21 16:54:40 coldwind Exp $
+
+  21 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
+  linuxtv-dvb-apps-1.1.0.ebuild, linuxtv-dvb-apps-1.1.1.20060917.ebuild,
+  linuxtv-dvb-apps-1.1.1.20070114.ebuild,
+  linuxtv-dvb-apps-1.1.1.20070924.ebuild,
+  linuxtv-dvb-apps-1.1.1.20071126.ebuild,
+  linuxtv-dvb-apps-1.1.1.20071201.ebuild,
+  linuxtv-dvb-apps-1.1.1.20080113.ebuild,
+  linuxtv-dvb-apps-1.1.1.20080317.ebuild:
+  Block dev-db/xbase (bug #208596). Fix DEPEND.
 
 *linuxtv-dvb-apps-1.1.1.20080317 (17 Mar 2008)
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild
index e76bb1a479d2..cd8148e214fc 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild,v 1.9 2007/11/27 10:04:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0.ebuild,v 1.10 2008/11/21 16:54:40 coldwind Exp $
 
 DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
 HOMEPAGE="http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
@@ -10,8 +10,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~x86"
 IUSE="usb"
-DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
+DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
 RDEPEND="${DEPEND}"
+# !dev-db/xbase (bug #208596)
 
 src_compile() {
 	cd "${S}"/util
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild
index 83720a715f72..ead926b68984 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild,v 1.8 2007/11/27 10:04:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild,v 1.9 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,8 +14,10 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
+DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
 RDEPEND="${DEPEND}"
+# !dev-db/xbase (bug #208596)
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
index 639637ac57be..97d490454b9f 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.9 2007/11/27 10:04:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.10 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="amd64 ~ia64 ppc x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild
index f57a4bcf25fd..5ce62d9db0e7 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild,v 1.2 2007/11/27 10:04:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild,v 1.3 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S="${WORKDIR}/dvb-apps-4bca5d49c9bd"
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild
index 76d36fe01d9e..b04a8f6c2c5b 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild,v 1.2 2007/11/27 10:04:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071126.ebuild,v 1.3 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S="${WORKDIR}/dvb-apps-06d58a93512c"
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild
index 0a3f78b4f05d..731e41885871 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild,v 1.1 2007/12/01 21:41:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20071201.ebuild,v 1.2 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S="${WORKDIR}/dvb-apps-435a56faec09"
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild
index 8a18a62bd35a..489e86b8c86e 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild,v 1.1 2008/01/21 19:06:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080113.ebuild,v 1.2 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S="${WORKDIR}/dvb-apps-6b2073cbad69"
 
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild
index 8228fb065eb5..1d9961e05189 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild,v 1.1 2008/03/17 11:19:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild,v 1.2 2008/11/21 16:54:40 coldwind Exp $
 
 inherit eutils versionator multilib
 
@@ -14,9 +14,11 @@ LICENSE="GPL-2"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
-RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-DEPEND="${DEPEND}
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
 
 S="${WORKDIR}/dvb-apps-3cde3460d120"