public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/
Date: Wed, 22 Jan 2020 19:25:29 +0000 (UTC)	[thread overview]
Message-ID: <1579721085.6b6cf15b5ddbf383b4b8f58466fb337bc6704313.chutzpah@gentoo> (raw)

commit:     6b6cf15b5ddbf383b4b8f58466fb337bc6704313
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Jan 22 19:24:45 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 19:24:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6cf15b

sys-libs/libxcrypt-4.4.11: Version bump, add py38

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-libs/libxcrypt/Manifest                |   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild | 153 +++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 0bdde211d72..7d6f6263be7 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2
+DIST libxcrypt-4.4.11.tar.gz 493509 BLAKE2B a2cd425194fa28fdde25def1f7c7cfc58af76ac228540e5d645f36295fb8fe21316393067d0a81764d7981e85003abeebd590b979e64191dd449f14bcbb613a0 SHA512 907802cf9979704888ec947a2dc57aebb9d1317184948a9e771f6ba59deb9434d93f962185c186e66bb891f1b9f92405b6884e85d2a1d99f55bac367cca12ef2
 DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild
new file mode 100644
index 00000000000..c48e1369c1c
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild
@@ -0,0 +1,153 @@
+# 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 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}]')
+	)"
+
+# Gentoo CI complained about not having this
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/libxcrypt-4.4.10-pythonver.patch"
+	"${FILESDIR}/libxcrypt-4.4.10-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\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"
+
+	# remove useless stuff from installation
+	find "${D}"/usr/share/doc/${PF} -type l -delete || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_install() {
+	local install_target
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*) install_target="install-libLTLIBRARIES";;
+		xcrypt_nocompat-*)
+			if is_final_abi; then
+				install_target="install"
+			else
+				install_target="install-libLTLIBRARIES"
+			fi
+			;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	emake DESTDIR="${D}" ${install_target}
+
+	# don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				"${D}"/usr/include/$(usex system '' 'xcrypt/')xcrypt.h || die
+		;;
+		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
+			;;
+	esac
+}


             reply	other threads:[~2020-01-22 19:25 UTC|newest]

Thread overview: 161+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-22 19:25 Patrick McLean [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-07 10:11 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/ Sam James
2025-05-07 10:11 Sam James
2025-05-07 10:11 Sam James
2025-05-07 10:10 Sam James
2025-04-26 12:41 Arthur Zamarin
2025-04-26  5:28 Sam James
2025-04-26  2:56 Sam James
2025-04-26  2:18 Sam James
2025-02-27 17:10 Mike Gilbert
2025-02-27 17:10 Mike Gilbert
2025-02-21 16:38 Mike Gilbert
2025-02-09  7:09 Sam James
2025-01-22  7:24 Sam James
2024-10-07  6:22 Sam James
2024-05-01  5:28 Joonas Niilola
2024-04-15  6:40 Arthur Zamarin
2024-04-13 18:37 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 15:25 Mike Gilbert
2024-04-13 15:22 Mike Gilbert
2024-03-11  3:29 Mike Gilbert
2024-03-04 10:24 Sam James
2024-01-29 22:14 Andreas K. Hüttel
2024-01-03 10:40 Sam James
2023-10-28 22:16 Sam James
2023-09-14 22:54 Sam James
2023-09-03  3:43 Sam James
2023-09-02 17:46 Sam James
2023-09-02 17:46 Sam James
2023-09-02 17:46 Sam James
2023-09-02 16:56 Sam James
2023-09-02 16:55 Sam James
2023-07-05 19:31 Sam James
2023-06-06 21:07 Sam James
2023-06-01  3:54 Sam James
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-24 13:18 Arthur Zamarin
2023-03-19 22:08 Sam James
2023-01-14 19:17 Sam James
2022-12-16  7:53 Sam James
2022-12-16  7:52 Sam James
2022-11-24 19:52 Mike Gilbert
2022-11-19  3:19 Sam James
2022-11-19  3:19 Sam James
2022-11-18  6:23 Sam James
2022-11-18  6:23 Sam James
2022-11-14  3:50 Sam James
2022-11-14  3:50 Sam James
2022-11-08  1:30 Sam James
2022-11-02  4:05 Sam James
2022-11-02  3:50 Sam James
2022-11-02  3:05 Sam James
2022-11-02  3:02 Sam James
2022-10-31 20:47 Sam James
2022-10-19  3:15 Sam James
2022-10-15 17:26 Mike Gilbert
2022-10-08 15:31 Mike Gilbert
2022-10-08 15:31 Mike Gilbert
2022-09-23  1:56 Sam James
2022-09-10 11:28 Sam James
2022-08-26 10:46 Sam James
2022-08-20 15:54 Arthur Zamarin
2022-07-30 14:06 Arthur Zamarin
2022-07-18  7:20 Agostino Sarubbo
2022-07-17 19:45 Sam James
2022-07-17 19:45 Sam James
2022-07-17 19:42 Sam James
2022-07-17 19:40 Sam James
2022-07-17 17:34 Sam James
2022-07-17 17:34 Sam James
2022-07-17 15:24 Sam James
2022-06-18 15:15 Sam James
2022-05-24  2:16 Sam James
2022-05-07  5:04 Sam James
2022-04-23 23:55 Sam James
2022-04-17 18:32 Sam James
2022-03-08 15:13 Sam James
2022-02-25 18:38 Sam James
2022-02-20  9:14 Agostino Sarubbo
2022-02-19 19:28 Sam James
2022-02-19 12:02 Arthur Zamarin
2022-02-19 12:02 Arthur Zamarin
2022-02-19  8:46 Arthur Zamarin
2022-02-19  3:38 Sam James
2022-02-19  3:06 Sam James
2022-01-06 10:39 David Seifert
2022-01-05  5:24 Sam James
2021-12-18  7:05 Sam James
2021-12-03 18:57 Sam James
2021-12-02  1:16 Sam James
2021-11-19 17:42 Sam James
2021-11-06  0:52 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:10 Sam James
2021-10-31 18:10 Sam James
2021-10-31 18:10 Sam James
2021-10-21  6:44 Sam James
2021-09-24 21:02 Mike Gilbert
2021-09-17 20:20 Sam James
2021-09-03  1:53 Sam James
2021-08-21 22:15 James Le Cuirot
2021-08-11  2:37 Sam James
2021-08-09  4:12 Sam James
2021-08-07  5:14 Sam James
2021-07-23 18:00 Sam James
2021-07-17 23:33 Andreas K. Hüttel
2021-07-17 23:33 Andreas K. Hüttel
2021-07-17 17:12 Andreas K. Hüttel
2021-07-16  3:58 Sam James
2021-07-14 20:46 Andreas K. Hüttel
2021-07-02  2:30 Sam James
2021-06-26 12:05 Sergei Trofimovich
2021-06-26  1:34 Sam James
2021-06-24 21:03 Sergei Trofimovich
2021-06-22 19:45 Sam James
2021-06-22 18:57 Sergei Trofimovich
2021-06-21  6:19 Agostino Sarubbo
2021-06-21  6:19 Agostino Sarubbo
2021-06-21  6:18 Agostino Sarubbo
2021-06-19 23:51 Sam James
2021-06-19 23:51 Sam James
2021-06-19  9:01 Sergei Trofimovich
2021-06-18 10:23 Sergei Trofimovich
2021-06-18 10:04 Sergei Trofimovich
2021-06-17  5:03 Sam James
2021-06-01  6:59 Agostino Sarubbo
2021-06-01  6:32 Agostino Sarubbo
2021-05-02  7:10 Patrick McLean
2021-03-05 20:27 Sam James
2021-02-22  2:21 Joshua Kinard
2021-02-03  0:38 Andreas K. Hüttel
2020-12-13  0:16 Sam James
2020-12-10  2:51 Matt Turner
2020-11-28 11:26 Sergei Trofimovich
2020-10-24 11:05 Sergei Trofimovich
2020-10-24 11:04 Sergei Trofimovich
2020-10-24 11:01 Sergei Trofimovich
2020-10-24 11:00 Sergei Trofimovich
2020-10-23  1:01 Sam James
2020-10-23  0:54 Sam James
2020-09-12  4:40 Patrick McLean
2020-08-05 14:17 Agostino Sarubbo
2020-06-23 18:47 Patrick McLean
2020-04-11 19:03 Patrick McLean
2020-02-15 10:03 David Seifert
2020-02-08  0:51 Patrick McLean
2020-02-08  0:29 Patrick McLean
2020-02-07  3:41 Patrick McLean
2020-02-07  0:13 Patrick McLean
2019-11-07  6:03 Patrick McLean
2019-11-05  5:34 Patrick McLean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1579721085.6b6cf15b5ddbf383b4b8f58466fb337bc6704313.chutzpah@gentoo \
    --to=chutzpah@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox