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

Package-Manager: portage-2.2_rc28/cvs/Linux i686

4 files changed, 98 insertions, 2 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/Manifest b/media-video/nvclock/Manifest
index e386ce05a042..5bc3faa707b7 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,5 +1,6 @@
 AUX callbacks.patch 837 RMD160 3703f3b3255ddae3b30354878017b421822260d7 SHA1 57cb431efcf66b64dedf06fb4c6904291bbfae97 SHA256 e245f38d0a837d877c601cf05e414d91c26741320ee3469a6fb98484eefb35d5
 AUX configure.in.diff 348 RMD160 e8a01a4d812d263a00d90e5fbceea8c64a6a54b2 SHA1 68c5bef3177dc63ff9c98b0e47ecbc40e6a15881 SHA256 0ac1e484f04f155d8e2182652951f900880b943435f53bfa403ece38ccce1660
+AUX nvclock-0.8_beta4-as-needed.patch 651 RMD160 4cf84c94b991b06259ef900edbdcafcab1071901 SHA1 7508ab06776bd85c9ab9b3de134b231bc0f33128 SHA256 f64732aea1e9ef53a91df1c628938c4cafadfef49f6c4a622d29b951302745c7
 AUX nvclock-0.8_beta4-flags.patch 3501 RMD160 ff7e9b58f3ad4b5fec5d2b3fd68705cee5686aff SHA1 a4b4bc40a4dfb9c436361e471c207ebfb74f2444 SHA256 5b6649d93b9b9c0696d4cae723ea6544aed9598a2e31e4eb5f433373c6fd5964
 AUX nvclock-insecure-tmp.diff 1093 RMD160 8fe8a704c8397d1f4c56a57f2e7e37c0faf24276 SHA1 e9e18d5127af4ce4e2162c785e4e165eaeda44c5 SHA256 572d40f5e0f3e91b74d7f4b0b88ff63fce28aa109b7f8f32529812d66ac7af10
 AUX nvclock_acinclude_qtlibs.patch 1108 RMD160 1960d2a4f3e956971175ac9343642dd9944577f9 SHA1 320d85ca31c069214ef429b4f2cf6b8358b143a2 SHA256 c6bd458331de21c85e1abf3edb686bb03fffbfc841c74f37c3d8eb9b2e744309
@@ -11,6 +12,7 @@ DIST nvclock0.8b4.tar.gz 336999 RMD160 02dbfde37514b34c7f0e5a8b71e8205e32575dcc
 EBUILD nvclock-0.7-r2.ebuild 1359 RMD160 995d07671bd5eb9c609645208a657cc73f82a20e SHA1 f133f2b2400bad909aa15f67f79f6042b5c3cc5e SHA256 d8a662121f686b638d9bfbe1ef5001ba61f4a1b5bce2b08076b0696e0f0bc1c9
 EBUILD nvclock-0.8_beta2.ebuild 1545 RMD160 188f26a262954e2ede27de3cb3c0a9a9fb54095b SHA1 da268f55ab279b5277870780f6154c5f6845894a SHA256 ce8cb95cdac82d0f26fc4a6785e679a31b849826655a855d1140ac086635de0f
 EBUILD nvclock-0.8_beta4-r2.ebuild 1897 RMD160 37a8f16504107571d5bc4a74cc9161236ce9de59 SHA1 84a1caa7a7c7a07bc65f0da805e0988b49fce12d SHA256 30b75a41ea77c7ed9b49fd03e834c4baa4da0036a272c05cb4b8163231ea39e4
+EBUILD nvclock-0.8_beta4-r3.ebuild 1940 RMD160 3320dba31714c6c1cf481d8b683de0a9ea78b76d SHA1 c55a4999a9af876bdfaa4a39f669161cbf917323 SHA256 d3af53c48dd310662fe83d9571868009d8eb8713f4eafb279db476ddced2952d
 EBUILD nvclock-0.8_beta4.ebuild 1543 RMD160 0582dd532a00db9158844028f6a110f40bd37ae1 SHA1 273a5d96d7401bd75008a6612c9e275abd3968cc SHA256 d57c65f21d36387a9bcb44fd581e0e8afd887233224de71e3ec81a7efc185cee
-MISC ChangeLog 4653 RMD160 b2ddc58df8361761e127b77b2b3a0309f09f6d5f SHA1 92cc3b97e30a354d8ed39012db97d6f473710782 SHA256 34d9fea0ad597d6b406482dbfc6dbcaa605c306876e77901846082b7ab7ad810
+MISC ChangeLog 4851 RMD160 16f3cca103befd91f80670b0869722bf1b5d3c09 SHA1 989b08b57144e7f06ee7bd6673453272fb6033df SHA256 eea8918946ed78a0e18c4e141dee29204f7a9e9c8fa628e05a62a588b6f4827c
 MISC metadata.xml 394 RMD160 07b282c2ed119fe065cfe3bbeca6ed002f31c4f8 SHA1 6b1fa0b9a38f58f14050b976a8d96465a6e83a9c SHA256 33a5ee93d6e17c49e2ede1ecf237c27ee97d331f9912b9252f693385bc826dc4
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"
+}