From b0c85b2635958d1aa7c9cee8dbf22ad871a280f1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 29 Jan 2024 23:49:41 +0000
Subject: gentoo auto-resync : 29:01:2024 - 23:49:41

---
 sys-libs/libxcrypt/Manifest                   |   2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild | 335 --------------------------
 sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild | 335 ++++++++++++++++++++++++++
 3 files changed, 336 insertions(+), 336 deletions(-)
 delete mode 100644 sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
 create mode 100644 sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild

(limited to 'sys-libs/libxcrypt')

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 5dfe54673e40..39445203fae8 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -4,6 +4,6 @@ DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f97
 DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f SHA512 fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10
 EBUILD libxcrypt-4.4.28-r2.ebuild 9464 BLAKE2B d5171d0edf8f3028b0e099273a4adfed9a4e7b4f8374f181f0802c37fccd096a6ab2e1823b2915191f54f7b7d48a2e7cd9fe7c91ca156e3f08fc09a50c33a885 SHA512 7e66fd6af9a2f925b881d23351ea3df2e50d8bce59830b253925b9b813b649594fd26b9700c8823a1ebd29c52079d0002b1a99c7367a82c2a6978986b357f640
 EBUILD libxcrypt-4.4.33.ebuild 9290 BLAKE2B 950410645ae7c368f5498ca33d26080af50f7e7123b62bb56c7c06c1599fda660efdfd00cf58ad3ef5015562b4541deba9c4791419223413591cc6786880550e SHA512 6623e4c543384119cf360b1de1ed00b775c51fc8d69653a94cfea2095491c8ae576299ab498a524b51ca477bcb5fbd14c659e886a7a12dd41371ac87b974e3cf
-EBUILD libxcrypt-4.4.36-r1.ebuild 9083 BLAKE2B 69699facdf9df3583b41b7a565f287f26c3a10eea22f24a2dea6597f4ebde8abe081f2c78a8516bf40644c3c97d432764c16d7da90f5fba572da1d94ddca01bf SHA512 b72cf8b1e02d43ca5ee0287c171d94933ed90fc709d46464e4cf9367d0cd25f85dbc738998efe4cf28843127a1a54ba279d6969ff36aeaee965cfe45aa8e59fe
+EBUILD libxcrypt-4.4.36-r2.ebuild 9083 BLAKE2B 75bae6bbaa6d87d2a7dde7c237e6e9d931adab44591a54d35e13f95993077d0cb16391fc85835ee67ffd6c30f88e052e24d4b5ecf6ea2833d56e0a1990401162 SHA512 a5fd4cdf5a9adc31e145109532181a659e4ddedbea7e7e3f74a47cb9afbcdbbcc1940f339cec2318fe7f34531b32d80f884e8e7db1b638dafede1493a987708c
 EBUILD libxcrypt-4.4.36.ebuild 9276 BLAKE2B 98a592ac762240cae507fc801b23df1172552d07a1583ef42d83efe00d1008f2fdc28cc71d73d527cb94d59ccd9db64062077789dece2428518b887bc72ba8a0 SHA512 8b4bf70219e81777d4ba975f0d06f33f9fda18211816e93f0b04363663a06fc2fad9cf1f02c012ca877935f45f6ea9af3afa026c56c12e7f5a97699097b975c3
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
deleted file mode 100644
index 91fc2b596b54..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 2004-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-	inherit autotools
-	SRC_URI="https://github.com/besser82/libxcrypt/releases/download/v${PV}/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
-fi
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+compat split-usr static-libs +system test headers-only"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-is_cross() {
-	local enabled_abis=( $(multilib_get_enabled_abis) )
-	[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-DEPEND="
-	system? (
-		elibc_glibc? (
-			${CATEGORY}/glibc[-crypt(+)]
-			!${CATEGORY}/glibc[crypt(+)]
-		)
-		elibc_musl? (
-			${CATEGORY}/musl[-crypt(+)]
-			!${CATEGORY}/musl[crypt(+)]
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/perl
-	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if has "distcc" ${FEATURES} ; then
-		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
-		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
-
-		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
-			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usev compat 'xcrypt_compat')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# WARNING: Please read on bumping or applying patches!
-	#
-	# There are two circular dependencies to be aware of:
-	# 1)
-	#	if we're bootstrapping configure and makefiles:
-	#		libxcrypt -> automake -> perl -> libxcrypt
-	#
-	#   mitigation:
-	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
-	#		and the ebuild uses that.
-	#		(Don't include the pre-generated Perl artefacts.)
-	#
-	#	solution for future:
-	#		Upstream are working on producing `make dist` tarballs.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# 2)
-	#	configure *unconditionally* needs Perl at build time to generate
-	#	a list of enabled algorithms based on the set passed to `configure`:
-	#		libxcrypt -> perl -> libxcrypt
-	#
-	#	mitigation:
-	#		None at the moment.
-	#
-	#	solution for future:
-	#		Not possible right now. Upstream intend on depending on Perl for further
-	#		configuration options.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# Therefore, on changes (inc. bumps):
-	#	* You must check whether upstream have started providing tarballs with bootstrapped
-	#	  auto{conf,make};
-	#
-	#	* diff the build system changes!
-	#
-	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-		# Facilitate our split variant build for compat + non-compat
-		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# Avoid possible "illegal instruction" errors with gold
-	# bug #821496
-	tc-ld-disable-gold
-
-	# Doesn't work with LTO: bug #852917.
-	# https://github.com/besser82/libxcrypt/issues/24
-	filter-lto
-
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xcprefix() {
-	if is_cross; then
-		echo "${EPREFIX}/usr/${CTARGET}"
-	else
-		echo "${EPREFIX}"
-	fi
-}
-
-get_xclibdir() {
-	printf -- "%s/%s/%s/%s\n" \
-		"$(get_xcprefix)" \
-		"$(usev !split-usr '/usr')" \
-		"$(get_libdir)" \
-		"$(usev !system 'xcrypt')"
-}
-
-get_xcincludedir() {
-	printf -- "%s/usr/include/%s\n" \
-		"$(get_xcprefix)" \
-		"$(usev !system 'xcrypt')"
-}
-
-get_xcmandir() {
-	printf -- "%s/usr/share/man\n" \
-		"$(get_xcprefix)"
-}
-
-get_xcpkgconfigdir() {
-	printf -- "%s/usr/%s/pkgconfig\n" \
-		"$(get_xcprefix)" \
-		"$(get_libdir)"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--host=${CTARGET}
-		--disable-werror
-		--libdir=$(get_xclibdir)
-		--with-pkgconfigdir=$(get_xcpkgconfigdir)
-		--includedir=$(get_xcincludedir)
-		--mandir="$(get_xcmandir)"
-	)
-
-	tc-export PKG_CONFIG
-
-	if is_cross; then
-		if tc-is-clang; then
-			export CC="${CTARGET}-clang"
-		else
-			export CC="${CTARGET}-gcc"
-		fi
-	fi
-
-	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
-
-	if use headers-only; then
-		# Nothing is compiled here which would affect the headers for the target.
-		# So forcing CC is sane.
-		headers_only_flags="CC=$(tc-getBUILD_CC)"
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
-}
-
-src_compile() {
-	use headers-only && return
-
-	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
-
-	use headers-only || \
-	(
-		shopt -s failglob || die "failglob failed"
-
-		# Make sure our man pages do not collide with glibc or man-pages.
-		for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
-			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
-				|| die "mv failed"
-		done
-	) || die "failglob error"
-
-	# Remove useless stuff from installation
-	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
-	find "${ED}" -name '*.la' -delete || die
-
-	# workaround broken upstream cross-* --docdir by installing files in proper locations
-	if is_cross; then
-		insinto "$(get_xcprefix)"/usr/share
-		doins -r "${ED}"/usr/share/doc
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-multilib_src_install() {
-	if use headers-only; then
-		emake DESTDIR="${D}" install-nodist_includeHEADERS
-		return
-	fi
-
-	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
-				(
-					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=( "${D}"/$(get_xclibdir)/*.a )
-
-						if [[ -n ${static_libs[*]} ]]; then
-							dodir "/usr/$(get_xclibdir)"
-							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
-								|| die "Moving static libs failed"
-						fi
-					fi
-
-					if use system; then
-						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
-						# to allow linker to correctly find shared libraries.
-						shopt -s failglob || die "failglob failed"
-
-						for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
-							lib_file_basename="$(basename "${lib_file}")"
-							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
-
-							# We already know we're in split-usr (checked above)
-							# See bug #843209 (also worth keeping in mind bug #802222 too)
-							local libdir_no_prefix=$(get_xclibdir)
-							libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
-							libdir_no_prefix=${libdir_no_prefix%/usr}
-							dosym -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
-						done
-
-						rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
-					fi
-				)
-			fi
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-}
-
-pkg_preinst() {
-	# Verify we're not in a bad case like bug #843209 with broken symlinks.
-	# This can be dropped when, if ever, the split-usr && system && compat case
-	# is cleaned up in *_src_install.
-	local broken_symlinks=()
-	mapfile -d '' broken_symlinks < <(
-		find "${ED}" -xtype l -print0
-	)
-
-	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
-		eerror "Broken symlinks found before merging!"
-		local symlink target resolved
-		for symlink in "${broken_symlinks[@]}" ; do
-			target="$(readlink "${symlink}")"
-			resolved="$(readlink -f "${symlink}")"
-			eerror "  '${symlink}' -> '${target}' (${resolved})"
-		done
-		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
-	fi
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild
new file mode 100644
index 000000000000..700cbf7866ee
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild
@@ -0,0 +1,335 @@
+# Copyright 2004-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/libxcrypt/releases/download/v${PV}/${P}.tar.xz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr static-libs +system test headers-only"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+is_cross() {
+	local enabled_abis=( $(multilib_get_enabled_abis) )
+	[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+DEPEND="
+	system? (
+		elibc_glibc? (
+			${CATEGORY}/glibc[-crypt(-)]
+			!${CATEGORY}/glibc[crypt(-)]
+		)
+		elibc_musl? (
+			${CATEGORY}/musl[-crypt(+)]
+			!${CATEGORY}/musl[crypt(+)]
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if has "distcc" ${FEATURES} ; then
+		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
+		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
+
+		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
+			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usev compat 'xcrypt_compat')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# Avoid possible "illegal instruction" errors with gold
+	# bug #821496
+	tc-ld-disable-gold
+
+	# Doesn't work with LTO: bug #852917.
+	# https://github.com/besser82/libxcrypt/issues/24
+	filter-lto
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xcprefix() {
+	if is_cross; then
+		echo "${EPREFIX}/usr/${CTARGET}"
+	else
+		echo "${EPREFIX}"
+	fi
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usev !split-usr '/usr')" \
+		"$(get_libdir)" \
+		"$(usev !system 'xcrypt')"
+}
+
+get_xcincludedir() {
+	printf -- "%s/usr/include/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usev !system 'xcrypt')"
+}
+
+get_xcmandir() {
+	printf -- "%s/usr/share/man\n" \
+		"$(get_xcprefix)"
+}
+
+get_xcpkgconfigdir() {
+	printf -- "%s/usr/%s/pkgconfig\n" \
+		"$(get_xcprefix)" \
+		"$(get_libdir)"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--host=${CTARGET}
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=$(get_xcpkgconfigdir)
+		--includedir=$(get_xcincludedir)
+		--mandir="$(get_xcmandir)"
+	)
+
+	tc-export PKG_CONFIG
+
+	if is_cross; then
+		if tc-is-clang; then
+			export CC="${CTARGET}-clang"
+		else
+			export CC="${CTARGET}-gcc"
+		fi
+	fi
+
+	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
+
+	if use headers-only; then
+		# Nothing is compiled here which would affect the headers for the target.
+		# So forcing CC is sane.
+		headers_only_flags="CC=$(tc-getBUILD_CC)"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
+}
+
+src_compile() {
+	use headers-only && return
+
+	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
+
+	use headers-only || \
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# Remove useless stuff from installation
+	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+	find "${ED}" -name '*.la' -delete || die
+
+	# workaround broken upstream cross-* --docdir by installing files in proper locations
+	if is_cross; then
+		insinto "$(get_xcprefix)"/usr/share
+		doins -r "${ED}"/usr/share/doc
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+multilib_src_install() {
+	if use headers-only; then
+		emake DESTDIR="${D}" install-nodist_includeHEADERS
+		return
+	fi
+
+	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
+				(
+					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=( "${D}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
+								|| die "Moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+
+							# We already know we're in split-usr (checked above)
+							# See bug #843209 (also worth keeping in mind bug #802222 too)
+							local libdir_no_prefix=$(get_xclibdir)
+							libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
+							libdir_no_prefix=${libdir_no_prefix%/usr}
+							dosym -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
+						done
+
+						rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
+
+pkg_preinst() {
+	# Verify we're not in a bad case like bug #843209 with broken symlinks.
+	# This can be dropped when, if ever, the split-usr && system && compat case
+	# is cleaned up in *_src_install.
+	local broken_symlinks=()
+	mapfile -d '' broken_symlinks < <(
+		find "${ED}" -xtype l -print0
+	)
+
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
+		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
+	fi
+}
-- 
cgit v1.2.3