Use libtirpc for nis logic #198134 by Wolfgang Thiess.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 53 insertions, 22 deletions

diff --git a/sys-libs/pwdb/ChangeLog b/sys-libs/pwdb/ChangeLog
index 66b8a8b86436..64c1f1be2731 100644
--- a/sys-libs/pwdb/ChangeLog
+++ b/sys-libs/pwdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/pwdb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.40 2011/02/06 21:35:40 leio Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.41 2012/04/13 23:21:39 vapier Exp $
+
+  13 Apr 2012; Mike Frysinger <vapier@gentoo.org> pwdb-0.62.ebuild,
+  files/pwdb-0.62-build.patch:
+  Use libtirpc for nis logic #198134 by Wolfgang Thiess.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> pwdb-0.62.ebuild:
   Drop to ~mips
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 31fa12377887..971d7d9912de 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX passwd 143 RMD160 ca859f48fde633c29a22f226ba01b4921c1463a1 SHA1 1aa61db7f3ae05490cb0b3eb56b0a95746d9183e SHA256 9cecaf4de9eaf61cf42c28bf1e63295a58e59e0ca0abb8fb7eaf6327201ce604
-AUX pwdb-0.62-build.patch 2914 RMD160 87e17e2072b7b5752b714e393e9652b479d1953c SHA1 8c99f37f26659217f0edbe4e49808e075d597065 SHA256 4c53d2cabaf71ef712ffcb384344657bb948b2b816563862c47629253b685360
+AUX pwdb-0.62-build.patch 2920 RMD160 1f75d6c7403777830606bdec038adaf4abec20eb SHA1 e03bb5742412449586e1c91e3a9e12667c8cd642 SHA256 39203b664af9404a4c10271d695c7644a8de1540c1e2d8b66c389d7bb2cc3852
 AUX pwdb-0.62-selinux.patch 10523 RMD160 e40e3f6ff74ec1e380303eb7b23e36b9d12ac760 SHA1 4f703ba7aa4ac558e053fad65e37771740b00564 SHA256 92e54ae9c7f74bcac0c582bc025f4897cf54bff31c187324d433cc0414270dd3
 DIST pwdb-0.62.tar.gz 133183 RMD160 01aca626eb54e82811ee7c7ae27b96bc22035b75 SHA1 10997946c087c3afdf9e4cca458eabaa1fac5317 SHA256 1e0420b92c9996f82b3364b982f7d6c62460c513afa329b78317b3037dc3d4b9
-EBUILD pwdb-0.62.ebuild 1318 RMD160 8527be18208f49d4a0d0e9492fe412d7c78e0111 SHA1 9bc2dcb3e6e22f82265384bb91a2dcf63a44fb62 SHA256 46bf829d93428e6975b05c7fc21091be08f69dd97f4e6ed9f08785e39871a89a
-MISC ChangeLog 4908 RMD160 f125da535560ac62ef3f4e3901fff32777eab81a SHA1 dc66d947c81e5f63eb45eed7422d9c63b4587658 SHA256 aa3e2606654b558ac93cbcee345e78b6553d8d0f9dd4f72fd74ad8594d643f27
+EBUILD pwdb-0.62.ebuild 1473 RMD160 815e41e0bb4f466494a216bc3e1e5fe3de222f70 SHA1 de77d572891dcd8c66f7ba7a9dfbddb45ad7af6a SHA256 a2df31e0b74edfc5eaa12d4dc82a1e40216019ffb46679c9a7cec35d2a92a6f1
+MISC ChangeLog 5067 RMD160 c98faee9364ec45b69f77922b1763df38b7b8a9e SHA1 18cbe5e705d56b1e845138612230cc1ea48c956d SHA256 4a6b679b2ba91a8530235b79585455e4aac6a768cacce556501cce2b063c24f2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPiLVCAAoJELEHsLL7fEFWRvEP/R9j4+4VDpgXdHg83Lg1r0o1
+Kc0rX7iyEwfHEiQx/TU7ekphNZchfXPokR9tYV1iTdQH1iyZ1llfq8yq3iSDu1KO
+UciC9fMGl5wssEBuBOL45z9M7ufmC/L0O+Eg5z+Tu5XD6HSPbl05dpvdUAEJV/l+
+OsntlM6w88a1yZreXgRw2r6THYx8t4iee52KYBHsoFs2gODnh+LNC0LDmn9I3OhW
+OgTUhUZ3HlRZMeyJHe6vq5dVbk2rLoW2dgT1CD201vpEvpLK3qBPUaF37WCmHR4N
+InUx3t5+eSUTKdTyNgAjcvxFnOKXB7QUphDsxUXrk7qv0MeJ4TgmGoWzkMcmuHCG
+3jcuKvWs2FN8SCBjN9WB+YtMrfvKom6VITpqIrH3gIATPxBDjcGuKas1UOgoBbsp
+PuK6KwzIyFUUlXzVGKPzGXOg8BtMXRHNbqhm5HqSBBDshIZg627g127BKJPAWFCp
+T9KrSirAFWO7Oe0z8TruGmLTJ6UzbEl5Zs5oszaU8isDbype2aVN/skChIT3MtWe
+uM9QDYAJVtlz1NGy3qN0r/0X1EjId8Q9fb6tleifWIgkaqaXzW0gEdh3AQlVid6i
+vNB8uxyH3a3VUeTIfjJOs43WD3AxRhbZE5Cens5DKbWInLoLEVGrHf7aEpUBzyA5
+/G6asmYYlMdPearrrTcJ
+=Zelp
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/pwdb/files/pwdb-0.62-build.patch b/sys-libs/pwdb/files/pwdb-0.62-build.patch
index a1f3e15d253d..ecef517b1ca3 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-build.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-build.patch
@@ -29,7 +29,7 @@ http://bugs.gentoo.org/137134
  
  $(LIBDYNAME): $(LIBOBJ)
 -	$(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl -lc
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl $(LDLIBS)
  	@ln -sf $(LIBFILENAME) $@
  
  $(LIBSTATIC): $(LIBOBJ)
diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild
index e304b2093c23..84b0656bec7d 100644
--- a/sys-libs/pwdb/pwdb-0.62.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.32 2011/02/06 21:35:40 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.33 2012/04/13 23:21:39 vapier Exp $
 
-inherit eutils toolchain-funcs
+EAPI="4"
+
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Password database"
 HOMEPAGE="http://packages.gentoo.org/package/sys-libs/pwdb"
@@ -14,34 +16,39 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux"
 RESTRICT="test" #122603
 
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-src_unpack () {
-	unpack ${A}
+# Note: NIS could probably be made conditional if anyone cared ...
+RDEPEND="selinux? ( sys-libs/libselinux )
+	net-libs/libtirpc"
+DEPEND="${RDEPEND}"
 
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
 
 	use selinux && epatch "${FILESDIR}"/${P}-selinux.patch
 
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libtirpc)
+
 	sed -i \
 		-e "s/^DIRS = .*/DIRS = libpwdb/" \
 		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
-		Makefile || die "sed of Makefile failed"
-	sed -i -e "s:=gcc:=$(tc-getCC):g" default.defs \
-		|| die "sed of default.defs failed"
+		Makefile || die
+	sed -i \
+		-e "s:=gcc:=$(tc-getCC):g" \
+		-e "s:=ar:=$(tc-getAR):g" \
+		-e "s:=ranlib:=$(tc-getRANLIB):g" \
+		default.defs || die
 }
 
 src_install() {
-	dodir /$(get_libdir) /usr/$(get_libdir) /usr/include/pwdb
+	dodir /usr/$(get_libdir) /usr/include/pwdb
 	emake \
 		INCLUDED="${D}"/usr/include/pwdb \
-		LIBDIR="${D}"/$(get_libdir) \
+		LIBDIR="${D}"/usr/$(get_libdir) \
 		LDCONFIG="echo" \
-		install || die
+		install
 
-	mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ || die
-	gen_usr_ldscript libpwdb.so
+	gen_usr_ldscript -a pwdb
 
 	insinto /etc
 	doins conf/pwdb.conf