From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- dev-libs/Manifest.gz | Bin 86966 -> 86972 bytes dev-libs/apr-util/Manifest | 2 +- dev-libs/apr-util/apr-util-1.6.1-r6.ebuild | 146 -------------------- dev-libs/apr-util/apr-util-1.6.1-r7.ebuild | 147 +++++++++++++++++++++ dev-libs/libfmt/Manifest | 5 +- .../libfmt/files/libfmt-8.0.0-no-udl-define.patch | 56 ++++++++ dev-libs/libfmt/libfmt-7.0.3.ebuild | 36 ----- dev-libs/libfmt/libfmt-8.0.0-r1.ebuild | 40 ++++++ dev-libs/libjcat/Manifest | 2 - dev-libs/libjcat/libjcat-0.1.7.ebuild | 65 --------- dev-libs/librep/Manifest | 2 +- dev-libs/librep/librep-0.92.7-r1.ebuild | 83 ++++++++++++ dev-libs/librep/librep-0.92.7.ebuild | 81 ------------ dev-libs/libsodium/Manifest | 3 + .../libsodium/libsodium-1.0.18_p20210617.ebuild | 98 ++++++++++++++ dev-libs/libtpms/Manifest | 4 +- dev-libs/libtpms/libtpms-0.8.2.ebuild | 46 ------- dev-libs/libtpms/libtpms-0.8.3.ebuild | 46 +++++++ dev-libs/libucl/Manifest | 4 +- dev-libs/libucl/libucl-0.8.1-r100.ebuild | 4 +- dev-libs/libucl/libucl-9999.ebuild | 4 +- dev-libs/libverto/Manifest | 3 + .../libverto/files/libverto-0.3.2-non-bash.patch | 117 ++++++++++++++++ dev-libs/libverto/libverto-0.3.2.ebuild | 49 +++++++ dev-libs/link-grammar/Manifest | 2 + dev-libs/link-grammar/link-grammar-5.9.1.ebuild | 123 +++++++++++++++++ dev-libs/opencl-icd-loader/Manifest | 4 +- .../opencl-icd-loader-2020.06.16.ebuild | 50 ------- .../opencl-icd-loader-2021.04.29.ebuild | 2 +- dev-libs/openssl/Manifest | 2 +- dev-libs/openssl/openssl-3.0.0_beta1.ebuild | 2 +- dev-libs/tvision/Manifest | 7 +- ...mmand-now-can-be-configured-from-the-envi.patch | 56 ++++++++ .../files/tvision-2.2.3-0001-use-proper-AR.patch | 23 ---- ...ed-configuration-option-to-exclude-libgpm.patch | 60 +++++++++ .../tvision-2.2.3-0003-Adjusted-c-years.patch | 34 +++++ ...n-2.2.3-0004-Made-ar-command-configurable.patch | 23 ++++ dev-libs/tvision/tvision-2.2.3.ebuild | 10 +- dev-libs/vc/Manifest | 2 + dev-libs/vc/vc-1.4.2.ebuild | 15 +++ 40 files changed, 986 insertions(+), 472 deletions(-) delete mode 100644 dev-libs/apr-util/apr-util-1.6.1-r6.ebuild create mode 100644 dev-libs/apr-util/apr-util-1.6.1-r7.ebuild create mode 100644 dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch delete mode 100644 dev-libs/libfmt/libfmt-7.0.3.ebuild create mode 100644 dev-libs/libfmt/libfmt-8.0.0-r1.ebuild delete mode 100644 dev-libs/libjcat/libjcat-0.1.7.ebuild create mode 100644 dev-libs/librep/librep-0.92.7-r1.ebuild delete mode 100644 dev-libs/librep/librep-0.92.7.ebuild create mode 100644 dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild delete mode 100644 dev-libs/libtpms/libtpms-0.8.2.ebuild create mode 100644 dev-libs/libtpms/libtpms-0.8.3.ebuild create mode 100644 dev-libs/libverto/files/libverto-0.3.2-non-bash.patch create mode 100644 dev-libs/libverto/libverto-0.3.2.ebuild create mode 100644 dev-libs/link-grammar/link-grammar-5.9.1.ebuild delete mode 100644 dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild create mode 100644 dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch delete mode 100644 dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch create mode 100644 dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch create mode 100644 dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch create mode 100644 dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch create mode 100644 dev-libs/vc/vc-1.4.2.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 52c3b77ba569..3d53c1343bc4 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index 3f5fe1503495..77ed3d57f82f 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -4,5 +4,5 @@ AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d -EBUILD apr-util-1.6.1-r6.ebuild 3771 BLAKE2B b79c0a69317e264bb0146edce1b34940e57d9bac1990b0ef8160e99da462fb2d03222b3279ac4aab356148d89735cb95f08b011a64174ff6362a7557f7fd82e9 SHA512 55adb89342d7d8accaf9c6b22bef5cda35f0a2324ad16e8fabe9e49d0577338aa470269e8566a6eb6b846a921dd76ef6ba4a3af65f40371bd0a37164c6c9fb6e +EBUILD apr-util-1.6.1-r7.ebuild 3791 BLAKE2B d39ebd34de8dafd80580c38b94d639be7230f1513a276c478ed26672e27bbbb29a2b72d11ee53b8e77bb330c7a4da4c273008a4ca71324cbc58544ad8df6c0e6 SHA512 1faef36ded7dfcc11ab9e28b70d8a887ce3ebc5d7b306b4dfc9f7d7ea57fa06a6f7fc9c5e2cc143cfe7dfcc151f04e0e51ef23e1b3a3af201b7377e50bf1b913 MISC metadata.xml 386 BLAKE2B d4ab564afc7fbffd8fa2f7d3709fb2141bb794937aa9dd0049b14a8ff21a1176c518c63080427b9afa09719a33f0f567bce8696f8fcb1373bc608171c58b8853 SHA512 c8e150e115b2d6999508e7a6c75d78e3b9ed6d5fbae11895f76b6e3421851a926b36a6a9cc225953212088f899d26fd4281876df76edaabb99d33972146e4ff5 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild deleted file mode 100644 index f46a637c7f25..000000000000 --- a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. -# APR_PV="${PV}" -APR_PV="1.6.2" - -inherit autotools db-use libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Utility Library" -HOMEPAGE="https://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs" -#RESTRICT="test" - -RDEPEND=" - dev-libs/expat - >=dev-libs/apr-${APR_PV}:1= - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm:= ) - ldap? ( =net-nds/openldap-2* ) - mysql? ( || ( - dev-db/mariadb-connector-c - >=dev-db/mysql-connector-c-8 - ) ) - nss? ( dev-libs/nss ) - odbc? ( dev-db/unixODBC ) - openssl? ( - dev-libs/openssl:0= - ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND=" - ${RDEPEND} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen ) -" - -DOCS=(CHANGES NOTICE README) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 - "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch - "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch - "${FILESDIR}"/${PN}-1.6.1-my_bool.patch - "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch -) - -src_prepare() { - default - - # Fix usage of libmysqlclient (bug #620230) - grep -lrF "libmysqlclient_r" "${S}" \ - | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ - || die - - mv configure.{in,ac} || die - eautoreconf - elibtoolize -} - -src_configure() { - local myconf=( - --datadir="${EPREFIX}"/usr/share/apr-util-1 - --with-apr="${SYSROOT}${EPREFIX}"/usr - --with-expat="${EPREFIX}"/usr - --without-sqlite2 - $(use_with gdbm) - $(use_with ldap) - $(use_with mysql) - $(use_with nss) - $(use_with odbc) - $(use_with openssl) - $(use_with postgres pgsql) - $(use_with sqlite sqlite3) - ) - - tc-is-static-only && myconf+=( --disable-util-dso ) - - if use berkdb; then - local db_version - db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version" - db_version="$(db_ver_to_slot "${db_version}")" - db_version="${db_version/\./}" - myconf+=( - --with-dbm=db${db_version} - # We use $T for the libdir because otherwise it'd simply be the normal - # system libdir. That's pointless as the compiler will search it for - # us already. This makes cross-compiling and such easier. - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}" - ) - else - myconf+=( --without-berkeley-db ) - fi - - if use nss || use openssl ; then - myconf+=( --with-crypto ) # 518708 - fi - - econf "${myconf[@]}" - # Use the current env build settings rather than whatever apr was built with. - sed -i -r \ - -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ - -e "/^CC=/s:=.*:=$(tc-getCC):" \ - -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ - -e '/^LTFLAGS/s:--silent::' \ - build/rules.mk || die -} - -src_compile() { - emake - use doc && emake dox -} - -src_test() { - # Building tests in parallel is broken - emake -j1 check -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then - find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die - fi - if ! use static-libs ; then - find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die - fi - - if use doc ; then - docinto html - dodoc -r docs/dox/html/* - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die -} diff --git a/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild new file mode 100644 index 000000000000..b54b74d8e7eb --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. +# APR_PV="${PV}" +APR_PV="1.6.2" + +inherit autotools db-use libtool multilib toolchain-funcs + +DESCRIPTION="Apache Portable Runtime Utility Library" +HOMEPAGE="https://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs" +#RESTRICT="test" + +RDEPEND=" + >=dev-libs/apr-${APR_PV}:1= + dev-libs/expat + virtual/libcrypt:= + berkdb? ( >=sys-libs/db-4:= ) + gdbm? ( sys-libs/gdbm:= ) + ldap? ( =net-nds/openldap-2* ) + mysql? ( || ( + dev-db/mariadb-connector-c + >=dev-db/mysql-connector-c-8 + ) ) + nss? ( dev-libs/nss ) + odbc? ( dev-db/unixODBC ) + openssl? ( + dev-libs/openssl:0= + ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND=" + ${RDEPEND} + >=sys-devel/libtool-2.4.2 + doc? ( app-doc/doxygen ) +" + +DOCS=(CHANGES NOTICE README) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 + "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch + "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch + "${FILESDIR}"/${PN}-1.6.1-my_bool.patch + "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch +) + +src_prepare() { + default + + # Fix usage of libmysqlclient (bug #620230) + grep -lrF "libmysqlclient_r" "${S}" \ + | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ + || die + + mv configure.{in,ac} || die + eautoreconf + elibtoolize +} + +src_configure() { + local myconf=( + --datadir="${EPREFIX}"/usr/share/apr-util-1 + --with-apr="${SYSROOT}${EPREFIX}"/usr + --with-expat="${EPREFIX}"/usr + --without-sqlite2 + $(use_with gdbm) + $(use_with ldap) + $(use_with mysql) + $(use_with nss) + $(use_with odbc) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_with sqlite sqlite3) + ) + + tc-is-static-only && myconf+=( --disable-util-dso ) + + if use berkdb; then + local db_version + db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version" + db_version="$(db_ver_to_slot "${db_version}")" + db_version="${db_version/\./}" + myconf+=( + --with-dbm=db${db_version} + # We use $T for the libdir because otherwise it'd simply be the normal + # system libdir. That's pointless as the compiler will search it for + # us already. This makes cross-compiling and such easier. + --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}" + ) + else + myconf+=( --without-berkeley-db ) + fi + + if use nss || use openssl ; then + myconf+=( --with-crypto ) # 518708 + fi + + econf "${myconf[@]}" + # Use the current env build settings rather than whatever apr was built with. + sed -i -r \ + -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ + -e "/^CC=/s:=.*:=$(tc-getCC):" \ + -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk || die +} + +src_compile() { + emake + use doc && emake dox +} + +src_test() { + # Building tests in parallel is broken + emake -j1 check +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die + if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then + find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die + fi + + if use doc ; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die +} diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest index 10e8e356b024..34b1583390c9 100644 --- a/dev-libs/libfmt/Manifest +++ b/dev-libs/libfmt/Manifest @@ -1,8 +1,9 @@ -DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a +AUX libfmt-8.0.0-no-udl-define.patch 1802 BLAKE2B 538a9dfe1dec002894db22536de91b8c3180eebd7029f5c97ca31da04b93c83dea38e70c44c880ef45e45fdded7010f571999eb3b65958d5af2cd23b5442bbe9 SHA512 967d2969a2afcfb2ad9be07382e2dba332162c7a43905f855a98dd2ae5cc6b9c387dbfeebd3f8cc538d51b4ac885b78584486831f9e80c1728be75a24f0fd628 DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15 DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517 -EBUILD libfmt-7.0.3.ebuild 778 BLAKE2B 9e9b994e80f7e6991913d2a553f76a7cc1690fc39a8c2692ff670a59734be819bc0cd56abffa82445e8e731faa95868341585457fbe7485ec639f1ae5d8154be SHA512 a818d4846e0551fd7eac246654d76104cda35b4a1d8d16f50d4e41876223298dc6c6eb4cff56a4ba2ad6bea304d4ba995f5a984fcadd98b4da5c95e8a905270c +DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c EBUILD libfmt-7.1.2.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1 EBUILD libfmt-7.1.3.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc +EBUILD libfmt-8.0.0-r1.ebuild 837 BLAKE2B 40ccd08531ed4834cd9b5489a623775a7770e2ef6ede4431d4ee45376f03895e5f1c6e40d9f4204b9368851f9e8d6620dc1c61e5e290d73bd5a3e17e6720f4c7 SHA512 35a204cd36f3b08d328b20c5da367826ce2d27647a19563fc540561226d75bc68c29c9352ea526062c2088010cc02a747fef26e619f554496649e0b140055926 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c diff --git a/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch b/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch new file mode 100644 index 000000000000..83078fa7285c --- /dev/null +++ b/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch @@ -0,0 +1,56 @@ +From ab89d342b5454528bd2b46e7f22c0311906f8ca2 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Tue, 22 Jun 2021 14:34:33 +0200 +Subject: [PATCH] format: do not use udl_{arg,formatter} return types when UDL + is not in use + +The udl_{arg,formatter} structs are only defined when +FMT_USE_USER_DEFINED_LITERALS is set, so don't try to define things that +return that struct when it's not defined. +--- + include/fmt/format.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/include/fmt/format.h b/include/fmt/format.h +index 03ae1c961..92b0f0fc5 100644 +--- a/include/fmt/format.h ++++ b/include/fmt/format.h +@@ -2730,6 +2730,8 @@ extern template auto snprintf_float(long double value, + #endif // FMT_HEADER_ONLY + + FMT_END_DETAIL_NAMESPACE ++ ++#if FMT_USE_USER_DEFINED_LITERALS + inline namespace literals { + /** + \rst +@@ -2741,18 +2743,18 @@ inline namespace literals { + fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23); + \endrst + */ +-#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS ++# if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS + template + constexpr auto operator""_a() + -> detail::udl_arg, + sizeof(Str.data) / sizeof(decltype(Str.data[0])), Str> { + return {}; + } +-#else ++# else + constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg { + return {s}; + } +-#endif ++# endif + + /** + \rst +@@ -2769,6 +2771,7 @@ constexpr auto operator"" _format(const char* s, size_t n) + return {{s, n}}; + } + } // namespace literals ++#endif // FMT_USE_USER_DEFINED_LITERALS + + template ::value)> + inline auto vformat(const Locale& loc, string_view fmt, format_args args) diff --git a/dev-libs/libfmt/libfmt-7.0.3.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild deleted file mode 100644 index 9e14967a6892..000000000000 --- a/dev-libs/libfmt/libfmt-7.0.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -LICENSE="MIT" -IUSE="test" -SLOT="0/$(ver_cut 1)" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/fmtlib/fmt.git" - inherit git-r3 -else - SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 x86" - S="${WORKDIR}/fmt-${PV}" -fi - -DEPEND="" -RDEPEND="" -RESTRICT="!test? ( test )" - -multilib_src_configure() { - local mycmakeargs=( - -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" - -DFMT_LIB_DIR="$(get_libdir)" - -DFMT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild b/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild new file mode 100644 index 000000000000..d489205c5abf --- /dev/null +++ b/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="Small, safe and fast formatting library" +HOMEPAGE="https://github.com/fmtlib/fmt" + +LICENSE="MIT" +IUSE="test" +SLOT="0/$(ver_cut 1)" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fmtlib/fmt.git" + inherit git-r3 +else + SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}/fmt-${PV}" +fi + +DEPEND="" +RDEPEND="" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${P}-no-udl-define.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" + -DFMT_LIB_DIR="$(get_libdir)" + -DFMT_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index 76f655107d56..9d56a47e3056 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1,8 +1,6 @@ AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d -DIST libjcat-0.1.7.tar.gz 64818 BLAKE2B a39bba9f82316e26f2d758d0ded6260968964404cc4401afb34cac2e74aff9649fa16ea28a9aceb72ef7d2d6ae45d25f8db333b212460f8e2e1c2e5649b76b68 SHA512 b22e4aee1e5bb396375ec50fb0a28544a52423116fdb81ce886638d56ee3003d3756339a4965aa0f27cb51759180f51075bd6eee6ced54b295a931c8cab0c519 DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9 EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6 -EBUILD libjcat-0.1.7.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e EBUILD libjcat-0.1.8.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b diff --git a/dev-libs/libjcat/libjcat-0.1.7.ebuild b/dev-libs/libjcat/libjcat-0.1.7.ebuild deleted file mode 100644 index 5ba6f9393cff..000000000000 --- a/dev-libs/libjcat/libjcat-0.1.7.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -PYTHON_REQ_USE="xml" - -inherit meson python-any-r1 vala xdg-utils - -DESCRIPTION="Library and tool for reading and writing Jcat files " -HOMEPAGE="https://github.com/hughsie/libjcat" -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="gpg gtk-doc +introspection +man pkcs7 test vala" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-glib:= - gpg? ( - app-crypt/gpgme - dev-libs/libgpg-error - ) - introspection? ( dev-libs/gobject-introspection:= ) - pkcs7? ( net-libs/gnutls ) - vala? ( dev-lang/vala:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - gtk-doc? ( dev-util/gtk-doc ) - man? ( sys-apps/help2man ) - test? ( net-libs/gnutls[tools] )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch -) - -python_check_deps() { - has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -src_prepare() { - xdg_environment_reset - use vala && vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtkdoc) - $(meson_use gpg) - $(meson_use introspection) - $(meson_use man) - $(meson_use pkcs7) - $(meson_use test tests) - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest index ec63c9d3faa8..e958235569e6 100644 --- a/dev-libs/librep/Manifest +++ b/dev-libs/librep/Manifest @@ -1,5 +1,5 @@ AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126 DIST librep_0.92.7.tar.xz 651344 BLAKE2B 3a0e9a3eef0afa2e095537dfc307418ba87ce7a9baabdba262fd9a24b71cc6577fe1282412da495d56bf22007f1931c5b834f5bcf4c5ebe87d6b43a4975d630e SHA512 752cb2da31457200b5896f70ce24a097b261b996da25998cd78a777f982597473afce1a216f449a4a969d29b1678bf54e2f148e86de6f9548eeb5cfd530ae377 -EBUILD librep-0.92.7.ebuild 1581 BLAKE2B 907fbee7b5397dbed6be6bbbcf76f574994ec002a70097c2333ee971fa610d0b3ae1b914b9ba45857a55cd51ce91a16b82a350533971c5002b387e0b5c64ab19 SHA512 364202afcc41399a1a320e675862d2174929858b304349ebfc6ac2fd420a72b8d68aaef5c597d35f21c4ef613db156ada787ae267c15176f4c52afad1879ebf9 +EBUILD librep-0.92.7-r1.ebuild 1612 BLAKE2B 7d492e6d5cc79f5fac47e0cf137c50154cbcbcb763b7f655a8c4ad1e9f7c8ee6e8fe7c684bcfd54a1d89dcb0cad828bd967a604f42020cf532efceff64ef6840 SHA512 e4cce157261be24701fb0a1d5c931dec53f3972e72e4ccb0c8c7c1cebf99c23b9729a592ee445c0b064f6d966d55943799a3eddcfcf3f9517119b062f4ee2792 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411 diff --git a/dev-libs/librep/librep-0.92.7-r1.ebuild b/dev-libs/librep/librep-0.92.7-r1.ebuild new file mode 100644 index 000000000000..fd71bdbfeaa3 --- /dev/null +++ b/dev-libs/librep/librep-0.92.7-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools elisp-common flag-o-matic + +DESCRIPTION="Shared library implementing a Lisp dialect" +HOMEPAGE="https://sawfish.fandom.com/" +SRC_URI="https://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" +IUSE="emacs gmp readline" + +RDEPEND=" + >=sys-libs/gdbm-1.8.0:= + virtual/libcrypt:= + emacs? ( >=app-editors/emacs-23.1:* ) + gmp? ( dev-libs/gmp:= ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.92.0-disable-elisp.patch +) + +S="${WORKDIR}/${PN}_${PV}" + +src_prepare() { + # fix #570072 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + default + + # The configure script is missing from this version. + eautoreconf +} + +src_configure() { + econf \ + $(use_with gmp) \ + $(use_with readline) \ + --disable-static \ + --libexecdir=/usr/$(get_libdir) \ + --without-ffi +} + +src_compile() { + default + + if use emacs; then + elisp-compile rep-debugger.el || die "elisp-compile failed" + fi +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die + + find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die + + dodoc doc/* + + if use emacs; then + elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \ + || die "elisp-site-file-install failed" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/librep/librep-0.92.7.ebuild b/dev-libs/librep/librep-0.92.7.ebuild deleted file mode 100644 index b5b9249eb9fa..000000000000 --- a/dev-libs/librep/librep-0.92.7.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools elisp-common flag-o-matic - -DESCRIPTION="Shared library implementing a Lisp dialect" -HOMEPAGE="https://sawfish.fandom.com/" -SRC_URI="https://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="emacs gmp readline" - -RDEPEND=" - >=sys-libs/gdbm-1.8.0 - emacs? ( >=app-editors/emacs-23.1:* ) - gmp? ( dev-libs/gmp:= ) - readline? ( sys-libs/readline:0= ) -" -BDEPEND=" - ${RDEPEND} - sys-apps/texinfo -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.92.0-disable-elisp.patch -) - -S="${WORKDIR}/${PN}_${PV}" - -src_prepare() { - # fix #570072 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - default - - # The configure script is missing from this version. - eautoreconf -} - -src_configure() { - econf \ - $(use_with gmp) \ - $(use_with readline) \ - --disable-static \ - --libexecdir=/usr/$(get_libdir) \ - --without-ffi -} - -src_compile() { - default - - if use emacs; then - elisp-compile rep-debugger.el || die "elisp-compile failed" - fi -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die - - find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die - - dodoc doc/* - - if use emacs; then - elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \ - || die "elisp-site-file-install failed" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index bb7aafe8ac2e..17d716290c80 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -3,6 +3,9 @@ DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006 DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589de42b38a7586b4a35571eec9a0b0afd1df101467cb8f82e9a32dbdb9a25058d827a5565ad8d49ad2216d2b6af5b101612a94080 SHA512 ddb77c0608a7e6cacf1923a3d0f5950975511c46d53f6f9c23f80dd99eab84dde2a1292c1e35555f7f1659f25a1b80668516558b83c42effb921fff06c0fb559 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf +DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc +DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a EBUILD libsodium-1.0.18_p20210421.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15 +EBUILD libsodium-1.0.18_p20210617.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0 diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild new file mode 100644 index 000000000000..3d4e4edcb0ee --- /dev/null +++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" +HOMEPAGE="https://libsodium.org" + +if [[ ${PV} == *_p* ]] ; then + MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) + MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3" + + # We use _pN to represent 'stable releases' + # These are backports from upstream to the last release branch + # See https://download.libsodium.org/libsodium/releases/README.html + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz" + + # TODO: Could verify-sig.eclass support minisig? bug #783066 + SRC_URI+=" verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )" + + S="${WORKDIR}/${PN}-stable" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc + inherit verify-sig + + SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )" +fi + +LICENSE="ISC" +SLOT="0/23" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+asm minimal static-libs +urandom" + +CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) +IUSE+=" ${CPU_USE[@]}" + +if [[ ${PV} == *_p* ]] ; then + IUSE+=" verify-sig" + + BDEPEND+=" verify-sig? ( app-crypt/minisign )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch +) + +src_unpack() { + if [[ ${PV} == *_p* ]] ; then + if use verify-sig ; then + elog "Verifying signature using app-crypt/minisign" + minisign -V \ + -P ${MINISIGN_KEY} \ + -x "${DISTDIR}"/${P}.tar.gz.minisig \ + -m "${DISTDIR}"/${P}.tar.gz || die "Failed to verify distfile using minisign!" + fi + + default + else + verify-sig_src_unpack + fi +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable asm) + $(use_enable cpu_flags_x86_aes aesni) + $(use_enable cpu_flags_x86_sse4_1 sse4_1) + $(use_enable minimal) + $(use_enable static-libs static) + $(use_enable !urandom blocking-random) + ) + + # --disable-pie is needed on x86, see bug #512734 + if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then + myeconfargs+=( --disable-pie ) + + # --disable-ssp is needed on musl x86 + # TODO: Check if still needed? bug #747346 + if use elibc_musl ; then + myeconfargs+=( --disable-ssp ) + fi + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index bc7a6a9f667b..d0390b27b848 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -1,4 +1,4 @@ AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997 -DIST libtpms-0.8.2.tar.gz 1253915 BLAKE2B 48281512f2611376f0f3a67a2646fdc406c2d28bfd560a07b23c122a1b4d68c2840c5cd23f41beae4a13eab419e722aed821cecd919ae6219da325724d55e3b3 SHA512 635f1b30265f1752602caefa1fa87f0032e4d38f1b7113137b7e25a85da10e34f89f9d928b960660e9451306807f111ed96c2a11cbb2de4fb4beb7e638f83727 -EBUILD libtpms-0.8.2.ebuild 1185 BLAKE2B 90295a0a4023e786ed52815b187baa20d91b03f3e959125ea626ec980b32356416ffc2a4e23b7a7179f0fbd5beab47857d7245ace5ba4e25d28dd6c10f927b4b SHA512 f7f2fbacb42ac4b531312e333abe24b72d93befa29781892c90a69a76a3c3cd0f8f280c8a104e52a8ffdde33971a6f38bea906aa6a2e6a60b1ebe15110fe6024 +DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b +EBUILD libtpms-0.8.3.ebuild 1185 BLAKE2B 90295a0a4023e786ed52815b187baa20d91b03f3e959125ea626ec980b32356416ffc2a4e23b7a7179f0fbd5beab47857d7245ace5ba4e25d28dd6c10f927b4b SHA512 f7f2fbacb42ac4b531312e333abe24b72d93befa29781892c90a69a76a3c3cd0f8f280c8a104e52a8ffdde33971a6f38bea906aa6a2e6a60b1ebe15110fe6024 MISC metadata.xml 403 BLAKE2B 4814e5c482ca758a1dabe326fd8a25fbe32554dbc1f68c4fe0b4db76ae1db086a31d256d8c015884fa6b811e495862a559fe3cdd08ffff7b35def3099769f40d SHA512 f0c7f037abbe22a17b86ae160ddd5c703051b10ec53bea2bf9f2aa6efdaf50bdb8fc2eb1ed7caa47bd2d7dc3276d8d0212dece07184c4fc2daa8793d1592e50c diff --git a/dev-libs/libtpms/libtpms-0.8.2.ebuild b/dev-libs/libtpms/libtpms-0.8.2.ebuild deleted file mode 100644 index d8fb23739da2..000000000000 --- a/dev-libs/libtpms/libtpms-0.8.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Library providing software emultion of a TPM" -HOMEPAGE="https://github.com/stefanberger/libtpms" -SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-libs/openssl:0=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.8.0-Remove-WError.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - --with-openssl \ - --with-tpm2 -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA" - elog "keys due to a flawed key creation algorithm. Because fixing this would render" - elog "existing sealed data inaccessible, to use the corrected algorithm, the old" - elog "TPM state file must be deleted and a new TPM state file created. Data still" - elog "sealed using the old state file will be permanently inaccessible. For the" - elog "details see https://github.com/stefanberger/libtpms/issues/183" -} diff --git a/dev-libs/libtpms/libtpms-0.8.3.ebuild b/dev-libs/libtpms/libtpms-0.8.3.ebuild new file mode 100644 index 000000000000..d8fb23739da2 --- /dev/null +++ b/dev-libs/libtpms/libtpms-0.8.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Library providing software emultion of a TPM" +HOMEPAGE="https://github.com/stefanberger/libtpms" +SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.0-Remove-WError.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --with-openssl \ + --with-tpm2 +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA" + elog "keys due to a flawed key creation algorithm. Because fixing this would render" + elog "existing sealed data inaccessible, to use the corrected algorithm, the old" + elog "TPM state file must be deleted and a new TPM state file created. Data still" + elog "sealed using the old state file will be permanently inaccessible. For the" + elog "details see https://github.com/stefanberger/libtpms/issues/183" +} diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest index fad14a59482e..12e07e66d9fd 100644 --- a/dev-libs/libucl/Manifest +++ b/dev-libs/libucl/Manifest @@ -1,4 +1,4 @@ DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af -EBUILD libucl-0.8.1-r100.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659 -EBUILD libucl-9999.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659 +EBUILD libucl-0.8.1-r100.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00 +EBUILD libucl-9999.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00 MISC metadata.xml 985 BLAKE2B b7b4f33a1c6a33751f246190f8b38cfdce778e37c70321760c173b61cfd1f8bbdb811930a8ecab46a3764e2f77f8908cda79e395885b322c8c3c599da31777b7 SHA512 3546d93841d932f75cd5352a4c06ef63ae30a106b7b44a2e2cc6bd99a0b703b1e2d5010671b46d29e7ec26d571c6f6f9c788e6f22a9a0a216752988559823aba diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild index d576b86cdf0e..2eb9fa97c158 100644 --- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild +++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RESTRICT="!test? ( test )" DEPEND="!!dev-libs/ucl lua? ( ${LUA_DEPS} ) urls? ( net-misc/curl ) - sign? ( dev-libs/openssl:0 ) + sign? ( dev-libs/openssl:0= ) " BDEPEND="${DEPEND} virtual/pkgconfig diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild index d576b86cdf0e..2eb9fa97c158 100644 --- a/dev-libs/libucl/libucl-9999.ebuild +++ b/dev-libs/libucl/libucl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RESTRICT="!test? ( test )" DEPEND="!!dev-libs/ucl lua? ( ${LUA_DEPS} ) urls? ( net-misc/curl ) - sign? ( dev-libs/openssl:0 ) + sign? ( dev-libs/openssl:0= ) " BDEPEND="${DEPEND} virtual/pkgconfig diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest index 91844d18419a..69fe02a0528d 100644 --- a/dev-libs/libverto/Manifest +++ b/dev-libs/libverto/Manifest @@ -1,4 +1,7 @@ AUX libverto-0.3.1-non-bash.patch 5519 BLAKE2B a829048133f79a2eb954bba3f094233f187623f87d994b79d75fb768e392ce5428e86fe6f693a9b98d18ad5dabb0e73f83275a8adcb1b5e51ed0f3c305f220bf SHA512 c1c4f9a33a5d7795f30ce0c225bf7e64e313a17f3f6718c292da9b3f9ce009730eeb6ce70e7730d8bd466e5aa67f8b3ffded61617e7f6f661b19adbf1aa218ef +AUX libverto-0.3.2-non-bash.patch 4444 BLAKE2B 43480f36158a6ff59ab3d1dc23752c2696ce488c746568f52aa0627aab3a3e298e549ed51221c2244d0ed473bc551527f0239637648424285f32f2fd7ffb5966 SHA512 7bfc23b48089b8362d8336b0dd3ac4903626c76ea3cfff02a30775d4b91eeddb31d34f125e60d2f8247e69132dbaac12041cd8ba21ae4bb733b32e10bf4b54b2 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740 +DIST libverto-0.3.2.tar.gz 383181 BLAKE2B 76d43397ecd6b7839be2a588c5b668eb6657138e48b786cde6fd82bb33aa071ce5f9efa19f06765d868033fa2ef4a03cf6d43bcd087c431909d2ca17562a5a48 SHA512 342f20f83b8f674230fefba013505e1339dab0022e5e232c39d6763e4307088fa290b5a8e83f588e97142f5c4d190b1430288750e45f37a5fe4174d84ef85fc1 EBUILD libverto-0.3.1-r1.ebuild 1550 BLAKE2B f4cd26c8231b8d784824e604762bfa5dad91ad833fe15991a208e524a4b9e6e377491357d5d6e4e711225a6427a081cf757c8871317157b8e9c3b5125f122a87 SHA512 fd1eb18bffd0e16431241486c9f1a22b738c704591b889afc76ec7fa86d40d2d664e77bf5a9164bf7a77b76c402e166f3fcba84fcd5b4c05021c9006cf51461c +EBUILD libverto-0.3.2.ebuild 1127 BLAKE2B fe15c1c369850422b08d46c205ec55d3c5989d6d4bd5e3ce9e7fc8ce05d5a61db340d8e6ba839b9158256c7e1448efa59f8ed603b5e4f8e1b65fc1ea6e7cd66d SHA512 07809fdf16800255ffa835f17b249f42f929a7f1ba861e08fd70b3858312989cc380064ebe18bdc0c082c0daf32f268093306005feb62a51360f6fcb70abb925 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00 diff --git a/dev-libs/libverto/files/libverto-0.3.2-non-bash.patch b/dev-libs/libverto/files/libverto-0.3.2-non-bash.patch new file mode 100644 index 000000000000..4d035a4617a3 --- /dev/null +++ b/dev-libs/libverto/files/libverto-0.3.2-non-bash.patch @@ -0,0 +1,117 @@ +https://github.com/latchset/libverto/pull/31 + +Strips bashisms from configure.ac causing breakage in net-nds/gssproxy +https://bugs.gentoo.org/762823 + +From bf5e1eac51cd8aa801c0125b892412bb73b97b08 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Jun 2021 03:29:56 +0100 +Subject: [PATCH] Fix bashisms in configure.ac + +'==' is not supported in POSIX shells. = is equivalent for us, so let's +use that instead. + +Bug: https://bugs.gentoo.org/762823 +--- + configure.ac | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1e510dc..30b7aa4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,15 +82,15 @@ AC_ARG_WITH([libevent], + + # Ensure that if a builtin is chosen only one is built + BUILTIN_MODULE= +-if test x$WITH_GLIB == xbuiltin; then ++if test x$WITH_GLIB = xbuiltin; then + BUILTIN_MODULE=glib + WITH_LIBEV=no + WITH_LIBEVENT=no +-elif test x$WITH_LIBEV == xbuiltin; then ++elif test x$WITH_LIBEV = xbuiltin; then + BUILTIN_MODULE=libev + WITH_LIBGLIB=no + WITH_LIBEVENT=no +-elif test x$WITH_LIBEVENT == xbuiltin; then ++elif test x$WITH_LIBEVENT = xbuiltin; then + BUILTIN_MODULE=libevent + WITH_LIBGLIB=no + WITH_LIBEV=no +@@ -101,20 +101,20 @@ if test x$BUILTIN_MODULE != x; then + fi + + # Ensure that there is only one default (convert duplicate default to yes) +-if test x$WITH_GLIB == xdefault; then ++if test x$WITH_GLIB = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [glib]) +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes + fi +-if test x$WITH_LIBEV == xdefault; then ++if test x$WITH_LIBEV = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libev]) +- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes ++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes + fi +-if test x$WITH_LIBEVENT == xdefault; then ++if test x$WITH_LIBEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes + fi + + BUILD_GLIB=no +@@ -124,7 +124,7 @@ BUILD_LIBEVENT=no + if test x$WITH_GLIB != xno; then + PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], + [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) +- if test x$BUILD_GLIB == xauto; then ++ if test x$BUILD_GLIB = xauto; then + BUILD_GLIB=yes + fi + fi +@@ -138,7 +138,7 @@ if test x$WITH_LIBEV != xno; then + ), + [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] + ) +- if test x$BUILD_LIBEV == xauto; then ++ if test x$BUILD_LIBEV = xauto; then + BUILD_LIBEV=yes + fi + fi +@@ -146,17 +146,17 @@ fi + if test x$WITH_LIBEVENT != xno; then + PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], + [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) +- if test x$BUILD_LIBEVENT == xauto; then ++ if test x$BUILD_LIBEVENT = xauto; then + BUILD_LIBEVENT=yes + fi + fi + +-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) +-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) +-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) +-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) +-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) +-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) ++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) ++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) ++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) ++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) ++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) ++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) + + AC_MSG_NOTICE() + AC_MSG_NOTICE([BUILD CONFIGURATION]) +-- +2.32.0 + diff --git a/dev-libs/libverto/libverto-0.3.2.ebuild b/dev-libs/libverto/libverto-0.3.2.ebuild new file mode 100644 index 000000000000..d6bf244ff04c --- /dev/null +++ b/dev-libs/libverto/libverto-0.3.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="Main event loop abstraction library" +HOMEPAGE="https://github.com/latchset/libverto/" +SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="glib +libev libevent +threads" +REQUIRED_USE="|| ( glib libev libevent )" + +DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) + libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) + libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )" + +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) + +PATCHES=( + "${FILESDIR}"/${P}-non-bash.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf \ + $(use_with glib) \ + $(use_with libev) \ + $(use_with libevent) \ + $(use_with threads pthread) \ + --disable-static +} + +multilib_src_install_all() { + default + + find "${ED}" -name '*.la' -delete +} diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index 5f203284c7cb..94473dc107e1 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -3,6 +3,8 @@ AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022 +DIST link-grammar-5.9.1.tar.gz 3809872 BLAKE2B fe0c407e2e4ea4201036647cbea7d4c2606fa9943653fcc2d3505963a00773006912b8af5c2762acf498220d2f48319a031736d59790c0fed616432973ea24ec SHA512 c8d8bc99ddd6f6190ebcb24fcafc79497c3eeab1deb3099691f55c735a0a607a8372a8dca5cd86ce7c20cd3a45e4f1cbf91bef39dc781a5b5a2246006b4f601e EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc EBUILD link-grammar-5.8.1.ebuild 3055 BLAKE2B b029a010785009c0463a272e8fa70a0166e14419292a4ea8f0c09d4d1bac7bd75ed7122ade19c4615816650dc71a0296c4ff97d0f873f756f8b6f3f9f9c61505 SHA512 7d21f89272decc806e310f961d3e40edc5fa55398aca74f71a9d80b151e18e7a27ee4d243c0fe5aee81ae5662f24ce242ccf3b0254ed9675b57aec786932a2e6 +EBUILD link-grammar-5.9.1.ebuild 3062 BLAKE2B 85ebccac2e225bf7262b9f1cc6af74ccaafa742de603a94996c25328694defb978968871aa5ab1c38afe53ee1371acba455c0677cfcc6a9fa107d0e32b564465 SHA512 161f9b3ca151b30b259ade74401e9379041e8146eddbbc4625c76fafd7a631f5650dc524b8549152bc2f97a9890df7ac8963212a715b6f767b4a7687d30e1c65 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2 diff --git a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild b/dev-libs/link-grammar/link-grammar-5.9.1.ebuild new file mode 100644 index 000000000000..2be3e58a4fd7 --- /dev/null +++ b/dev-libs/link-grammar/link-grammar-5.9.1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools java-pkg-opt-2 python-r1 out-of-source + +DESCRIPTION="A Syntactic English parser" +HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/" +SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="aspell +hunspell java python" # pcre +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# XXX: sqlite is automagic +# Does not build with >=sci-mathematics/minisat-2, bug #593662 +# add pcre support: pcre? ( dev-libs/libpcre ) +RDEPEND=" + dev-db/sqlite:3 + aspell? ( app-text/aspell ) + hunspell? ( app-text/hunspell ) + java? ( + >=virtual/jdk-1.6:* + dev-java/ant-core + ) + python? ( ${PYTHON_DEPS} ) + !sci-mathematics/minisat" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/swig:0 + sys-devel/autoconf-archive + virtual/pkgconfig" + +pkg_setup() { + if use aspell && use hunspell; then + ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist," + ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if" + ewarn "you want aspell support." + fi + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + use java && java-pkg-opt-2_src_prepare + + eapply "${FILESDIR}"/${PN}-5.8.1-lld.patch + + eautoreconf +} + +my_src_configure() { + local myconf=( + --disable-maintainer-mode + --disable-editline + --disable-perl-bindings + --disable-static + --enable-sat-solver=bundled + $(use_enable aspell) + $(use_enable hunspell) + $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '') + $(use_enable java java-bindings) + # $(use_enable pcre regex-tokenizer) + # $(use_with pcre) + ) + + econf \ + --disable-python-bindings \ + "${myconf[@]}" + + if use python; then + python_configure() { + econf \ + --enable-python-bindings \ + "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure + fi +} + +my_src_compile() { + local -x MAIN_BUILD_DIR="${BUILD_DIR}" + default + + if use python; then + python_compile() { + emake -C bindings/python \ + VPATH="${S}:${MAIN_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la + } + python_foreach_impl run_in_build_dir python_compile + fi +} + +my_src_install() { + local -x MAIN_BUILD_DIR="${BUILD_DIR}" + default + + if use python; then + python_install() { + emake -C bindings/python \ + VPATH="${S}:${MAIN_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + DESTDIR="${D}" \ + install + } + python_foreach_impl run_in_build_dir python_install + fi + + # no static archives + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + use java && java-pkg-opt-2_pkg_preinst +} diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest index 37c3bd85c742..5fe1a3fc0ab0 100644 --- a/dev-libs/opencl-icd-loader/Manifest +++ b/dev-libs/opencl-icd-loader/Manifest @@ -1,5 +1,3 @@ -DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178 -EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722 -EBUILD opencl-icd-loader-2021.04.29.ebuild 889 BLAKE2B 96cb7dd1778980f57c7c21f84614f9c571827567fd0aa6048155dbfbf484baf8935df3dbd10f1100ada0920c0fc6e68dcf59639a1805a0e10992fe1288cdcb45 SHA512 0f2523f6784f5635ce67650eb242ce5a7cf54bb54190a522467fded0eacaffda7df54bcd57179296944e866a1f2ce153bc214a36beda7fed128eabef61e54d55 +EBUILD opencl-icd-loader-2021.04.29.ebuild 887 BLAKE2B dc8dfa8729cdae1efaf08ef950051ee8d40385ac9ac85b61172ce9ccce8794d4ac208c190d6a0572ad4f02008b01a9437b8312153bf3a5716f7460bb83c273fb SHA512 14e1ca4a25d3dc5819abe67218371ac1b2bc603323c3123432a7789fc345eaec3d62b7bac85cdaca2c2d82355dec8ec9357a82352262fa79f329218c5f02eeba MISC metadata.xml 340 BLAKE2B ade1ca3014eb1b6b36aa11078944e4b13ecdc02ee889751c1c69bf85d320a75dc70c5f74bd24aa69ed4822f966ad218f4742c3249e2b2aa2f51f21ab9cf07064 SHA512 599a65843a54b48228a37ee4e8219e5b128bdf2e6f998fd397292e0aa6466a5b0b1ce3977c1aa8ce9341778975cace7ffb890ba66a2c1c7ac44934ce9891e906 diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild deleted file mode 100644 index 566faffb1de0..000000000000 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic - -MY_PN="OpenCL-ICD-Loader" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Official Khronos OpenCL ICD Loader" -HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader" -SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="dev-util/opencl-headers - !app-eselect/eselect-opencl - !dev-libs/ocl-icd" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Until the next upstream release. Bug #716410 - if use test; then - append-cflags $(test-flags-CC -fcommon) - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include" - ) - cmake_src_configure -} - -multilib_src_test() { - OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \ - cmake_src_test -} diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild index e52197a47873..dc98e27b7a14 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 547dc2aab168..95fbdc138dc6 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -9,5 +9,5 @@ DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7ad DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d EBUILD openssl-1.0.2u.ebuild 9895 BLAKE2B e3120c9bacee4a6cf6e00f1fdc0e480df1e28ca38c9c901d14f679a4a6a5cab074f1bdefbd9e94a28399e2ce7f14fafcc7261146a3fd95bca92427fff46ab361 SHA512 ccb2f8c173cfac5adf5aef9d61a5894168f3092f626d6e6b09cc91e29592765975eef243cd1d42b4693abbd568bc836cc875242476ab6ec00df143cfd394a080 EBUILD openssl-1.1.1k.ebuild 10292 BLAKE2B 65992f0284bae36b470dae1c979ed0cd6794d147e9c5981f43822e32be87ac4cb51db517141d20b77c5fba104a068893b838f91cefbb24e57af22d1377534c3c SHA512 cb43106f639e268230e406bba3eb0e742c8daf6bc6584faf72a7138ef82213ac92d4400360957a444d981b09edae091081a84425feb76156095d11449f4a4962 -EBUILD openssl-3.0.0_beta1.ebuild 8184 BLAKE2B 3713e504271fcf5116eb6e789deca73b54d66751d692fdbe4b441cee1f79927844701a768d978c151e133fabb211c7a1a85a8709b46945c1e5f3042153b1c5b7 SHA512 497a284458f9bd5d71048208a4a66f01b07ff83b75fddb75ddb299d0693cd32a17d6a9211238cc855a25e1dfa98db946e399376595a5ec4be29e26770fc4e910 +EBUILD openssl-3.0.0_beta1.ebuild 8188 BLAKE2B 78941fb8fade63cc6201cc9e22d3ccd3f277080e97768f9fd7f4c7d0395d793e10072778ceb2488ad2cb6c4be0918f54c61ab60ac08435503cf9344f4a78f0e1 SHA512 61cf8a9e41cabd08526c9b1e7b7cc0e20e6ba839f2dfe85aef4773e950b41eb31642c8092ddb0c1a1bd3f4b6260d8c6f91552c064cb77fb4c2208dabef16c6c7 MISC metadata.xml 1354 BLAKE2B d18c8fdbc725d1c3dc63d7431f739267e4932a42e5a6df706abc0e77e96fee79d4b18679e52ce6f8db3afe6c33bcbc88c43b866a3136856800510abe4b359050 SHA512 15846b4760a40d2e36759c09cc00329d1cebbbdf7f7ed779fe9e9d3e81e5a1641458566baac753ad99380024056c54611502f07c6b8335f51025131060857e70 diff --git a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1.ebuild index f5fac82dbecb..396083b136aa 100644 --- a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild +++ b/dev-libs/openssl/openssl-3.0.0_beta1.ebuild @@ -148,7 +148,7 @@ multilib_src_configure() { unset SCRIPTS #312551 unset CROSS_COMPILE #311473 - tc-export CC AR RANLIB RC + tc-export AR CC CXX RANLIB RC use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } echoit() { echo "$@" ; "$@" ; } diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest index 7c19a0518649..5ba7c2aa154b 100644 --- a/dev-libs/tvision/Manifest +++ b/dev-libs/tvision/Manifest @@ -5,9 +5,12 @@ AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214 AUX tvision-2.2.1.4-flags.patch 392 BLAKE2B 8124537533a9a9e6568dec6aebdae766f05b1c59f7bbfbb34f8096ce0c4b61e9e5f0a70f525505592fe57c41ee61c8e31db1cd5e6fad5c977c73649c6b4f9b8e SHA512 8b3ccdf1dd49d436d9ebb05ee69081ca0abfb6b1dc6b41042788ef7b0c1328cbcf67788837577897d2e2485b41aaf620d789b39b33a0f82d442a263508f52017 AUX tvision-2.2.1.4-gcc6.patch 1108 BLAKE2B 7a99bd2aa759d7995fa1bd0afd93c4b1a329d764f9dfff47796a997079718d90eeabe71e09046a6801644fcbf04caa05c955225a3fc77a0f031cad6d6ccc45e8 SHA512 05f55ad5f99107419bac22226b82dd2f94ec673e2c10e9872b59d47a42c7ab12e0f36c30bb1d019b15c8c07d8f5ebe2cf7637d42ca271d34c2042bb259fab3af AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5bb25d68e5c9ad8d09c2fd16ca6e7a5c52c1febc2e8547b4f3444339f806415a396cccd140db1df10de6a3dbdb6ebff0f SHA512 92c867111f4f528da29ff612c72c90d77709eb46c587b5759f2bc69392d538a6c25ed2d54b8fe7eca0cd3b167a7db0c50de94e88f2107f7527884d15485c1a3f -AUX tvision-2.2.3-0001-use-proper-AR.patch 622 BLAKE2B e95e94946361f3f32058318603dd863ca14620d4dcebcf9e0a2335afcaed221bf7dceaff2f210d4d928a9c9afa514ba2e3e9f43730d5a28aa098a9cd67845511 SHA512 aca74659cf17f614178cbcdc6f6161ed46d7f6dbbcd0166f9f4697bce63a8547bdf3d9a615483071616911665e8c2a154e7116388d8b0c2c64c8ca08b3b62bcb +AUX tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch 1281 BLAKE2B 1db252881ba1bd93b28623020749e2ab5b4c0410132dcd447367a1940766085c63f072656084ded6a041433dceffb4630359b02818e7db652060255ccc270b07 SHA512 6308f5557a5cdd1eb87fa92509377c0e3ef70ac168ddfc3da17d19155e27576950055a46f7edc606fae2997587b8a6852a943e9e5ccce79d533ae0f68c037ba7 +AUX tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch 1931 BLAKE2B d14b41fdbf96615cf7b8abf667179cf54aa0478724252d6ef6e3ff50c79ad94b3a1e581a894fdeac8ca79e003a865f493d42dc3bda7a948e8d53f5bf2cd2a119 SHA512 269e36ea6c26d6cf7201d886d52758e827761bc4fdacd3af2fae2dd4ccb328847ca3d40661626effebf77bd075f0c19d2201c5d35e0a58348ada58ea35dbdb97 +AUX tvision-2.2.3-0003-Adjusted-c-years.patch 908 BLAKE2B 87a2bbe41e0ff3a7e765bd38fb29a1ce710db6e9c4576c09ef80bea500bea6751893592726ea7132f6693010f24e8d70443dd8c6aa2c6a792eefcce087dbe0c1 SHA512 639c8668910f64bdd1e765f75a37cf9b5d480e2872cb4b2aae0fbc84f6da8f75899525271811a64cc2bb363f2490c3f8e70a08003cb27851d269a2d65144664e +AUX tvision-2.2.3-0004-Made-ar-command-configurable.patch 540 BLAKE2B fe8bcb93d28897debe4d3c94c04291758d0a6fed051ba320e27f453ea4c3f206339c9052db14173f7e8899c14c1ab2c00b3c76a29e4d71e8a95c5f1450cfef0c SHA512 0f04d4ee449a401f3276a3642b71139c9fc39286314932cc22dc2a0ff8c452b06ff082f850240a3ef89b7719bef993ae63dc45b9812eb7e56e72812a7f98c254 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030 EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67 -EBUILD tvision-2.2.3.ebuild 1696 BLAKE2B 1f59386adba13f4083bc84b19dd68f469ebeeb6069862ccb363fb633219bd48337c040f3076b8709b9974b749b68e102c586a690ed2de81d5acafa3c2401af76 SHA512 9894629043baf8046153d6ce042418e8b2ce28beb5e70b24cb1bba28f5c2eb0ca95cad03795e8e45ad33ccb6fbcad1e05103b35195a2259ef0a83df76d6a83dc +EBUILD tvision-2.2.3.ebuild 1970 BLAKE2B f15daa149840ddec0992d30c278386454a0054f4f5432972c0df64082dbb7146805b11a23ab2220258c0d63f272a98f7bf48b06628b223176902c36f4a3b8ce7 SHA512 cd699af7ea3e165ccc2e20e4307b04bc1370ba275fdf78b50d19fb9d4c8f5f7fea1ff2daf00fbbe4a0e5dbfaff68667f9b10a3154f91c702deed0f128f1bae0e MISC metadata.xml 480 BLAKE2B dae64ea0d83b95289c108bd2b7d6bebd3d715e528ac3805306855962df76fa3e30192776d344443c25b874d739753a963fa9074d302b26b19c697ee743ba6562 SHA512 b55cef1bf47c4254ecc1461f246e5f3548bce7ebd449bf62f08574a5c27394bc9cfa8affa948ff63d14f815bd7ac41e6d78780a1b94b77d52d28541e2ddfc88a diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch new file mode 100644 index 000000000000..239161b2f0a9 --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch @@ -0,0 +1,56 @@ +From: "Salvador E. Tropea" +Date: Thu, 17 Jun 2021 13:11:22 -0300 +Subject: [PATCH 1/4] Added `ar` command now can be configured from the + environment + +- Using the AR environment variable. +- Related to issue: #1 +- Gentoo issue: https://bugs.gentoo.org/796278 +--- + conflib.pl | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/conflib.pl b/conflib.pl +index 0abd33df..946bfa95 100644 +--- a/conflib.pl ++++ b/conflib.pl +@@ -1386,21 +1386,27 @@ sub LookForGNUMake + + sub LookForGNUar + { +- my $test; +- print 'Looking for GNU ar: '; ++ my ($ar, $test); + +- if ($conf{'GNU_AR'}) ++ print 'Looking for GNU ar: '; ++ $ar=$conf{'GNU_AR'}; ++ if ($ar) + { +- print "$conf{'GNU_AR'} (cached)\n"; +- return $conf{'GNU_AR'}; ++ print "$ar (cached)\n"; ++ return $ar; ++ } ++ $ar=$ENV{'AR'}; ++ if (!length($ar)) ++ { ++ $ar='ar'; + } + $conf{'UseRanLib'}=0; +- $test=RunRedirect('ar --version',$ErrorLog); ++ $test=RunRedirect($ar.' --version',$ErrorLog); + if (($test=~/GNU ar/) || ($test=~/BSD ar/)) + { +- $conf{'GNU_AR'}='ar'; +- print "ar\n"; +- return 'ar'; ++ $conf{'GNU_AR'}=$ar; ++ print "$ar\n"; ++ return $ar; + } + $test=RunRedirect('gar --version',$ErrorLog); + if ($test=~/GNU ar/) +-- +2.32.0 + diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch deleted file mode 100644 index ce45ec32ef5e..000000000000 --- a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Mon, 14 Jun 2021 17:48:45 +0200 -Subject: [PATCH 2/2] use proper AR - -Signed-off-by: Bernd Waibel ---- - intl/dummy/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile -index c32b0a8..d47e185 100644 ---- a/intl/dummy/Makefile -+++ b/intl/dummy/Makefile -@@ -2,4 +2,4 @@ RHIDE_GCC=gcc - CC=$(RHIDE_GCC) - - libtvfintl.a: intldummy.o -- ar -rv libtvfintl.a intldummy.o -+ $(AR) -rv libtvfintl.a intldummy.o --- -2.32.0 - diff --git a/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch new file mode 100644 index 000000000000..03cbb76a82d9 --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch @@ -0,0 +1,60 @@ +From: "Salvador E. Tropea" +Date: Thu, 17 Jun 2021 13:28:36 -0300 +Subject: [PATCH 2/4] Added configuration option to exclude libgpm + +- Fixes #1 +--- + config.pl | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/config.pl b/config.pl +index 21d81ff3..424e3065 100644 +--- a/config.pl ++++ b/config.pl +@@ -73,7 +73,14 @@ if ($OS eq 'DOS') + + if ($OS eq 'UNIX') + { +- LookForGPM($GPMVersionNeeded); ++ if ($conf{'gpm'} eq 'no') ++ { ++ $conf{'HAVE_GPM'}='no'; ++ } ++ else ++ { ++ LookForGPM($GPMVersionNeeded); ++ } + LookForNCurses($NCursesVersionNeeded); + LookForKeysyms(); + LookForXlib(); +@@ -424,6 +431,10 @@ sub SeeCommandLine + { + $conf{'no-dynamic'}='yes'; + } ++ elsif ($i eq '--without-gpm') ++ { ++ $conf{'gpm'}='no'; ++ } + # elsif ($i eq '--unsafe-memcpy') + # { + # $conf{'HAVE_UNSAFE_MEMCPY'}='yes'; +@@ -482,6 +493,7 @@ sub ShowHelp + print "--no-intl : don't use international support.\n"; + print "--without-static : don't create the static library.\n"; + print "--without-dynamic: don't create the dynamic library.\n"; ++ print "--without-gpm : skip gpm library detection.\n"; + print "--with-mss : compiles with MSS memory debugger.\n"; + print "--without-mss : compiles without MSS [default].\n"; + print "--with-ssc : compiles using Simple Streams Compatibility.\n"; +@@ -532,7 +544,7 @@ sub GiveAdvice + print " using this library reconfigure using --no-intl. Read about it in the readme.\n"; + print " [[[[[[[*******************>>>>> IMPORTANT!!! <<<<<*******************]]]]]]]\n"; + } +- if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux')) ++ if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux') && ($conf{'gpm'} ne 'no')) + { + print "\n"; + print "* No mouse support for console! please install the libgpm package needed\n"; +-- +2.32.0 + diff --git a/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch new file mode 100644 index 000000000000..743591c324ad --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch @@ -0,0 +1,34 @@ +From: "Salvador E. Tropea" +Date: Thu, 17 Jun 2021 13:35:42 -0300 +Subject: [PATCH 3/4] Adjusted (c) years + +--- + config.pl | 2 +- + conflib.pl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.pl b/config.pl +index 424e3065..cda54600 100644 +--- a/config.pl ++++ b/config.pl +@@ -1,5 +1,5 @@ + #!/usr/bin/perl +-# Copyright (C) 1999-2012 by Salvador E. Tropea (SET), ++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET), + # see copyrigh file for details + # + # To specify the compilation flags define the CFLAGS environment variable. +diff --git a/conflib.pl b/conflib.pl +index 946bfa95..c8e70204 100644 +--- a/conflib.pl ++++ b/conflib.pl +@@ -1,5 +1,5 @@ + #!/usr/bin/perl +-# Copyright (C) 1999-2004 by Salvador E. Tropea (SET), ++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET), + # see copyrigh file for details + # + # Common configuration routines. +-- +2.32.0 + diff --git a/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch new file mode 100644 index 000000000000..9c67313523aa --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch @@ -0,0 +1,23 @@ +From: "Salvador E. Tropea" +Date: Thu, 17 Jun 2021 13:36:09 -0300 +Subject: [PATCH 4/4] Made ar command configurable. + +--- + intl/dummy/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile +index c32b0a8b..e24c1976 100644 +--- a/intl/dummy/Makefile ++++ b/intl/dummy/Makefile +@@ -1,5 +1,6 @@ + RHIDE_GCC=gcc ++RHIDE_AR=ar + CC=$(RHIDE_GCC) + + libtvfintl.a: intldummy.o +- ar -rv libtvfintl.a intldummy.o ++ $(RHIDE_AR) -rv libtvfintl.a intldummy.o +-- +2.32.0 + diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild index 28c667ecd8dd..9f8e1f689593 100644 --- a/dev-libs/tvision/tvision-2.2.3.ebuild +++ b/dev-libs/tvision/tvision-2.2.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples nls" +IUSE="examples gpm nls" DOCS=( readme.txt THANKS TODO ) HTML_DOCS=( www-site/. ) @@ -25,7 +25,6 @@ RDEPEND=" dev-libs/libbsd media-libs/allegro:0[X] sys-apps/util-linux - sys-libs/gpm sys-libs/ncurses:0= x11-libs/libICE x11-libs/libSM @@ -36,6 +35,7 @@ RDEPEND=" x11-libs/libXmu x11-libs/libXt x11-libs/libxcb:= + gpm? ( sys-libs/gpm ) " DEPEND="${RDEPEND}" BDEPEND="sys-devel/gettext" @@ -43,7 +43,10 @@ BDEPEND="sys-devel/gettext" PATCHES=( "${FILESDIR}"/${PN}-2.2.1.4-flags.patch "${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch - "${FILESDIR}"/${P}-0001-use-proper-AR.patch + "${FILESDIR}"/${P}-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch + "${FILESDIR}"/${P}-0002-Added-configuration-option-to-exclude-libgpm.patch + "${FILESDIR}"/${P}-0003-Adjusted-c-years.patch + "${FILESDIR}"/${P}-0004-Made-ar-command-configurable.patch ) src_configure() { @@ -58,6 +61,7 @@ src_configure() { --x-include="${EPREFIX}/usr/include/X11" ) + use gpm || myconf+=( --without-gpm ) use nls || myconf+=( --no-intl ) # Note: Do not use econf here, this isn't an autoconf configure script, diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest index e9ab997366a7..1ad90875e04a 100644 --- a/dev-libs/vc/Manifest +++ b/dev-libs/vc/Manifest @@ -1,4 +1,6 @@ AUX vc-1.4.1-missing-include.patch 417 BLAKE2B 97bc99422cf68cd2aad45bb15f8314bf0fbc23d671134facddb79e1a37417c08472618496195fe014b0ec63e1a35d9a8a389b626d6beb199d6c03adf516f4813 SHA512 6bd54e083f560d1ad14ea88ed96937b91132138a62fff8a43a23a72eafd12b520e4419899da46918ca47dd172872e515075c28a053b834ee7f5899537d79698c DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a +DIST vc-1.4.2.tar.gz 639711 BLAKE2B e8ef5c1249f1d5bff26997dd2b9e7e5923682a5251119b23fe4e7d4f9a166b4f9bfa0f5599d1fc4fd6ca390515e51039051c2afb17aece4c2c40a3cbd6ab630e SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf EBUILD vc-1.4.1-r1.ebuild 458 BLAKE2B 9b13a354a7ee8d0b39bec13dfbf56444d792e951206bb38f830d69da503b6770403d3126e16bc7535eed3143fea589ae73146cdbb93a35290022cf66a814a4a6 SHA512 823fef7d55cf03bcee0ec4b0fd33a9563962c420ecc2f559a763b1f8d540d066c842f88a15d645bb8962fb8a65864aba1590fe8a49982dd183a082c450c4dcba +EBUILD vc-1.4.2.ebuild 406 BLAKE2B c0d14df8f5d1e4ec35bdc8903f67026a4212fdd9ab81fb8be73372646adb4b6812e5b33f61c7613be931eaf20ae5b4ff37c626cc3e20f8067a96b67407c6311b SHA512 55521553bf5c7d4f34437505a92867bc60f6a8ee0bbbb6b894e0e3a7c9be9663dfa99ec43f3da1175dbe5b8131d500d45bbee42ddcde093ed2eb9bf46ad261b1 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a diff --git a/dev-libs/vc/vc-1.4.2.ebuild b/dev-libs/vc/vc-1.4.2.ebuild new file mode 100644 index 000000000000..a6c153f2082b --- /dev/null +++ b/dev-libs/vc/vc-1.4.2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="SIMD Vector Class Library for C++" +HOMEPAGE="https://github.com/VcDevel/Vc" +SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/Vc-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -- cgit v1.2.3