diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-04-13 23:21:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-04-13 23:21:39 +0000 |
| commit | 8a8784a3bd6c17b6b6c1e063962252ff62d82f26 (patch) | |
| tree | efbc0d6302bf3a7e8ea814d8a97add9c90661453 /sys-libs/pwdb | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8a8784a3bd6c17b6b6c1e063962252ff62d82f26.tar.gz gentoo-2-8a8784a3bd6c17b6b6c1e063962252ff62d82f26.tar.bz2 gentoo-2-8a8784a3bd6c17b6b6c1e063962252ff62d82f26.zip | |
Use libtirpc for nis logic #198134 by Wolfgang Thiess.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/pwdb')
| -rw-r--r-- | sys-libs/pwdb/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/pwdb/files/pwdb-0.62-build.patch | 2 | ||||
| -rw-r--r-- | sys-libs/pwdb/pwdb-0.62.ebuild | 39 |
3 files changed, 30 insertions, 19 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/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 |