[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-15 Thread Arthur Zamarin
commit: 648b2a67db6b40c2bf223fea529b0aabd449dcb1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 15 06:40:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 15 06:40:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648b2a67

sys-libs/libxcrypt: Stabilize 4.4.36-r3 sparc, #929925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index 726dab6f521c..550e7631a094 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Arthur Zamarin
commit: e3a19b765dcbfd89317e1b8154aafb0c5d72c241
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:37:05 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:37:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a19b76

sys-libs/libxcrypt: Stabilize 4.4.36-r3 ppc, #929925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index 49aef08729c4..7958fe90b47d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Arthur Zamarin
commit: 367970057d4f13aa0896af4113be32bdef08d60d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 17:48:22 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 17:48:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36797005

sys-libs/libxcrypt: Stabilize 4.4.36-r3 arm64, #929925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index a860c6a422f4..fa2c008627cf 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Arthur Zamarin
commit: c6edb9b0ddf3f2b80e8f0e5ffa29ac5071ce64dd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 17:48:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 17:48:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6edb9b0

sys-libs/libxcrypt: Stabilize 4.4.36-r3 ppc64, #929925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index fa2c008627cf..d32870379f7b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Arthur Zamarin
commit: 734dec1a85432bb99097771ca877583f438ffb4f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 17:48:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 17:48:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734dec1a

sys-libs/libxcrypt: Stabilize 4.4.36-r3 arm, #929925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index d32870379f7b..49aef08729c4 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Mike Gilbert
commit: d8ff467d1e7e6b480f96f5181256f5b5c0ee285d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 13 15:23:25 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 13 15:25:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ff467d

sys-libs/libxcrypt: inherit multibuild

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index 3801c49f579a..a860c6a422f4 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit crossdev multilib python-any-r1 flag-o-matic toolchain-funcs 
multilib-minimal
+inherit crossdev 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;



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-04-13 Thread Mike Gilbert
commit: ab652776c216583f44fb0e4e717b44a0420ff43c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 13 15:22:07 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 13 15:22:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab652776

sys-libs/libxcrypt: enable py3.12

Closes: https://bugs.gentoo.org/929859
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index 3faec08e8e41..3801c49f579a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-03-10 Thread Mike Gilbert
commit: 03f1639e36e33a7d85b9fb09f4799067fe45a984
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Mar 11 03:12:47 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Mar 11 03:28:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f1639e

sys-libs/libxcrypt: general clean up

Drop support for split-usr.
Simplify logic to determine install paths.
Use crossdev.eclass for cross-* support.
Avoid storing "/usr/${CTARGET}" in pkgconfig files for cross builds.
Move python_setup to src_configure.

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 254 ++
 1 file changed, 254 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
new file mode 100644
index ..3faec08e8e41
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -0,0 +1,254 @@
+# 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 crossdev 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 static-libs +system test headers-only"
+RESTRICT="!test? ( test )"
+
+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() {
+   :
+}
+
+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
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-03-04 Thread Sam James
commit: 0de0fe54f9954f49976adf7f585d005945430647
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:20:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:23:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de0fe54

sys-libs/libxcrypt: drop 4.4.28-r2, 4.4.33

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest   |   2 -
 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 343 --
 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild| 338 -
 3 files changed, 683 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 98da62c172ae..416fefe5b930 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1 @@
-DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
-DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
 DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 
8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f
 SHA512 
fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
deleted file mode 100644
index 4e9c2fb26ca2..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 2004-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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(+)]
-   )
-   )
-"
-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=(
-   $(usex 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 -> 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-01-29 Thread Andreas K. Hüttel
commit: f777d389830da3a28f911e38ebae51b5de299e8b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Mon Jan 29 22:13:21 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Jan 29 22:13:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f777d389

sys-libs/libxcrypt: fix glibc dependency

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../{libxcrypt-4.4.36-r1.ebuild => libxcrypt-4.4.36-r2.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild
similarity index 99%
rename from sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
rename to sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild
index 91fc2b596b54..700cbf7866ee 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r2.ebuild
@@ -40,8 +40,8 @@ is_cross() {
 DEPEND="
system? (
elibc_glibc? (
-   ${CATEGORY}/glibc[-crypt(+)]
-   !${CATEGORY}/glibc[crypt(+)]
+   ${CATEGORY}/glibc[-crypt(-)]
+   !${CATEGORY}/glibc[crypt(-)]
)
elibc_musl? (
${CATEGORY}/musl[-crypt(+)]



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2024-01-03 Thread Sam James
commit: 2ce2bb2e2944a9fae66c899dc2d1ecd9f2ec589d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 10:35:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 10:39:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce2bb2e

sys-libs/libxcrypt: pass -Wl,--undefined-version for other linkers if supported

Revbump as it's a library.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild | 335 ++
 1 file changed, 335 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.ebuild
new file mode 100644
index ..91fc2b596b54
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r1.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):
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/files/, sys-libs/libxcrypt/

2023-12-28 Thread Sam James
commit: d0e2ea531a20deb88f83545cbc522fbcd6a8c005
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 06:21:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 14:57:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e2ea53

sys-libs/libxcrypt: drop 4.4.34, 4.4.35

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   2 -
 .../files/libxcrypt-4.4.35-smartmatch.patch|  62 
 sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild | 340 
 sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild | 344 -
 4 files changed, 748 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index e3282a958fa6..98da62c172ae 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,5 +1,3 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
-DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B 
acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b
 SHA512 
ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
-DIST libxcrypt-4.4.35-autotools.tar.xz 622972 BLAKE2B 
93e8ee0d028aa8b2d1b3882c48cd056a1f60ea22c44f38b29c78eaea6719fa9d01c1d0d78065a2c1adbab6f5ca9a2570ee411f78673b979a3b5c2a1f930e275d
 SHA512 
c024b183417db2c4bd8bcc371e8789182ad98f91c79d6a64ce9505abd0251ef6499e8fbceb914274ca50f477fe068e3cf69eed197287bb2c0491aa91ead4df52
 DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 
8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f
 SHA512 
fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10

diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch 
b/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
deleted file mode 100644
index 1956df921bdd..
--- a/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 95d6e03ae37f4ec948474d05bbdd2938aba2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
-Date: Sun, 25 Jun 2023 01:35:08 +0200
-Subject: [PATCH] Remove smartmatch usage from gen-crypt-h
-
-Needed for Perl 5.38

- build-aux/scripts/gen-crypt-h | 31 ++-
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h
-index 12aecf6..b113b79 100644
 a/build-aux/scripts/gen-crypt-h
-+++ b/build-aux/scripts/gen-crypt-h
-@@ -12,7 +12,6 @@ use v5.14;# implicit use strict, use feature ':5.14'
- use warnings FATAL => 'all';
- use utf8;
- use open qw(:std :utf8);
--no  if $] >= 5.018, warnings => 'experimental::smartmatch';
- no  if $] >= 5.022, warnings => 'experimental::re_strict';
- use if $] >= 5.022, re   => 'strict';
- 
-@@ -37,22 +36,20 @@ sub process_config_h {
- local $_;
- while (<$fh>) {
- chomp;
--# Yes, 'given $_' is really required here.
--given ($_) {
--when ('#define HAVE_SYS_CDEFS_H 1') {
--$have_sys_cdefs_h = 1;
--}
--when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
--$have_sys_cdefs_begin_end_decls = 1;
--}
--when ('#define HAVE_SYS_CDEFS_THROW 1') {
--$have_sys_cdefs_throw = 1;
--}
--when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
--$substs{XCRYPT_VERSION_STR}   = $1;
--$substs{XCRYPT_VERSION_MAJOR} = $2;
--$substs{XCRYPT_VERSION_MINOR} = $3;
--}
-+
-+if ($_ eq '#define HAVE_SYS_CDEFS_H 1') {
-+$have_sys_cdefs_h = 1;
-+}
-+elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
-+$have_sys_cdefs_begin_end_decls = 1;
-+}
-+elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') {
-+$have_sys_cdefs_throw = 1;
-+}
-+elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
-+$substs{XCRYPT_VERSION_STR}   = $1;
-+$substs{XCRYPT_VERSION_MAJOR} = $2;
-+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-10-28 Thread Sam James
commit: 18e96b9959bff4b4efd87d58fc2aa775f311dbdb
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 28 22:15:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 28 22:15:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e96b99

sys-libs/libxcrypt: Stabilize 4.4.36 ppc, #913517

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index ae56c53456ea..51562c02d41f 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-14 Thread Sam James
commit: 598a96ef965a2e692cb44207d0cace2587df850d
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Sep 14 13:42:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 14 22:53:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598a96ef

sys-libs/libxcrypt: stable 4.4.36 for sparc, bug #913517

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 0943c85e2c8e..ae56c53456ea 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 6a83f9c1dac7d5ba2b7dc27260e56559152a6681
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 03:42:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 03:42:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a83f9c1

sys-libs/libxcrypt: Stabilize 4.4.36 hppa, #913517

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index b6bac0aa7d84..0943c85e2c8e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 2701bb5e4b9f5f224c3c8c03954e95eb74375d8e
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 17:46:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 17:46:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2701bb5e

sys-libs/libxcrypt: Stabilize 4.4.36 ppc64, #913517

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 9ccdfa955d08..706e4480648b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 0f582d7fde154673e314d66aff1ae3f72633
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 17:46:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 17:46:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f582d7f

sys-libs/libxcrypt: Stabilize 4.4.36 arm, #913517

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 706e4480648b..7d5690a9143d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 5011cb31c0274729d2b4900f6c0da6d4bede0b9e
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 17:46:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 17:46:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5011cb31

sys-libs/libxcrypt: Stabilize 4.4.36 x86, #913517

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 7d5690a9143d..b6bac0aa7d84 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 3797e9615df78a7c4cc76e810735f0e3eb7c
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 16:55:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 16:55:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3797e961

sys-libs/libxcrypt: stabilize 4.4.36 for arm64

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index e3450fe1f762..9ccdfa955d08 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-09-02 Thread Sam James
commit: 14fb9691c006550f8583703cd6c475280ed89795
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 16:54:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 16:54:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fb9691

sys-libs/libxcrypt: stabilize 4.4.36 for amd64

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 98e00079f8ba..e3450fe1f762 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-07-05 Thread Sam James
commit: d753a26148716c5a31c7ea85f6b8913dba9afa47
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  5 18:44:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  5 18:44:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d753a261

sys-libs/libxcrypt: add 4.4.36

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild | 340 +
 2 files changed, 341 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 533bca04ca24..e3282a958fa6 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -2,3 +2,4 @@ DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
 DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B 
acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b
 SHA512 
ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
 DIST libxcrypt-4.4.35-autotools.tar.xz 622972 BLAKE2B 
93e8ee0d028aa8b2d1b3882c48cd056a1f60ea22c44f38b29c78eaea6719fa9d01c1d0d78065a2c1adbab6f5ca9a2570ee411f78673b979a3b5c2a1f930e275d
 SHA512 
c024b183417db2c4bd8bcc371e8789182ad98f91c79d6a64ce9505abd0251ef6499e8fbceb914274ca50f477fe068e3cf69eed197287bb2c0491aa91ead4df52
+DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 
8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f
 SHA512 
fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
new file mode 100644
index ..98e00079f8ba
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -0,0 +1,340 @@
+# Copyright 2004-2023 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')
+   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/, sys-libs/libxcrypt/files/

2023-06-24 Thread Andreas K. Hüttel
commit: f96b20bcc7e34a3eedd5c8b8f70728eb373cb2cd
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Jun 24 23:39:11 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Jun 24 23:39:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96b20bc

sys-libs/libxcrypt: Fix build with Perl 5.38

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../files/libxcrypt-4.4.35-smartmatch.patch| 62 ++
 sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild |  4 ++
 2 files changed, 66 insertions(+)

diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch 
b/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
new file mode 100644
index ..1956df921bdd
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
@@ -0,0 +1,62 @@
+From 95d6e03ae37f4ec948474d05bbdd2938aba2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
+Date: Sun, 25 Jun 2023 01:35:08 +0200
+Subject: [PATCH] Remove smartmatch usage from gen-crypt-h
+
+Needed for Perl 5.38
+---
+ build-aux/scripts/gen-crypt-h | 31 ++-
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h
+index 12aecf6..b113b79 100644
+--- a/build-aux/scripts/gen-crypt-h
 b/build-aux/scripts/gen-crypt-h
+@@ -12,7 +12,6 @@ use v5.14;# implicit use strict, use feature ':5.14'
+ use warnings FATAL => 'all';
+ use utf8;
+ use open qw(:std :utf8);
+-no  if $] >= 5.018, warnings => 'experimental::smartmatch';
+ no  if $] >= 5.022, warnings => 'experimental::re_strict';
+ use if $] >= 5.022, re   => 'strict';
+ 
+@@ -37,22 +36,20 @@ sub process_config_h {
+ local $_;
+ while (<$fh>) {
+ chomp;
+-# Yes, 'given $_' is really required here.
+-given ($_) {
+-when ('#define HAVE_SYS_CDEFS_H 1') {
+-$have_sys_cdefs_h = 1;
+-}
+-when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
+-$have_sys_cdefs_begin_end_decls = 1;
+-}
+-when ('#define HAVE_SYS_CDEFS_THROW 1') {
+-$have_sys_cdefs_throw = 1;
+-}
+-when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
+-$substs{XCRYPT_VERSION_STR}   = $1;
+-$substs{XCRYPT_VERSION_MAJOR} = $2;
+-$substs{XCRYPT_VERSION_MINOR} = $3;
+-}
++
++if ($_ eq '#define HAVE_SYS_CDEFS_H 1') {
++$have_sys_cdefs_h = 1;
++}
++elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
++$have_sys_cdefs_begin_end_decls = 1;
++}
++elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') {
++$have_sys_cdefs_throw = 1;
++}
++elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
++$substs{XCRYPT_VERSION_STR}   = $1;
++$substs{XCRYPT_VERSION_MAJOR} = $2;
++$substs{XCRYPT_VERSION_MINOR} = $3;
+ }
+ }
+ 
+-- 
+2.39.3
+

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
index 331a6cc1c58c..69a9af2f77ba 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
@@ -55,6 +55,10 @@ BDEPEND="
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-smartmatch.patch"
+)
+
 python_check_deps() {
python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-06-06 Thread Sam James
commit: a047c739aedd78250d1e16642cad5d62d14e15ea
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  6 21:06:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  6 21:07:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a047c739

sys-libs/libxcrypt: add 4.4.35

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild | 340 +
 2 files changed, 341 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 4eeb1c356079..533bca04ca24 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,4 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
 DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B 
acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b
 SHA512 
ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
+DIST libxcrypt-4.4.35-autotools.tar.xz 622972 BLAKE2B 
93e8ee0d028aa8b2d1b3882c48cd056a1f60ea22c44f38b29c78eaea6719fa9d01c1d0d78065a2c1adbab6f5ca9a2570ee411f78673b979a3b5c2a1f930e275d
 SHA512 
c024b183417db2c4bd8bcc371e8789182ad98f91c79d6a64ce9505abd0251ef6499e8fbceb914274ca50f477fe068e3cf69eed197287bb2c0491aa91ead4df52

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
new file mode 100644
index ..331a6cc1c58c
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
@@ -0,0 +1,340 @@
+# Copyright 2004-2023 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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=(
+   $(usex compat 'xcrypt_compat' '')
+   xcrypt_nocompat
+   )
+
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+  

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-05-31 Thread Sam James
commit: ac86a66c5fc728f6910a4d78f81d8efcbc9416a6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:52:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:52:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac86a66c

sys-libs/libxcrypt: add 4.4.34

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild | 340 +
 2 files changed, 341 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index e8366c622f2b..4eeb1c356079 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
+DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B 
acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b
 SHA512 
ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild
new file mode 100644
index ..331a6cc1c58c
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild
@@ -0,0 +1,340 @@
+# Copyright 2004-2023 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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=(
+   $(usex 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
+   #
+   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: 90bac5dcaef2dc166ddd710875ea3d235d644e98
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:28 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bac5dc

sys-libs/libxcrypt: Stabilize 4.4.33 arm, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index a75c9b9b75c5..2eb269c3e6ba 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: ef267151652fefdb21ac45ebac14c0a0a7251d2d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef267151

sys-libs/libxcrypt: Stabilize 4.4.33 ppc64, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index 2eb269c3e6ba..cf829c1c0d34 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: 33e52ef4d7596d1c9e2c3a6a8640a736310865b3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e52ef4

sys-libs/libxcrypt: Stabilize 4.4.33 ppc, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index cf829c1c0d34..826be07412c6 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: 8304af0fe9afec7879666c02bde8b1325c8a6874
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8304af0f

sys-libs/libxcrypt: Stabilize 4.4.33 arm64, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index ad247de20c34..a75c9b9b75c5 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: ec470ec7e858649fe61a74db8bdf841d60969d71
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec470ec7

sys-libs/libxcrypt: Stabilize 4.4.33 x86, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index 2f4dad781b57..ad247de20c34 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-31 Thread Arthur Zamarin
commit: e9da2ccec02dbe6b502e14ffa75630345d1eece3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 31 11:59:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 31 11:59:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9da2cce

sys-libs/libxcrypt: Stabilize 4.4.33 amd64, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index 06c559e674c3..2f4dad781b57 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-24 Thread Arthur Zamarin
commit: bd506bacb4b1d1877dc674dfeaca46f4d0f762fa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 24 13:18:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 24 13:18:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd506bac

sys-libs/libxcrypt: Stabilize 4.4.33 sparc, #886217

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index f062f307542a..06c559e674c3 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-03-19 Thread Sam James
commit: 0ec4364fc6af61839891b0bf30db49361f35ffb3
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 19 22:08:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 19 22:08:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec4364f

sys-libs/libxcrypt: Stabilize 4.4.33 hppa, #886217

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index b8e357fe4526..f062f307542a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2023-01-14 Thread Sam James
commit: 7ca22bfaf0bfcc2ae757213baf363f18bdd47f34
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Jan 13 07:28:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 19:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca22bfa

sys-libs/libxcrypt: fix build with lld-16

Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 7 +++
 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild| 7 +++
 2 files changed, 14 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index aadddc16912a..4e9c2fb26ca2 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -129,6 +129,13 @@ src_configure() {
# https://github.com/besser82/libxcrypt/issues/24
filter-lto
 
+   # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+   # https://github.com/gentoo/gentoo/pull/28355
+   # mold needs this too but right now tc-ld-is-mold is also not available
+   if tc-ld-is-lld; then
+   append-ldflags -Wl,--undefined-version
+   fi
+
multibuild_foreach_variant multilib-minimal_src_configure
 }
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index a793f41d2d62..b8e357fe4526 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -131,6 +131,13 @@ src_configure() {
# https://github.com/besser82/libxcrypt/issues/24
filter-lto
 
+   # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+   # https://github.com/gentoo/gentoo/pull/28355
+   # mold needs this too but right now tc-ld-is-mold is also not available
+   if tc-ld-is-lld; then
+   append-ldflags -Wl,--undefined-version
+   fi
+
multibuild_foreach_variant multilib-minimal_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-12-15 Thread Sam James
commit: 340b8977176b5c9044d88040d898cf739ea5e414
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 07:53:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 07:53:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340b8977

sys-libs/libxcrypt: Stabilize 4.4.28-r2 ppc, #886215

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 4c23191a127b..b88f0d7bc72d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-12-15 Thread Sam James
commit: 913410b1d85acac5a5ba10a91225c9c495494bb0
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 07:52:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 07:52:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913410b1

sys-libs/libxcrypt: Stabilize 4.4.28-r2 sparc, #886215

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 224b5d1989e4..4c23191a127b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-24 Thread Mike Gilbert
commit: f2ce3c6afffc66326db15f564e8e2aac8778ad26
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 24 19:46:40 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 24 19:52:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ce3c6a

sys-libs/libxcrypt: rework broken symlink detection

Use the GNU-specific find -xtype option; PMS says GNU find is required.
Ensure arguments are properlty quoted.
Consolidate output to one line per broken link.

Closes: https://bugs.gentoo.org/882801
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 20 ++--
 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 20 ++--
 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild| 20 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 8f335d8027ca..581dc70c0fd7 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -304,17 +304,17 @@ pkg_preinst() {
# is cleaned up in *_src_install.
local broken_symlinks=()
mapfile -d '' broken_symlinks < <(
-   find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+   find "${ED}" -xtype l -print0
)
 
-   [[ -z "${broken_symlinks[@]}" ]] && return
-
-   eerror "Broken symlinks found before merging!"
-   for symlink in "${broken_symlinks[@]}" ; do
-   bad_dest="$(readlink -f ${symlink})"
-   eerror "\t${symlink} is broken!"
-   eerror "\treadlink -f ${symlink}:"
-   eerror "\t\t${bad_dest}"
+   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."
-   done
+   fi
 }

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 5e72a74c6d85..755fdd744e22 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -320,17 +320,17 @@ pkg_preinst() {
# is cleaned up in *_src_install.
local broken_symlinks=()
mapfile -d '' broken_symlinks < <(
-   find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+   find "${ED}" -xtype l -print0
)
 
-   [[ -z "${broken_symlinks[@]}" ]] && return
-
-   eerror "Broken symlinks found before merging!"
-   for symlink in "${broken_symlinks[@]}" ; do
-   bad_dest="$(readlink -f ${symlink})"
-   eerror "\t${symlink} is broken!"
-   eerror "\treadlink -f ${symlink}:"
-   eerror "\t\t${bad_dest}"
+   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."
-   done
+   fi
 }

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index d0bd8a723065..0e077bd372ed 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -315,17 +315,17 @@ pkg_preinst() {
# is cleaned up in *_src_install.
local broken_symlinks=()
mapfile -d '' broken_symlinks < <(
-   find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+   find "${ED}" -xtype l -print0
)
 
-   [[ -z "${broken_symlinks[@]}" ]] && return
-
-   eerror "Broken symlinks found before merging!"
-   for symlink in "${broken_symlinks[@]}" ; do
-   bad_dest="$(readlink -f ${symlink})"
-   eerror "\t${symlink} is broken!"
-   eerror "\treadlink -f ${symlink}:"
-   eerror "\t\t${bad_dest}"
+   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}")"
+   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-18 Thread Sam James
commit: 378fc5ffeca673f1893fa2cef65e47f4a3aaf4c4
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 19 02:12:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 19 03:19:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378fc5ff

sys-libs/libxcrypt: add 4.4.33

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild | 331 +
 2 files changed, 332 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 9870ae6432d7..ccae59424643 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.32-autotools.tar.xz 624332 BLAKE2B 
fbbbfe8ac6b1e9f283621d2bf3b554ba6652c5cea94932666a5a920c74fad7b0bc265fccdacc694113ed1c273a16e064b7aba45da83499e974741039484e7064
 SHA512 
dab13a858ac796c51cdcf9efbb6f525397ea8c1daa9c0169893228a17c767e4442b4fb9b7a40db46da1fc4f1752c4c8dda97a7b2c644a58377a053deb16e3ed9
+DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
new file mode 100644
index ..d0bd8a723065
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -0,0 +1,331 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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=(
+   $(usex 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
+   #
+   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-18 Thread Sam James
commit: 2c0af76b7ba87a312dbbfc6c8fcc3a8868449915
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 19 02:12:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 19 03:19:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0af76b

sys-libs/libxcrypt: drop 4.4.32

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 -
 sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild | 331 -
 2 files changed, 332 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index ccae59424643..e8366c622f2b 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,2 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
-DIST libxcrypt-4.4.32-autotools.tar.xz 624332 BLAKE2B 
fbbbfe8ac6b1e9f283621d2bf3b554ba6652c5cea94932666a5a920c74fad7b0bc265fccdacc694113ed1c273a16e064b7aba45da83499e974741039484e7064
 SHA512 
dab13a858ac796c51cdcf9efbb6f525397ea8c1daa9c0169893228a17c767e4442b4fb9b7a40db46da1fc4f1752c4c8dda97a7b2c644a58377a053deb16e3ed9
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 
6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d
 SHA512 
998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild
deleted file mode 100644
index d0bd8a723065..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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=(
-   $(usex 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
-   #
-   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-17 Thread Sam James
commit: 37375f05866147e2b03a5639d80fdac2ed7bd7e1
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 06:22:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 06:22:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37375f05

sys-libs/libxcrypt: drop 4.4.31

Another short-lived release, although 4.4.32 isn't fixing a mistake in .31.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 -
 sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild | 331 -
 2 files changed, 332 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index cdf84f5fae68..9870ae6432d7 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,2 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
-DIST libxcrypt-4.4.31-autotools.tar.xz 624388 BLAKE2B 
a8eabba80a383148e82c114310a58213b9f74dab96bf78c62115edd841b53bf7f735a26277327f59abab86e77a98a5a4990a8d14e82d6cf2dbe717c48a80a80b
 SHA512 
31275558c5d340ef3f99fffab1ab086e355f2d88ca524283459cfba523b68abcabd61f2fe9246ec9822e121c9376c6fb004a9647aff16728bfcc49421ca365b4
 DIST libxcrypt-4.4.32-autotools.tar.xz 624332 BLAKE2B 
fbbbfe8ac6b1e9f283621d2bf3b554ba6652c5cea94932666a5a920c74fad7b0bc265fccdacc694113ed1c273a16e064b7aba45da83499e974741039484e7064
 SHA512 
dab13a858ac796c51cdcf9efbb6f525397ea8c1daa9c0169893228a17c767e4442b4fb9b7a40db46da1fc4f1752c4c8dda97a7b2c644a58377a053deb16e3ed9

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild
deleted file mode 100644
index d0bd8a723065..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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=(
-   $(usex 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:
-   #  

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-17 Thread Sam James
commit: c5208406775fcaec1390cf71df97c69f9ff2208d
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 06:22:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 06:22:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5208406

sys-libs/libxcrypt: add 4.4.32

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild | 331 +
 2 files changed, 332 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 4f43492fa621..cdf84f5fae68 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.31-autotools.tar.xz 624388 BLAKE2B 
a8eabba80a383148e82c114310a58213b9f74dab96bf78c62115edd841b53bf7f735a26277327f59abab86e77a98a5a4990a8d14e82d6cf2dbe717c48a80a80b
 SHA512 
31275558c5d340ef3f99fffab1ab086e355f2d88ca524283459cfba523b68abcabd61f2fe9246ec9822e121c9376c6fb004a9647aff16728bfcc49421ca365b4
+DIST libxcrypt-4.4.32-autotools.tar.xz 624332 BLAKE2B 
fbbbfe8ac6b1e9f283621d2bf3b554ba6652c5cea94932666a5a920c74fad7b0bc265fccdacc694113ed1c273a16e064b7aba45da83499e974741039484e7064
 SHA512 
dab13a858ac796c51cdcf9efbb6f525397ea8c1daa9c0169893228a17c767e4442b4fb9b7a40db46da1fc4f1752c4c8dda97a7b2c644a58377a053deb16e3ed9

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild
new file mode 100644
index ..d0bd8a723065
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild
@@ -0,0 +1,331 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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=(
+   $(usex 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
+   #
+   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-13 Thread Sam James
commit: f3e01350c6b7db8cf6a21178143a4ccc2cd31a1d
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 14 03:47:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 14 03:48:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e01350

sys-libs/libxcrypt: add 4.4.31

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild | 331 +
 2 files changed, 332 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 88b68ba56c84..d12fa87ebdf9 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,4 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B 
a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8
 SHA512 
278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0
 DIST libxcrypt-4.4.30-autotools.tar.xz 623560 BLAKE2B 
ebd4aeb7c07a6acd2abc32cc5fe2a01181a47a55290c245b7d02f196da7a1a6b22ab5090f2262b3c6be587c0646e454fe19a0eb3a3ac8c7c7f53e65d0e268f2c
 SHA512 
14f808c93bac43316ba7c1fb7f7446d5f935aa2bbca7191126c135cae7d9506eb6a9314ab9cdb9b7b5f6a50931574eae4728cb33b8c1694c089c54827074d409
+DIST libxcrypt-4.4.31-autotools.tar.xz 624388 BLAKE2B 
a8eabba80a383148e82c114310a58213b9f74dab96bf78c62115edd841b53bf7f735a26277327f59abab86e77a98a5a4990a8d14e82d6cf2dbe717c48a80a80b
 SHA512 
31275558c5d340ef3f99fffab1ab086e355f2d88ca524283459cfba523b68abcabd61f2fe9246ec9822e121c9376c6fb004a9647aff16728bfcc49421ca365b4

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild
new file mode 100644
index ..d0bd8a723065
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.31.ebuild
@@ -0,0 +1,331 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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=(
+   $(usex compat 'xcrypt_compat' '')
+   xcrypt_nocompat
+   )
+
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+  

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-13 Thread Sam James
commit: dce8fe585d9ea16ea3aba7090667461119976a59
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 14 03:48:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 14 03:48:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dce8fe58

sys-libs/libxcrypt: drop 4.4.29, 4.4.30

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   2 -
 sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild | 336 -
 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 331 
 3 files changed, 669 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index d12fa87ebdf9..4f43492fa621 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,4 +1,2 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
-DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B 
a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8
 SHA512 
278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0
-DIST libxcrypt-4.4.30-autotools.tar.xz 623560 BLAKE2B 
ebd4aeb7c07a6acd2abc32cc5fe2a01181a47a55290c245b7d02f196da7a1a6b22ab5090f2262b3c6be587c0646e454fe19a0eb3a3ac8c7c7f53e65d0e268f2c
 SHA512 
14f808c93bac43316ba7c1fb7f7446d5f935aa2bbca7191126c135cae7d9506eb6a9314ab9cdb9b7b5f6a50931574eae4728cb33b8c1694c089c54827074d409
 DIST libxcrypt-4.4.31-autotools.tar.xz 624388 BLAKE2B 
a8eabba80a383148e82c114310a58213b9f74dab96bf78c62115edd841b53bf7f735a26277327f59abab86e77a98a5a4990a8d14e82d6cf2dbe717c48a80a80b
 SHA512 
31275558c5d340ef3f99fffab1ab086e355f2d88ca524283459cfba523b68abcabd61f2fe9246ec9822e121c9376c6fb004a9647aff16728bfcc49421ca365b4

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
deleted file mode 100644
index 1593faa8066b..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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(+)]
-   )
-   )
-"
-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=(
-   $(usex compat 'xcrypt_compat' '')
-   xcrypt_nocompat
-   )
-
-   use test && 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-07 Thread Sam James
commit: 9e31f300c271105246eff16f2ec30e61d8754876
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  8 01:18:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  8 01:18:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e31f300

sys-libs/libxcrypt: add (R)DEPEND on sys-libs/musl too

Ordering for a fresh crossdev root w/ 'armv7a-unknown-linux-musleabihf-emerge 
-v1 musl'
now works correctly instead of pulling in libxcrypt first.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
index bb75ae09bb7a..d0bd8a723065 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
@@ -37,12 +37,14 @@ is_cross() {
[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
 }
 
-DEPEND="system? (
+DEPEND="
+   system? (
elibc_glibc? (
${CATEGORY}/glibc[-crypt(+)]
!${CATEGORY}/glibc[crypt(+)]
)
elibc_musl? (
+   ${CATEGORY}/musl[-crypt(+)]
!${CATEGORY}/musl[crypt(+)]
)
)



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-01 Thread Sam James
commit: 6af39cccf4b7fc28f208c701c62a28c5435a2cf2
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 04:04:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 04:04:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af39ccc

sys-libs/libxcrypt: set +system for older too

See: 194c44cd74b3426485c21ef3555f0bfcbfd3f4c9
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 7c7340f29a7b..8f335d8027ca 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -21,7 +21,7 @@ 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"
+IUSE="+compat split-usr static-libs +system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 430e3dc385ed..5e72a74c6d85 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -21,7 +21,7 @@ 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"
+IUSE="+compat split-usr static-libs +system test headers-only"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
index 111353e6e533..1593faa8066b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
@@ -21,7 +21,7 @@ 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"
+IUSE="+compat split-usr static-libs +system test headers-only"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-01 Thread Sam James
commit: 194c44cd74b3426485c21ef3555f0bfcbfd3f4c9
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 03:50:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 03:50:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194c44cd

sys-libs/libxcrypt: set +system again in IUSE

For musl, as it's not mandatory, but still the default.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
index daf738da0d6a..bb75ae09bb7a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
@@ -21,7 +21,8 @@ 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"
+IUSE="+compat split-usr static-libs +system test headers-only"
+REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 
 export CTARGET=${CTARGET:-${CHOST}}



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-01 Thread Sam James
commit: ca25ba7592c78f402e3ad3b222c74b476137c7dc
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 03:03:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 03:03:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca25ba75

sys-libs/libxcrypt: drop REQUIRED_USE for split-usr->system

This makes things awkward on profiles where USE=system isn't
forced, like musl. We already do the right thing when USE=split-usr
and USE=system anyway.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
index 9b0d595d7869..daf738da0d6a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
@@ -22,7 +22,6 @@ 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}}



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-11-01 Thread Sam James
commit: 67b62e98c3b475c46489f25469492f579ed531ca
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 02:29:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 02:29:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b62e98

sys-libs/libxcrypt: add 4.4.30

Closes: https://bugs.gentoo.org/838172
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 329 +
 2 files changed, 330 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index e9b80b386336..88b68ba56c84 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B 
a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8
 SHA512 
278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0
+DIST libxcrypt-4.4.30-autotools.tar.xz 623560 BLAKE2B 
ebd4aeb7c07a6acd2abc32cc5fe2a01181a47a55290c245b7d02f196da7a1a6b22ab5090f2262b3c6be587c0646e454fe19a0eb3a3ac8c7c7f53e65d0e268f2c
 SHA512 
14f808c93bac43316ba7c1fb7f7446d5f935aa2bbca7191126c135cae7d9506eb6a9314ab9cdb9b7b5f6a50931574eae4728cb33b8c1694c089c54827074d409

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
new file mode 100644
index ..9b0d595d7869
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
@@ -0,0 +1,329 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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(+)]
+   )
+   )
+"
+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=(
+   $(usex 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:
+   # 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-10-31 Thread Sam James
commit: a0b993a42185dbab43b9694721270b63c3bf7796
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 20:47:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 20:47:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b993a4

sys-libs/libxcrypt: add 4.4.29

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild | 336 +
 2 files changed, 337 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index f39bd81c1c6e..e9b80b386336 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1 +1,2 @@
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
+DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B 
a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8
 SHA512 
278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
new file mode 100644
index ..111353e6e533
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
@@ -0,0 +1,336 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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(+)]
+   )
+   )
+"
+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=(
+   $(usex 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.
+   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-10-18 Thread Sam James
commit: 884319a75efc97f367338fc9d2f099e7bc1b2b6b
Author: Adrian Ratiu  collabora  com>
AuthorDate: Tue Oct 18 17:18:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 19 03:14:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884319a7

sys-libs/libxcrypt: add headers-only install

While bootstrapping a pure LLVM based toolchain, compiler-rt-sanitizers
depends on crypt.h, but libxcrypt cannot be built yet because
it requires a working compiler runtime, so the solution is:

1. Install libxcrypt headers-only
2. Build compiler-rt-sanitizers & the rest of llvm/clang
3. Build full libxcrypt

Thus we add the ability to install libxcrypt headers-only,
similar to how glibc does it.

Closes: https://bugs.gentoo.org/877567
Signed-off-by: Adrian Ratiu  collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/27840
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 18 --
 sys-libs/libxcrypt/metadata.xml   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 3f390bf67ca3..430e3dc385ed 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -21,7 +21,7 @@ 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"
+IUSE="+compat split-usr static-libs system test headers-only"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 
@@ -209,10 +209,18 @@ multilib_src_configure() {
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
esac
 
-   ECONF_SOURCE="${S}" econf "${myconf[@]}"
+   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
 }
 
@@ -227,6 +235,7 @@ src_test() {
 src_install() {
multibuild_foreach_variant multilib-minimal_src_install
 
+   use headers-only || \
(
shopt -s failglob || die "failglob failed"
 
@@ -250,6 +259,11 @@ src_install() {
 }
 
 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

diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
index 36921daf30b5..cef5e501f632 100644
--- a/sys-libs/libxcrypt/metadata.xml
+++ b/sys-libs/libxcrypt/metadata.xml
@@ -13,6 +13,7 @@

Build with compatibility interfaces for 
other crypt implementations
Install as system libcrypt.so rather than 
to an alternate directory (will collide with sys-libs/glibc's 
version)
+   Build and install only the 
headers.


besser82/libxcrypt



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-10-15 Thread Mike Gilbert
commit: 44e7f86ff7cf80e0ec466778d82695c68a89ead1
Author: Adrian Ratiu  collabora  com>
AuthorDate: Fri Oct 14 13:47:13 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 15 17:25:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e7f86f

sys-libs/libxcrypt: fix binary cross compilation

Even though all files are installed in the proper places
when cross compiling, further testing revealed the libxcrypt
binary itself is not correctly cross-complied for the target
architecture, instead it is compiled for the host.

Set up the proper variables to ensure the binary is built for
the correct architecture.

Before:
libcrypt.so.2.0.0: ELF 64-bit LSB shared object, x86-64,
version 1 (SYSV), dynamically linked, BuildID[xxHash]=0d041ee2539129be, stripped

After:
libcrypt.so.2.0.0: ELF 64-bit LSB shared object, ARM aarch64,
version 1 (SYSV), dynamically linked, BuildID[xxHash]=ba09206297aebce3, stripped

Closes: https://bugs.gentoo.org/877093
Signed-off-by: Adrian Ratiu  collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/27780
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 11 +++
 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 11 +++
 2 files changed, 22 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index c55c58c004b0..7c7340f29a7b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -165,6 +165,7 @@ get_xcpkgconfigdir() {
 
 multilib_src_configure() {
local -a myconf=(
+   --host=${CTARGET}
--disable-werror
--libdir=$(get_xclibdir)
--with-pkgconfigdir=$(get_xcpkgconfigdir)
@@ -196,6 +197,16 @@ multilib_src_configure() {
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
esac
 
+   tc-export PKG_CONFIG
+
+   if is_cross; then
+   if tc-is-clang; then
+   export CC="${CTARGET}-clang"
+   else
+   export CC="${CTARGET}-gcc"
+   fi
+   fi
+
ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 8cd9318c3373..3f390bf67ca3 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -167,6 +167,7 @@ get_xcpkgconfigdir() {
 
 multilib_src_configure() {
local -a myconf=(
+   --host=${CTARGET}
--disable-werror
--libdir=$(get_xclibdir)
--with-pkgconfigdir=$(get_xcpkgconfigdir)
@@ -174,6 +175,16 @@ multilib_src_configure() {
--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
+
if use elibc_musl; then
# musl declares getcontext and swapcontext in ucontext.h,
# but does not implement them in libc.



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-10-08 Thread Mike Gilbert
commit: 2348f47ab316c60da4c94ef8ad62f95faa3313c8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct  8 15:19:56 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct  8 15:19:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2348f47a

sys-libs/libxcrypt: drop 4.4.20

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 -
 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 206 -
 2 files changed, 207 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 96779be2c5c3..f39bd81c1c6e 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1 @@
-DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
deleted file mode 100644
index b918f9efda8d..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86"
-IUSE="+compat split-usr static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-   elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
-   !sys-libs/musl
-   )"
-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_setup() {
-   MULTIBUILD_VARIANTS=(
-   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-10-08 Thread Mike Gilbert
commit: 6da5a9571d82af96730a4ecb966b58b4c18c13a7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct  8 15:29:25 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct  8 15:29:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da5a957

sys-libs/libxcrypt: add musl workaround

Closes: https://bugs.gentoo.org/838172
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 7 +++
 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index b43b4ada2480..c55c58c004b0 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -172,6 +172,13 @@ multilib_src_configure() {
--mandir="$(get_xcmandir)"
)
 
+   if use elibc_musl; then
+   # musl declares getcontext and swapcontext in ucontext.h,
+   # but does not implement them in libc.
+   # https://bugs.gentoo.org/838172
+   myconf+=( ac_cv_header_ucontext_h=no )
+   fi
+
case "${MULTIBUILD_ID}" in
xcrypt_compat-*)
myconf+=(

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 5bac36b61b87..8cd9318c3373 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -174,6 +174,13 @@ multilib_src_configure() {
--mandir="$(get_xcmandir)"
)
 
+   if use elibc_musl; then
+   # musl declares getcontext and swapcontext in ucontext.h,
+   # but does not implement them in libc.
+   # https://bugs.gentoo.org/838172
+   myconf+=( ac_cv_header_ucontext_h=no )
+   fi
+
case "${MULTIBUILD_ID}" in
xcrypt_compat-*)
myconf+=(



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-09-22 Thread Sam James
commit: 25e9d8c30d3aa10eef3bacdb8053a6e7b4bc5e81
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 01:52:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 01:52:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e9d8c3

sys-libs/libxcrypt: drop 4.4.27, 4.4.28

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 -
 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 225 
 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 271 -
 3 files changed, 497 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 8e0a4b158e80..96779be2c5c3 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,2 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
-DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 
13dd5730fded0684c8e7321fee8a786663ff1080a6ca248bd718c4f6c9f6bd2853689c347be9f9ae51ebc1281aaa2143dfc020149382d259e7eefe66ac8b675e
 SHA512 
f13ae1e69bf5850abb47a28f9ac3e3b0a8b3123adc53d39fd39a26d53847bf6e3fdca751e086cd80ce4e5d9ee419b09148c247cbe5f663b3019b66f82cdc5f5c
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
deleted file mode 100644
index 60500e99a483..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="+compat split-usr static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-   elibc_glibc? (
-   sys-libs/glibc[-crypt(+)]
-   !sys-libs/glibc[crypt(+)]
-   )
-   !sys-libs/musl
-   )
-"
-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=(
-   $(usex 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
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-09-10 Thread Sam James
commit: 777ef3df1b81456b7b733d5673b341c6b9a22d88
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  8 03:24:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 11:28:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777ef3df

sys-libs/libxcrypt: wire up musl USE=system support

This brings musl in line with the changes we made for glibc a while
ago. The situation with glibc is a bit different because the migration
is mandatory there, while we're just strongly recommending it for musl
because sys-libs/libxcrypt[-system] causes headaches (see linked
PAM bug for an example, but I've also hit a similar issue with Python
yesterday).

Bug: https://bugs.gentoo.org/867991
Bug: https://bugs.gentoo.org/699422
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 304 ++
 1 file changed, 304 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
new file mode 100644
index ..5bac36b61b87
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -0,0 +1,304 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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"
+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(+)]
+   )
+   )
+"
+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=(
+   $(usex 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:
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-08-26 Thread Sam James
commit: 0114f8e5c6fca595fa02aebd3cdc1d46d75bba0e
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Aug 25 21:41:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 26 10:46:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0114f8e5

sys-libs/libxcrypt: use  tag in metadata.xml

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
index 6b56e023623a..36921daf30b5 100644
--- a/sys-libs/libxcrypt/metadata.xml
+++ b/sys-libs/libxcrypt/metadata.xml
@@ -12,7 +12,7 @@


Build with compatibility interfaces for 
other crypt implementations
-   Install as system libcrypt.so rather than 
to an alternate directory (will collide with sys-libs/glibc's version)
+   Install as system libcrypt.so rather than 
to an alternate directory (will collide with sys-libs/glibc's 
version)


besser82/libxcrypt



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-08-20 Thread Arthur Zamarin
commit: 21ef29dd0b7872c5b61cf8f86200e899e3f42cf2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 13 07:35:52 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 20 15:53:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ef29dd

sys-libs/libxcrypt: use python_has_version

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild| 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild| 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index 9d57697c9416..b918f9efda8d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -34,7 +34,7 @@ BDEPEND="dev-lang/perl
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {
-   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index c9559428437e..60500e99a483 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -38,7 +38,7 @@ BDEPEND="dev-lang/perl
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {
-   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index a725dffed1ed..b43b4ada2480 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -50,7 +50,7 @@ BDEPEND="dev-lang/perl
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {
-   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
index 50aec10c1952..0a364e88a43d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -50,7 +50,7 @@ BDEPEND="dev-lang/perl
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {
-   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-30 Thread Arthur Zamarin
commit: 00868d1619d59c748e2a46a7cba887e40690226e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 30 14:05:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 30 14:05:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00868d16

sys-libs/libxcrypt: Stabilize 4.4.28-r1 hppa, #858593

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 6d7aa58a3899..a725dffed1ed 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-18 Thread Agostino Sarubbo
commit: 0f7a726228c538f2dd3f2aedf4a158bf1c4933fa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul 18 07:20:33 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul 18 07:20:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7a7262

sys-libs/libxcrypt: sparc stable wrt bug #858593

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 7111973c539e..6d7aa58a3899 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 7b58e4c3074016b0ab58af6c3e8e03f150363bab
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 19:45:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 19:45:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b58e4c3

sys-libs/libxcrypt: Stabilize 4.4.28-r1 ppc64, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 168406060983..a9ebf0c3dfe5 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 88621879544b52cdc1940502e32e10e3d8c8002e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 19:45:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 19:45:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88621879

sys-libs/libxcrypt: Stabilize 4.4.28-r1 ppc, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index a9ebf0c3dfe5..7111973c539e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 5bf848e334d747828eeafd310250206504217032
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 19:42:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 19:42:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf848e3

sys-libs/libxcrypt: Stabilize 4.4.28-r1 arm, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 6ad6fb38354e..168406060983 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 8d5d47230655887f979182b1b8ec5448ab72b9c1
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 19:40:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 19:40:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5d4723

sys-libs/libxcrypt: Stabilize 4.4.28-r1 arm64, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 549c0c7a626c..6ad6fb38354e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 35d3e66eba79404ee3f02b75e88a69a82285cfe3
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 17:34:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 17:34:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d3e66e

sys-libs/libxcrypt: Stabilize 4.4.28-r1 x86, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 9c8e81478ee5..d6370294da63 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 018982beb76bd06fa344cb767764a411c47a6d31
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 17:34:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 17:34:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018982be

sys-libs/libxcrypt: Stabilize 4.4.28-r1 amd64, #858593

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index d6370294da63..549c0c7a626c 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-07-17 Thread Sam James
commit: 84de2426ea11790239b90fee313852bf00a20edd
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 15:04:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 15:06:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84de2426

sys-libs/libxcrypt: use new filter-lto

Bug: https://bugs.gentoo.org/852917
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 00bcffbd2ef4..9c8e81478ee5 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 
# Doesn't work with LTO: bug #852917.
# https://github.com/besser82/libxcrypt/issues/24
-   filter-flags -flto=* -flto
+   filter-lto
 
multibuild_foreach_variant multilib-minimal_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-06-18 Thread Sam James
commit: 764b9be6851658364f4163ce9df3edc34dba9ee3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 18 15:15:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 18 15:15:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764b9be6

sys-libs/libxcrypt: disable LTO

Closes: https://bugs.gentoo.org/852917
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index dbab827b3def..00bcffbd2ef4 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit eapi8-dosym multibuild multilib python-any-r1 toolchain-funcs 
multilib-minimal
+inherit eapi8-dosym 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;
@@ -123,6 +123,10 @@ src_configure() {
# bug #821496
tc-ld-disable-gold
 
+   # Doesn't work with LTO: bug #852917.
+   # https://github.com/besser82/libxcrypt/issues/24
+   filter-flags -flto=* -flto
+
multibuild_foreach_variant multilib-minimal_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-05-23 Thread Sam James
commit: 939a3db71064f9b1da8e6a6fca3ecfb386f2ec30
Author: Sam James  gentoo  org>
AuthorDate: Sun May  8 04:07:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 24 02:16:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939a3db7

sys-libs/libxcrypt: fix prefix install

Bug: https://bugs.gentoo.org/80
Closes: https://bugs.gentoo.org/843209
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 298 ++
 1 file changed, 298 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
new file mode 100644
index ..dbab827b3def
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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"
+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(+)]
+   )
+   !${CATEGORY}/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "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=(
+   $(usex 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};
+   #
+   #   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-05-06 Thread Sam James
commit: ac6191ed2fff5b6070ff1efb7128f70b501176d0
Author: Adrian Ratiu  collabora  com>
AuthorDate: Fri May  6 08:58:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 05:03:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6191ed

sys-libs/libxcrypt: fix cross + system dependencies

Starting with the v4.4.28 ebuild, libxcrypt supports cross-* builds
so we need to ensure the dependencies are properly specified, for
eg: aarch64-cros-linux-gnu/libxcrypt needs to depend on the
aarch64-cros-linux-gnu/glibc instead of plain sys-libs/glibc.

Closes: https://bugs.gentoo.org/842906
Signed-off-by: Adrian Ratiu  collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/25348
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
index f4a2b797141a..50aec10c1952 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -39,10 +39,10 @@ is_cross() {
 
 DEPEND="system? (
elibc_glibc? (
-   sys-libs/glibc[-crypt(+)]
-   !sys-libs/glibc[crypt(+)]
+   ${CATEGORY}/glibc[-crypt(+)]
+   !${CATEGORY}/glibc[crypt(+)]
)
-   !sys-libs/musl
+   !${CATEGORY}/musl
)
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-04-23 Thread Sam James
commit: aabea35bb6fdc0e5de5b899c0c2efa8e9570b1e1
Author: Adrian Ratiu  collabora  com>
AuthorDate: Fri Apr 22 13:38:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 23 23:54:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabea35b

sys-libs/libxcrypt: add cross-* build support

This logic is required for cross LLVM toolchains built against
glibc with its libcrypt disabled because compiler-rt requires a
crypt.h header for its sanitizers, leading to a circular build
dependency situation:

libxcrypt -> compiler-rt -> libxcrypt

To break this circular dep other cross-compilation build systems
like Yocto have disabled compiler-rt sanitizers entirely [1] or
a crypt.h header might be copied into the compiler-rt sources.

A better solution than the above two is to directly be able to
build libxcrypt before compiler-rt in the cross toolchain setup
steps which is what this addition enables.

[1] https://github.com/kraj/meta-clang/pull/426

Bug: https://bugs.gentoo.org/699422
Co-authored-by: Sam James  gentoo.org>
Signed-off-by: Adrian Ratiu  collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/20601
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 64 +-
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
index 9bebb1243fee..3a86e64f4aa3 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -25,6 +25,18 @@ IUSE="+compat split-usr static-libs system test"
 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? (
sys-libs/glibc[-crypt(+)]
@@ -114,19 +126,46 @@ src_configure() {
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\n" \
+   printf -- "%s/%s/%s/%s\n" \
+   "$(get_xcprefix)" \
"$(usex split-usr '' '/usr')" \
"$(get_libdir)" \
"$(usex system '' 'xcrypt')"
 }
 
+get_xcincludedir() {
+   printf -- "%s/usr/include/%s\n" \
+   "$(get_xcprefix)" \
+   "$(usex 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=(
--disable-werror
-   --libdir="${EPREFIX}"$(get_xclibdir)
-   --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-   --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+   --libdir=$(get_xclibdir)
+   --with-pkgconfigdir=$(get_xcpkgconfigdir)
+   --includedir=$(get_xcincludedir)
+   --mandir="$(get_xcmandir)"
)
 
case "${MULTIBUILD_ID}" in
@@ -168,7 +207,7 @@ src_install() {
shopt -s failglob || die "failglob failed"
 
# Make sure our man pages do not collide with glibc or 
man-pages.
-   for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+   for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
mv -n "${manpage}" "$(dirname 
"${manpage}")/xcrypt_$(basename "${manpage}")" \
|| die "mv failed"
done
@@ -177,6 +216,13 @@ src_install() {
# 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() {
@@ -185,7 +231,7 @@ multilib_src_install() {
# Don't install the libcrypt.so symlink for the "compat" version
case "${MULTIBUILD_ID}" in
xcrypt_compat-*)
-   rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
+   rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-04-17 Thread Sam James
commit: 66342ee423f76aea8fafa6921f5a9b3e18e07b43
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 18:24:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 18:24:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66342ee4

sys-libs/libxcrypt: drop 4.4.25-r1, 4.4.26-r1

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest   |   2 -
 sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild | 225 --
 sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild | 225 --
 3 files changed, 452 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 4755648acb55..8e0a4b158e80 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,5 +1,3 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
-DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
-DIST libxcrypt-4.4.26-autotools.tar.xz 617808 BLAKE2B 
9fb8e31b22a085c0d0d5ab2ee3fb69fbebaccee2281e9be7d745218b5b92d949ffd3aa9c385671d58c93a654e16b943a33284b0b4737d52d26e43e2f7840fe74
 SHA512 
22c72cacd87c5751c4160413738fdf52c8fee300dcad01b289a6eaf892439883b9478103f791f5f53c8e5e2f2dd81057e5fda45e7cf7fdfd3ba93dd811bc01e3
 DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 
13dd5730fded0684c8e7321fee8a786663ff1080a6ca248bd718c4f6c9f6bd2853689c347be9f9ae51ebc1281aaa2143dfc020149382d259e7eefe66ac8b675e
 SHA512 
f13ae1e69bf5850abb47a28f9ac3e3b0a8b3123adc53d39fd39a26d53847bf6e3fdca751e086cd80ce4e5d9ee419b09148c247cbe5f663b3019b66f82cdc5f5c
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
deleted file mode 100644
index c9559428437e..
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="+compat split-usr static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-   elibc_glibc? (
-   sys-libs/glibc[-crypt(+)]
-   !sys-libs/glibc[crypt(+)]
-   )
-   !sys-libs/musl
-   )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl
-   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-   has_version -b "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=(
-   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-03-08 Thread Sam James
commit: abd32ce670c35428f1dd75eca13960142cd0664e
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  8 15:06:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  8 15:13:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd32ce6

sys-libs/libxcrypt: add 4.4.28

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 225 +
 2 files changed, 226 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 02dbaeba5293..4755648acb55 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -2,3 +2,4 @@ DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d
 DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
 DIST libxcrypt-4.4.26-autotools.tar.xz 617808 BLAKE2B 
9fb8e31b22a085c0d0d5ab2ee3fb69fbebaccee2281e9be7d745218b5b92d949ffd3aa9c385671d58c93a654e16b943a33284b0b4737d52d26e43e2f7840fe74
 SHA512 
22c72cacd87c5751c4160413738fdf52c8fee300dcad01b289a6eaf892439883b9478103f791f5f53c8e5e2f2dd81057e5fda45e7cf7fdfd3ba93dd811bc01e3
 DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 
13dd5730fded0684c8e7321fee8a786663ff1080a6ca248bd718c4f6c9f6bd2853689c347be9f9ae51ebc1281aaa2143dfc020149382d259e7eefe66ac8b675e
 SHA512 
f13ae1e69bf5850abb47a28f9ac3e3b0a8b3123adc53d39fd39a26d53847bf6e3fdca751e086cd80ce4e5d9ee419b09148c247cbe5f663b3019b66f82cdc5f5c
+DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B 
c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d
 SHA512 
3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
new file mode 100644
index ..9bebb1243fee
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -0,0 +1,225 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+IUSE="+compat split-usr static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+   elibc_glibc? (
+   sys-libs/glibc[-crypt(+)]
+   !sys-libs/glibc[crypt(+)]
+   )
+   !sys-libs/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "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=(
+   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-25 Thread Sam James
commit: ec1e2dd5ae1350388507b0433967893661789158
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Feb 25 13:37:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 25 18:37:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1e2dd5

sys-libs/libxcrypt: stable 4.4.27 for hppa, bug #833661

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 7b3bc5b35cc6..c9559428437e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-20 Thread Agostino Sarubbo
commit: 5dd67666f205621caa9a7389218df6d5004a36d4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 20 09:14:27 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 20 09:14:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd67666

sys-libs/libxcrypt: amd64 stable wrt bug #833661

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index fc33382942c0..7b3bc5b35cc6 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-19 Thread Sam James
commit: 446c352d9739a43d81dee915f43a77ab7397ca0d
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 19:26:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 19:26:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446c352d

sys-libs/libxcrypt: Stabilize 4.4.27 sparc, #833661

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 42087c024327..fc33382942c0 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-19 Thread Arthur Zamarin
commit: f58b7793fb909f303ae780bda3d406531b2ad23c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 19 11:42:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 19 12:01:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58b7793

sys-libs/libxcrypt: Stabilize 4.4.27 arm64, #833661

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 1604ba001fff..42087c024327 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-19 Thread Arthur Zamarin
commit: a182675c697dafd7ad4a40444885388f3aa71a22
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 19 11:37:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 19 12:01:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a182675c

sys-libs/libxcrypt: Stabilize 4.4.27 arm, #833661

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 004397b41119..1604ba001fff 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-19 Thread Arthur Zamarin
commit: a7e2f01492a6037e6d2e7d66b839b2811e40109b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 19 08:46:40 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 19 08:46:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e2f014

sys-libs/libxcrypt: Stabilize 4.4.27 ppc64, #833661

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 68554abd3eef..004397b41119 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-18 Thread Sam James
commit: b5ee98cef8e59b081a0c974074eed67c52904dea
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 03:38:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 03:38:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ee98ce

sys-libs/libxcrypt: Stabilize 4.4.27 ppc, #833661

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 33b09c110e7a..68554abd3eef 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-02-18 Thread Sam James
commit: 39623509bf2cd0ed53a6e2ca7ac4b3ce5e7c0d72
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 03:03:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 03:03:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39623509

sys-libs/libxcrypt: Stabilize 4.4.27 x86, #833661

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index 9bebb1243fee..33b09c110e7a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-01-06 Thread David Seifert
commit: 25fb40c05a6bb5dd96344dd73251cabdaea457d6
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan  6 10:38:41 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan  6 10:38:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fb40c0

sys-libs/libxcrypt: remove superfluous sys-apps/findutils dep

Signed-off-by: David Seifert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild| 3 +--
 sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild | 1 -
 sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild | 3 +--
 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild| 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index 6b7c1ae7612f..9d57697c9416 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,6 @@ DEPEND="system? (
)"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-lang/perl
-   sys-apps/findutils
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index 046aa201cc37..c9559428437e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -35,7 +35,6 @@ DEPEND="system? (
 "
 RDEPEND="${DEPEND}"
 BDEPEND="dev-lang/perl
-   sys-apps/findutils
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
index fa017859016b..9bebb1243fee 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,6 @@ DEPEND="system? (
 "
 RDEPEND="${DEPEND}"
 BDEPEND="dev-lang/perl
-   sys-apps/findutils
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
index fa017859016b..9bebb1243fee 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,6 @@ DEPEND="system? (
 "
 RDEPEND="${DEPEND}"
 BDEPEND="dev-lang/perl
-   sys-apps/findutils
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
 
 python_check_deps() {



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2022-01-04 Thread Sam James
commit: 5e7c3bdcfc1c0be472e4cd5530c5f0376b7a5ff0
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  5 05:24:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  5 05:24:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7c3bdc

sys-libs/libxcrypt: Stabilize 4.4.25-r1 sparc, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index 13858d396505..046aa201cc37 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-12-17 Thread Sam James
commit: abadfbbc46acb3741e839303f64110db2791ab37
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 18 07:05:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 18 07:05:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abadfbbc

sys-libs/libxcrypt: add 4.4.27

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild | 226 +
 2 files changed, 227 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 17af4f1fb10d..02dbaeba5293 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,4 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
 DIST libxcrypt-4.4.26-autotools.tar.xz 617808 BLAKE2B 
9fb8e31b22a085c0d0d5ab2ee3fb69fbebaccee2281e9be7d745218b5b92d949ffd3aa9c385671d58c93a654e16b943a33284b0b4737d52d26e43e2f7840fe74
 SHA512 
22c72cacd87c5751c4160413738fdf52c8fee300dcad01b289a6eaf892439883b9478103f791f5f53c8e5e2f2dd81057e5fda45e7cf7fdfd3ba93dd811bc01e3
+DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 
13dd5730fded0684c8e7321fee8a786663ff1080a6ca248bd718c4f6c9f6bd2853689c347be9f9ae51ebc1281aaa2143dfc020149382d259e7eefe66ac8b675e
 SHA512 
f13ae1e69bf5850abb47a28f9ac3e3b0a8b3123adc53d39fd39a26d53847bf6e3fdca751e086cd80ce4e5d9ee419b09148c247cbe5f663b3019b66f82cdc5f5c

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
new file mode 100644
index ..fa017859016b
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
@@ -0,0 +1,226 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+IUSE="+compat split-usr static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+   elibc_glibc? (
+   sys-libs/glibc[-crypt(+)]
+   !sys-libs/glibc[crypt(+)]
+   )
+   !sys-libs/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   sys-apps/findutils
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "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=(
+   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-12-03 Thread Sam James
commit: 92b792402254e0ae4b269fbc48ba75815deb3f19
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 18:56:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 18:56:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b79240

sys-libs/libxcrypt: only show < GCC 10 warning with distcc

The issues should only occur if configure is confused
which should only happen with a mismatch between
the compiler used for configure and compilation
(e.g. distcc).

Bug: https://bugs.gentoo.org/823179
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild | 8 
 sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index d73e13788fd3..13858d396505 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -43,13 +43,13 @@ python_check_deps() {
 }
 
 pkg_pretend() {
-   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
-
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
 }
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
index b25eb93a2469..fa017859016b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
@@ -43,13 +43,13 @@ python_check_deps() {
 }
 
 pkg_pretend() {
-   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
-
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
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-12-01 Thread Sam James
commit: a6396f527bae1a5d55bb63060713cd60b83cf323
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 01:16:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 01:16:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6396f52

sys-libs/libxcrypt: add warning re distcc and older GCCs (<10)

Bug: https://bugs.gentoo.org/823179
Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild | 11 +++
 sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild | 11 +++
 2 files changed, 22 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index d8f01115f15c..d73e13788fd3 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -42,6 +42,17 @@ python_check_deps() {
has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+   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
+
+   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."
+   fi
+}
+
 pkg_setup() {
MULTIBUILD_VARIANTS=(
$(usex compat 'xcrypt_compat' '')

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
index 5d0f0cffee7d..b25eb93a2469 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
@@ -42,6 +42,17 @@ python_check_deps() {
has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+   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
+
+   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."
+   fi
+}
+
 pkg_setup() {
MULTIBUILD_VARIANTS=(
$(usex compat 'xcrypt_compat' '')



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-11-19 Thread Sam James
commit: f9db221ddfadd7518e96fb63d93d1edabc5b97eb
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 19 17:39:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 19 17:41:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9db221d

sys-libs/libxcrypt: disable gold

Disable gold as a precaution given report of odd behaviour (possible
illegal instructions being emitted) with gold.

It's not quite clear how this could happen but gold is already
on its way out and I'd rather play it safe here pending
more information.

Bug: https://bugs.gentoo.org/821496
Signed-off-by: Sam James  gentoo.org>

 .../{libxcrypt-4.4.25.ebuild => libxcrypt-4.4.25-r1.ebuild} | 6 +-
 .../{libxcrypt-4.4.26.ebuild => libxcrypt-4.4.26-r1.ebuild} | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
similarity index 97%
rename from sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
rename to sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index e95748621284..d8f01115f15c 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt;
@@ -97,6 +97,10 @@ src_prepare() {
 }
 
 src_configure() {
+   # Avoid possible "illegal instruction" errors with gold
+   # bug #821496
+   tc-ld-disable-gold
+
multibuild_foreach_variant multilib-minimal_src_configure
 }
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
similarity index 97%
rename from sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
rename to sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
index dca937cb958a..5d0f0cffee7d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt;
@@ -97,6 +97,10 @@ src_prepare() {
 }
 
 src_configure() {
+   # Avoid possible "illegal instruction" errors with gold
+   # bug #821496
+   tc-ld-disable-gold
+
multibuild_foreach_variant multilib-minimal_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-11-05 Thread Sam James
commit: 0a2bd36767b21b1afa18823d4f1f622bc533026e
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  6 00:52:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 00:52:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2bd367

sys-libs/libxcrypt: Stabilize 4.4.25 hppa, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index e71f4982bc5..e9574862128 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: 8074b2696f0738b328a9b0a03d6066755853d304
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:12:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:12:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8074b269

sys-libs/libxcrypt: Stabilize 4.4.25 ppc64, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 5689f7d600c..e71f4982bc5 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: 1f04290be44480cb576fdbe881263e5d62b48242
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:12:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:12:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f04290b

sys-libs/libxcrypt: Stabilize 4.4.25 ppc, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 2b4cd77d8e9..5689f7d600c 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: 155c269d7c95fb1bcc796bfe8dae0af104234168
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:11:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:11:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155c269d

sys-libs/libxcrypt: Stabilize 4.4.25 x86, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 17daf06022f..2b4cd77d8e9 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: 3b88cfcee7f68f1291970ed12eaf837db209acb9
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:10:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:10:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b88cfce

sys-libs/libxcrypt: Stabilize 4.4.25 arm, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index dca937cb958..c6091e24088 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: 6bd9b6d2e497d6244dba801a9d82a80c5b921e72
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:10:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:10:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd9b6d2

sys-libs/libxcrypt: Stabilize 4.4.25 amd64, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 187bd9e3166..17daf06022f 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-31 Thread Sam James
commit: a4966710d35a43acb1eb6fed267908dee5bb8216
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 18:10:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 18:10:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4966710

sys-libs/libxcrypt: Stabilize 4.4.25 arm64, #809410

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index c6091e24088..187bd9e3166 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-10-21 Thread Sam James
commit: 09e05d8e76dac3c6b911a06862783d10080c9095
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 21 06:42:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 21 06:44:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e05d8e

sys-libs/libxcrypt: backport prefix fixes to 4.4.20

Needed for the relatively-new stable Prefix.

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index f31e856bc88..6b7c1ae7612 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -106,8 +106,8 @@ get_xclibdir() {
 multilib_src_configure() {
local -a myconf=(
--disable-werror
-   --libdir=$(get_xclibdir)
-   --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+   --libdir="${EPREFIX}"$(get_xclibdir)
+   --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
)
 
@@ -157,8 +157,8 @@ src_install() {
) || die "failglob error"
 
# Remove useless stuff from installation
-   find "${D}"/usr/share/doc/${PF} -type l -delete || die
-   find "${D}" -name '*.la' -delete || die
+   find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+   find "${ED}" -name '*.la' -delete || die
 }
 
 multilib_src_install() {
@@ -167,7 +167,7 @@ multilib_src_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) \
+   rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
|| die "failed to remove extra compat libraries"
;;
xcrypt_nocompat-*)
@@ -181,7 +181,7 @@ multilib_src_install() {
 
if [[ -n ${static_libs[*]} ]]; 
then
dodir 
"/usr/$(get_xclibdir)"
-   mv "${static_libs[@]}" 
"${D}/usr/$(get_xclibdir)" \
+   mv "${static_libs[@]}" 
"${ED}/usr/$(get_xclibdir)" \
|| die "Moving 
static libs failed"
fi
fi



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-09-24 Thread Mike Gilbert
commit: 87629e669d0b7d36bd2a51d7da4604e1af02cce9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Sep 24 21:01:31 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Sep 24 21:01:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87629e66

sys-libs/libxcrypt: disable static-libs by default

Bug: https://bugs.gentoo.org/750920
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index f75a2a57824..f31e856bc88 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86"
-IUSE="+compat split-usr +static-libs system test"
+IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 0124869d552..dca937cb958 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
-IUSE="+compat split-usr +static-libs system test"
+IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
index 0124869d552..dca937cb958 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
-IUSE="+compat split-usr +static-libs system test"
+IUSE="+compat split-usr static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-09-17 Thread Sam James
commit: de0581259cb5ca594e63a28031bcbc0978739f32
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 17 20:17:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 17 20:17:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de058125

sys-libs/libxcrypt: add 4.4.26

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild | 211 +
 2 files changed, 212 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index fe7f2fe9688..17af4f1fb10 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
+DIST libxcrypt-4.4.26-autotools.tar.xz 617808 BLAKE2B 
9fb8e31b22a085c0d0d5ab2ee3fb69fbebaccee2281e9be7d745218b5b92d949ffd3aa9c385671d58c93a654e16b943a33284b0b4737d52d26e43e2f7840fe74
 SHA512 
22c72cacd87c5751c4160413738fdf52c8fee300dcad01b289a6eaf892439883b9478103f791f5f53c8e5e2f2dd81057e5fda45e7cf7fdfd3ba93dd811bc01e3

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
new file mode 100644
index 000..0124869d552
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild multilib python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+   elibc_glibc? (
+   sys-libs/glibc[-crypt(+)]
+   !sys-libs/glibc[crypt(+)]
+   )
+   !sys-libs/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   sys-apps/findutils
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=(
+   $(usex 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
+   

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-09-02 Thread Sam James
commit: 4e49f413b0c964612c19bea14d80f75f45f8a7d3
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  2 21:09:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  2 23:52:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e49f413

sys-libs/libxcrypt: [QA] fix IndirectInherits

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 2 +-
 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index 01358ced262..f75a2a57824 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..9} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt;

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 98714fc323b..0124869d552 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt;



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-08-21 Thread James Le Cuirot
commit: 3e1819fbb24a71d682afe2fa9372bad74b830ae2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Aug 21 16:11:44 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug 21 22:15:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1819fb

sys-libs/libxcrypt: Keyword 4.4.25 for ~m68k

One scrypt-related test fails. There was a similar failure in scrypt's
own test suite, and I'm going to look into it.

Closes: https://bugs.gentoo.org/749933
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
index 6ca63517d94..98714fc323b 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="+compat split-usr +static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-08-10 Thread Sam James
commit: 8d488dcb032a2951aed18ded0254ccda556c48b6
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 02:37:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 02:37:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d488dcb

sys-libs/libxcrypt: drop 4.4.23, 4.4.23-r2, 4.4.24

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest   |   2 -
 sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild | 211 --
 sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild| 207 -
 sys-libs/libxcrypt/libxcrypt-4.4.24.ebuild| 211 --
 4 files changed, 631 deletions(-)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index ba026464d54..fe7f2fe9688 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,4 +1,2 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
-DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B 
a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199
 SHA512 
30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
-DIST libxcrypt-4.4.24-autotools.tar.xz 635260 BLAKE2B 
b353877144ca976480834bfd51d54bb0f288e5a1d0718d9b04871d5ecc79a4e762bc3a9760b600c0301ea75a5255acef2bb59b22840c373f3f3234c21b031568
 SHA512 
3b867d86df4d14aff4e90975b408eb5478fa4819139ffadef3f32eed5a3518a7a45104a1ea1f4f16c854d7d3f4087b76867000eb5e3217cdf52b9f84cc6f71b0
 DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
deleted file mode 100644
index 6ca63517d94..000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-IUSE="+compat split-usr +static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-   elibc_glibc? (
-   sys-libs/glibc[-crypt(+)]
-   !sys-libs/glibc[crypt(+)]
-   )
-   !sys-libs/musl
-   )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl
-   sys-apps/findutils
-   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   MULTIBUILD_VARIANTS=(
-   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-08-08 Thread Sam James
commit: dabf5ac4fb577f2725274aee03f16adcbd5536bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 04:11:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 04:11:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabf5ac4

sys-libs/libxcrypt: add 4.4.25

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 211 +
 2 files changed, 212 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index f37a8422c58..ba026464d54 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,4 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B 
a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199
 SHA512 
30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
 DIST libxcrypt-4.4.24-autotools.tar.xz 635260 BLAKE2B 
b353877144ca976480834bfd51d54bb0f288e5a1d0718d9b04871d5ecc79a4e762bc3a9760b600c0301ea75a5255acef2bb59b22840c373f3f3234c21b031568
 SHA512 
3b867d86df4d14aff4e90975b408eb5478fa4819139ffadef3f32eed5a3518a7a45104a1ea1f4f16c854d7d3f4087b76867000eb5e3217cdf52b9f84cc6f71b0
+DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B 
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
 SHA512 
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
new file mode 100644
index 000..6ca63517d94
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+   elibc_glibc? (
+   sys-libs/glibc[-crypt(+)]
+   !sys-libs/glibc[crypt(+)]
+   )
+   !sys-libs/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   sys-apps/findutils
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=(
+   $(usex 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 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

2021-08-06 Thread Sam James
commit: 92fbded82003721a34b6c16fb967f6565ae5d441
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  7 05:13:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  7 05:14:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92fbded8

sys-libs/libxcrypt: add 4.4.24

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libxcrypt/Manifest|   1 +
 sys-libs/libxcrypt/libxcrypt-4.4.24.ebuild | 211 +
 2 files changed, 212 insertions(+)

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 5d96aee67a9..f37a8422c58 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
 SHA512 
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B 
a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199
 SHA512 
30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
+DIST libxcrypt-4.4.24-autotools.tar.xz 635260 BLAKE2B 
b353877144ca976480834bfd51d54bb0f288e5a1d0718d9b04871d5ecc79a4e762bc3a9760b600c0301ea75a5255acef2bb59b22840c373f3f3234c21b031568
 SHA512 
3b867d86df4d14aff4e90975b408eb5478fa4819139ffadef3f32eed5a3518a7a45104a1ea1f4f16c854d7d3f4087b76867000eb5e3217cdf52b9f84cc6f71b0

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.24.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.24.ebuild
new file mode 100644
index 000..6ca63517d94
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.24.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild python-any-r1 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/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+   elibc_glibc? (
+   sys-libs/glibc[-crypt(+)]
+   !sys-libs/glibc[crypt(+)]
+   )
+   !sys-libs/musl
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+   sys-apps/findutils
+   test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+   has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=(
+   $(usex 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
+   #
+   # 

  1   2   >