app-laptop/nvidia-bl: Cleanup version ebuild for nvidia-bl (bug 296127)

svn path=/sunrise/; revision=9740

diff --git a/app-laptop/nvidia-bl/ChangeLog b/app-laptop/nvidia-bl/ChangeLog
index 55a23b7dcfbe2a6d7cc2aaa24ab425ab9f7b1107..455f475fe1c99d68405887ea47447d93c02354ef 100644 (file)
--- a/app-laptop/nvidia-bl/ChangeLog
+++ b/app-laptop/nvidia-bl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2009; Emilio Coppa (ercoppa) <ercoppa@gmail.org>
+  +nvidia-bl-0.14.ebuild, -nvidia-bl-0.14-r2.ebuild,
+  -files/nvidia-bl-makefile.patch:
+  Cleanup version ebuild for nvidia-bl (bug 296127)
+
   10 Dec 2009; Emilio Coppa (ercoppa) <ercoppa@gmail.com>
   +nvidia-bl-0.14-r2.ebuild, +files/nvidia-bl-makefile.patch, +metadata.xml:
   New Ebuild for bug 296127

diff --git a/app-laptop/nvidia-bl/Manifest b/app-laptop/nvidia-bl/Manifest
index 2238be99684ed3eee89c387e953c10f97e8de0f9..109353ccf8719e6ce5cee862d2000c48f6e00e4b 100644 (file)
--- a/app-laptop/nvidia-bl/Manifest
+++ b/app-laptop/nvidia-bl/Manifest
@@ -1,5 +1,4 @@
-AUX nvidia-bl-makefile.patch 1125 RMD160 f6820a67c84d3e1e1420e4034733411449b5f20f SHA1 c410223eb15d156a7689c967b3ad0c81c3a2061a SHA256 f1f980cf538cbf501a4e0c02ed6305a1a27953aa75f8a8e7ad0b0c7b848de185
 DIST nvidia-bl-dkms_0.14~karmic.tar.gz 7718 RMD160 ce7a528381fc1b888e53dfa9520870504a283f37 SHA1 d7b67a3571fcb410fbfe0830e5eb30a57af45d54 SHA256 b61d54b22eb3ef718d267f3e77f3a1f1171610b8f9ce3b2b4c3ddd2696087395
-EBUILD nvidia-bl-0.14-r2.ebuild 800 RMD160 90b24a366754db83137c761e43d2b30914178dbf SHA1 c378517a5efcefd984037ad66a1f90797f85e06f SHA256 354b56ee9a2613f4020fae890d414c0a6af5390b6f2bbb6c5236b690381792b4
-MISC ChangeLog 285 RMD160 fa3bf9b1b41c907047826c52cfe19a7e8f45400b SHA1 f02e9b3277f136253e25f99345a91b9d1fbabef9 SHA256 37e5dfaa3c2bcf904d46d170341ee97ed212252fab442855c94630aec13ebedd
+EBUILD nvidia-bl-0.14.ebuild 690 RMD160 5cb5ef832f7f48ec015c8ebf5ac9bd10d97c07dc SHA1 df6b13dca16d237c560eb9b472960c41d076d158 SHA256 2cd0d96ed61b6320e465e587225a9acf9669ac9612111bd41832a1972cb42dac
+MISC ChangeLog 484 RMD160 02aa25257a8d66e808b3c1b420ef2a09e965d6a1 SHA1 15591053b6bb8a3e383b72ecd35b9673418de0bb SHA256 e3e7b5a6f8a11beeeaa58797b1b696775f31ea969481ec3fd795bf3f011f273f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-laptop/nvidia-bl/files/nvidia-bl-makefile.patch b/app-laptop/nvidia-bl/files/nvidia-bl-makefile.patch
deleted file mode 100644 (file)
index d5a09d3..0000000
--- a/app-laptop/nvidia-bl/files/nvidia-bl-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -rup nvidia-bl-dkms-0.14.0.orig/Makefile nvidia-bl-dkms-0.14.0/Makefile
---- nvidia-bl-dkms-0.14.0.orig/Makefile        2009-05-26 11:06:07.000000000 +0200
-+++ nvidia-bl-dkms-0.14.0/Makefile     2009-12-07 21:14:49.000000000 +0100
-@@ -1,31 +1,6 @@
--NAME  = nvidia_bl
--VERSION       = 0.14.0
--SRC   = usr/src
-+MODULE_NAME=nvidia_bl
-+obj-m    := $(MODULE_NAME).o
- 
--TARBALL       = $(NAME)-$(VERSION).dkms.tar.gz
--PATCH = ./scripts/patch-name-version.sh $(NAME) $(VERSION)
--
--all:  $(SRC)/$(TARBALL)
--
--$(SRC)/$(TARBALL): $(SRC)/dkms_source_tree/$(NAME).c
--      (cd $(SRC); tar cvfz $(TARBALL) dkms*)
--
--clean:
--      rm -f $(SRC)/$(TARBALL)
--
--distclean: clean
--      rm -rf *-stamp debian/$(NAME)-dkms debian/*.log debian/files
--
--install: $(SRC)/$(TARBALL)
--      install -d "$(DESTDIR)/$(SRC)"
--      (cd $(SRC); install -m 644 $(NAME)-$(VERSION).dkms.tar.gz "$(DESTDIR)/$(SRC)")
--
--bump:
--      $(PATCH) debian/postinst
--      $(PATCH) debian/postrm
--      $(PATCH) debian/prerm
--      $(PATCH) debian/rules
--      $(PATCH) debian/postinst
--      $(PATCH) usr/src/dkms_source_tree/dkms.conf
--      chmod 0755 debian/rules
-+all:
-+      make -C /lib/modules/`uname -r`/build M=`pwd`/usr/src/dkms_source_tree/
- 

diff --git a/app-laptop/nvidia-bl/nvidia-bl-0.14-r2.ebuild b/app-laptop/nvidia-bl/nvidia-bl-0.14.ebuild
similarity index 69%
rename from app-laptop/nvidia-bl/nvidia-bl-0.14-r2.ebuild
rename to app-laptop/nvidia-bl/nvidia-bl-0.14.ebuild
index 001fed791f120b762310bb24c9473e27eed7eb77..2a699e25e0671541b88e06e20e3601ce67366ed2 100644 (file)
--- a/app-laptop/nvidia-bl/nvidia-bl-0.14-r2.ebuild
+++ b/app-laptop/nvidia-bl/nvidia-bl-0.14.ebuild
@@ -13,18 +13,13 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-S="${WORKDIR}/${PN}-dkms-${PV}.0"
+S="${WORKDIR}/${PN}-dkms-${PV}.0/usr/src/dkms_source_tree"
 
-MODULE_NAMES="nvidia_bl(kernel/drivers::${S}/usr/src/dkms_source_tree/)"
+MODULE_NAMES="nvidia_bl(kernel/drivers)"
 
 pkg_setup() {
        kernel_is -lt 2 6 29 && die "kernel 2.6.29 or higher is required"
        linux-mod_pkg_setup
-       BUILD_PARAMS="-C ${KV_DIR} M=${S}/usr/src/dkms_source_tree"
+       BUILD_PARAMS="-C ${KV_DIR} M=${S}"
        BUILD_TARGETS="nvidia_bl.ko"
 }
-
-src_unpack() {
-       unpack ${A}
-       epatch "${FILESDIR}/nvidia-bl-makefile.patch"
-}