summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2020-02-06 19:35:51 -0800
committerPatrick McLean <chutzpah@gentoo.org>2020-02-06 19:41:11 -0800
commite1f8bbd1b76dc8cbb826e1ab48ae160753e86be8 (patch)
treecde74e4e7ed027466f039b3e069c5e8c654e3bc7 /sys-libs/libxcrypt
parentprofiles/base: fix libxcrypt USE mask date, add split-usr to mask (diff)
downloadgentoo-e1f8bbd1b76dc8cbb826e1ab48ae160753e86be8.tar.gz
gentoo-e1f8bbd1b76dc8cbb826e1ab48ae160753e86be8.tar.bz2
gentoo-e1f8bbd1b76dc8cbb826e1ab48ae160753e86be8.zip
sys-libs/libxcrypt-4.4.12-r1: revbump, fix USE=system
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-libs/libxcrypt')
-rw-r--r--sys-libs/libxcrypt/libxcrypt-4.4.12-r1.ebuild50
-rw-r--r--sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild157
2 files changed, 25 insertions, 182 deletions
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.12-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12-r1.ebuild
index 45264f51d4a..0983a476eda 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.12-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.12-r1.ebuild
@@ -126,37 +126,37 @@ multilib_src_install() {
|| die "failed to remove extra compat libraries"
;;
xcrypt_nocompat-*)
- if use static-libs; then
+ if use split-usr; then
(
- # .a files are installed to /$(get_libdir) by default
- # move static libraries to /usr prefix or portage will abort
- shopt -s nullglob || die "failglob failed"
- static_libs=( "${ED}"/$(get_xclibdir)/*.a )
-
- if [[ -n ${static_libs[*]} ]]; then
- dodir "/usr/$(get_xclibdir)"
- mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
- || die "moving static libs failed"
+ if use static-libs; then
+ # .a files are installed to /$(get_libdir) by default
+ # move static libraries to /usr prefix or portage will abort
+ shopt -s nullglob || die "failglob failed"
+ static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+ if [[ -n ${static_libs[*]} ]]; then
+ dodir "/usr/$(get_xclibdir)"
+ mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+ || die "moving static libs failed"
+ fi
fi
- )
- fi
- if use split-usr && use system; then
- (
- # now try to find libraries and make sure to generate
- # ldscripts for them
- shopt -s failglob || die "failglob failed"
+ if use system; then
+ # now try to find libraries and make sure to generate
+ # ldscripts for them
+ shopt -s failglob || die "failglob failed"
- for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
- libname="$(basename "${lib_file}")"
+ for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+ libname="$(basename "${lib_file}")"
- cp -L "${lib_file}" \
- "${ED}/usr/$(get_xclibdir)/${libname}" \
- || die "copying ${libname} failed"
+ cp -L "${lib_file}" \
+ "${ED}/usr/$(get_xclibdir)/${libname}" \
+ || die "copying ${libname} failed"
- gen_usr_ldscript ${libname}
- dosym ${libname} /usr/$(get_xclibdir)/${libname}.2
- done
+ gen_usr_ldscript ${libname}
+ dosym ${libname} /usr/$(get_xclibdir)/${libname}.2
+ done
+ fi
)
fi
;;
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild
deleted file mode 100644
index a7ecbd9f4e5..00000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools usr-ldscript multibuild python-any-r1 multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others "
-SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat split-usr +static-libs system test"
-
-DEPEND="system? (
- elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
- !sys-libs/musl
- )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-apps/findutils
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]')
- )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/libxcrypt-4.4.12-pythonver.patch"
- "${FILESDIR}/libxcrypt-4.4.12-multibuild.patch"
-)
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=(
- $(usex compat 'xcrypt_compat' '')
- xcrypt_nocompat
- )
-
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xclibdir() {
- printf -- "%s/%s/%s\n" \
- "$(usex split-usr '' '/usr')" \
- "$(get_libdir)" \
- "$(usex system '' 'xcrypt')"
-}
-
-multilib_src_configure() {
- local -a myconf=(
- --libdir=$(get_xclibdir)
- --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
- --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
- )
-
- case "${MULTIBUILD_ID}" in
- xcrypt_compat-*)
- myconf+=(
- --disable-static
- --disable-xcrypt-compat-files
- --enable-obsolete-api=yes
- )
- ;;
- xcrypt_nocompat-*)
- myconf+=(
- --enable-obsolete-api=no
- $(use_enable static-libs static)
- )
- ;;
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
- esac
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_compile() {
- multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
- emake check
-}
-
-src_test() {
- multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
- multibuild_foreach_variant multilib-minimal_src_install
-
- (
- shopt -s failglob || die "failglob failed"
-
- # make sure out man pages don't collide with glibc or man-pages
- for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
- mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
- || die "mv failed"
- done
- ) || die "failglob error"
-
- gen_usr_ldscript libxcrypt.so $(usex system 'libcrypt.so' '')
-
- # remove useless stuff from installation
- find "${D}"/usr/share/doc/${PF} -type l -delete || die
- find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- # don't install the libcrypt.so symlink for the "compat" version
- case "${MULTIBUILD_ID}" in
- xcrypt_compat-*)
- rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
- || die "failed to remove extra compat libraries"
- ;;
- xcrypt_nocompat-*)
- if use split-usr; then
- (
- shopt -s failglob || die "failglob failed"
-
- for so_file in "${D}"$(get_xclibdir)/*$(get_libname)*; do
- so_file=$(basename "${so_file}") || die
-
- dosym ../../$(usex system '' '../')$(get_libdir)$(usex system '' '/xcrypt')/${so_file} \
- /usr/$(get_libdir)/$(usex system '' 'xcrypt/')${so_file}
- done
- ) || die "symlinking library failure"
- fi
- ;;
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
- esac
-
- # .a files are installed to /$(get_libdir) by default
- if use static-libs; then
- (
- shopt -s nullglob || die "nullglob failed"
- static_libs=( "${D}"/$(get_xclibdir)/*.a )
-
- if [[ -n ${static_libs[*]} ]]; then
- mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
- || die "moving static libs failed"
- fi
- )
- fi
-}