gtk/gtk2 USE flag check fix

5 files changed, 27 insertions, 68 deletions

diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
index a05b5d7ed3b8..03e2927d89c0 100644
--- a/media-tv/nvtv/ChangeLog
+++ b/media-tv/nvtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/nvtv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.2 2003/06/18 18:35:13 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.3 2003/12/04 17:57:09 seemant Exp $
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> nvtv-0.4.4.ebuild,
+  nvtv-0.4.5.ebuild:
+  fix up the gtk/gtk2 USE flag use according to bug #34566 by Spider
+  <spider@gentoo.org>
 
 *nvtv-0.4.5 (18 Jun 2003)
 
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index 9f2f650db81e..c412a1ce9c95 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -1,7 +1,5 @@
-MD5 bd09b0f99f694497e7e26c005c37f46c ChangeLog 1406
-MD5 6e7ed6b686a40817f72c64e3462396fc nvtv-0.4.4.ebuild 1174
-MD5 996a23fe28732f857bf97f91b530e8a3 nvtv-0.4.5.ebuild 1156
+MD5 ce5e1425001ef4389bb52105c869f16e nvtv-0.4.5.ebuild 1203
+MD5 a01cd39651a2474434cab999f8dca0dc ChangeLog 1589
 MD5 f691708ddf9faed17b657dc03253f20a metadata.xml 383
-MD5 5f2bf6c79b70ba39b3c942a63dc046e9 files/digest-nvtv-0.4.4 62
-MD5 9ab4a460e891477b0f575c2fb123c641 files/nvtv.start 549
 MD5 adc49002cf7b7b0274f7b51ba7e0749d files/digest-nvtv-0.4.5 62
+MD5 9ab4a460e891477b0f575c2fb123c641 files/nvtv.start 549
diff --git a/media-tv/nvtv/files/digest-nvtv-0.4.4 b/media-tv/nvtv/files/digest-nvtv-0.4.4
deleted file mode 100644
index c955f76a363d..000000000000
--- a/media-tv/nvtv/files/digest-nvtv-0.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46188ffd2a30ef152f7e3c6dc4bf678a nvtv-0.4.4.tar.gz 763349
diff --git a/media-tv/nvtv/nvtv-0.4.4.ebuild b/media-tv/nvtv/nvtv-0.4.4.ebuild
deleted file mode 100644
index 8cf27a52a471..000000000000
--- a/media-tv/nvtv/nvtv-0.4.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.4.ebuild,v 1.1 2003/06/18 11:59:23 seemant Exp $
-
-IUSE="X gtk gtk2"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="TV-Out for NVidia cards"
-HOMEPAGE="http://sourceforge.net/projects/nv-tv-out/"
-SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="sys-apps/pciutils
-	gtk? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )
-	X? ( >=x11-base/xfree-4.0 )"
-
-src_compile() {
-	local myconf
-
-	if use gtk2; then
-		myconf="${myconf} --with-gtk=gtk2"
-	elif use gtk; then
-		myconf="${myconf} --with-gtk=gtk1"
-	else
-		myconf="${myconf} --without-gtk";
-	fi
-
-	use X && myconf="${myconf} --with-x" || myconf="${myconf} --without-x"
-
-	econf ${myconf}
-
-	# The CFLAGS don't seem to make it into the Makefile.
-	cd src
-	emake CXFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dobin src/nvtv
-	dosbin src/nvtvd
-
-	dodoc ANNOUNCE BUGS FAQ INSTALL README \
-		doc/USAGE doc/chips.txt doc/overview.txt \
-		doc/timing.txt xine/tvxine
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nvtv.start nvtv
-}
diff --git a/media-tv/nvtv/nvtv-0.4.5.ebuild b/media-tv/nvtv/nvtv-0.4.5.ebuild
index 967f7b6edc31..e632b5f6051d 100644
--- a/media-tv/nvtv/nvtv-0.4.5.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.2 2003/09/01 19:38:06 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.3 2003/12/04 17:57:09 seemant Exp $
 
 IUSE="X gtk gtk2"
 
@@ -13,24 +13,32 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="sys-apps/pciutils
-	gtk? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )
+	gtk? (
+		gtk2? ( =x11-libs/gtk+-2* )
+		!gtk2? ( =x11-libs/gtk+-1.2* )
+	)
 	X? ( >=x11-base/xfree-4.0 )"
 
 src_compile() {
 	local myconf
 
-	if use gtk2; then
-		myconf="${myconf} --with-gtk=gtk2"
-	elif use gtk; then
-		myconf="${myconf} --with-gtk=gtk1"
+	if use gtk
+	then
+		if use gtk2
+			then
+				myconf="${myconf} --with-gtk=gtk2"
+			else
+				myconf="${myconf} --with-gtk=gtk1"
+			fi
 	else
-		myconf="${myconf} --without-gtk";
+		myconf="${myconf} --without-gtk"
 	fi
 
-	use X && myconf="${myconf} --with-x" || myconf="${myconf} --without-x"
+	use X \
+		&& myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
 
-	econf ${myconf}
+	econf ${myconf} || die
 
 	# The CFLAGS don't seem to make it into the Makefile.
 	cd src