evbump to fix install locations and LDFLAGS

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 78 insertions, 4 deletions

diff --git a/sys-auth/libnss-cache/ChangeLog b/sys-auth/libnss-cache/ChangeLog
index 471cff15119f..535e3b57e9cf 100644
--- a/sys-auth/libnss-cache/ChangeLog
+++ b/sys-auth/libnss-cache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/libnss-cache
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-cache/ChangeLog,v 1.4 2010/07/17 11:06:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-cache/ChangeLog,v 1.5 2010/09/15 00:53:42 xmw Exp $
+
+*libnss-cache-0.1-r1 (15 Sep 2010)
+
+  15 Sep 2010; Michael Weber <xmw@gentoo.org> +libnss-cache-0.1-r1.ebuild,
+  +files/libnss-cache-0.1-r1-make-install.patch, metadata.xml:
+  Revbump to fix install locations (bug #277995, thanks Nathan March) and
+  LDFLAGS (bug #336554).
 
   17 Jul 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Fix metadata.xml. maintainer-needed is not a herd
diff --git a/sys-auth/libnss-cache/Manifest b/sys-auth/libnss-cache/Manifest
index b09080e0121e..d5d7c88b5387 100644
--- a/sys-auth/libnss-cache/Manifest
+++ b/sys-auth/libnss-cache/Manifest
@@ -1,5 +1,7 @@
 AUX 0.1-make-install.patch 1066 RMD160 73d57a9c2af5a12d42d804e85457a6ccd9c29911 SHA1 38ca6585bb67f1ff69fe505d6a770bf05268be7d SHA256 22b5f4331436630394e395c3cffc1ac0537adf7dff48b6b772aec845af229222
+AUX libnss-cache-0.1-r1-make-install.patch 1051 RMD160 bdccdc9d359186764936e0cd6ef2ec21f938f597 SHA1 2af50d541739d0725e710fad5e5d46e21cb47666 SHA256 80350d7d6081986bd99d149328c34f4171af6d201f29a01ae6a003c108f48c7a
 DIST libnss-cache-0.1.tar.gz 7371 RMD160 f1a14e233a9441a521118be3be710b7a63d839df SHA1 9c7c12109ea6015e51bb0fc03f5e9160c3c5b806 SHA256 d7931100d0de9d4ce0e169d2bc06df85945495444d110f8fe57b312eb4464b94
+EBUILD libnss-cache-0.1-r1.ebuild 724 RMD160 90a0b37a312ed3a571ad67488417f0ef7a117785 SHA1 05dd8a091293c94d99c32f0ea55cfad04980a52d SHA256 53f6d5c9138ec120876a9961b29cceef430dd13415471147ecef4414fd8a90d3
 EBUILD libnss-cache-0.1.ebuild 719 RMD160 03dde21fa55c85452d2a581e4f447bf0ea0c6ac0 SHA1 c3625d33d381912e5a4721fd637fb27bead7fc6c SHA256 26638d0a4ede62ca53968e4a948a338691bfd2f8c88fcac56d2341342edf9bf4
-MISC ChangeLog 808 RMD160 d05f4135c3764ab38a64113d433106070524f616 SHA1 e41329d9851e5d08d51aede12b08dc0b338dd9d4 SHA256 712bf8d3e83ac6251c98bcbabf04b2fa80311765efca1e86c96943c3100df131
-MISC metadata.xml 235 RMD160 1ce65639bb18accc5a42d20a6d792463b47acbd9 SHA1 d46cff600814e82f56ad848dfef921737bd7f5a1 SHA256 8220270d8ab3559b457d44a7060aaa9b00ccbc8e75d91d5ed81fde4f47b9db63
+MISC ChangeLog 1077 RMD160 9e5a6dfa3ebfc133dbd45022298eee43d456bbba SHA1 99b74d5d2d8ae529c7ce1a3ba7b4c0604a1408a8 SHA256 f5c4d7827498ea14d6baea48af681783420ba9c9c06684354967b3420dbe5169
+MISC metadata.xml 249 RMD160 cc288c3d918df9fecf4122c05c5ba0ce720f2572 SHA1 7658c9fc75581538d2a2b40b466d02a6f8fdee4c SHA256 d32c7b66135139026802d69adebb2c6f914935f59c35522ad74a43bb2e99c850
diff --git a/sys-auth/libnss-cache/files/libnss-cache-0.1-r1-make-install.patch b/sys-auth/libnss-cache/files/libnss-cache-0.1-r1-make-install.patch
new file mode 100644
index 000000000000..798aa2f0ef33
--- /dev/null
+++ b/sys-auth/libnss-cache/files/libnss-cache-0.1-r1-make-install.patch
@@ -0,0 +1,34 @@
+--- Makefile	2010-09-15 02:16:20.851387801 +0200
++++ Makefile	2010-09-15 02:23:26.651387798 +0200
+@@ -1,21 +1,24 @@
+-CC=gcc
++CC?=gcc
+ #CFLAGS=-Wall -fPIC -DDEBUG -g -O0
+-CFLAGS=-Wall -fPIC
++CFLAGS+=-Wall -fPIC
++LDFLAGS+=
+ LIBRARY=libnss_cache.so.2.0
+ LINKS=libnss_cache.so.2 libnss_cache.so
++DESTDIR?=
+ PREFIX=/usr
+ BUILD=.libs
+-LIBDIR=$(PREFIX)/lib
++LIBDIR?=$(PREFIX)/lib
++SONAME=libnss_cache.so.2
+ 
+ nss_cache:
+ 	[ -d $(BUILD) ] || mkdir $(BUILD)
+ 	$(CC) $(CFLAGS) -c nss_cache.c -o $(BUILD)/nss_cache.o
+-	$(CC) -shared -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
++	$(CC) -shared -Wl,-soname,$(SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o $(LDFLAGS)
+ 
+ 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)$(LIBDIR) ] || install -d $(DESTDIR)$(LIBDIR)
++	install $(BUILD)/$(LIBRARY) $(DESTDIR)$(LIBDIR)
++	cd $(DESTDIR)$(LIBDIR); for link in $(LINKS); do ln -sf $(LIBRARY) $$link ; done
diff --git a/sys-auth/libnss-cache/libnss-cache-0.1-r1.ebuild b/sys-auth/libnss-cache/libnss-cache-0.1-r1.ebuild
new file mode 100644
index 000000000000..21c65223c6d0
--- /dev/null
+++ b/sys-auth/libnss-cache/libnss-cache-0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/09/15 00:53:42 xmw Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="libnss-cache is a library that serves nss lookups."
+HOMEPAGE="http://code.google.com/p/nsscache/"
+SRC_URI="http://nsscache.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-make-install.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die
+}
diff --git a/sys-auth/libnss-cache/metadata.xml b/sys-auth/libnss-cache/metadata.xml
index 73b4424dea0e..328a85cafe08 100644
--- a/sys-auth/libnss-cache/metadata.xml
+++ b/sys-auth/libnss-cache/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 	</maintainer>
 </pkgmetadata>