commit: 53a03105633eb89a469859355f23f034d15ea1e0 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Dec 27 15:29:03 2021 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Dec 27 15:30:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=53a03105
dev-libs/libgcrypt: migrate to gx86 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> dev-libs/libgcrypt/Manifest | 3 - .../libgcrypt/files/libgcrypt-1.6.1-uscore.patch | 26 ------- .../files/libgcrypt-multilib-syspath.patch | 23 ------ dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild | 82 ---------------------- dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild | 82 ---------------------- dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild | 82 ---------------------- dev-libs/libgcrypt/metadata.xml | 15 ---- 7 files changed, 313 deletions(-) diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest deleted file mode 100644 index 5a23e33ec5..0000000000 --- a/dev-libs/libgcrypt/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060 -DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8 -DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60 diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch deleted file mode 100644 index 22bfac3104..0000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch +++ /dev/null @@ -1,26 +0,0 @@ -The version taken from GnuPG 1.4 assumes any cross-compiled package have -prefixed underscores, which is not the case; by using libtool's own macro, -we can avoid the whole issue. - ---- libgcrypt-1.6.1/configure.ac -+++ libgcrypt-1.6.1/configure.ac -@@ -1022,7 +1022,7 @@ - # Check whether underscores in symbols are required. This needs to be - # done before setting up the assembler stuff. - # --GNUPG_SYS_SYMBOL_UNDERSCORE() -+LT_SYS_SYMBOL_USCORE - - - ################################# ---- libgcrypt-1.6.1/mpi/config.links -+++ libgcrypt-1.6.1/mpi/config.links -@@ -362,7 +362,7 @@ - - # Make sysdep.h - echo '/* created by config.links - do not edit */' >./mpi/sysdep.h --if test x$ac_cv_sys_symbol_underscore = xyes; then -+if test x$sys_symbol_underscore = xyes; then - cat <<EOF >>./mpi/sysdep.h - #if __STDC__ - #define C_SYMBOL_NAME(name) _##name diff --git a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch b/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch deleted file mode 100644 index 7859851ccc..0000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in -index c052638..4c8ddc3 100644 ---- a/src/libgcrypt-config.in -+++ b/src/libgcrypt-config.in -@@ -154,9 +154,12 @@ if test "$echo_libs" = "yes"; then - libs_final="$libs" - - # Set up `libdirs'. -- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then -- libdirs="-L$libdir" -- fi -+ case "$libdir" in -+ /usr/lib|/usr/lib64|/lib|/lib64) ;; -+ *) -+ libdirs="-L$libdir" -+ ;; -+ esac - - # Set up `libs_final'. - libs_final="$libs_final $gpg_error_libs" --- -1.7.6.1 - diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild deleted file mode 100644 index 9236d04075..0000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/"; -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc o-flag-munging static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( virtual/texi2dvi )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -src_prepare() { - default - # missing attribute(sysv_abi) for Cygwin? - [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S - # always use -no-undefined even if upstream is not convinced yet - sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die - eautoreconf -} - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --enable-noexecstack - $(use_enable o-flag-munging O-flag-munging) - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - # no cygwin patch yet - $([[ ${CHOST} == *-cygwin* ]] && \ - echo "gcry_cv_gcc_win64_platform_as_ok=no") - - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_compile() { - default - multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf -} - -multilib_src_install_all() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild deleted file mode 100644 index 9236d04075..0000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/"; -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc o-flag-munging static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( virtual/texi2dvi )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -src_prepare() { - default - # missing attribute(sysv_abi) for Cygwin? - [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S - # always use -no-undefined even if upstream is not convinced yet - sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die - eautoreconf -} - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --enable-noexecstack - $(use_enable o-flag-munging O-flag-munging) - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - # no cygwin patch yet - $([[ ${CHOST} == *-cygwin* ]] && \ - echo "gcry_cv_gcc_win64_platform_as_ok=no") - - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_compile() { - default - multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf -} - -multilib_src_install_all() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild deleted file mode 100644 index 9236d04075..0000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/"; -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc o-flag-munging static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( virtual/texi2dvi )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -src_prepare() { - default - # missing attribute(sysv_abi) for Cygwin? - [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S - # always use -no-undefined even if upstream is not convinced yet - sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die - eautoreconf -} - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --enable-noexecstack - $(use_enable o-flag-munging O-flag-munging) - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - # no cygwin patch yet - $([[ ${CHOST} == *-cygwin* ]] && \ - echo "gcry_cv_gcc_win64_platform_as_ok=no") - - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_compile() { - default - multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf -} - -multilib_src_install_all() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml deleted file mode 100644 index 9b7e9f273f..0000000000 --- a/dev-libs/libgcrypt/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Kristian Fiskerstrand</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Crypto</name> - </maintainer> -<use> -<flag name="o-flag-munging">Enable O-flag mangling during build</flag> -</use> -</pkgmetadata>
