diff options
Diffstat (limited to 'dev-libs')
63 files changed, 64 insertions, 3322 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 97d158dc36ad..d94bb43043bf 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest index 1c70f7bf789b..b942f76d2d12 100644 --- a/dev-libs/ding-libs/Manifest +++ b/dev-libs/ding-libs/Manifest @@ -1,8 +1,6 @@ AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af408b8e9cc31415efc1c1679b2bb0f21a998a1d0e951708203778e7d03e58e19cadf760a8f4ff1050d53e1eadbd8b83d5fcf84c4e5d8dc9ba SHA512 f0ef79aa548aef09a1611bacd6dd69d765ab09fd19a498fb24b14c7a2882f2b6ca2f2246f99faa3c1796ef7d9bf43bf4e1412442ec6220c4e71607ab7f41ec9d AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593 -DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628 DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703 -EBUILD ding-libs-0.6.1-r1.ebuild 932 BLAKE2B bebbf6d14a083ce22b3121f796353427889dd2149b3760487467316171b73eb37964d9f9fe5605d801d660f4ff5ff0f58167d59826b6eb76e46ba90c8766bb9d SHA512 decbaef04bd6023a0f5a2aed6f811781b1db6e8d455ae9db21b65b07c4c4587a788c36af2f20770b352608d11cbd10603b07e71ea7270aef7d188a30f0c74733 EBUILD ding-libs-0.6.2-r1.ebuild 628 BLAKE2B cb6bca809b82229e0a8611f420a458e9374376f8f3ea672f8fe484dcfaa784e94f06cfc7435061e6beb5999770f93a8cc4088674548e46d3091cc1f7d0cef5b0 SHA512 da3182534777539b47bfd7d37c19ab08706e1762c797c4ee8864d9a63094c02a3d77fc1fd2faaf8873744e2d4762686ee34dd941df0f96b68fb4fc4ea9394d43 MISC metadata.xml 247 BLAKE2B cb144c57b3bcd3ce9042d41d2c5fe955abd61d93f348e9bc249d6f8a41172bbdf4b28e83682b8817f202886e6daf757fa0bb825b39eb6409633a323a162ee9f0 SHA512 cb8ffcc6e9e67e555d82ca99bccc6479b0db6e211127a53452d07dc4b106e7e0633ff9c8e0af1b1eccd7b6154ae3d7f61a50e8dbec835fcdca7c070e8cde2f1d diff --git a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild deleted file mode 100644 index 1445f869fec7..000000000000 --- a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="set of utility libraries (mostly used by sssd)" -HOMEPAGE="https://pagure.io/SSSD/ding-libs" -SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch - "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch - "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf --disable-static -} - -multilib_src_install_all() { - einstalldocs - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 27234f22affc..61f44f368682 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,9 +1,4 @@ -AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40 -DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595 -DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4 DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7 -EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8 -EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e EBUILD ell-0.53.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f diff --git a/dev-libs/ell/ell-0.51.ebuild b/dev-libs/ell/ell-0.51.ebuild deleted file mode 100644 index 094d7615adac..000000000000 --- a/dev-libs/ell/ell-0.51.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" -fi -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="pie test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="test? ( sys-apps/dbus )" - -CONFIG_CHECK=" - ~TIMERFD - ~EVENTFD - ~CRYPTO_USER_API - ~CRYPTO_USER_API_HASH - ~CRYPTO_MD5 - ~CRYPTO_SHA1 - ~KEY_DH_OPERATIONS -" - -PATCHES=( - "${FILESDIR}"/${P}-musl-build-time.patch -) - -src_prepare() { - default - sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ - unit/test-dbus*.c unit/dbus.conf || die - [[ "${PV}" == *9999 ]] && eautoreconf -} - -multilib_src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - local DOCS=( ChangeLog README ) - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.52-r1.ebuild b/dev-libs/ell/ell-0.52-r1.ebuild deleted file mode 100644 index 0220fd7c1acc..000000000000 --- a/dev-libs/ell/ell-0.52-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -fi -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="pie test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( sys-apps/dbus )" - -CONFIG_CHECK=" - ~TIMERFD - ~EVENTFD - ~CRYPTO_USER_API - ~CRYPTO_USER_API_HASH - ~CRYPTO_MD5 - ~CRYPTO_SHA1 - ~KEY_DH_OPERATIONS -" - -src_prepare() { - default - sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ - unit/test-dbus*.c unit/dbus.conf || die - [[ "${PV}" == *9999 ]] && eautoreconf -} - -src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable pie) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/files/ell-0.51-musl-build-time.patch b/dev-libs/ell/files/ell-0.51-musl-build-time.patch deleted file mode 100644 index 201bc7994406..000000000000 --- a/dev-libs/ell/files/ell-0.51-musl-build-time.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=ce7fcfe194f0abcb8f419f83276b16a4ab274032 - -From: "Milan P. Stanić" <mps@arvanta.net> -Date: Mon, 6 Jun 2022 22:05:39 +0200 -Subject: build: fix time.h related breakage on musl - -missing time.h for struct timeval usage -forward declaration of struct timeval in time-private.h ---- a/ell/dhcp-transport.c -+++ b/ell/dhcp-transport.c -@@ -40,6 +40,7 @@ - #include <linux/filter.h> - #include <net/if_arp.h> - #include <errno.h> -+#include <sys/time.h> - - #include "io.h" - #include "util.h" ---- a/ell/dhcp6-transport.c -+++ b/ell/dhcp6-transport.c -@@ -35,6 +35,7 @@ - #include <net/if.h> - #include <unistd.h> - #include <errno.h> -+#include <sys/time.h> - - #include "private.h" - #include "missing.h" ---- a/ell/icmp6.c -+++ b/ell/icmp6.c -@@ -36,6 +36,7 @@ - #include <net/if.h> - #include <unistd.h> - #include <errno.h> -+#include <sys/time.h> - - #include "private.h" - #include "useful.h" ---- a/ell/time-private.h -+++ b/ell/time-private.h -@@ -19,7 +19,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -- -+struct timeval; - uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs); - uint64_t _time_fuzz_msecs(uint64_t ms); - uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset); ---- a/ell/time.c -+++ b/ell/time.c -@@ -26,6 +26,7 @@ - - #define _GNU_SOURCE - #include <time.h> -+#include <sys/time.h> - - #include "time.h" - #include "time-private.h" -cgit diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index 93a6202bff44..e473c0a8ffe0 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1,7 +1,4 @@ -AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7 AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c -DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c -EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69 -EBUILD jansson-2.14.ebuild 935 BLAKE2B 2136d7b3018876eea3060dfd607d6e485bd4e486fd7df9a24f65ba3439dbf2a5b11404949662c75ae81717142d384e7aab410194b6b54d3269a4dec12ca2d5ec SHA512 a020d8b54885b223efb5a13e8de1d7e29de779aed6a184136b27a02be528957a2d24352180ea7cf37b1357912b50430dd8814557b2bb2da8c34d356eba52d2b8 +EBUILD jansson-2.14-r1.ebuild 846 BLAKE2B 960a04dc7037f0e39fdbd9fe5fd31f037956321dbb0808f693dd0a79a35f0880d8fe3a194780cbb2639003aa18dbc22030af3bd58e4e5aaf201cacd05e4c5d45 SHA512 dd0cdd26830026a4a896400fda6e357a48bb2d45a477c9089ed40ad45a0085b47a835f58750266e511037118c40f836915d8818282da2f440119607f5da5fcf7 MISC metadata.xml 475 BLAKE2B 9cc60096cb39c1f472a534fd3a1e32da41f251b7f9601e10bd64164f3aa46fef7b492f8c2902b09ea56ac185de146e9c32014d5c741542cce2b5b289864d983a SHA512 7412836cd76c643dd976b26732d827d7efd607d87cecf79ef7d27815e7a14bba4210ee33c01c4f6da5193068c8662fd857935bb1e304edd81a86ae2bf3094ca1 diff --git a/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch b/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch deleted file mode 100644 index e611896e9c4e..000000000000 --- a/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch +++ /dev/null @@ -1,269 +0,0 @@ -Rebase pull request #543 onto v2.13.1 - -Allows jansson documentation to compile with Sphinx-3.0 - -Squashed commit messages below: - - -pick 798d40c doc: convert refcounting directive to a class - -Directive functions are no longer supported in Sphinx-3.0 -but directive classes have been supported since early 1.x - - -pick 9431889 doc: do not use references for standard C types or file names - -Use double-backtick quoting instead. It has the same effect -(because these links had nowhere to link to) but it does not -result in loud warnings about broken references by default with Sphinx-3.x. - - -pick c329fd7 doc: add return types for function-like macros - -The Sphinx-3.0 c:function:: directive requires the return type. - -Sphinx-3.0 also adds function-like macro support to the c:macro:: -directive, which Sphinx-1.x and Sphinx-2.x do not support, but it -is probably a good idea to keep compatibility with slightly older -Sphinx for now. - -diff --git a/CHANGES b/CHANGES -index a374a86..256fde1 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -8,7 +8,7 @@ Released 2020-05-07 - - Include `jansson_version_str()` and `jansson_version_cmp()` in - shared library. (#534) - -- - Include `scripts/` in tarball. (#535) -+ - Include ``scripts/`` in tarball. (#535) - - - Version 2.13 -@@ -127,7 +127,7 @@ Released 2018-02-09 - - - Work around gcc's -Wimplicit-fallthrough. - -- - Fix CMake detection of `sys/types.h` header (#375). -+ - Fix CMake detection of ``sys/types.h`` header (#375). - - - Fix `jansson.pc` generated by CMake to be more consistent with the one - generated using GNU Autotools (#368). -diff --git a/doc/apiref.rst b/doc/apiref.rst -index c3a814f..94c5726 100644 ---- a/doc/apiref.rst -+++ b/doc/apiref.rst -@@ -145,33 +145,33 @@ Type - .. function:: int json_typeof(const json_t *json) - - Return the type of the JSON value (a :type:`json_type` cast to -- :type:`int`). *json* MUST NOT be *NULL*. This function is actually -+ ``int``). *json* MUST NOT be *NULL*. This function is actually - implemented as a macro for speed. - --.. function:: json_is_object(const json_t *json) -- json_is_array(const json_t *json) -- json_is_string(const json_t *json) -- json_is_integer(const json_t *json) -- json_is_real(const json_t *json) -- json_is_true(const json_t *json) -- json_is_false(const json_t *json) -- json_is_null(const json_t *json) -+.. function:: int json_is_object(const json_t *json) -+ int json_is_array(const json_t *json) -+ int json_is_string(const json_t *json) -+ int json_is_integer(const json_t *json) -+ int json_is_real(const json_t *json) -+ int json_is_true(const json_t *json) -+ int json_is_false(const json_t *json) -+ int json_is_null(const json_t *json) - - These functions (actually macros) return true (non-zero) for values - of the given type, and false (zero) for values of other types and - for *NULL*. - --.. function:: json_is_number(const json_t *json) -+.. function:: int json_is_number(const json_t *json) - - Returns true for values of types ``JSON_INTEGER`` and - ``JSON_REAL``, and false for other types and for *NULL*. - --.. function:: json_is_boolean(const json_t *json) -+.. function:: int json_is_boolean(const json_t *json) - - Returns true for types ``JSON_TRUE`` and ``JSON_FALSE``, and false - for values of other types and for *NULL*. - --.. function:: json_boolean_value(const json_t *json) -+.. function:: int json_boolean_value(const json_t *json) - - Alias of :func:`json_is_true()`, i.e. returns 1 for ``JSON_TRUE`` - and 0 otherwise. -@@ -594,7 +594,7 @@ A JSON array is an ordered collection of other JSON values. - Appends all elements in *other_array* to the end of *array*. - Returns 0 on success and -1 on error. - --.. function:: json_array_foreach(array, index, value) -+.. function:: void json_array_foreach(array, index, value) - - Iterate over every element of ``array``, running the block - of code that follows each time with the proper values set to -@@ -732,11 +732,11 @@ allowed in object keys. - recursively merged with the corresponding values in *object* if they are also - objects, instead of overwriting them. Returns 0 on success or -1 on error. - --.. function:: json_object_foreach(object, key, value) -+.. function:: void json_object_foreach(object, key, value) - - Iterate over every key-value pair of ``object``, running the block - of code that follows each time with the proper values set to -- variables ``key`` and ``value``, of types :type:`const char *` and -+ variables ``key`` and ``value``, of types ``const char *`` and - :type:`json_t *` respectively. Example:: - - /* obj is a JSON object */ -@@ -764,7 +764,7 @@ allowed in object keys. - .. versionadded:: 2.3 - - --.. function:: json_object_foreach_safe(object, tmp, key, value) -+.. function:: void json_object_foreach_safe(object, tmp, key, value) - - Like :func:`json_object_foreach()`, but it's safe to call - ``json_object_del(object, key)`` during iteration. You need to pass -@@ -1488,17 +1488,17 @@ arguments. - Output a JSON null value. No argument is consumed. - - ``b`` (boolean) [int] -- Convert a C :type:`int` to JSON boolean value. Zero is converted -+ Convert a C ``int`` to JSON boolean value. Zero is converted - to ``false`` and non-zero to ``true``. - - ``i`` (integer) [int] -- Convert a C :type:`int` to JSON integer. -+ Convert a C ``int`` to JSON integer. - - ``I`` (integer) [json_int_t] - Convert a C :type:`json_int_t` to JSON integer. - - ``f`` (real) [double] -- Convert a C :type:`double` to JSON real. -+ Convert a C ``double`` to JSON real. - - ``o`` (any value) [json_t \*] - Output any given JSON value as-is. If the value is added to an -@@ -1625,20 +1625,20 @@ type whose address should be passed. - Expect a JSON null value. Nothing is extracted. - - ``b`` (boolean) [int] -- Convert a JSON boolean value to a C :type:`int`, so that ``true`` -+ Convert a JSON boolean value to a C ``int``, so that ``true`` - is converted to 1 and ``false`` to 0. - - ``i`` (integer) [int] -- Convert a JSON integer to C :type:`int`. -+ Convert a JSON integer to C ``int``. - - ``I`` (integer) [json_int_t] - Convert a JSON integer to C :type:`json_int_t`. - - ``f`` (real) [double] -- Convert a JSON real to C :type:`double`. -+ Convert a JSON real to C ``double``. - - ``F`` (integer or real) [double] -- Convert a JSON number (integer or real) to C :type:`double`. -+ Convert a JSON number (integer or real) to C ``double``. - - ``o`` (any value) [json_t \*] - Store a JSON value with no conversion to a :type:`json_t` pointer. -diff --git a/doc/ext/refcounting.py b/doc/ext/refcounting.py -index bba2684..e72c481 100644 ---- a/doc/ext/refcounting.py -+++ b/doc/ext/refcounting.py -@@ -24,8 +24,8 @@ - """ - - from docutils import nodes -+from docutils.parsers.rst import Directive - --class refcounting(nodes.emphasis): pass - - def visit(self, node): - self.visit_emphasis(node) -@@ -40,16 +40,25 @@ def html_depart(self, node): - self.body.append('</em>') - - --def refcounting_directive(name, arguments, options, content, lineno, -- content_offset, block_text, state, state_machine): -- if arguments[0] == 'borrow': -- text = 'Return value: Borrowed reference.' -- elif arguments[0] == 'new': -- text = 'Return value: New reference.' -- else: -- raise Error('Valid arguments: new, borrow') -+class refcounting(nodes.emphasis): -+ pass -+ -+class refcounting_directive(Directive): -+ has_content = False -+ required_arguments = 1 -+ optional_arguments = 0 -+ final_argument_whitespace = False -+ -+ def run(self): -+ if self.arguments[0] == 'borrow': -+ text = 'Return value: Borrowed reference.' -+ elif self.arguments[0] == 'new': -+ text = 'Return value: New reference.' -+ else: -+ raise Error('Valid arguments: new, borrow') -+ -+ return [refcounting(text, text)] - -- return [refcounting(text, text)] - - def setup(app): - app.add_node(refcounting, -@@ -57,4 +66,4 @@ def setup(app): - latex=(visit, depart), - text=(visit, depart), - man=(visit, depart)) -- app.add_directive('refcounting', refcounting_directive, 0, (1, 0, 0)) -+ app.add_directive('refcounting', refcounting_directive) -diff --git a/doc/upgrading.rst b/doc/upgrading.rst -index 9b49046..94ff7de 100644 ---- a/doc/upgrading.rst -+++ b/doc/upgrading.rst -@@ -47,13 +47,13 @@ List of Incompatible Changes - - **Underlying type of JSON integers** - The underlying C type of JSON integers has been changed from -- :type:`int` to the widest available signed integer type, i.e. -- :type:`long long` or :type:`long`, depending on whether -- :type:`long long` is supported on your system or not. This makes -+ ``int`` to the widest available signed integer type, i.e. -+ ``long long`` or ``long``, depending on whether -+ ``long long`` is supported on your system or not. This makes - the whole 64-bit integer range available on most modern systems. - - ``jansson.h`` has a typedef :type:`json_int_t` to the underlying -- integer type. :type:`int` should still be used in most cases when -+ integer type. ``int`` should still be used in most cases when - dealing with smallish JSON integers, as the compiler handles - implicit type coercion. Only when the full 64-bit range is needed, - :type:`json_int_t` should be explicitly used. -@@ -69,8 +69,8 @@ List of Incompatible Changes - - **Unsigned integers in API functions** - Version 2.0 unifies unsigned integer usage in the API. All uses of -- :type:`unsigned int` and :type:`unsigned long` have been replaced -- with :type:`size_t`. This includes flags, container sizes, etc. -+ ``unsigned int`` and ``unsigned long`` have been replaced -+ with ``size_t``. This includes flags, container sizes, etc. - This should not require source code changes, as both -- :type:`unsigned int` and :type:`unsigned long` are usually -- compatible with :type:`size_t`. -+ ``unsigned int`` and ``unsigned long`` are usually -+ compatible with ``size_t``. diff --git a/dev-libs/jansson/jansson-2.13.1-r1.ebuild b/dev-libs/jansson/jansson-2.13.1-r1.ebuild deleted file mode 100644 index 0ea1a8080ff6..000000000000 --- a/dev-libs/jansson/jansson-2.13.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="C library for encoding, decoding and manipulating JSON data" -HOMEPAGE="https://www.digip.org/jansson/" -SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="doc static-libs" - -BDEPEND="doc? ( dev-python/sphinx )" - -PATCHES=( - # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668 - "${FILESDIR}/${P}-sphinx3.patch" -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake html - HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. ) - fi -} - -multilib_src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14-r1.ebuild index 8c97fdd39128..fb6ee3866f10 100644 --- a/dev-libs/jansson/jansson-2.14.ebuild +++ b/dev-libs/jansson/jansson-2.14-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit toolchain-funcs DESCRIPTION="C library for encoding, decoding and manipulating JSON data" HOMEPAGE="https://www.digip.org/jansson/" @@ -18,23 +18,23 @@ BDEPEND="doc? ( dev-python/sphinx )" PATCHES=( "${FILESDIR}/${P}-test-symbols.patch" ) -multilib_src_configure() { +src_configure() { tc-ld-force-bfd - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) + econf $(use_enable static-libs static) } -multilib_src_compile() { +src_compile() { default - if multilib_is_native_abi && use doc ; then + if use doc ; then emake html HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. ) fi } -multilib_src_install() { +src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest index 034c455cb482..6c4e742b72a6 100644 --- a/dev-libs/libIDL/Manifest +++ b/dev-libs/libIDL/Manifest @@ -1,3 +1,3 @@ DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac -EBUILD libIDL-0.8.14-r3.ebuild 762 BLAKE2B 2b7496df7fa2f2e3011f2a2f8cdf0b9c8e7f365eba1d6fa28ae95693534498d4cde2748c1d55840489ef2dc6684458749b68e74800781693d34d5a574a0be93d SHA512 b5dacd70ba1dee9550ba0e24963dba18845c373c0cad0860b224bde4334d2f9917a0d226589c8c3886ffcc8cc243528e3fc0a437948f7467a85c537f2d988ff2 +EBUILD libIDL-0.8.14-r4.ebuild 557 BLAKE2B 45dedad9f5b5ce5f208d0ff1e53bd1012b5fb5861a2415335f14e1241193b93ec09d8f86fe3000c4f3b80880ce831850249942543263081c74ad3bf9f497655b SHA512 47bae89190fa46923b458ac2a6095228621c2ec85d2fac5814219e09c16b7077e859f2e7f3793c3662b2142495e4890525505ab9fa62c2d329bc767bd269815a MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/dev-libs/libIDL/libIDL-0.8.14-r3.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild index 6f9443f5ab35..905d25ac123d 100644 --- a/dev-libs/libIDL/libIDL-0.8.14-r3.ebuild +++ b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 GNOME_TARBALL_SUFFIX="bz2" -inherit gnome2 multilib-minimal +inherit gnome2 DESCRIPTION="CORBA tree builder" HOMEPAGE="https://www.gnome.org/" @@ -13,21 +13,9 @@ LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]" +RDEPEND=">=dev-libs/glib-2.44.1-r1:2" DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex virtual/yacc virtual/pkgconfig" - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure -} - -multilib_src_compile() { - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest index c90f4f71f0e4..7277df997b99 100644 --- a/dev-libs/libbase58/Manifest +++ b/dev-libs/libbase58/Manifest @@ -1,3 +1,3 @@ DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9 -EBUILD libbase58-0.1.4-r1.ebuild 1344 BLAKE2B bc4e5d9bd8d2b30d3d2639f09841251d9509993a2b7ffe295719dc05c61977c145d330c141b5d942854091947057874f6dd0e7a74234aec70ecc5e6a20550bc3 SHA512 d0b9fcc76dc65bd9ee602004f28ae6c810cad8a19d06692c2a38b4a2cfeac5aefeb2b074cfc15ecb84588196f54e154263993560efb67e710cbe465978f43426 +EBUILD libbase58-0.1.4-r2.ebuild 1117 BLAKE2B 4e5c6258df496237f351cf2220f9b61c3506e5c243981c18a584610d032583253e71e0e67068181a867858289c355fe7e7e6022055f84c0c94847a20ff60cfc9 SHA512 cf1e04787046f6b5188111d0e005b01fceb330dde238dc3ec21c26ae121be57206b3bc70e466ecf41a87fc3a2c3277c3a020a7afa694056dd2c9a3b74eacf7af MISC metadata.xml 561 BLAKE2B 4747d01d7747818fcb2d36263fd890e08358af515bb399fb13cdfa6c8b2e1551634a9d61e294b0f7d8eca25755c729449b83abafb0d9e76c8da379e005afe664 SHA512 7922704b6f261747a611400dd5b208cd2052e93ed36a4f6a46daeaad1c23ee8693d56406000ffd1021755b6a411351be657690e3db598d18e820826793205fc9 diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild index 80dc047c83be..11e8cf11ea37 100644 --- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild +++ b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools DESCRIPTION="C implementation of Bitcoin's base58 encoding" HOMEPAGE="https://github.com/luke-jr/libbase58" -LICENSE="MIT" - SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" SLOT="0/0" KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86" IUSE="test tools" @@ -20,35 +20,35 @@ RDEPEND="tools? ( dev-libs/libgcrypt )" DEPEND="${RDEPEND} test? ( app-editors/vim-core - dev-libs/libgcrypt[${MULTILIB_USEDEP}] + dev-libs/libgcrypt ) " src_prepare() { - eapply_user - eautoreconf + default - # NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for - # multilib support. - multilib_copy_sources + eautoreconf } -multilib_src_configure() { +src_configure() { local myeconf=( - --disable-static LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config" ) - if multilib_is_native_abi && use tools; then + + if use tools; then myeconf+=( --enable-tool ) elif use test; then myeconf+=( --enable-tool --bindir='/TRASH' ) else myeconf+=( --disable-tool ) fi + econf "${myeconf[@]}" } -multilib_src_install_all() { +src_install() { + default + if use test; then # It's hard to control this directory with multilib_is_native_abi && use tools, hence -f. rm -rf "${ED}/TRASH" || die diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest index 5ca0788c1090..d4bb6692ba1b 100644 --- a/dev-libs/libfmt/Manifest +++ b/dev-libs/libfmt/Manifest @@ -1,19 +1,7 @@ -AUX libfmt-8.0.0-no-udl-define.patch 1802 BLAKE2B 538a9dfe1dec002894db22536de91b8c3180eebd7029f5c97ca31da04b93c83dea38e70c44c880ef45e45fdded7010f571999eb3b65958d5af2cd23b5442bbe9 SHA512 967d2969a2afcfb2ad9be07382e2dba332162c7a43905f855a98dd2ae5cc6b9c387dbfeebd3f8cc538d51b4ac885b78584486831f9e80c1728be75a24f0fd628 AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743dd3ab381c307774d136aeb974997ba6f004bb0e30ba02fa5e69952f76fb142133c9e5c9867194352d54ec6d9f4bacf9a13fa09 SHA512 c03186a3d4d1857f5063e94a5bdbc764535c042d98dc20d577c88ad3d93a60d75e7bf6a95c547df8fc7b037c021b464b9e47b6fcb6aba4ee9716e1727f181cd9 -DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15 -DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517 -DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c -DIST libfmt-8.0.1.tar.gz 805616 BLAKE2B b64a4686050a9edb4e5d3ec28a3727a847105ae0b12a89461841e14d6c9c442e391cdcfbca39b2d141d04cdb10d00516ecc8bf605867c792b7d2d6bc99c7b2bc SHA512 643e68d5b2e0e9c83231ab2b0036596a6297b1d9ed6bd7b1172bee4ff134c8af8f09174c06c94225132c1b635b0977ea4ce783748d7bd76a9a0b5ad597456c84 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 -DIST libfmt-9.0.0.tar.gz 833639 BLAKE2B 1455aec5bec73c56d4d4074ae034176143a3f6171aa60505ee48cbc4b6c66e0de4b5600c4a91e2d16073a285f98b3e5b5ee89b4061e49578c005bccc04855045 SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be -EBUILD libfmt-7.1.2.ebuild 759 BLAKE2B 878df7af9878dd81fad43339b8a7ee30c294edbcdeabc6642c7f65d8ffcc391728c69025f95fee0ed8ebe6db43ca853ecd4839865b338a40f17237013c77126c SHA512 6c86389b1122ea8def13df3eb776a953da71d94544849702892d18301263f5d2f68df1fdeb9e6d95271baa6678494c3b089877da44213d0d89aac447325c1daa -EBUILD libfmt-7.1.3.ebuild 759 BLAKE2B 878df7af9878dd81fad43339b8a7ee30c294edbcdeabc6642c7f65d8ffcc391728c69025f95fee0ed8ebe6db43ca853ecd4839865b338a40f17237013c77126c SHA512 6c86389b1122ea8def13df3eb776a953da71d94544849702892d18301263f5d2f68df1fdeb9e6d95271baa6678494c3b089877da44213d0d89aac447325c1daa -EBUILD libfmt-8.0.0-r1.ebuild 818 BLAKE2B 9150bc0e7ccf4561e980c4241658747ff597651c737bc3e310271de310083e644d24b279c61a6a4946364dc392bbe7bb48b0ba1a21fdf1b61798da7e3fbd3c3b SHA512 c27e0a9b392610c580bcdb133f1fbc61efa7e38d22416779527f403b64ddf23ec7dd2551d99dfda76f308669d699b6f74f595678e8d2ab59a7b52f7a6c20c375 -EBUILD libfmt-8.0.1-r1.ebuild 759 BLAKE2B 284fb666372d3c19ffcf0d92881814575ad7f9884186b5c88edc0df4701ecad97a1346494047749434b944b04f207d7b324b2712136761ce0a0435bb489ed532 SHA512 5e8292e4c2205d912f371af533f7d471d4b0b897104d9c37abca59c79d853f435939c52510002b6ea5d5e6380eaeedaaf260b43a2f4f256d21ec9b596b175ce5 -EBUILD libfmt-8.1.1-r1.ebuild 817 BLAKE2B 1b37a334e01cb02318c7f77e5037147a2be99cb1aa10c453ef0db5c29dbca723febbcfb59340ea24e1235a2195936a75ae67170c84add4c6bf65b3ca0568b71e SHA512 c439cdb3988e2cef8cbe2efcd97ba06f61b3c051092ee5ed143a772b9a25751a75bcefb86bd7f055fa05454f48eccf7d18dae4f8e26155a91592610dfe1f3cde -EBUILD libfmt-8.1.1.ebuild 765 BLAKE2B b734f176937de7e9258cda873b5690d702ebf3b9e3c45f3b197ae8608fd44410e190413bcfff66261b79a3774ee1fd615288ee40d957c61c18cdee56549a6358 SHA512 120127e41cf4b858353ae64b601c9cbfdb60aacc06a53bd7bed3260fcdaf0377be4a32b181bf8736bc3afd30e2386241a359b96e28b593a400786518209eec67 -EBUILD libfmt-9.0.0.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2 +EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe EBUILD libfmt-9.1.0-r1.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161 EBUILD libfmt-9999.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742 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 deleted file mode 100644 index 83078fa7285c..000000000000 --- a/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ab89d342b5454528bd2b46e7f22c0311906f8ca2 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" <Jason@zx2c4.com> -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>(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 <detail_exported::fixed_string Str> - constexpr auto operator""_a() - -> detail::udl_arg<remove_cvref_t<decltype(Str.data[0])>, - sizeof(Str.data) / sizeof(decltype(Str.data[0])), Str> { - return {}; - } --#else -+# else - constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> { - 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 <typename Locale, FMT_ENABLE_IF(detail::is_locale<Locale>::value)> - inline auto vformat(const Locale& loc, string_view fmt, format_args args) diff --git a/dev-libs/libfmt/libfmt-7.1.2.ebuild b/dev-libs/libfmt/libfmt-7.1.2.ebuild deleted file mode 100644 index da3c9a55fcdc..000000000000 --- a/dev-libs/libfmt/libfmt-7.1.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-7.1.3.ebuild b/dev-libs/libfmt/libfmt-7.1.3.ebuild deleted file mode 100644 index da3c9a55fcdc..000000000000 --- a/dev-libs/libfmt/libfmt-7.1.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 deleted file mode 100644 index 2cbd39e73a14..000000000000 --- a/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/libfmt/libfmt-8.0.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild deleted file mode 100644 index a42f00e8d426..000000000000 --- a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -LICENSE="MIT" -IUSE="test" -SLOT="0/${PV}" - -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 ~riscv 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.1.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild index e27cb08ab953..b621d9247a58 100644 --- a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild +++ b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}/fmt-${PV}" fi diff --git a/dev-libs/libfmt/libfmt-8.1.1.ebuild b/dev-libs/libfmt/libfmt-8.1.1.ebuild deleted file mode 100644 index afa368653c52..000000000000 --- a/dev-libs/libfmt/libfmt-8.1.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -LICENSE="MIT" -IUSE="test" -SLOT="0/${PV}" - -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 ~riscv ~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-9.0.0.ebuild b/dev-libs/libfmt/libfmt-9.0.0.ebuild deleted file mode 100644 index d61928901158..000000000000 --- a/dev-libs/libfmt/libfmt-9.0.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -LICENSE="MIT" -IUSE="test" -SLOT="0/${PV}" - -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 ~riscv ~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/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 25c93edb4e6c..c697db0ea40a 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,9 +1,7 @@ AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57 -AUX libgpg-error-1.45-gpgrt_config_libdir.patch 1663 BLAKE2B c127cd45accd61e1a4b47980a6b269059911831cddfc33de79b3f8989b67f3ea7bdd8fd73fc4f83e1509c32b1addf9979d9eef305fe05cb30bfa336a34953f69 SHA512 493471dfae869710ed1c8fe0765f7e83dd675e3d4a32dd8c1e12389e3ffce24310742c78e7552057da7d4361c01242d01a48800499baca686cc4addddf931937 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457 DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d DIST libgpg-error-1.46.tar.bz2.sig 119 BLAKE2B 5c4ce6111d2872a19d7fa818c67cabc584eef93e47c0e0e42b7e5a54cced137910861bba730f2c8f41fcaf8d9311e21f725d284b4c1948e653741e84fc06ef3d SHA512 2c2957fbf6220d60846cade760985486c9a287b04f4361b22352352ef68963f0ae6add00a8925b76bdb924223383a1029565063e4a925865be1802fa821a7bca -EBUILD libgpg-error-1.45-r1.ebuild 1984 BLAKE2B fb622e43f183e520c376009b177e1d55c7c6c50d6eb147ab8d58dfaa11f0b208c76216b61574e1413b648d05860d389af940349b98d76885f3f42344170ae0da SHA512 3911ee0d4b74853adc1dbf19c7e7d717639bbf6b5033cf9f54314923167ecd30f258f57082b430e05fab6cc4785b8b359fc46211fa7b3a71240b740379727cc3 EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce EBUILD libgpg-error-1.46-r1.ebuild 2622 BLAKE2B 74dc5b9629cf9fb784734ba1c0c4e4a1cdc84073782db5d56bc36e02a9232d7895f1da1df7f0f9ded37849c83fa70209697270ed3a801c939527087d81dfca88 SHA512 196512a776c1263803bae61c8cdfc20049eb337175499250c35e011ee1f0a5a1b59b36d3f511933027c041cc50554a3be7ab6ad5acb82aa28ca8fd30a08bc4c5 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305 diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch b/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch deleted file mode 100644 index a7db0e4d4b64..000000000000 --- a/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream: -https://dev.gnupg.org/rE4615816f71e91f4c3bb8b0e4122dd153ec7c1927 -https://dev.gnupg.org/T6136 - -From 4615816f71e91f4c3bb8b0e4122dd153ec7c1927 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Thu, 25 Aug 2022 15:30:07 +0900 -Subject: [PATCH] gpgrt-config: Strip system paths for --cflags and --libs. - -* src/gpgrt-config.in: Strip -I and -L with system paths. - --- - -This behavior is more compatible to pkg-config. - -GnuPG-bug-id: 6136 -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> - -diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in -index 3aaa243..85d21b4 100644 ---- a/src/gpgrt-config.in -+++ b/src/gpgrt-config.in -@@ -1,6 +1,6 @@ - #!@INSTALLSHELLPATH@ - # -*- mode: shell-script; sh-shell: "/bin/sh" -*- --# Copyright (C) 2018, 2021 g10 Code GmbH -+# Copyright (C) 2018, 2021, 2022 g10 Code GmbH - # - # This file is free software; as a special exception the author gives - # unlimited permission to copy and/or distribute it, with or without -@@ -193,9 +193,14 @@ list_only_once () { - __arg="" - - for __arg; do -- if not_listed_yet $__arg $__result; then -- __result="$__result${__result:+ }$__arg" -- fi -+ case "$__arg" in -+ -I/usr/include|-I/include) ;; -+ *) -+ if not_listed_yet $__arg $__result; then -+ __result="$__result${__result:+ }$__arg" -+ fi -+ ;; -+ esac - done - - echo $__result -@@ -210,6 +215,7 @@ list_only_once_for_libs () { - # the resulted list is in reverse order - for __arg; do - case "$__arg" in -+ -L/usr/lib|-L/usr/lib64|-L/lib|-L/lib64) ;; - -l*) - # As-is - __rev_list="$__arg${__rev_list:+ }$__rev_list" diff --git a/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild deleted file mode 100644 index 9d47ab1f8c4a..000000000000 --- a/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal toolchain-funcs prefix - -DESCRIPTION="Contains error handling functions used by GnuPG software" -HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp nls static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/gpg-error.h - /usr/include/gpgrt.h -) - -PATCHES=( - "${FILESDIR}/${PN}-1.44-remove_broken_check.patch" - "${FILESDIR}/${PN}-1.45-gpgrt_config_libdir.patch" -) - -src_prepare() { - default - - if use prefix ; then - # don't hardcode /usr/xpg4/bin/sh as shell on Solaris - sed -i -e 's/solaris\*/disabled/' configure.ac || die - fi - - # only necessary for as long as we run eautoreconf, configure.ac - # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is - # not a pure /bin/sh script, so it fails on some hosts - hprefixify -w 1 autogen.sh - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(multilib_is_native_abi || echo --disable-languages) - $(use_enable common-lisp languages) - $(use_enable nls) - # required for sys-power/suspend[crypt], bug 751568 - $(use_enable static-libs static) - $(use_enable test tests) - --enable-threads - CC_FOR_BUILD="$(tc-getBUILD_CC)" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest index 5e56585c4354..951f1a68342e 100644 --- a/dev-libs/libksba/Manifest +++ b/dev-libs/libksba/Manifest @@ -1,10 +1,5 @@ AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999 -DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b -DIST libksba-1.6.1.tar.bz2 667546 BLAKE2B 6fad243c8eace31188264515cfe146afdfe9155ded571614dc1a9a8e2e357cb301d471cdbd084e1db59e888ed4eea7270755723c98c5bd7bb6ef857aedf4cd75 SHA512 cb1113204ce5a3344103e03c541238bfddf40b79579cf97b5707c03b064afcda362db16467739afe8342e5bd42dd367b6f9e51f46ef8de1126293773d23b7cf4 -DIST libksba-1.6.1.tar.bz2.sig 119 BLAKE2B e80f6706a81b927cb2dcce5def046d5395668b078f6da605476943446607aae580dc775aa21fa11f29b4ce7c7abaa09462e702610b0976eb5fc633c741d8dbed SHA512 574e2cb49c47fa6ac62f30a5b6c06b636d12ec0c1fba02ef0cbb8e50225143925ee9ebb9b4c3112a5f470a62cc2b01687d93ee0037235297c94fdf7ef63fa704 DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68fbfea075fe828dd0885d6f245c59639b18af6c6593054cd0008b06b1f6e4418c8874b0b59feb77b24fc7940db07 SHA512 50533887942921f8009cedd636915c2b27f231151a3b8316af6801a5f8637d66896ba5a24207bf82d8b03e26624133e80c6dd69f1196f06ada929090ef0f178c DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4 -EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df -EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028 EBUILD libksba-1.6.2.ebuild 1621 BLAKE2B 69ba0fda40914ad0be306dafe90e0ebfe8f26a429fd82ec3535a0e821ef4d9fce8b01bce69a2d872ff252f7c28073cc88f324069465e2a5f1b9e12a869c53f4c SHA512 15973b5e35b323b189a390e5d9cd4fea9f8dc3a756a0fb356dfe89d4c48d1f21a8f4776e35fc0fb5282977d768fe22d9934e58d16300856e4de2eb9c010e15a9 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e diff --git a/dev-libs/libksba/libksba-1.6.0-r1.ebuild b/dev-libs/libksba/libksba-1.6.0-r1.ebuild deleted file mode 100644 index 4519c155623c..000000000000 --- a/dev-libs/libksba/libksba-1.6.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="X.509 and CMS (PKCS#7) library" -HOMEPAGE="https://www.gnupg.org/related_software/libksba" -SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" - -LICENSE="LGPL-3+ GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch -) - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # People need to use ksba-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-libs/libksba/libksba-1.6.1.ebuild b/dev-libs/libksba/libksba-1.6.1.ebuild deleted file mode 100644 index 6a9a5c5f0e56..000000000000 --- a/dev-libs/libksba/libksba-1.6.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc -inherit toolchain-funcs verify-sig - -DESCRIPTION="X.509 and CMS (PKCS#7) library" -HOMEPAGE="https://www.gnupg.org/related_software/libksba" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" -SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" - -LICENSE="LGPL-3+ GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/bison - verify-sig? ( sec-keys/openpgp-keys-gnupg ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch -) - -src_configure() { - export CC_FOR_BUILD="$(tc-getBUILD_CC)" - - local myeconfargs=( - $(use_enable static-libs static) - - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # People need to use ksba-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest index 66850132e4d7..7de0241c8aef 100644 --- a/dev-libs/libslz/Manifest +++ b/dev-libs/libslz/Manifest @@ -1,5 +1,5 @@ DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948 DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4 -EBUILD libslz-1.2.0-r1.ebuild 827 BLAKE2B 1fa2258635ce0869ebd64972c5037036791fc72b1b0752f2679d9636e54252af1eaef89f30ae66c05eff13db525ea4c3424d43293127d804ccea444b09efc4ea SHA512 fabb2305828b0a68ec564d8090a7f6b3828b004b66a41d3a4b59b861777d7a895bac0ee578e2e52699d816db4b6dcf94e1d1e2872987e7807715e3a1c71b31b3 +EBUILD libslz-1.2.0-r1.ebuild 826 BLAKE2B 3425b3b0e38e2a70a67489195faa6bfb0172f9939653a79b9f97c73d85eacf3e804e76c7889d42d247fa7216b40ebe2a55f716b3633fa71b4f99bf63e7694ab9 SHA512 1b3f89147d86c97c04abb458677440d16ccba65ef4210486daccdf9031c9c977337e3cbc273b212a1f2c23dfbd4d62c1adf3dc7e30f81196162633bf5b048f4e MISC metadata.xml 1191 BLAKE2B 98101432b70c26facdf54b28710ec27afe7ede00aa69840d29d9e0ce0e78b915656d8e9b4dba0fb7eb0332535e2a53fc142d90df1d6a79ca1df7a23a9ca60d44 SHA512 3696dabd8230d673f7077109ff791dab7415c6d7b5466ff0a59633a06ab8415592903232d50832cc9ba64d2bc38bddcbd542a82aaa88384e2277475c406f0adf diff --git a/dev-libs/libslz/libslz-1.2.0-r1.ebuild b/dev-libs/libslz/libslz-1.2.0-r1.ebuild index 8fff4fd6f227..633d4804c308 100644 --- a/dev-libs/libslz/libslz-1.2.0-r1.ebuild +++ b/dev-libs/libslz/libslz-1.2.0-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="MIT" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86" IUSE="tools" src_compile() { diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index e17f4edd0c6e..db4c285c070d 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,11 +1,5 @@ AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd -DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef -DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c -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 DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160 -EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb -EBUILD libsodium-1.0.18_p20210617.ebuild 2525 BLAKE2B 5a7ec4a44f5bb82dbbac1ad5b0c1ac2525922a41997a510d72f56434854dfe7b0246f64a5504181d78c1079d58d619f691644f249fb8ac4b9566b56f53051c3e SHA512 59e898b12d7b0eff6499fa21e830112a80713db65abeec3f985af6d9bce969ec4c12e8d7a214d7f95201fc88f4f180c6a556582a69896c056179d57e9c9f45de EBUILD libsodium-1.0.18_p20220618.ebuild 2515 BLAKE2B b99ffc90567e8b15edc548d19ac45603b336a8012575a34856194e05a0249a0bca60ae0d945c39322c0e2552a92ffcff7a96c37f3a1c04f48ae932ebef49200f SHA512 d2483b4e7ceb2c5ad46bce108309e96cbe7d1801a63fc9378be2f859fce959111ce33cacf1247643e96263dd2efa512af9d6b08f13e41b1fd3de24aafa2c934c MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483 diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild deleted file mode 100644 index 3fa3a86d9302..000000000000 --- a/dev-libs/libsodium/libsodium-1.0.18.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://libsodium.org" -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 )" - -LICENSE="ISC" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jedisct1 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable asm) - $(use_enable minimal) - $(use_enable !urandom blocking-random) - $(use_enable static-libs static) - $(use_enable cpu_flags_x86_sse4_1 sse4_1) - $(use_enable cpu_flags_x86_aes aesni) - ) - - # --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() { - einstalldocs - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild deleted file mode 100644 index c7b80db078da..000000000000 --- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 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=${BROOT}/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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 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 - # TODO: Check if still needed? - if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then - myeconfargs+=( --disable-pie ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 31e46f5155ac..5a8b7b8590cc 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,12 +1,9 @@ DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5 DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c -DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428 -DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe EBUILD libxml2-2.10.2.ebuild 5335 BLAKE2B 46ade566ce046d0cf524741064b8e4f365f3df13c709cf6897feb91c3d71197a98f1a26ee41081dc92a79ec13cdbca57e948ac5a18bf8207d91ee307e3b07dc9 SHA512 7ea53bd001bb838007665254d02cdd1ba7ab5ab7ee6d5c056d7406dd799d215a3bcfcbc6a053a5e0e7a7f5552d74189ff66bacbc0e65d9bdbfabf953b5dbcd51 EBUILD libxml2-2.10.3.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760 -EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827 EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0 diff --git a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild deleted file mode 100644 index 28e55087cabf..000000000000 --- a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_REQ_USE="xml(+)" -inherit autotools flag-o-matic python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -PATCHSET_VERSION="2.9.14-patches-r0" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit autotools git-r3 -else - inherit gnome.org libtool - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -SRC_URI+=" - https://dev.gentoo.org/~soap/distfiles/${PN}-${PATCHSET_VERSION}.tar.bz2 - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - )" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) - -PATCHES=( "${WORKDIR}"/patches ) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (bug #26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake test -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 4902a01c598a..d9a07797a27d 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,6 +1,4 @@ -DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96 DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca -EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01 EBUILD libxslt-1.1.37.ebuild 2969 BLAKE2B 815364a6d3e282a5c9dcc2d7d37c6515e77f67e91857e911dfd78958e4444f5c64b95365048e04b4fc93f7b1a84c0b78b9126c06f51d4c235d9ef8a374768a30 SHA512 28b9023d3f913f37ca24553bfc0b1166b99fbb17466566f8e20fa0c12d29256c291767f481b21ddfa61568c4be13f1d9b4724ef1c3261141f751c10233eec6d5 EBUILD libxslt-9999.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-1.1.35.ebuild deleted file mode 100644 index 3848a6609fa0..000000000000 --- a/dev-libs/libxslt/libxslt-1.1.35.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal - -# Note: Please bump this in sync with dev-libs/libxml2. -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" - inherit autotools git-r3 -else - inherit gnome.org - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="crypt debug examples static-libs" - -BDEPEND=">=virtual/pkgconfig-1" -RDEPEND=" - >=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xslt-config -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libxslt/xsltconfig.h -) - -DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Prefix always needs elibtoolize if not eautoreconf'd. - elibtoolize - fi -} - -multilib_src_configure() { - # Python bindings were dropped as they were Python 2 only at the time - # Work in 1.1.35+ is occurring to add prelim. Python 3 support, so could - # restore if something needs them. - ECONF_SOURCE="${S}" econf \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - --without-python \ - $(use_with crypt crypto) \ - $(use_with debug) \ - $(use_with debug mem-debug) \ - $(use_enable static-libs static) \ - "$@" -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index d10455d04392..54bdcafa9798 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,10 +1,6 @@ AUX spdlog-1.9.2-fix-clone-test.patch 422 BLAKE2B adf5104879b3ffae5658b8cc38d78b56e9c330c59add082a4604372ba45822512774a331995634915bdf3514ed4cf74d5e8171835cea3e8dbd9bae33177ebfdf SHA512 e66801855e2856f5195644eb31b3f53fee62164df9883d66289c6bfefff1c1c7e7d4aea320b0cd510ab5a656b415886ab2fe2686047d77f33cde4f997569b2c9 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692 DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666 -DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb -DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c -EBUILD spdlog-1.10.0.ebuild 1052 BLAKE2B 0c97ecf8b5a62362dc79d5dc9dbf682881f2694671a5712614057e848f45f001d3dee1f437ddf08100d2703f5e69ada5c130ba3c1898e7b00d5bb9ad53610a53 SHA512 f33ed451d1272ef566ec3b91ab9feeff32481e0e9e7627e0a04e5c00f2dafa330c44ac38aa8146e6a3d701a78b4b1fc8a9a087453bc04bd0eb406acffd929030 -EBUILD spdlog-1.9.2-r1.ebuild 1259 BLAKE2B 6e7ba878d9ee9423170a9c2d3b97a279bb9717937fc1df6d0c7f1ed7a4591cb8c05b829a8da6e97b00b68d82252a9ab459e87fa0205ff99c8d08cfc7895d77a8 SHA512 c4c4bc1f648cb6ca7a716f9d88324cd38e753a1d006cc59483f541531be0ce2b5b83cea0b0f447d4c43ffae01472c673ced43f71043cf21c9633ae1965fbfdb3 -EBUILD spdlog-1.9.2.ebuild 1154 BLAKE2B c9d1a6441a46b9d945e5036734e2efab4551ab7712b6df7faf82c470b18db538eeb16067e186a351c9ba48480cfa9a8455cc5b333922f875567db633be04ef35 SHA512 4234dd4b5319e7932c4a17484411dd5104da67190d6a67cfadfa1b6d30d669d74f7f61b3358f19c1e1312634948715b548869e55f85667368263846c9563167d +EBUILD spdlog-1.10.0.ebuild 1051 BLAKE2B ebf55210df05bb7a8774a50991e07d9131166b56a8783ae021ae7e351bc7e4193a494738952f1a4783c28db99d289d53abf1202426e77f7d4759960626aa9999 SHA512 5bc8a4613c59d0bda07009191069ac0901121fcaeb220568cb4e68a9f9834c8be61d235f69852ce3af0e1f63e076f3043f17856fd21781f99197127e16f874a6 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c diff --git a/dev-libs/spdlog/spdlog-1.10.0.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild index f496aa6b47f3..5b255d81d0bd 100644 --- a/dev-libs/spdlog/spdlog-1.10.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.10.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/gabime/${PN}" else SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" fi LICENSE="MIT" diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild deleted file mode 100644 index d1522c98ebf1..000000000000 --- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Very fast, header only, C++ logging library" -HOMEPAGE="https://github.com/gabime/spdlog" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gabime/${PN}" -else - SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - # Temporary for bug #811750 - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -fi - -LICENSE="MIT" -SLOT="0/1" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=dev-libs/libfmt-8.0.0:= -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-force_external_fmt.patch" - "${FILESDIR}/${P}-fix-clone-test.patch" -) - -src_prepare() { - use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch - - cmake_src_prepare - rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" -} - -src_configure() { - local mycmakeargs=( - -DSPDLOG_BUILD_BENCH=no - -DSPDLOG_BUILD_EXAMPLE=no - -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=yes - -DSPDLOG_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-libs/spdlog/spdlog-1.9.2.ebuild b/dev-libs/spdlog/spdlog-1.9.2.ebuild deleted file mode 100644 index beb63a1a7f60..000000000000 --- a/dev-libs/spdlog/spdlog-1.9.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Very fast, header only, C++ logging library" -HOMEPAGE="https://github.com/gabime/spdlog" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gabime/${PN}" -else - SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - # Temporary for bug #811750 - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )" - KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" -fi - -LICENSE="MIT" -SLOT="0/1" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=dev-libs/libfmt-8.0.0:= -" -RDEPEND="${DEPEND}" - -src_prepare() { - use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch - - cmake_src_prepare - rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" -} - -src_configure() { - local mycmakeargs=( - -DSPDLOG_BUILD_BENCH=no - -DSPDLOG_BUILD_EXAMPLE=no - -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=yes - -DSPDLOG_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest index 7dd431679f78..2616a2885890 100644 --- a/dev-libs/userspace-rcu/Manifest +++ b/dev-libs/userspace-rcu/Manifest @@ -1,7 +1,5 @@ AUX userspace-rcu-0.13.1-loong.patch 5308 BLAKE2B 94ca49f47c68efb8e368033ee77eeeba0484735d7bef2ea15bc1956a9c05c8f5d275f521412aa3bcaeb4221e86240b6d42b04112d8a3565fc4074b84059d460f SHA512 32fc545a8201cc8a8db4d38c4fc3ec93c0717e23a87cd0533be0e60ef47027d8442547cd0cd46e4e99d235efcf8045eb8c106fde1e3389256fd80114b20df5a6 AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82 -DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182 DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a -EBUILD userspace-rcu-0.13.1.ebuild 1106 BLAKE2B 178a7101a35c4ac47d1ec5522b59d23cf0f1a0a15f569a1b3fb6846a720f92bafc7fc6b90398b3e11f8b5f98e1a16690b707b94ec869ce32b910e4ac132a0b66 SHA512 79ff76ca5bc0dc71a9548d927e61d64afde3232fa1bc5a64391252386d183a51c3a55546b138626eb526c630f68efe0cc28ff0e266c825247ce38c7573e1a221 EBUILD userspace-rcu-0.13.2.ebuild 1106 BLAKE2B e715d27230f38a2981f7aef2edfcef9291292e6c6eb211dfcc8eee02935f49b001f5560e6a879ff0de203cc5cc30778290a83f228dfbce3d2c5d95af0146ab6a SHA512 eb3fa88ff25378dc8d45001b923aaddb88e7c72ef5ed68edea6059bc7da11baa2f586b8f9fc74df4f44bd15e4573dc62c3605b712d7db7f3142fd0256e9f10d6 MISC metadata.xml 341 BLAKE2B bc37ed52ea2032c387966023434b69d8b184e7800e8588398350eaa6f55c8895822370ebcf971b8ebc87d112ec3de973929455a78519b4f0f5081a4693be0d8f SHA512 a88f7a9bebe6947cc296e3f0d7b316648cba7117551ee6a9b06c51d5ecd010ebf34918939fffef4dc6156dc818cbd38b72dd394a6acff9b873e8a3fc247e3f02 diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild deleted file mode 100644 index a534a4ce7d3f..000000000000 --- a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Userspace RCU (read-copy-update) library" -HOMEPAGE="https://liburcu.org/" -SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/8" # subslot = soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( sys-process/time )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch - "${FILESDIR}"/${PN}-0.13.1-loong.patch -) - -src_prepare() { - default - - # Needed for tests patch - # ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973) - # ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189) - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-shared - $(use_enable static-libs static) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - default - - emake -C tests/regression regtest -} - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest index 922d94d78788..7d28f7c95b85 100644 --- a/dev-libs/xapian-bindings/Manifest +++ b/dev-libs/xapian-bindings/Manifest @@ -1,11 +1,5 @@ -AUX xapian-bindings-1.4.20-slibtool.patch 4917 BLAKE2B 7c2b580e39071e7812067165220fcaef016f8e99f451dd5a1c460198987e5754a075214b67b90712686cd6d345c54f31d3a5b0a6d5b7c0fc94dae9c0422ba0f1 SHA512 ce7ee401e91713c9f914e6c87c2adc968dd8c863f19d597048d2052348abc65760213eded0deec3dc46dd0df637d61a0cfd0986670a1aa9c47c892a6b6c1597d -DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6 -DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33 -EBUILD xapian-bindings-1.4.18-r1.ebuild 7047 BLAKE2B 1d2fd7b5d833876d00d49f7f5159255e83233ca662dedb720813d10ce15e39a2bfb46cdb0836b88773d3887469c3a62648356aa8676fe3a2cf1ab8e8e45659d5 SHA512 f1c2675ad652b555cb2be48a1a327192424c5866c04b10c84c9f8ea794fff8d487fc9edfe7417c8bf141fee253f2669c635c51def709818db2f8a3b6fa5a3b45 -EBUILD xapian-bindings-1.4.19.ebuild 7121 BLAKE2B a2c0d20a764a5a192e354986961803e49c535ee2338305366d0dbf93c6f1747654c30b48d01cc1fc3a9876c572e3faa588ef941b1ecad9a938060251d89d7bca SHA512 7b8b48bac9926d5a596b775bd687cafd6fc53a153ba18bc5aac8de1730c258494f7e340c623a56e218b626889f14971f44b9e6606d9cc05dd889d14346e94e84 -EBUILD xapian-bindings-1.4.20-r1.ebuild 7206 BLAKE2B badceb446b50d5b5ecb5e934efdd35daa33bed66cbdd3f0cfd48cd3878f266051c77fe08c57ff13d7dd5d1b020d905cf39269a9201a76cd22c16b348f981901c SHA512 5a58191d7c1b8c07ae331b8b24d656709985ce6bb1187c58435b388e5e52fa91ed78427c4c046f61f76e6d157d6b9db8db209b64d57f5f0564f2208fdba85c71 -EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05 +EBUILD xapian-bindings-1.4.19.ebuild 7119 BLAKE2B 94c1604be122be96515ccceaf6ae9c380771a3ccda47ffbf522fadf094c132e8b1052d171afa2b55a812831ba674667c5f11c618d6c9d270f8df1fd67d28d1aa SHA512 59a412af6c10d7624aadaf9b59dfc499f9e97f1da5d710c0f6c435b9a057e19eacd3362c39e663a35e8086a6a7a7b04f40db4cce6f0de7be7dcc0c321a02b415 EBUILD xapian-bindings-1.4.21.ebuild 7129 BLAKE2B 8944d678da73648ef5d629c10e01786c273a541e373a30961c2ec3e85804a05798412d0f77af8ceb50f0b4e896412805fb9851c2930c210e11bae870a90afc54 SHA512 65771b8c107e0d6048bfa268c3faacafb9ca729e79cc6f0e5e87c56a5a9fe28f096481006ac6fb47f4052efa4c0101c976f2879f115fff1afbef872f92f967d0 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467 diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch deleted file mode 100644 index d73f8bcb19b9..000000000000 --- a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch +++ /dev/null @@ -1,133 +0,0 @@ -Upstream-PR: https://github.com/xapian/xapian/pull/322 - -From c513b0d31d2df31eb57ccbe08bbe46821863557d Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Wed, 20 Jul 2022 13:37:20 -0700 -Subject: [PATCH] xapian-bindings: Fix the build with slibtool - -With slibtool the --config argument works differently than in GNU -libtool which results in 'auto/Xapian/Xapian$(PERL_SO)' failing to be -created. This can be worked around by using libtool --mode=install where -slibtool can copy the module to the intended location. - -However GNU libtool still requires using --config otherwise it fails -during --mode=install with the following error. - - /bin/bash ../libtool --mode=install cp Xapian.la /home/runner/work/xapian/xapian/perl/auto/Xapian/Xapian.la - libtool: error: error: cannot install 'Xapian.la' to a directory not ending in /usr/local/lib/x86_64-linux-gnu/perl/5.26.1/auto/Xapian - -gentoo issue: https://bugs.gentoo.org/793428 ---- - java/run-java-test | 21 +++++++++++++++++---- - perl/Makefile.am | 9 +++++++-- - python3/Makefile.am | 9 +++++++-- - tcl8/run-tcl-test | 20 +++++++++++++------- - 4 files changed, 44 insertions(+), 15 deletions(-) - -diff --git a/java/run-java-test b/java/run-java-test -index d0e97af300e..a838de98492 100755 ---- a/java/run-java-test -+++ b/java/run-java-test -@@ -1,11 +1,24 @@ - #!/bin/sh - # To run `jdb` instead of `java` set JAVA=jdb - # To run under gdb, set JAVA='gdb --args java' -+LIBTOOL="${LIBTOOL-../libtool}" - arg=`echo "$1"|sed 's!.*/!!;s!\.class$!!'` -+ -+# GNU libtool and slibtool have different and incompatible usage for --config. -+if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then -+ . ./libtoolconfig.$$ -+else -+ objdir="built/libs" -+ rm -rf "$objdir" -+ mkdir -p "$objdir" -+ ${LIBTOOL} --mode=install cp libxapian_jni.la "$objdir" -+fi -+rm -f libtoolconfig.$$ -+ - # Use libtool's -dlopen option to ensure that libxapian_jni.so (or whatever) - # is in the shared library path. --${LIBTOOL-../libtool} --config > libtoolconfig.$$ --. ./libtoolconfig.$$ --rm -f libtoolconfig.$$ --${LIBTOOL-../libtool} -dlopen libxapian_jni.la --mode=execute \ -+${LIBTOOL} -dlopen libxapian_jni.la --mode=execute \ - $OSX_SIP_HACK_ENV ${JAVA-java} -Djava.library.path="$objdir" -classpath built/xapian.jar${PATHSEP-:}. "$arg" -+rc=$? -+rm -rf built/libs -+exit $rc -diff --git a/perl/Makefile.am b/perl/Makefile.am -index 4f2e5e4283d..f71579736e5 100644 ---- a/perl/Makefile.am -+++ b/perl/Makefile.am -@@ -55,9 +55,14 @@ BUILT_SOURCES = Xapian.pm xapian_wrap.cc \ - - auto/Xapian/Xapian$(PERL_SO): Xapian.la - @$(MKDIR_P) auto/Xapian -- $(LIBTOOL) --config > libtoolconfig.tmp -+## GNU libtool and slibtool have different and incompatible usage for --config. -+ if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \ - ## ksh requires a path on the sourced file. -- . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian -+ . ./libtoolconfig.tmp; \ -+ cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian; \ -+ else \ -+ $(LIBTOOL) --mode=install cp $< $@; \ -+ fi; - rm -f libtoolconfig.tmp - - EXTRA_DIST = perl.i except.i extra.i $(TESTS) \ -diff --git a/python3/Makefile.am b/python3/Makefile.am -index 3c692a9e2d4..9bf01833636 100644 ---- a/python3/Makefile.am -+++ b/python3/Makefile.am -@@ -88,9 +88,14 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@: xapian/__init__.py xapian/ - - xapian/_xapian$(PYTHON3_EXT_SUFFIX): _xapian.la - $(MKDIR_P) xapian -- $(LIBTOOL) --config > libtoolconfig.tmp -+## GNU libtool and slibtool have different and incompatible usage for --config. -+ if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \ - ## ksh requires a path on the sourced file. -- . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian -+ . ./libtoolconfig.tmp; \ -+ cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian; \ -+ else \ -+ $(LIBTOOL) --mode=install cp $< $@; \ -+ fi; - rm -f libtoolconfig.tmp - - CLEANFILES = \ -diff --git a/tcl8/run-tcl-test b/tcl8/run-tcl-test -index 206b5e0e056..71511032024 100755 ---- a/tcl8/run-tcl-test -+++ b/tcl8/run-tcl-test -@@ -1,14 +1,20 @@ - #!/bin/sh --${LIBTOOL-../libtool} --config > libtoolconfig.$$ --. ./libtoolconfig.$$ --rm -f libtoolconfig.$$ -+tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}` -+rm -f xapian$tclshlibext -+ -+LIBTOOL="${LIBTOOL-../libtool}" - module=yes --eval shlibext=$shrext_cmds - --tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}` -+# GNU libtool and slibtool have different and incompatible usage for --config. -+if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then -+ . ./libtoolconfig.$$ -+ eval shlibext=$shrext_cmds -+ ln -s $objdir/xapian$shlibext xapian$tclshlibext -+else -+ ${LIBTOOL} --mode=install cp xapian.la ./xapian$tclshlibext -+fi -+rm -f libtoolconfig.$$ - --rm -f xapian$tclshlibext --ln -s $objdir/xapian$shlibext xapian$tclshlibext - $OSX_SIP_HACK_ENV ${TCLSH-tclsh} ${srcdir-.}/runtest.tcl ${srcdir-.}/smoketest.tcl - rc=$? - rm -f xapian$tclshlibext diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild deleted file mode 100644 index 5c0655965cf7..000000000000 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild +++ /dev/null @@ -1,343 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+)" - -USE_PHP="php7-4" - -PHP_EXT_NAME="xapian" -PHP_EXT_INI="yes" -PHP_EXT_OPTIONAL_USE="php" - -USE_RUBY="ruby25 ruby26 ruby27 ruby30" -RUBY_OPTIONAL="yes" - -inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng - -DESCRIPTION="SWIG and JNI bindings for Xapian" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="java lua mono perl php python ruby tcl" -REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( || ( $(ruby_get_use_targets) ) )" - -COMMONDEPEND=">=dev-libs/xapian-1.4.15 - lua? ( ${LUA_DEPS} ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:=[-threads] ) - python? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - ruby? ( $(ruby_implementations_depend) ) - tcl? ( dev-lang/tcl:= ) - mono? ( dev-lang/mono )" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - java? ( >=virtual/jdk-1.6 )" -RDEPEND="${COMMONDEPEND} - java? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}/${P}" - -has_basic_bindings() { - # Update this list if new bindings are added that are not built - # multiple times for multiple versions like lua, php, python and ruby are - return $(use mono || use java || use perl || use tcl) -} - -php_copy_sources() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_copy_sources -} - -php_foreach_impl() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_foreach_variant "$@" -} - -ruby_copy_sources() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_copy_sources -} - -ruby_foreach_impl() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_foreach_variant "$@" -} - -pkg_setup() { - use mono && mono-env_pkg_setup - use java && java-pkg-opt-2_pkg_setup -} - -src_unpack() { - default - - if use php; then - local php_slot - for php_slot in $(php_get_slots); do - # Unfortunately required for php-ext-source-r3_createinifiles(). - mkdir "${WORKDIR}/${php_slot}" - done - fi -} - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - - # https://trac.xapian.org/ticket/702 - export XAPIAN_CONFIG="/usr/bin/xapian-config" - - if use lua; then - lua_copy_sources - fi - - if use php; then - php_copy_sources - fi - - if use python; then - python_copy_sources - fi - - if use ruby; then - ruby_copy_sources - fi - - eapply_user -} - -src_configure() { - if has_basic_bindings ; then - local conf=( - --disable-documentation - $(use_with mono csharp) - $(use_with java) - $(use_with perl) - $(use_with tcl) - --without-lua - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - ) - - if use java; then - local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)" - fi - - if use perl; then - local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')" - local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')" - fi - - econf "${conf[@]}" - fi - - lua_configure() { - local myconf=( - --disable-documentation - --without-csharp - --without-java - --without-perl - --without-tcl - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - --with-lua - ) - - local -x LUA_INC="$(lua_get_include_dir)" - local -x LUA_LIB="$(lua_get_cmod_dir)" - - econf "${myconf[@]}" - - } - - if use lua; then - lua_foreach_impl run_in_build_dir lua_configure - fi - - php_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-python - --without-python3 - --without-ruby - --without-tcl - ) - if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then - myconf+=( - --with-php - --without-php7 - ) - local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then - myconf+=( - --without-php - --with-php7 - ) - local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - fi - - econf "${myconf[@]}" - } - - if use php; then - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - php_foreach_impl run_in_build_dir php_configure - fi - - python_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-ruby - --without-tcl - --with-python3 - ) - - # Avoid sandbox failures when compiling modules - addpredict "$(python_get_sitedir)" - - econf "${myconf[@]}" - } - - if use python; then - python_foreach_impl run_in_build_dir python_configure - fi - - ruby_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-python - --without-python3 - --with-ruby - --without-tcl - ) - local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}" - - econf "${myconf[@]}" - } - - if use ruby; then - ruby_foreach_impl run_in_build_dir ruby_configure - fi -} - -src_compile() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake - fi - - if use php; then - php_foreach_impl run_in_build_dir emake - fi - - if use python; then - unset PYTHONDONTWRITEBYTECODE - python_foreach_impl run_in_build_dir emake - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake - fi -} - -src_test() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake check - fi - - if use php; then - php_foreach_impl run_in_build_dir emake check - fi - - if use python; then - python_foreach_impl run_in_build_dir emake check - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake check - fi -} - -src_install() { - if has_basic_bindings ; then - emake DESTDIR="${D}" install - fi - - if use java; then - java-pkg_dojar java/built/xapian.jar - # TODO: make the build system not install this... - java-pkg_doso java/.libs/libxapian_jni.so - rm -rf "${ED}/var" || die "could not remove java cruft!" - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - if use php; then - php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - php-ext-source-r3_createinifiles - # php-ext-source-r3_createinifiles() changes current directory. - cd "${S}" - fi - - if use python; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - python_foreach_impl python_optimize - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - # For some USE combinations this directory is not created - if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then - mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc AUTHORS HACKING NEWS TODO README -} diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild index 551cc14289db..080f7453900b 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild @@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="java lua mono perl php python ruby tcl" REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) lua? ( ${LUA_REQUIRED_USE} ) diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild deleted file mode 100644 index adaa8d9ff860..000000000000 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild +++ /dev/null @@ -1,352 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1,3,4} luajit ) - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="threads(+)" - -USE_PHP="php7-4 php8-0" - -PHP_EXT_NAME="xapian" -PHP_EXT_INI="yes" -PHP_EXT_OPTIONAL_USE="php" - -USE_RUBY="ruby26 ruby27 ruby30" -RUBY_OPTIONAL="yes" - -inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng - -DESCRIPTION="SWIG and JNI bindings for Xapian" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="java lua mono perl php python ruby tcl" -REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( || ( $(ruby_get_use_targets) ) )" - -COMMONDEPEND=">=dev-libs/xapian-1.4.20 - lua? ( ${LUA_DEPS} ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:=[-threads] ) - python? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - ruby? ( $(ruby_implementations_depend) ) - tcl? ( dev-lang/tcl:= ) - mono? ( dev-lang/mono )" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - java? ( >=virtual/jdk-1.8:* )" -RDEPEND="${COMMONDEPEND} - java? ( >=virtual/jre-1.8:* )" - -S="${WORKDIR}/${P}" - -PATCHES=( - "${FILESDIR}"/${P}-slibtool.patch # 793428 -) - -has_basic_bindings() { - # Update this list if new bindings are added that are not built - # multiple times for multiple versions like lua, php, python and ruby are - return $(use mono || use java || use perl || use tcl) -} - -php_copy_sources() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_copy_sources -} - -php_foreach_impl() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_foreach_variant "$@" -} - -ruby_copy_sources() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_copy_sources -} - -ruby_foreach_impl() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_foreach_variant "$@" -} - -pkg_setup() { - use mono && mono-env_pkg_setup - use java && java-pkg-opt-2_pkg_setup -} - -src_unpack() { - default - - if use php; then - local php_slot - for php_slot in $(php_get_slots); do - # Unfortunately required for php-ext-source-r3_createinifiles(). - mkdir "${WORKDIR}/${php_slot}" - done - fi -} - -src_prepare() { - default - - eautoreconf - - use java && java-pkg-opt-2_src_prepare - - # https://trac.xapian.org/ticket/702 - export XAPIAN_CONFIG="/usr/bin/xapian-config" - - if use lua; then - lua_copy_sources - fi - - if use php; then - php_copy_sources - fi - - if use python; then - python_copy_sources - fi - - if use ruby; then - ruby_copy_sources - fi -} - -src_configure() { - # Needed to get e.g. test failure details - MAKEOPTS+=" VERBOSE=1" - - if has_basic_bindings ; then - local conf=( - --disable-documentation - $(use_with mono csharp) - $(use_with java) - $(use_with perl) - $(use_with tcl) - --without-lua - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - ) - - if use java; then - local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)" - fi - - if use perl; then - local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')" - local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')" - fi - - econf "${conf[@]}" - fi - - lua_configure() { - local myconf=( - --disable-documentation - --without-csharp - --without-java - --without-perl - --without-tcl - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - --with-lua - ) - - local -x LUA_INC="$(lua_get_include_dir)" - local -x LUA_LIB="$(lua_get_cmod_dir)" - - econf "${myconf[@]}" - - } - - if use lua; then - lua_foreach_impl run_in_build_dir lua_configure - fi - - php_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-python - --without-python3 - --without-ruby - --without-tcl - ) - if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then - myconf+=( - --with-php - --without-php7 - ) - local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then - myconf+=( - --without-php - --with-php7 - ) - local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - fi - - econf "${myconf[@]}" - } - - if use php; then - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - php_foreach_impl run_in_build_dir php_configure - fi - - python_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-ruby - --without-tcl - --with-python3 - ) - - # Avoid sandbox failures when compiling modules - addpredict "$(python_get_sitedir)" - - econf "${myconf[@]}" - } - - if use python; then - python_foreach_impl run_in_build_dir python_configure - fi - - ruby_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-python - --without-python3 - --with-ruby - --without-tcl - ) - local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}" - - econf "${myconf[@]}" - } - - if use ruby; then - ruby_foreach_impl run_in_build_dir ruby_configure - fi -} - -src_compile() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake - fi - - if use php; then - php_foreach_impl run_in_build_dir emake - fi - - if use python; then - unset PYTHONDONTWRITEBYTECODE - python_foreach_impl run_in_build_dir emake - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake - fi -} - -src_test() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake check - fi - - if use php; then - php_foreach_impl run_in_build_dir emake check - fi - - if use python; then - python_foreach_impl run_in_build_dir emake check - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake check - fi -} - -src_install() { - if has_basic_bindings ; then - emake DESTDIR="${D}" install - fi - - if use java; then - java-pkg_dojar java/built/xapian.jar - # TODO: make the build system not install this... - java-pkg_doso java/.libs/libxapian_jni.so - rm -rf "${ED}/var" || die "could not remove java cruft!" - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - if use php; then - php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - php-ext-source-r3_createinifiles - # php-ext-source-r3_createinifiles() changes current directory. - cd "${S}" - fi - - if use python; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - python_foreach_impl python_optimize - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - # For some USE combinations this directory is not created - if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then - mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc AUTHORS HACKING NEWS TODO README -} diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild deleted file mode 100644 index b7ecddfc2361..000000000000 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1,3,4} luajit ) - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="threads(+)" - -USE_PHP="php7-4 php8-0" - -PHP_EXT_NAME="xapian" -PHP_EXT_INI="yes" -PHP_EXT_OPTIONAL_USE="php" - -USE_RUBY="ruby26 ruby27 ruby30" -RUBY_OPTIONAL="yes" - -inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng - -DESCRIPTION="SWIG and JNI bindings for Xapian" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="java lua mono perl php python ruby tcl" -REQUIRED_USE="|| ( java lua mono perl php python ruby tcl ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( || ( $(ruby_get_use_targets) ) )" - -COMMONDEPEND=">=dev-libs/xapian-1.4.20 - lua? ( ${LUA_DEPS} ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:=[-threads] ) - python? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - ruby? ( $(ruby_implementations_depend) ) - tcl? ( dev-lang/tcl:= ) - mono? ( dev-lang/mono )" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - java? ( >=virtual/jdk-1.6 )" -RDEPEND="${COMMONDEPEND} - java? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}/${P}" - -has_basic_bindings() { - # Update this list if new bindings are added that are not built - # multiple times for multiple versions like lua, php, python and ruby are - return $(use mono || use java || use perl || use tcl) -} - -php_copy_sources() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_copy_sources -} - -php_foreach_impl() { - local MULTIBUILD_VARIANTS=($(php_get_slots)) - multibuild_foreach_variant "$@" -} - -ruby_copy_sources() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_copy_sources -} - -ruby_foreach_impl() { - local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations)) - multibuild_foreach_variant "$@" -} - -pkg_setup() { - use mono && mono-env_pkg_setup - use java && java-pkg-opt-2_pkg_setup -} - -src_unpack() { - default - - if use php; then - local php_slot - for php_slot in $(php_get_slots); do - # Unfortunately required for php-ext-source-r3_createinifiles(). - mkdir "${WORKDIR}/${php_slot}" - done - fi -} - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - - # https://trac.xapian.org/ticket/702 - export XAPIAN_CONFIG="/usr/bin/xapian-config" - - if use lua; then - lua_copy_sources - fi - - if use php; then - php_copy_sources - fi - - if use python; then - python_copy_sources - fi - - if use ruby; then - ruby_copy_sources - fi - - eapply_user -} - -src_configure() { - # Needed to get e.g. test failure details - MAKEOPTS+=" VERBOSE=1" - - if has_basic_bindings ; then - local conf=( - --disable-documentation - $(use_with mono csharp) - $(use_with java) - $(use_with perl) - $(use_with tcl) - --without-lua - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - ) - - if use java; then - local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)" - fi - - if use perl; then - local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')" - local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')" - fi - - econf "${conf[@]}" - fi - - lua_configure() { - local myconf=( - --disable-documentation - --without-csharp - --without-java - --without-perl - --without-tcl - --without-php - --without-php7 - --without-python - --without-python3 - --without-ruby - --with-lua - ) - - local -x LUA_INC="$(lua_get_include_dir)" - local -x LUA_LIB="$(lua_get_cmod_dir)" - - econf "${myconf[@]}" - - } - - if use lua; then - lua_foreach_impl run_in_build_dir lua_configure - fi - - php_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-python - --without-python3 - --without-ruby - --without-tcl - ) - if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then - myconf+=( - --with-php - --without-php7 - ) - local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then - myconf+=( - --without-php - --with-php7 - ) - local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" - fi - - econf "${myconf[@]}" - } - - if use php; then - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - php_foreach_impl run_in_build_dir php_configure - fi - - python_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-ruby - --without-tcl - --with-python3 - ) - - # Avoid sandbox failures when compiling modules - addpredict "$(python_get_sitedir)" - - econf "${myconf[@]}" - } - - if use python; then - python_foreach_impl run_in_build_dir python_configure - fi - - ruby_configure() { - local myconf=( - --disable-documentation - --without-java - --without-lua - --without-csharp - --without-perl - --without-php - --without-php7 - --without-python - --without-python3 - --with-ruby - --without-tcl - ) - local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}" - - econf "${myconf[@]}" - } - - if use ruby; then - ruby_foreach_impl run_in_build_dir ruby_configure - fi -} - -src_compile() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake - fi - - if use php; then - php_foreach_impl run_in_build_dir emake - fi - - if use python; then - unset PYTHONDONTWRITEBYTECODE - python_foreach_impl run_in_build_dir emake - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake - fi -} - -src_test() { - if has_basic_bindings ; then - default - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake check - fi - - if use php; then - php_foreach_impl run_in_build_dir emake check - fi - - if use python; then - python_foreach_impl run_in_build_dir emake check - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake check - fi -} - -src_install() { - if has_basic_bindings ; then - emake DESTDIR="${D}" install - fi - - if use java; then - java-pkg_dojar java/built/xapian.jar - # TODO: make the build system not install this... - java-pkg_doso java/.libs/libxapian_jni.so - rm -rf "${ED}/var" || die "could not remove java cruft!" - fi - - if use lua; then - lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - if use php; then - php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - php-ext-source-r3_createinifiles - # php-ext-source-r3_createinifiles() changes current directory. - cd "${S}" - fi - - if use python; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - python_foreach_impl python_optimize - fi - - if use ruby; then - ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - fi - - # For some USE combinations this directory is not created - if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then - mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc AUTHORS HACKING NEWS TODO README -} diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest index a9875c3c0bfa..f6b4f28ae14b 100644 --- a/dev-libs/xapian/Manifest +++ b/dev-libs/xapian/Manifest @@ -1,14 +1,6 @@ -AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8d91f8d6921f9a897188991e518f78e402b48c013e9659438be65f558157fec0bc214238f64010b428f3e3642586931d561a2ebc7ef SHA512 a2c9c30bbfe1217dd185bf547cf637784b73180f1346b97564c760c2a6cb67eef28766b0829f6dba04483c9bff8d6faeb58d2daddc9c541d6a2df62e9d4a9684 -DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe -DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 -DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346 -DIST xapian-core-1.4.20.tar.xz 3003788 BLAKE2B c4bfa4af9112a206b14c8c2f4a76eb4c1267a752130287b6623233d3a09783b903a3275b2ec275f38f1d195119c730565a31ed303b8e2dedefc42cae10387600 SHA512 e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a -EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8 -EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141 -EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd -EBUILD xapian-1.4.19.ebuild 1887 BLAKE2B b5bf0ec1150ede1881b7fa0bba8d7651d6454a6cc9ba663c024c81f6470e0e9004ed31fc8d54c89fbf625d5e2cd5e9388bfc1e4b6f33fcf93d339947b5941117 SHA512 57ecd05889faf1388b51f6d70aa108cd10374c009574f996956adfe05d64bee08d13c1b65bd8b8274228ce4a959a534ca596538a0aa98297d767e5f30003a6b5 -EBUILD xapian-1.4.20.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee +EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 564a230f9ab784c55be59808404b631b9653ddec0befcc396bd71bbf23fec1c3de92a66d40dbfa6805701c659c48b8ef511958e9d42e12767dde12e586292ffe SHA512 9eafa08e04443a43e3d3346fd2d46fcba30c624cda8b84404cc5bd098dc6186b612545bcfbf34952e419ef1029efecbc1e27a66539de7f628cd5455121b5aa66 +EBUILD xapian-1.4.21-r1.ebuild 1442 BLAKE2B 11616926e8253292615ac885cafb21cf4f7a51e5bcc1300ba9b82be07948f3a3ed91271077a80c27311a907b69d832bfa561d6345a9867b446bf0abca3fbfd24 SHA512 a56e927607f735a0036bc637fb8f11cef8d9e9d29205324f190fd6c2071e8c3deea848eeb69f0936db687665014f411763abe8f814949fdf14b258c4c96453f4 EBUILD xapian-1.4.21.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee -MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5 +MISC metadata.xml 813 BLAKE2B b365d558fc9e5c1c86d9dfb90624fb27f4c502303fb602c7f21c9b392f729160cb1e7f56120d276d4fadeb88c616fca81912e5473b5273cc5841693d507f51d7 SHA512 0a40218154223a4ac13301ef324d925fd56d74749fa289c9a6d19cee7348f781430491fa65991bedc89aaaef9b0a0dd725eda49edcc993df506884b9cf3289d2 diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch deleted file mode 100644 index 67693e968dff..000000000000 --- a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/788046 ---- a/api/omdocument.cc -+++ b/api/omdocument.cc -@@ -39,6 +39,7 @@ - - #include <algorithm> - #include <string> -+#include <limits> - - using namespace std; - diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml index ca0ccfc79066..0ca12a77b8ac 100644 --- a/dev-libs/xapian/metadata.xml +++ b/dev-libs/xapian/metadata.xml @@ -15,8 +15,6 @@ applications. </longdescription> <use> - <flag name="brass">Enabled brass backend db support</flag> - <flag name="chert">Enabled chert backend db support</flag> <flag name="inmemory">Enabled inmemory backend db support</flag> <flag name="remote">Enabled remote backend db support</flag> </use> diff --git a/dev-libs/xapian/xapian-1.2.25-r1.ebuild b/dev-libs/xapian/xapian-1.2.25-r1.ebuild deleted file mode 100644 index 8dc1dcb06fb8..000000000000 --- a/dev-libs/xapian/xapian-1.2.25-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic multilib-minimal - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2. -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris" -IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory" - -DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -multilib_src_configure() { - local myconf="" - - # "brass_check.cc:40:48: error: reference to ‘byte’ is ambiguous" - # bug #789390 - append-cxxflags -std=c++14 - - if use cpu_flags_x86_sse2; then - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - myconf="${myconf} --enable-sse=sse" - else - myconf="${myconf} --disable-sse" - fi - fi - - myconf="${myconf} $(use_enable static-libs static)" - - use brass || myconf="${myconf} --disable-backend-brass" - use chert || myconf="${myconf} --disable-backend-chert" - use inmemory || myconf="${myconf} --disable-backend-inmemory" - - myconf="${myconf} --enable-backend-flint --enable-backend-remote" - - ECONF_SOURCE=${S} econf ${myconf} -} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - use doc || rm -rf "${ED%/}/usr/share/doc/xapian-core-${PV}" - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - find "${ED}" -name "*.la" -type f -delete || die -} - -multilib_src_test() { - emake check VALGRIND= -} diff --git a/dev-libs/xapian/xapian-1.4.17-r1.ebuild b/dev-libs/xapian/xapian-1.4.17-r1.ebuild deleted file mode 100644 index 25d39cf439b4..000000000000 --- a/dev-libs/xapian/xapian-1.4.17-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit multilib-minimal - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" -IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote" - -DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch -) - -multilib_src_configure() { - local myconf="" - - if use cpu_flags_x86_sse2; then - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - myconf="${myconf} --enable-sse=sse" - else - myconf="${myconf} --disable-sse" - fi - fi - - myconf="${myconf} $(use_enable static-libs static)" - - use inmemory || myconf="${myconf} --disable-backend-inmemory" - use remote || myconf="${myconf} --disable-backend-remote" - - myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - - ECONF_SOURCE=${S} econf ${myconf} -} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_test() { - emake check VALGRIND= -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if use doc; then - rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die - fi - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - find "${ED}" -name "*.la" -type f -delete || die -} diff --git a/dev-libs/xapian/xapian-1.4.18-r1.ebuild b/dev-libs/xapian/xapian-1.4.18-r1.ebuild deleted file mode 100644 index 2cb7f29c2d2a..000000000000 --- a/dev-libs/xapian/xapian-1.4.18-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit multilib-minimal - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" -IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote" - -DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -multilib_src_configure() { - local myconf="" - - if use cpu_flags_x86_sse2; then - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - myconf="${myconf} --enable-sse=sse" - else - myconf="${myconf} --disable-sse" - fi - fi - - myconf="${myconf} $(use_enable static-libs static)" - - use inmemory || myconf="${myconf} --disable-backend-inmemory" - use remote || myconf="${myconf} --disable-backend-remote" - - myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - - ECONF_SOURCE=${S} econf ${myconf} -} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_test() { - emake check VALGRIND= -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if use doc; then - rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die - fi - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - find "${ED}" -name "*.la" -type f -delete || die -} diff --git a/dev-libs/xapian/xapian-1.4.19.ebuild b/dev-libs/xapian/xapian-1.4.19.ebuild index 6624e0dffa78..00fe7b8f5d51 100644 --- a/dev-libs/xapian/xapian-1.4.19.ebuild +++ b/dev-libs/xapian/xapian-1.4.19.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote" DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}] diff --git a/dev-libs/xapian/xapian-1.4.20.ebuild b/dev-libs/xapian/xapian-1.4.21-r1.ebuild index d50c34543512..fea1a23cc14a 100644 --- a/dev-libs/xapian/xapian-1.4.20.ebuild +++ b/dev-libs/xapian/xapian-1.4.21-r1.ebuild @@ -3,8 +3,6 @@ EAPI="8" -inherit multilib-minimal - MY_P="${PN}-core-${PV}" DESCRIPTION="Xapian Probabilistic Information Retrieval library" @@ -16,13 +14,13 @@ SLOT="0/30" # ABI version of libxapian.so KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote" -DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}]" +DEPEND="sys-apps/util-linux + sys-libs/zlib" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" -multilib_src_configure() { +src_configure() { local myconf="" if use cpu_flags_x86_sse2; then @@ -42,29 +40,16 @@ multilib_src_configure() { myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - ECONF_SOURCE=${S} econf ${myconf} + econf ${myconf} } -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_test() { +src_test() { emake check VALGRIND= } -multilib_src_install() { +src_install() { emake DESTDIR="${D}" install -} -multilib_src_install_all() { if use doc; then rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die fi diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest index f35155826c44..7d68fc0ed74a 100644 --- a/dev-libs/xmlrpc-c/Manifest +++ b/dev-libs/xmlrpc-c/Manifest @@ -3,7 +3,5 @@ AUX xmlrpc-c-1.51.06-pkg-config-openssl.patch 1244 BLAKE2B be5e48daa409cb67ae5f7 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1 EBUILD xmlrpc-c-1.51.06-r2.ebuild 2220 BLAKE2B 0da9ca0b686fb0e01bb9eb9310ee15de032cd2d21114525132125af4dadd4e1256e5bae0701dd422100303f96ddf5e2806b9acdd4021c180097260450e6af11c SHA512 36b12377551f37c6bf8411f4ef5899bb52550135e6c8b963016efc9ab0f07bd3fbd414bb3a16045ee63d872d53efc353d92ff304e9d678d1c9b3a93f8c341baa -EBUILD xmlrpc-c-1.51.06-r3.ebuild 2416 BLAKE2B 05ad0438a4a14830aa461fe146ad32d951f0df3681ef9517fd584a4ae3f5af360cc22e7c5748d46aaa96595ec62594640a1b1ef1a7fcdfafe1941eb189a7b9d9 SHA512 a8f9edfd8d5533f9f5c954b0fa03dcc09b30ce9cebe64d37fe71db13c5c13a640aeea165349a876e18c4bdbef8b40604d126b75456f4ebba73a3461270ab7e7e -EBUILD xmlrpc-c-1.54.05-r1.ebuild 2423 BLAKE2B 828387b760176093e38f1b1827c43ada80e2f5b5fa2b3d69d44e0238a4b828e43a70e98b28f63e8fcccfcdcd8e5af5cf59c20af69f062b103ac462123a037a25 SHA512 6ccbb74044cb3a1cc8da1f9e14c6050ef431b957ab5d9dc910c7acbf47e3b6c9c42d29b2d39175cdf35d50d7cf8a66f584906fdfbe29c570dfde1238ce87dd72 -EBUILD xmlrpc-c-1.54.05.ebuild 2233 BLAKE2B e7fae962a0dbabc1f40f1286a0873695c3dfe500326404d3058979cdefdde7943629c3b4e5bb2fd38741d5ab5d77b850756dc669ed0241e52869a7416ded05e9 SHA512 8c7e928a659357fb2c5fcfeef55fe7e30fbe857c625d84e07222713c9ef497c16af16c9ce08425115b1d2c109ae0cb2c28bb25003a3a633aebdc63a18a711022 +EBUILD xmlrpc-c-1.54.05-r2.ebuild 2019 BLAKE2B d11dc16b23051a481b9f330eeb0914b2c8d35dce98391b982f70946d113ee5a08f57be88691212cdc177d7a874e2a04764c2fed5d503045ad656e7117e397606 SHA512 82e5dcea08828ca2158cc59707bff1730eb14cd637bccc585d34290d90d2ad35b4458ce74df67c9c783a58c0828439d932d0c4325c21e08dcf0a6a8ac5e52819 MISC metadata.xml 628 BLAKE2B 3d59eebbcf6eddfba969215a990fd59daa58b78dc305f05d10ba9f77f3ce5d5edbed0599644b40574beacb3c1e084af745bc2d75f0cb660968f4e3bf963c4f00 SHA512 fd572b06cc3359372e5b048d721b33d6bb614ab631fec95628af36217f94434fc9f279d83ec0de8828cd72265158b1a88f58418f94fb2e3d3e82de117c7bea71 diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild deleted file mode 100644 index 2f376e845193..000000000000 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html -# 1. Only the "Super Stable" series is released as a tarball -# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/ -# Because of this, we are following the "Super Stable" release channel - -DESCRIPTION="A lightweight RPC library based on XML and HTTP" -HOMEPAGE="http://xmlrpc-c.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0/4.51" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="abyss +cgi +curl +cxx +libxml2 threads test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="test? ( abyss curl cxx )" - -RDEPEND=" - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0=[${MULTILIB_USEDEP}] - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch - "${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch -) - -pkg_setup() { - use curl || ewarn "Curl support disabled: No client library will be built" -} - -src_prepare() { - sed -i \ - -e "/CFLAGS_COMMON/s|-g -O3$||" \ - -e "/CXXFLAGS_COMMON/s|-g$||" \ - common.mk || die - - default - - # Out-of-source install phase is broken - multilib_copy_sources -} - -multilib_src_configure() { - tc-export PKG_CONFIG - - ECONF_SOURCE="${S}" \ - econf \ - --disable-libwww-client \ - --disable-wininet-client \ - --without-libwww-ssl \ - $(use_enable abyss abyss-server) \ - $(use_enable cgi cgi-server) \ - $(use_enable curl curl-client) \ - $(use_enable cxx cplusplus) \ - $(use_enable libxml2 libxml2-backend) \ - $(use_enable threads abyss-threads) -} - -multilib_src_compile() { - default_src_compile - # Tools building is broken in this release - #multilib_is_native_abi && use tools && emake -rC "${S}"/tools -} - -multilib_src_test() { - # Needed for tests, bug #836469 - cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die - default_src_test -} - -#multilib_src_install_all() { -# # Tools building is broken in this release -# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -#} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild index c473a0e5f5f2..185a023016a1 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit toolchain-funcs # Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html # 1. Only the "Super Stable" series is released as a tarball @@ -17,18 +17,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0/4.54" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - IUSE="abyss +cgi +curl +cxx +libxml2 threads test" - RESTRICT="!test? ( test )" - REQUIRED_USE="test? ( abyss curl cxx )" RDEPEND=" - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0=[${MULTILIB_USEDEP}] - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + sys-libs/ncurses:= + sys-libs/readline:= + curl? ( net-misc/curl ) + libxml2? ( dev-libs/libxml2 ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -43,21 +40,17 @@ pkg_setup() { } src_prepare() { + default + sed -i \ -e "/CFLAGS_COMMON/s|-g -O3$||" \ -e "/CXXFLAGS_COMMON/s|-g$||" \ common.mk || die - - default - - # Out-of-source install phase is broken - multilib_copy_sources } -multilib_src_configure() { +src_configure() { tc-export PKG_CONFIG - ECONF_SOURCE="${S}" \ econf \ --disable-libwww-client \ --disable-wininet-client \ @@ -70,19 +63,16 @@ multilib_src_configure() { $(use_enable threads abyss-threads) } -multilib_src_compile() { - default_src_compile +src_compile() { + default + # Tools building is broken in this release - #multilib_is_native_abi && use tools && emake -rC "${S}"/tools + #use tools && emake -rC "${S}"/tools } -multilib_src_test() { - # Needed for tests, bug #836469 - cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die - default_src_test -} +src_install() { + default -#multilib_src_install_all() { -# # Tools building is broken in this release -# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -#} + # Tools building is broken in this release + #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild deleted file mode 100644 index b09f6997a32b..000000000000 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html -# 1. Only the "Super Stable" series is released as a tarball -# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/ -# Because of this, we are following the "Super Stable" release channel - -DESCRIPTION="A lightweight RPC library based on XML and HTTP" -HOMEPAGE="http://xmlrpc-c.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0/4.54" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="abyss +cgi +curl +cxx +libxml2 threads test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="test? ( abyss curl cxx )" - -RDEPEND=" - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0=[${MULTILIB_USEDEP}] - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - use curl || ewarn "Curl support disabled: No client library will be built" -} - -src_prepare() { - sed -i \ - -e "/CFLAGS_COMMON/s|-g -O3$||" \ - -e "/CXXFLAGS_COMMON/s|-g$||" \ - common.mk || die - - default - - # Out-of-source install phase is broken - multilib_copy_sources -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --disable-libwww-client \ - --disable-wininet-client \ - --without-libwww-ssl \ - $(use_enable abyss abyss-server) \ - $(use_enable cgi cgi-server) \ - $(use_enable curl curl-client) \ - $(use_enable cxx cplusplus) \ - $(use_enable libxml2 libxml2-backend) \ - $(use_enable threads abyss-threads) -} - -multilib_src_compile() { - default_src_compile - # Tools building is broken in this release - #multilib_is_native_abi && use tools && emake -rC "${S}"/tools -} - -multilib_src_test() { - # Needed for tests, bug #836469 - cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die - default_src_test -} - -#multilib_src_install_all() { -# # Tools building is broken in this release -# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -#} |