commit: e122a052af9717ce76e8e2bd0de17d9ca19bc9a3 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Feb 9 21:51:44 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Feb 9 21:51:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e122a052
app-crypt/rhash: Drop old 1.4.2 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> app-crypt/rhash/Manifest | 1 - app-crypt/rhash/files/rhash-1.4.2-clang.patch | 80 ----------------------- app-crypt/rhash/rhash-1.4.2.ebuild | 93 --------------------------- 3 files changed, 174 deletions(-) diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest index 9211a10f3293..e243bbfc4bbc 100644 --- a/app-crypt/rhash/Manifest +++ b/app-crypt/rhash/Manifest @@ -1,2 +1 @@ -DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25 DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7 diff --git a/app-crypt/rhash/files/rhash-1.4.2-clang.patch b/app-crypt/rhash/files/rhash-1.4.2-clang.patch deleted file mode 100644 index 460e73a6ace7..000000000000 --- a/app-crypt/rhash/files/rhash-1.4.2-clang.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4dc506066cf1727b021e6352535a8bb315c3f8dc Mon Sep 17 00:00:00 2001 -From: Aleksey <rhash.ad...@gmail.com> -Date: Sat, 17 Jul 2021 18:39:41 +0300 -Subject: [PATCH] configure: fix clang detection on macOS - ---- - configure | 58 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 28 insertions(+), 30 deletions(-) - -diff --git a/configure b/configure -index 59d432b..111270a 100755 ---- a/configure -+++ b/configure -@@ -519,38 +519,36 @@ else - elif run_cmd "$CC --version"; then - cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1) - fi -- if test -n "${cc_name_tmp}"; then -- if echo "$cc_name_tmp" | grep -q "gcc"; then -- cc_name=$cc_name_tmp -- start_check "$CC version" -- cc_vendor=gnu -- cc_version=$($CC -dumpversion 2>&1) -- if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then -- cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null) -- if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then -- cc_version=$cc_v2 -- fi -+ if echo "$cc_name_tmp" | grep -q "gcc"; then -+ cc_name=$cc_name_tmp -+ start_check "$CC version" -+ cc_vendor=gnu -+ cc_version=$($CC -dumpversion 2>&1) -+ if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then -+ cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null) -+ if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then -+ cc_version=$cc_v2 - fi -- case $cc_version in -- 2.96*) -- cc_fail=yes -- ;; -- *) -- _cc_major=$(echo $cc_version | cut -d '.' -f 1) -- _cc_minor=$(echo $cc_version | cut -d '.' -f 2) -- _cc_mini=$(echo $cc_version | cut -d '.' -f 3) -- ;; -- esac -- finish_check "$cc_name $cc_version" -- break -- fi -- if echo "$cc_name_tmp" | grep -q "clang"; then -- start_check "$CC version" -- cc_vendor=clang -- cc_version=$($CC -dumpversion 2>&1) -- finish_check "clang $cc_version" -- break - fi -+ case $cc_version in -+ 2.96*) -+ cc_fail=yes -+ ;; -+ *) -+ _cc_major=$(echo $cc_version | cut -d '.' -f 1) -+ _cc_minor=$(echo $cc_version | cut -d '.' -f 2) -+ _cc_mini=$(echo $cc_version | cut -d '.' -f 3) -+ ;; -+ esac -+ finish_check "$cc_name $cc_version" -+ break -+ elif $CC --version 2>&1 | grep -q "clang"; then -+ start_check "$CC version" -+ cc_vendor=clang -+ cc_version=$($CC -dumpversion 2>&1) -+ finish_check "clang $cc_version" -+ break -+ else - cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3) - if test "$cc_name_tmp" = "Sun C"; then - start_check "$CC version" diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild deleted file mode 100644 index 85a78659e4d4..000000000000 --- a/app-crypt/rhash/rhash-1.4.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs multilib-minimal - -DESCRIPTION="Console utility and library for computing and verifying file hash sums" -HOMEPAGE="http://rhash.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug nls ssl static-libs" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] -)" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/RHash-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-clang.patch -) - -src_prepare() { - default - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - # we lack posix_memalign - sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \ - librhash/util.h || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - # 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 - - set -- \ - ./configure \ - --target="${CHOST}" \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --extra-cflags="${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --sysconfdir="${EPREFIX}"/etc \ - --disable-openssl-runtime \ - --disable-static \ - --enable-lib-shared \ - $(use_enable debug) \ - $(use_enable nls gettext) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs lib-static) - - echo "${@}" - "${@}" || die "configure failed" -} - -# We would add compile-gmo to the build targets but install-gmo always -# recompiles unconditionally. :( -# (note from sam: this might be fixed in >1.4.2? -# https://github.com/rhash/RHash/commit/9e4eeb1268149b24b7fbe0fc0fe91e3a266e6261) - -multilib_src_install() { - # -j1 needed due to race condition. - emake DESTDIR="${D}" -j1 \ - install{,-lib-headers,-pkg-config} \ - $(use nls && echo install-gmo) \ - $(use kernel_Winnt || echo install-lib-so-link) -} - -multilib_src_test() { - emake test -}