From: Matthias Schwarzott <zzam@gentoo.org>
Date: Wed, 21 Mar 2007 20:28:49 +0000 (+0000)
Subject: Make ebuild work with newer Makefile.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22c83fad5ddcd57cc635048e8550e0e14fb422d5;p=gentoo.git

Make ebuild work with newer Makefile.
Package-Manager: portage-2.1.2.2
---

diff --git a/media-tv/v4l-dvb-hg/ChangeLog b/media-tv/v4l-dvb-hg/ChangeLog
index 673ac353a02e..f04943406c9c 100644
--- a/media-tv/v4l-dvb-hg/ChangeLog
+++ b/media-tv/v4l-dvb-hg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/v4l-dvb-hg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/ChangeLog,v 1.10 2007/01/05 17:14:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/ChangeLog,v 1.11 2007/03/21 20:28:49 zzam Exp $
+
+  21 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  v4l-dvb-hg-0.1-r2.ebuild:
+  Make ebuild work with newer Makefile.
 
   05 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   v4l-dvb-hg-0.1-r2.ebuild:
diff --git a/media-tv/v4l-dvb-hg/Manifest b/media-tv/v4l-dvb-hg/Manifest
index fe11892e0ec9..82cd184ed199 100644
--- a/media-tv/v4l-dvb-hg/Manifest
+++ b/media-tv/v4l-dvb-hg/Manifest
@@ -5,26 +5,25 @@ AUX v4l-dvb-hg-fix-makefile-recursion.diff 487 RMD160 f6efec24edc262c84ba441db10
 MD5 6bbaa98ad92502ce465c90a5acda4561 files/v4l-dvb-hg-fix-makefile-recursion.diff 487
 RMD160 f6efec24edc262c84ba441db10bda783dcee0f16 files/v4l-dvb-hg-fix-makefile-recursion.diff 487
 SHA256 e49824645474618553f14fed6c3ce203984ea0647da46f542d0f83b46389234f files/v4l-dvb-hg-fix-makefile-recursion.diff 487
-EBUILD v4l-dvb-hg-0.1-r2.ebuild 2924 RMD160 ebcb2708952f449569eca20e03d76e2ced2f250b SHA1 ab31d90836b3f98ecacb2db13b1613cf695f5a35 SHA256 5707866ad860c58622fe12ba989a62ee22ffcb2ba65838cad110a88657d3b451
-MD5 72c31252413883e77f27190dfceed9f2 v4l-dvb-hg-0.1-r2.ebuild 2924
-RMD160 ebcb2708952f449569eca20e03d76e2ced2f250b v4l-dvb-hg-0.1-r2.ebuild 2924
-SHA256 5707866ad860c58622fe12ba989a62ee22ffcb2ba65838cad110a88657d3b451 v4l-dvb-hg-0.1-r2.ebuild 2924
-MISC ChangeLog 1671 RMD160 7b2ef5faccf8ab839aea3ac297c4dd36b53c4cc2 SHA1 2386db89642417ea535514a21405c71771aa4e66 SHA256 0c2faa47b48c94a02fa596ebe1b945ab41ef31fa2b3756806c4db0e95134c77d
-MD5 0f7b626fdaab04a3bc01c05cc0be1595 ChangeLog 1671
-RMD160 7b2ef5faccf8ab839aea3ac297c4dd36b53c4cc2 ChangeLog 1671
-SHA256 0c2faa47b48c94a02fa596ebe1b945ab41ef31fa2b3756806c4db0e95134c77d ChangeLog 1671
+EBUILD v4l-dvb-hg-0.1-r2.ebuild 2889 RMD160 6e783a593627aeec0a599e9e507fa34bf64eb3e8 SHA1 1b1c0a3dc21909db57a61c7bf64248e6348140e8 SHA256 e7f07a5803f0739fa45b4ee24e4f7a170e7dbce16c007238efdbadc43d67e4f6
+MD5 ce40cbe81e75c364040e5561901b4fb0 v4l-dvb-hg-0.1-r2.ebuild 2889
+RMD160 6e783a593627aeec0a599e9e507fa34bf64eb3e8 v4l-dvb-hg-0.1-r2.ebuild 2889
+SHA256 e7f07a5803f0739fa45b4ee24e4f7a170e7dbce16c007238efdbadc43d67e4f6 v4l-dvb-hg-0.1-r2.ebuild 2889
+MISC ChangeLog 1788 RMD160 a2280cb067eabdc16a8f78bd152b6d0212033a3b SHA1 f0727b71136c9a3c809d5b049b1d80964285b433 SHA256 ca2eb79b1b35f0f0d8f21c3fddf081633f9fbfd471e11b9a67807453c99d65a6
+MD5 bdd215121d370fd56f0129bb025c2df6 ChangeLog 1788
+RMD160 a2280cb067eabdc16a8f78bd152b6d0212033a3b ChangeLog 1788
+SHA256 ca2eb79b1b35f0f0d8f21c3fddf081633f9fbfd471e11b9a67807453c99d65a6 ChangeLog 1788
 MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
 SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-v4l-dvb-hg-0.1-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-v4l-dvb-hg-0.1-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-v4l-dvb-hg-0.1-r2 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-v4l-dvb-hg-0.1-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-v4l-dvb-hg-0.1-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-v4l-dvb-hg-0.1-r2 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: GnuPG-Pack Basics: http://home.arcor.de/rose-indorf
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFnoffdn07HTTCgIoRAm4EAJ4/fqAUP7V1FgZhN+MPCRgpWKSctgCfeSQ1
-vFE0fFbaHoONEWPucnN1mqs=
-=lYoc
+iD8DBQFGAZWjt2vP6XvVdOcRAn19AKCzRfB3F+7OXBa/1FoayJlHW0+aIwCgxzSg
+jUDlKKk8Y046HIf9lNOeozk=
+=p2HA
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2 b/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2
index 8b137891791f..e69de29bb2d1 100644
--- a/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2
+++ b/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2
@@ -1 +0,0 @@
-
diff --git a/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild b/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild
index 5d2aff210dc3..bcab166e5412 100644
--- a/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild
+++ b/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild,v 1.7 2007/01/05 17:14:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild,v 1.8 2007/03/21 20:28:49 zzam Exp $
 
 
 : ${EHG_REPO_URI:=${V4l_DVB_HG_REPO_URI:-http://linuxtv.org/hg/v4l-dvb}}
@@ -78,8 +78,7 @@ src_unpack() {
 	sed -i ${S}/../linux/drivers/media/video/stradis.c -e '/MODULE_DEVICE_TABLE/d'
 
 	cd ${S}
-	sed -e 's#/lib/modules/$(KERNELRELEASE)/kernel/drivers/media#$(DESTDIR)/$(DEST)#' \
-		-e '/-install::/s:rminstall::' \
+	sed	-e '/-install::/s:rminstall::' \
 		-i Makefile
 
 	elog "Removing depmod-calls"
@@ -91,8 +90,11 @@ src_unpack() {
 
 src_install() {
 	# install the modules
-	make install DESTDIR="${D}" \
-		DEST="/lib/modules/${KV_FULL}/v4l-dvb" \
+	local DEST="${D}/lib/modules/${KV_FULL}/v4l-dvb"
+	make install \
+		DEST="${DEST}" \
+		KDIR26="${DEST}" \
+		KDIRA="${DEST}" \
 	|| die "make install failed"
 
 	cd ${S}/..