Update the patch and ebuild to use DESTDIR and PREFIX sanely. Add ~x86.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

4 files changed, 25 insertions, 13 deletions

diff --git a/sys-auth/libnss-cache/ChangeLog b/sys-auth/libnss-cache/ChangeLog
index b7f19852f53b..02d3ff216d70 100644
--- a/sys-auth/libnss-cache/ChangeLog
+++ b/sys-auth/libnss-cache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/libnss-cache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-cache/ChangeLog,v 1.1 2009/03/18 05:33:07 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-cache/ChangeLog,v 1.2 2009/03/18 22:51:47 robbat2 Exp $
+
+  18 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/0.1-make-install.patch, libnss-cache-0.1.ebuild:
+  Update the patch and ebuild to use DESTDIR and PREFIX sanely. Add ~x86.
 
 *libnss-cache-0.1 (18 Mar 2009)
 
diff --git a/sys-auth/libnss-cache/Manifest b/sys-auth/libnss-cache/Manifest
index 5376593cb959..6e010d9c26b9 100644
--- a/sys-auth/libnss-cache/Manifest
+++ b/sys-auth/libnss-cache/Manifest
@@ -1,5 +1,5 @@
-AUX 0.1-make-install.patch 617 RMD160 fccfb92c84e759b26d1c05cdb77bc702850aab4e SHA1 a2dc2d07390b77b2dee06dad53fafc23025e7395 SHA256 254cde87db1ef95b623b5a8dba1ffec49428c8a0e335377f390b86e454376abd
+AUX 0.1-make-install.patch 1066 RMD160 73d57a9c2af5a12d42d804e85457a6ccd9c29911 SHA1 38ca6585bb67f1ff69fe505d6a770bf05268be7d SHA256 22b5f4331436630394e395c3cffc1ac0537adf7dff48b6b772aec845af229222
 DIST libnss-cache-0.1.tar.gz 7371 RMD160 f1a14e233a9441a521118be3be710b7a63d839df SHA1 9c7c12109ea6015e51bb0fc03f5e9160c3c5b806 SHA256 d7931100d0de9d4ce0e169d2bc06df85945495444d110f8fe57b312eb4464b94
-EBUILD libnss-cache-0.1.ebuild 645 RMD160 5571ff2cada38752408b0e28fe5fe1fd197d0a7a SHA1 ce5ea30cd70bc7bd4420cd9749a166801c952002 SHA256 ba6380a18ee68abd29e79bcb556ec08a1d3e285996ccc3282b9ae5f87a87c41d
-MISC ChangeLog 391 RMD160 f1d7e32cde54170cce468c4199643c66aa99776d SHA1 5f435d2d6ea1fae5faa833ea1eb26c880114db64 SHA256 33f5495d76e9597ac540653a59f34b3007bdb1ea9520a6fa6f406bbba7ae132d
+EBUILD libnss-cache-0.1.ebuild 684 RMD160 2dbbc7e295ee8c942c98c55583320b27efcfafbc SHA1 6fdc566c04f76f5b69b3314092c51e4b50cea6e3 SHA256 572cc5b1f4dd9f653fcd55260bf3af64d4e07280bf4526834fbc814950c555d8
+MISC ChangeLog 576 RMD160 5a8ea208f256896bb518669bcf4c90a612a2a35f SHA1 3c30eb8656529c7bd18b8b6c78fef6013464adb4 SHA256 227824afa564792921bcfcfcf400342af394d97249b4812c7912ed61b41927bf
 MISC metadata.xml 171 RMD160 5a419c3135013b4b321dac70f611a0a4fdce40ad SHA1 d92c626607f8d20d27bad77be1c591937c9a33ce SHA256 4a03010700e508691922d5ba63e8fe7db592e7e537ac4a79a2d0fdd13499c11e
diff --git a/sys-auth/libnss-cache/files/0.1-make-install.patch b/sys-auth/libnss-cache/files/0.1-make-install.patch
index 3281d0c4c7e1..c245f2d25308 100644
--- a/sys-auth/libnss-cache/files/0.1-make-install.patch
+++ b/sys-auth/libnss-cache/files/0.1-make-install.patch
@@ -1,12 +1,12 @@
---- libnss-cache/Makefile	2009-03-17 20:42:15.128063498 -0700
-+++ libnss-cache/Makefile	2009-03-17 20:38:33.059408526 -0700
-@@ -3,14 +3,16 @@
+diff -Nuar libnss-cache.orig/Makefile libnss-cache/Makefile
+--- libnss-cache.orig/Makefile	2008-03-22 20:22:50.000000000 -0700
++++ libnss-cache/Makefile	2009-03-18 15:45:19.244473770 -0700
+@@ -3,19 +3,21 @@
  CFLAGS=-Wall -fPIC
  LIBRARY=libnss_cache.so.2.0
  LINKS=libnss_cache.so.2 libnss_cache.so
--PREFIX=/usr
-+DESTDIR=/
-+PREFIX=$(DESTDIR)/usr
++DESTDIR=
+ PREFIX=/usr
  BUILD=.libs
  LIBDIR=$(PREFIX)/lib
 +SONAME=libnss_cache.so.2
@@ -19,3 +19,11 @@
  
  clean:
  	rm -rf $(BUILD)
+ 
+ install:
+-	[ -d $(LIBDIR) ] || install -d $(LIBDIR)
+-	install $(BUILD)/$(LIBRARY) $(LIBDIR)
+-	cd $(LIBDIR); for link in $(LINKS); do ln -sf $(LIBRARY) $$link ; done
++	[ -d $(DESTDIR)/$(PREFIX)/$(LIBDIR) ] || install -d $(DESTDIR)/$(PREFIX)/$(LIBDIR)
++	install $(BUILD)/$(LIBRARY) $(DESTDIR)/$(PREFIX)/$(LIBDIR)
++	cd $(DESTDIR)/$(PREFIX)/$(LIBDIR); for link in $(LINKS); do ln -sf $(LIBRARY) $$link ; done
diff --git a/sys-auth/libnss-cache/libnss-cache-0.1.ebuild b/sys-auth/libnss-cache/libnss-cache-0.1.ebuild
index 657c471ad36e..17d48ee184c2 100644
--- a/sys-auth/libnss-cache/libnss-cache-0.1.ebuild
+++ b/sys-auth/libnss-cache/libnss-cache-0.1.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/sys-auth/libnss-cache/libnss-cache-0.1.ebuild,v 1.1 2009/03/18 05:33:07 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-cache/libnss-cache-0.1.ebuild,v 1.2 2009/03/18 22:51:47 robbat2 Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://nsscache.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -24,5 +24,5 @@ src_unpack() {
 }
 
 src_install() {
-	emake LIBDIR=$(get_libdir)
+	emake LIBDIR="$(get_libdir)" PREFIX=/ DESTDIR="${D}" install
 }