Patch for --as-needed (bug #247909).

(Portage version: 2.2_rc28/cvs/Linux i686)

3 files changed, 95 insertions, 1 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 1e4fc7893365..debb7cc31f2e 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvclock
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.30 2009/04/02 07:41:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.31 2009/04/03 23:55:23 jer Exp $
+
+*nvclock-0.8_beta4-r3 (03 Apr 2009)
+
+  03 Apr 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/nvclock-0.8_beta4-as-needed.patch, +nvclock-0.8_beta4-r3.ebuild:
+  Patch for --as-needed (bug #247909).
 
   02 Apr 2009; Jeroen Roovers <jer@gentoo.org> nvclock-0.8_beta4-r2.ebuild:
   Install into proper docdir (bug #241292).
diff --git a/media-video/nvclock/files/nvclock-0.8_beta4-as-needed.patch b/media-video/nvclock/files/nvclock-0.8_beta4-as-needed.patch
new file mode 100644
index 000000000000..5b2d3ea1a6f3
--- /dev/null
+++ b/media-video/nvclock/files/nvclock-0.8_beta4-as-needed.patch
@@ -0,0 +1,14 @@
+Change linking order to make it possible to use -Wl,--as-needed in LDFLAGS
+
+diff -ru nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in
+--- nvclock0.8b4.orig/src/Makefile.in	2009-01-03 12:02:54.000000000 -0500
++++ nvclock0.8b4/src/Makefile.in	2009-04-02 20:04:12.678271229 -0400
+@@ -15,7 +15,7 @@
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I..
+-    LIBS=@X11_LIBS@ -L./backend -lbackend -L./nvcontrol -lnvcontrol
++    LIBS=-L./backend -lbackend -L./nvcontrol -lnvcontrol @X11_LIBS@
+ else
+     DEPS=$(libbackend)
+     INCLUDES=-I./backend -I./nvcontrol -I..
diff --git a/media-video/nvclock/nvclock-0.8_beta4-r3.ebuild b/media-video/nvclock/nvclock-0.8_beta4-r3.ebuild
new file mode 100644
index 000000000000..679a4d60d36f
--- /dev/null
+++ b/media-video/nvclock/nvclock-0.8_beta4-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r3.ebuild,v 1.1 2009/04/03 23:55:23 jer Exp $
+
+inherit eutils autotools toolchain-funcs
+
+MY_P="${PN}${PV/_beta/b}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="NVIDIA Overclocking Utility"
+HOMEPAGE="http://www.linuxhardware.org/nvclock/"
+SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="gtk qt3"
+
+RDEPEND="virtual/libc
+	gtk? ( =x11-libs/gtk+-2* )
+	qt3? ( =x11-libs/qt-3* )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch to fix broken autoconf macro "--with-qt-libs" needed below
+	# Submitted upstream, hopefully fixed in a later version
+	use qt3 && epatch "${FILESDIR}"/nvclock_acinclude_qtlibs.patch
+
+	# Bug #240846:
+	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	sed -i Makefile.in -e "s:/share/doc/nvclock:/share/doc/${PF}:g" || \
+		die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC CXX
+	# Needed to ensure it compiles against Qt3 rather than Qt4
+	export QTDIR=/usr/qt/3
+	export MOC=${QTDIR}/bin/moc
+
+	local myconf
+
+	myconf="--bindir=/usr/bin"
+
+	# Qt3 package doesn't install symlinks from ${QTDIR}/lib64 to ${QTDIR}/lib
+	use amd64 && myconf="${myconf} --with-qt-libs=${QTDIR}/lib64"
+
+	econf $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
+
+	emake -j1 || die
+}
+
+src_install() {
+	dodir /usr/bin
+	emake DESTDIR="${D}" install || die
+	#dodoc AUTHORS README
+
+	newinitd "${FILESDIR}"/nvclock_initd nvclock
+	newconfd "${FILESDIR}"/nvclock_confd nvclock
+
+	#insinto /usr/share/applications
+	#doins nvclock.desktop
+	#validate_desktop_entries /usr/share/applications/nvclock.desktop
+}
+
+pkg_postinst() {
+	elog "To enable card overclocking at startup, edit your /etc/conf.d/nvclock"
+	elog "accordingly and then run: rc-update add nvclock default"
+}