Use emake and econf (but with a --bindir= hack because ./configure sucks).

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

4 files changed, 37 insertions, 17 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 3b0fafc2fb7a..03fd95e53b4c 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2009/04/02 06:02:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.29 2009/04/02 07:29:22 jer Exp $
+
+*nvclock-0.8_beta4-r2 (02 Apr 2009)
+
+  02 Apr 2009; Jeroen Roovers <jer@gentoo.org>
+  files/nvclock-0.8_beta4-flags.patch, -nvclock-0.8_beta4-r1.ebuild,
+  +nvclock-0.8_beta4-r2.ebuild:
+  Use emake and econf (but with a --bindir= hack because ./configure sucks).
 
 *nvclock-0.8_beta4-r1 (02 Apr 2009)
 
diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest
index 579a55893766..6b558e674204 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,6 +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-flags.patch 3154 RMD160 f1338f6f739c20dbcd49565a63f61c954f741483 SHA1 55b96a47eafc975b89f202491f32d3843214066d SHA256 a4c9b8e5676f5d97b5aa63481fa5642a54a7cc3a6d13b807bcc9593540a55f4a
+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
 AUX nvclock_confd 360 RMD160 a793577e43a9a66bb0eb8b4d22e8ddb39b6ac30c SHA1 c9da108dbe24f5c1a42f859b6d28b83031fcb8ce SHA256 2bbf36faa3b78425471275f70c4d8abdff4720dc854152e4ad7b2da68810bdca
@@ -10,7 +10,7 @@ DIST nvclock0.8b2.tar.gz 316510 RMD160 1c8aff1a0f2bd472f9d5296d2d575823b2cb5107
 DIST nvclock0.8b4.tar.gz 336999 RMD160 02dbfde37514b34c7f0e5a8b71e8205e32575dcc SHA1 758b3848b036e2b3e25368cfec4c6cd82a963dc9 SHA256 bdb695e869822c4740c361bcace81b5527b774002d42785c986da9a92d7a9b0b
 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-r1.ebuild 1755 RMD160 62d3c00a716893379adc412cf20c9583397fc81c SHA1 7fef182322a7d1687fcf894fda45e94755292f77 SHA256 5e127de4e4e44c0a7f0052c33786a42428247cc4e7a42ae7e86ca361e213fdf3
+EBUILD nvclock-0.8_beta4-r2.ebuild 1808 RMD160 c5281c116bd63cc37b1c21477905d3473e53b048 SHA1 aec03c02234b230508fef5a44d73b1b5fdb669db SHA256 8bc943dd1f61fac63224f36f0484f3f02dcdd3a0f245857ee008876a0ee13079
 EBUILD nvclock-0.8_beta4.ebuild 1543 RMD160 0582dd532a00db9158844028f6a110f40bd37ae1 SHA1 273a5d96d7401bd75008a6612c9e275abd3968cc SHA256 d57c65f21d36387a9bcb44fd581e0e8afd887233224de71e3ec81a7efc185cee
-MISC ChangeLog 4269 RMD160 95dac8f37a26d353468f27ccf98e1ea955f90513 SHA1 a79023de4e27cba719fe4ca93ae9d339acaea092 SHA256 1b4d851839ecda9b686b2b425c3412df02d444b7c256fda52f7b95708f963a40
+MISC ChangeLog 4532 RMD160 062617803ba15a22d24a0d65b7edf533a39c35d2 SHA1 c15f397826a7d5540363abc0babba53f592999df SHA256 1db58d35662f6dddbb232bf93f82b1c307aeab8bd397aa40573956fb6f00648b
 MISC metadata.xml 394 RMD160 07b282c2ed119fe065cfe3bbeca6ed002f31c4f8 SHA1 6b1fa0b9a38f58f14050b976a8d96465a6e83a9c SHA256 33a5ee93d6e17c49e2ede1ecf237c27ee97d331f9912b9252f693385bc826dc4
diff --git a/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch b/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch
index a75fe5fc0159..6f00fc1a3f3b 100644
--- a/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch
+++ b/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch
@@ -1,5 +1,5 @@
 --- ./nvclock0.8b4/src/backend/Makefile.in.orig	2007-12-27 17:05:38.000000000 +0100
-+++ ./nvclock0.8b4/src/backend/Makefile.in	2009-04-02 07:34:55.000000000 +0200
++++ ./nvclock0.8b4/src/backend/Makefile.in	2009-04-02 09:07:53.000000000 +0200
 @@ -1,11 +1,10 @@
 -CC=@CC@ -O0
  AR=ar
@@ -21,7 +21,7 @@
 \ No newline at end of file
 +uninstall:
 --- ./nvclock0.8b4/src/gtk/Makefile.in.orig	2008-05-11 12:25:46.000000000 +0200
-+++ ./nvclock0.8b4/src/gtk/Makefile.in	2009-04-02 07:34:55.000000000 +0200
++++ ./nvclock0.8b4/src/gtk/Makefile.in	2009-04-02 09:12:10.000000000 +0200
 @@ -1,7 +1,6 @@
 -CC=@CC@
  INSTALL=@INSTALL@
@@ -41,7 +41,7 @@
  clean:
  	rm -f nvclock_gtk *.core *.o *.exe
 --- ./nvclock0.8b4/src/Makefile.in.orig	2009-01-03 18:02:54.000000000 +0100
-+++ ./nvclock0.8b4/src/Makefile.in	2009-04-02 07:34:55.000000000 +0200
++++ ./nvclock0.8b4/src/Makefile.in	2009-04-02 09:12:24.000000000 +0200
 @@ -1,4 +1,3 @@
 -CC=@CC@
  INSTALL=@INSTALL@
@@ -60,8 +60,19 @@
  
  
  clean: clean-recursive clean-app
+@@ -50,8 +49,8 @@
+ install: install-recursive install-app
+ install-app:
+ 	mkdir -p $(bindir)
+-	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
+-	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
++	$(INSTALL) -c nvclock $(bindir)/nvclock
++	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
+ 
+ 
+ uninstall: uninstall-recursive uninstall-app
 --- ./nvclock0.8b4/src/nvcontrol/Makefile.in.orig	2005-12-09 20:46:05.000000000 +0100
-+++ ./nvclock0.8b4/src/nvcontrol/Makefile.in	2009-04-02 07:36:58.000000000 +0200
++++ ./nvclock0.8b4/src/nvcontrol/Makefile.in	2009-04-02 09:07:53.000000000 +0200
 @@ -1,8 +1,7 @@
 -CC=@CC@
  AR=ar
@@ -80,7 +91,7 @@
 \ No newline at end of file
 +uninstall:
 --- ./nvclock0.8b4/src/qt/Makefile.in.orig	2008-05-11 12:25:46.000000000 +0200
-+++ ./nvclock0.8b4/src/qt/Makefile.in	2009-04-02 07:39:37.000000000 +0200
++++ ./nvclock0.8b4/src/qt/Makefile.in	2009-04-02 09:11:51.000000000 +0200
 @@ -1,9 +1,8 @@
 -CXX=@CXX@
  INSTALL=@INSTALL@
diff --git a/media-video/nvclock/nvclock-0.8_beta4-r1.ebuild b/media-video/nvclock/nvclock-0.8_beta4-r2.ebuild
index f3806267e0a7..4b99d4554e62 100644
--- a/media-video/nvclock/nvclock-0.8_beta4-r1.ebuild
+++ b/media-video/nvclock/nvclock-0.8_beta4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2009/04/02 06:02:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r2.ebuild,v 1.1 2009/04/02 07:29:22 jer Exp $
 
 inherit eutils autotools toolchain-funcs
 
@@ -41,25 +41,27 @@ src_compile() {
 
 	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"
 
-	./configure $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
+	econf $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
 
-	make || die
+	emake -j1 || die
 }
 
 src_install() {
 	dodir /usr/bin
-	einstall || die
-	dodoc AUTHORS README
+	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
+	#insinto /usr/share/applications
+	#doins nvclock.desktop
+	#validate_desktop_entries /usr/share/applications/nvclock.desktop
 }
 
 pkg_postinst() {