From 7da5ce67a08a90afbbe4b2c82393cd7fca0d74d6 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Thu, 28 Jul 2016 21:37:20 -0400
Subject: media-tv/nvtv: new revision with a patch to respect CFLAGS.

Gentoo-Bug: 240836

Package-Manager: portage-2.2.28
---
 media-tv/nvtv/files/respect-cflags.patch | 31 +++++++++++++++++
 media-tv/nvtv/nvtv-0.4.7-r2.ebuild       | 58 --------------------------------
 media-tv/nvtv/nvtv-0.4.7-r3.ebuild       | 44 ++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 58 deletions(-)
 create mode 100644 media-tv/nvtv/files/respect-cflags.patch
 delete mode 100644 media-tv/nvtv/nvtv-0.4.7-r2.ebuild
 create mode 100644 media-tv/nvtv/nvtv-0.4.7-r3.ebuild

(limited to 'media-tv/nvtv')

diff --git a/media-tv/nvtv/files/respect-cflags.patch b/media-tv/nvtv/files/respect-cflags.patch
new file mode 100644
index 000000000000..2fa991f72638
--- /dev/null
+++ b/media-tv/nvtv/files/respect-cflags.patch
@@ -0,0 +1,31 @@
+The rest of the build system will respect the user's CFLAGS if we
+don't wipe them out, so just delete the line that does that. The
+removal of the gtk-1.x stuff is so that we can run eautoreconf and
+have it work; we don't support gtk1 in Gentoo anyway.
+
+diff --git a/configure.in b/configure.in
+index f8f48cc..d8f1261 100755
+--- a/configure.in
++++ b/configure.in
+@@ -57,9 +57,6 @@ dnl
+ dnl Debugging enables, CFLAGS
+ dnl
+ 
+-dnl Clear -g -O2 from CFLAGS
+-CFLAGS=""
+-
+ AC_MSG_CHECKING(for debugging info)
+ 
+ AC_ARG_ENABLE(debug,
+@@ -110,11 +107,6 @@ if test ${with_gtk} = no ; then
+ fi
+ 
+ if test ${have_gtk} = no ; then
+-  if test ${with_gtk} = yes -o ${with_gtk} = gtk1 ; then
+-    AM_PATH_GTK(1.2.0, have_gtk=gtk1)
+-  fi
+-fi
+-if test ${have_gtk} = no ; then
+   if test ${with_gtk} = yes -o ${with_gtk} = gtk2 ; then
+     AM_PATH_GTK_2_0(2.0.0, have_gtk=gtk2)
+   fi
diff --git a/media-tv/nvtv/nvtv-0.4.7-r2.ebuild b/media-tv/nvtv/nvtv-0.4.7-r2.ebuild
deleted file mode 100644
index 2f4a8cd01420..000000000000
--- a/media-tv/nvtv/nvtv-0.4.7-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-IUSE="X gtk"
-
-DESCRIPTION="TV-Out for NVidia cards"
-HOMEPAGE="https://sourceforge.net/projects/nv-tv-out/"
-SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="sys-apps/pciutils[-zlib]
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86vidmodeproto )"
-
-src_configure() {
-	local myconf
-
-	if use gtk
-	then
-		myconf="${myconf} --with-gtk"
-	else
-		myconf="${myconf} --without-gtk"
-	fi
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# The CFLAGS don't seem to make it into the Makefile.
-	cd src
-	emake CXFLAGS="${CFLAGS}"
-}
-
-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
-
-	newinitd "${FILESDIR}"/nvtv.start nvtv
-}
diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
new file mode 100644
index 000000000000..0cfa7fe9c230
--- /dev/null
+++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+IUSE="X gtk"
+
+DESCRIPTION="TV-Out for NVidia cards"
+HOMEPAGE="https://sourceforge.net/projects/nv-tv-out/"
+SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="sys-apps/pciutils[-zlib]
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xf86vidmodeproto )"
+
+PATCHES=( "${FILESDIR}/respect-cflags.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gtk) $(use_with X x)
+}
+
+src_install() {
+	dobin src/nvtv
+	dosbin src/nvtvd
+	dodoc ANNOUNCE BUGS FAQ README doc/*.txt doc/USAGE
+	newinitd "${FILESDIR}"/nvtv.start nvtv
+}
-- 
cgit v1.2.3-65-gdbad