Gentoo Archives: gentoo-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 18/21] dev-libs/libpwquality: switch to sep-usr eclass
Date: Thu, 31 Mar 2016 00:06:06
Message-Id: 1459382320-20672-19-git-send-email-vapier@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default by Mike Frysinger
1 ---
2 dev-libs/libpwquality/libpwquality-1.3.0.ebuild | 12 +++---------
3 1 file changed, 3 insertions(+), 9 deletions(-)
4
5 diff --git a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
6 index e2597b0..8082188 100644
7 --- a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
8 +++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
9 @@ -5,7 +5,7 @@
10 EAPI="5"
11 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
12
13 -inherit eutils multilib pam python-r1 toolchain-funcs
14 +inherit eutils multilib pam python-r1 sep-usr
15
16 DESCRIPTION="Library for password quality checking and generating random passwords"
17 HOMEPAGE="https://fedorahosted.org/libpwquality/"
18 @@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
19 IUSE="pam python static-libs"
20
21 RDEPEND="
22 - >=sys-libs/cracklib-2.8:=
23 + >=sys-libs/cracklib-2.8:=[sep-usr?]
24 pam? ( virtual/pam )
25 python? ( ${PYTHON_DEPS} )
26 "
27 @@ -38,7 +38,6 @@ src_configure() {
28 configuring() {
29 local sitedir
30 econf \
31 - --libdir="${EPREFIX}/$(get_libdir)" \
32 $(use_enable pam) \
33 --with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
34 $(use_enable python python-bindings) \
35 @@ -58,12 +57,7 @@ src_test() {
36
37 src_install() {
38 if_use_python_python_foreach_impl default
39 - if use static-libs; then
40 - # Do not install static libs in /lib
41 - mkdir -p "${ED}usr/$(get_libdir)"
42 - mv "${ED}$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
43 - gen_usr_ldscript libpwquality.so
44 - fi
45 + gen_usr_ldscript -a pwquality
46 prune_libtool_files --modules
47 }
48
49 --
50 2.7.4