diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-03-18 22:51:47 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-03-18 22:51:47 +0000 |
| commit | eb523aea647710a7ce5cf7c6310f2f7f346c8092 (patch) | |
| tree | 4b0277de3b33a3bc2e9d25c6c1138fe515a393ce /sys-auth/libnss-cache | |
| parent | Version bump. (diff) | |
| download | gentoo-2-eb523aea647710a7ce5cf7c6310f2f7f346c8092.tar.gz gentoo-2-eb523aea647710a7ce5cf7c6310f2f7f346c8092.tar.bz2 gentoo-2-eb523aea647710a7ce5cf7c6310f2f7f346c8092.zip | |
Update the patch and ebuild to use DESTDIR and PREFIX sanely. Add ~x86.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/libnss-cache')
| -rw-r--r-- | sys-auth/libnss-cache/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-auth/libnss-cache/files/0.1-make-install.patch | 20 | ||||
| -rw-r--r-- | sys-auth/libnss-cache/libnss-cache-0.1.ebuild | 6 |
3 files changed, 22 insertions, 10 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/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 } |