diff options
Diffstat (limited to 'app-arch')
37 files changed, 438 insertions, 691 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex d53de5fc71d9..6d29b9044514 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest index b23c10102163..241dc5608aea 100644 --- a/app-arch/advancecomp/Manifest +++ b/app-arch/advancecomp/Manifest @@ -1,3 +1,4 @@ +AUX advancecomp-2.2_pre20190301-gcc-11.patch 7012 BLAKE2B ba239903860dbebec89d102f7417bc1db83129a762dfa59ed81ea46ef0ca58720556f0e697a05a995d095f1f33540538dcebeff98bc228b870ff84e267a51fa1 SHA512 a122abb506667203d202da35796f4f59bf050aa25edeec644bbf9c6ccd2fb841c1b3e8df9b782af0d84dd6362d2722044cc54d53c5923da5a47fc6296322d16e DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7 -EBUILD advancecomp-2.2_pre20190301.ebuild 1002 BLAKE2B a43008f31eda3336f4b529db071b61e02b362f5f6b3da59fe77b064a31134626e2bc4643b6eebc6c5702fb229ff0fdb8057414c57d5f406db6de39272b2714eb SHA512 522bf7d3aada96ed7507a3b48244b6dbb50cb83b12b1e4a3d0f2ecff4a849fc2b192642a3678fc05aeb61ed4a9b4a2e9fba5178581ce7640b9d516ab19e3fd1b +EBUILD advancecomp-2.2_pre20190301.ebuild 1047 BLAKE2B 38f4a51875c94066ca1145cef0c9da2dadcb99126b81cbe7752b82fcc61db2f7381ffd94adf6d60d5a23c93b6da6e2f04c608dbb2a348bf61d46d97e3b9f7474 SHA512 cf1fbb54db472e22fd28385e789a2e79030b6edf7d3f109ab74a4a5a5f4c608b5ca0f103112384d5c5e82910987aff680c18c31dd8ad64cc35a0ce281b1f23fd MISC metadata.xml 389 BLAKE2B ed897e83e347f7fc4b6e6fa63d80411e17976e1a31643ca586f3a842745673f690ceeff904b0fffcf39633002525d603fb01cac62caff5e8bc4639e14ecea3aa SHA512 d8b6d613b1fc382dc8add3ace9f08eec9d479e0460db597e241edfcc5b398f8916eeb8958eaca6588a00ce8fd8a9c2833a12b422256d4629eac573f59780dd0a diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild index e103631dcc47..edb31f6a8c44 100644 --- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild +++ b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,6 +10,7 @@ DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression" HOMEPAGE="https://www.advancemame.it/comp-readme.html" SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz" +S=${WORKDIR}/${PN}-${EGIT_COMMIT} LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT" SLOT="0" @@ -24,7 +25,9 @@ DEPEND="${RDEPEND}" # https://sourceforge.net/p/advancemame/bugs/270/ RESTRICT="test" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} +PATCHES=( + "${FILESDIR}"/${P}-gcc-11.patch +) src_prepare() { default diff --git a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch b/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch new file mode 100644 index 000000000000..b72a6824a305 --- /dev/null +++ b/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch @@ -0,0 +1,184 @@ +From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 28 Apr 2021 22:11:42 +0200 +Subject: [PATCH] Remove dynamic exception specification to fix C++17 + compatibility + +The dynamic exception specifications have been deprecated in C++11 +and eventually removed in C++17 [1]. GCC-11 uses gnu++17 by default, +causing advancecomp to fail to compile: + + In file included from rezip.cc:24: + file.h:70:43: error: ISO C++17 does not allow dynamic exception specifications + 70 | bool file_exists(const std::string& file) throw (error); + | ^~~~~ + file.h:71:75: error: ISO C++17 does not allow dynamic exception specifications + 71 | e(const std::string& path, const char* data, unsigned size) throw (error); + | ^~~~~ + ... + +Since there is really no gain from having these specifications anymore, +just remove them to fix the build. + +[1] https://en.cppreference.com/w/cpp/language/except_spec +--- + file.cc | 26 +++++++++++++------------- + file.h | 24 ++++++++++++------------ + 2 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/file.cc b/file.cc +index 1e90348..d676d25 100644 +--- a/file.cc ++++ b/file.cc +@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly) + /** + * Check if a file exists. + */ +-bool file_exists(const string& path) throw (error) ++bool file_exists(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s) != 0) { +@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error) + /** + * Write a whole file. + */ +-void file_write(const string& path, const char* data, unsigned size) throw (error) ++void file_write(const string& path, const char* data, unsigned size) + { + FILE* f = fopen(path.c_str(), "wb"); + if (!f) +@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro + /** + * Read a whole file. + */ +-void file_read(const string& path, char* data, unsigned size) throw (error) ++void file_read(const string& path, char* data, unsigned size) + { + file_read(path, data, 0, size); + } +@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error) + /** + * Read a whole file. + */ +-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error) ++void file_read(const string& path, char* data, unsigned offset, unsigned size) + { + FILE* f = fopen(path.c_str(), "rb"); + if (!f) +@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t + /** + * Get the time of a file. + */ +-time_t file_time(const string& path) throw (error) ++time_t file_time(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s)!=0) +@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error) + /** + * Set the time of a file. + */ +-void file_utime(const string& path, time_t tod) throw (error) ++void file_utime(const string& path, time_t tod) + { + struct utimbuf u; + +@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error) + /** + * Get the size of a file. + */ +-unsigned file_size(const string& path) throw (error) ++unsigned file_size(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s)!=0) +@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error) + /** + * Get the crc of a file. + */ +-crc_t file_crc(const string& path) throw (error) ++crc_t file_crc(const string& path) + { + unsigned size = file_size(path); + +@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error) + /** + * Copy a file. + */ +-void file_copy(const string& path1, const string& path2) throw (error) ++void file_copy(const string& path1, const string& path2) + { + unsigned size; + +@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error) + /** + * Move a file. + */ +-void file_move(const string& path1, const string& path2) throw (error) ++void file_move(const string& path1, const string& path2) + { + if (rename(path1.c_str(), path2.c_str())!=0 + && errno==EXDEV) { +@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error) + /** + * Remove a file. + */ +-void file_remove(const string& path1) throw (error) ++void file_remove(const string& path1) + { + if (remove(path1.c_str())!=0) { + throw error() << "Failed remove of " << path1; +@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error) + /** + * Rename a file. + */ +-void file_rename(const string& path1, const string& path2) throw (error) ++void file_rename(const string& path1, const string& path2) + { + if (rename(path1.c_str(), path2.c_str())!=0) { + throw error() << "Failed rename of " << path1 << " to " << path2; +@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw () + /** + * Make a drectory tree. + */ +-void file_mktree(const std::string& path) throw (error) ++void file_mktree(const std::string& path) + { + string dir = file_dir(path); + string name = file_name(path); +diff --git a/file.h b/file.h +index 1b0cf85..49429b5 100644 +--- a/file.h ++++ b/file.h +@@ -67,18 +67,18 @@ typedef unsigned crc_t; + crc_t crc_compute(const char* data, unsigned len); + crc_t crc_compute(crc_t pred, const char* data, unsigned len); + +-bool file_exists(const std::string& file) throw (error); +-void file_write(const std::string& path, const char* data, unsigned size) throw (error); +-void file_read(const std::string& path, char* data, unsigned size) throw (error); +-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error); +-time_t file_time(const std::string& path) throw (error); +-void file_utime(const std::string& path, time_t tod) throw (error); +-unsigned file_size(const std::string& path) throw (error); +-crc_t file_crc(const std::string& path) throw (error); +-void file_copy(const std::string& path1, const std::string& path2) throw (error); +-void file_move(const std::string& path1, const std::string& path2) throw (error); +-void file_remove(const std::string& path1) throw (error); +-void file_mktree(const std::string& path1) throw (error); ++bool file_exists(const std::string& file); ++void file_write(const std::string& path, const char* data, unsigned size); ++void file_read(const std::string& path, char* data, unsigned size); ++void file_read(const std::string& path, char* data, unsigned offset, unsigned size); ++time_t file_time(const std::string& path); ++void file_utime(const std::string& path, time_t tod); ++unsigned file_size(const std::string& path); ++crc_t file_crc(const std::string& path); ++void file_copy(const std::string& path1, const std::string& path2); ++void file_move(const std::string& path1, const std::string& path2); ++void file_remove(const std::string& path1); ++void file_mktree(const std::string& path1); + + std::string file_temp(const std::string& path) throw (); + std::string file_randomize(const std::string& path, int n) throw (); diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest index 4e2b877872f7..2c57330099af 100644 --- a/app-arch/brotli/Manifest +++ b/app-arch/brotli/Manifest @@ -1,5 +1,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 8b90b73dacd0a643ed34441378026d5e20a5c50797e8dcac32f9627db5b7aebaa65cff74cf30ab6cb4c6cd6c1a5fc529c73fb0d7d2859e486e9a1406b274a0fd SHA512 6becec9055b96298bd5ce44c5af713901febe38db8160a2499bb63e41adb9386dd3b16160f5852e4df4d36bb26aa014dfb59fcc9d0ad37f85c5ac0a77def0c9f -EBUILD brotli-9999.ebuild 1645 BLAKE2B 9c910229d35e60c5141e51dcefa7d3c7f5e5df9e58a94f6a727e6936d65354b7593fa389658a2f8eb9e948eec676b9ee78ff33830f8bb58fe7b8e1f2764c1272 SHA512 49a056058706f2411dd654f1fd5f093b27798cc6129b16b31c976e5c70c5d422d8a9d540e9cf27c2d1f83c32f88d4ef466a78972f0b56319c72b4620951a8ec8 +EBUILD brotli-1.0.9-r2.ebuild 1844 BLAKE2B 9ab0224a88f895446a0237d083fb85931436c5aac47c26001e9556eed631d15ad166d094e05bb44b73ea00acd38a105469a9e8017a89a48f3aafa7e1d7d14a78 SHA512 0043e2af0bde7cb003cdbdf3e07da80164097c7220ace7666888dacc7a54f8ab8f649758e9a140cbeb354600643b198d1fa4b406331cca419b8eeaecfb487225 +EBUILD brotli-9999.ebuild 1730 BLAKE2B ff641ac49dd29a27469afda38b84dff17a623aa7863e310b03b88723d35483bbdb622d2f9b7a6fb8b363bfacdacb275c8e9cbd29a1bf1d1c051a01c220a5e2c3 SHA512 258cc7962e09c5fe2e4f05b5fe82213f5ba607535b64579178af0661b85a768974061fc4a020920018f8ce1268251820f86277177d5d4cec195454e4eb8dc0f7 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild new file mode 100644 index 000000000000..9f152be136aa --- /dev/null +++ b/app-arch/brotli/brotli-1.0.9-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_OPTIONAL="1" +DISTUTILS_IN_SOURCE_BUILD="1" + +inherit cmake-multilib distutils-r1 + +DESCRIPTION="Generic-purpose lossless compression algorithm" +HOMEPAGE="https://github.com/google/brotli" + +SLOT="0/$(ver_cut 1)" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" + +IUSE="python static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +LICENSE="MIT python? ( Apache-2.0 )" + +DOCS=( README.md CONTRIBUTING.md ) + +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +# tests are currently broken, see https://github.com/google/brotli/issues/850 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PV}-linker.patch" +) + +src_prepare() { + use python && distutils-r1_src_prepare + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + ) + cmake-utils_src_configure +} +src_configure() { + cmake-multilib_src_configure + use python && distutils-r1_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile +} +src_compile() { + cmake-multilib_src_compile + use python && distutils-r1_src_compile +} + +python_test() { + esetup.py test || die +} + +multilib_src_test() { + cmake-utils_src_test +} +src_test() { + cmake-multilib_src_test + use python && distutils-r1_src_test +} + +multilib_src_install() { + cmake-utils_src_install + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die +} +multilib_src_install_all() { + use python && distutils-r1_src_install +} diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index d84bfa85b3e9..87affbe108c9 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -17,7 +17,7 @@ SLOT="0/$(ver_cut 1)" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" -IUSE="python test" +IUSE="python static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" LICENSE="MIT python? ( Apache-2.0 )" @@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/google/${PN}.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi @@ -73,6 +73,7 @@ src_test() { multilib_src_install() { cmake-utils_src_install + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } multilib_src_install_all() { use python && distutils-r1_src_install diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 6423992774c4..ba5d28e84df6 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1,24 +1,11 @@ AUX bzip2-1.0.3-no-test.patch 165 BLAKE2B 48f0f9393d1f7e6f56c93ecc53e80ea7507b7ac921e0d459082c9ac51eb98f9e89233c12975c2346b1c7e424e505116df881b1e57207a7ef325e0c55e2ce90ce SHA512 c6064aada01b9eebdaf5350bcc0f9b52dcc03fa8b5e361d5cb09260de0d301c190e406c5daa0edfb808bc2cb5061a4cd5361f920741024b750fa8e7570715e95 -AUX bzip2-1.0.4-POSIX-shell.patch 676 BLAKE2B f6ba04224ad924979221924dc81398455404a18b36754bc104ec67c4aa44e15512e51b84f5247f4737b1e242b5aa1497c76ebfd5cefa05d3ed4cfb2ee53c1781 SHA512 66e02e9422ecee1ae6e8e007eba95581313fcfa5703fa648470ff8975b5453e3d5323a4acf6264658612a6a2972e5c74cce061ce749e51d5e74769d068e4b365 AUX bzip2-1.0.4-makefile-CFLAGS.patch 577 BLAKE2B adc265fbd71745e1f688c85386e48389c15569263861efa3aaa76a0328d71724fda22a23e95234cc13c90c95536b21e776bebffa79433d4f42e82d44c88588a7 SHA512 031780e77710619eb8c91350885a602b1cc1768e3776e46313a9535df6d8eb9502fa99624d81e5eccdebfaf97786148c3cd10fb2faed69c5a2ba24158915c0cd AUX bzip2-1.0.4-man-links.patch 402 BLAKE2B 9a3cabc0e3964f75408445d7a2d94422ffa38e22d0869e4f97b252ef2947173ab9a504f0c1cd82fc7479494038f899f4a2429e39729d6f3d80e570ca8ef97797 SHA512 91abd3af9ffb339cbf85e28cc65b9193d8799d81281320d4709e234f3f40483b390fd9517ad3a8aab8d240f011786df8f17e9240104a43d1292bca983c1c22cc -AUX bzip2-1.0.6-CVE-2016-3189.patch 594 BLAKE2B b4a9f6e0267637d1f815e1b8cdbddfdd5e54fcc05cbd2f31c7e64494626b7531f2bb2b5ae8b288ce0ca116abc131235dbf31f32411b58b91e156a136adbc7ad1 SHA512 0b1d5814b93397c588c9b22a7bba57e2a7360ec30a781ca3c9236781089fb8e9f0393a9fd93c880517d084f54712b631302cffa4af81a91dff791717645ec81b -AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d381ee87de8f725ed39b936e778ab517d00807a3a84120802d23fc5b54df48b3d33bebb18c7f9ba1c9afa961cc SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 -AUX bzip2-1.0.6-nselectors-upper-bound-check.patch 1061 BLAKE2B 884403bac278b7a6ed486372a948ba5b96b9faab3cd43548e0c1ec58f15c713d0acf09b4180dc33f4135511f259f5c23794d061bf9790195034b0e0260870709 SHA512 f7a17bfe8e6a420b3ad0e2a37e34201318d4a869ad0e626a7247a005823efb4460a7aec5d3f465ebdd02a02ad9076fab3ddbcb6262044f03c60e6cb104eeb32d -AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7 -AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab -AUX bzip2-1.0.6-ubsan-error.patch 921 BLAKE2B a2d746725ed9e40f24ac7c83cdbea06884e0013121bad5a2c748975817293c8f300735d46c85e646e008a54d49d002331a86a31726bc7231451514e628ad4637 SHA512 871ad39056b5b5dba35d90f30e1753569241f1054a2564f115d65186232fd84c427c92199e88ba012b4a646d9f18469b3681ef2992ec028b1004f6b7e13a110d -AUX bzip2-1.0.7-out-of-tree-build.patch 1997 BLAKE2B f4cb04658aa8bba2300a07080009e4b949875e206e302b0d39167899f507572d5f2a2065a22a2df70c3513e8c26bc4a89de7cf3dd8a3850061cd774236a194bd SHA512 f2c8a5ca920f5c3d6a515692fd657e10f381257bca14c1a296b6f54a8823a223aa8da881f9618df035601afad6778ba374a11d83ebf993f7f2e4c51855399e77 -AUX bzip2-1.0.7-saneso.patch 463 BLAKE2B e16398fa15e9eae5f277c1b075c171c351f234e403386c4a8702f9dc7ed2999ac9735f130796d3dab8349222a33997d371d873a76d8cf6c1e3300b88e9a40e17 SHA512 a039db1147236245743b844f68543f58f39e7e996f90d8e444d3b385bb56717ceb66703696be486fd57094971e52d88a87e36fcdd46cf8aa7f935bb7245b0723 AUX bzip2-1.0.8-mingw.patch 330 BLAKE2B 27cfec9fb3fb16f624445d0f035d56a6a747eaa1e602f92e651e6c041bb94ff78a17d0fb03314e2c1ac52afdff42f58cce725f1d733052ad3c4ad2574fe5a1c8 SHA512 49accf2bf744079b5fc4e4349e26dfaaf79a791ac871ffeb1220f8a3c700ca9d502ae78a8ec57b06f072707de1a0df64799d2bc6fe5f26d2c2b58637bb9103f4 AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a01908fcd2eb8f1b187c822991d818011e49165abaed679d899a2fa29adb6751faa82659e31c6e0f853b4548061f2913cb0cd18 SHA512 9008152aeb299825635eb9b6f4887951ba6ec190b7e545e12d82e2222ba4ed1ceb31e3eef1275b5f196b726e34a04da1e7c2c95a694c7c771a8852f20a1bf305 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8 -DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 -DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 -EBUILD bzip2-1.0.6-r11.ebuild 3150 BLAKE2B da2e8941f3208aff465b1850b244e523a4ac34eccb53c022ebc41d4dc8c035e88bdb452aeff1a2124e98a8ba8d705c42d7c930979fb2d97102a99f49124d366c SHA512 c083fb1551974b95e285e5c8795dd5474451048407aea61aeb441c5d5fb67e9dadeccbc151dfa746df6dc51464b5f3ef4901da7d08fe32c499333790775d81ee -EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379 EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild deleted file mode 100644 index 1484da57cb92..000000000000 --- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly -# (since we're building shared libs) ... - -EAPI=6 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="static static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.6-saneso.patch - "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 - "${FILESDIR}"/${PN}-1.0.6-progress.patch - "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 - "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch - "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 - "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch - "${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch -) - -DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) -HTML_DOCS=( manual.html ) - -src_prepare() { - default - - # - Use right man path - # - Generate symlinks instead of hardlinks - # - pass custom variables to control libdir - sed -i \ - -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ - -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - Makefile || die -} - -bemake() { - emake \ - VPATH="${S}" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - "$@" -} - -multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -s libbz2.so.${PV} libbz2.so || die - bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" -} - -multilib_src_install() { - into /usr - - # Install the shared lib manually. We install: - # .x.x.x - standard shared lib behavior - # .x.x - SONAME some distros use #338321 - # .x - SONAME Gentoo uses - dolib.so libbz2.so.${PV} - local v - for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do - dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} - done - use static-libs && dolib.a libbz2.a - - if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover - into / - dobin bzip2 - fi -} - -multilib_src_install_all() { - # `make install` doesn't cope with out-of-tree builds, nor with - # installing just non-binaries, so handle things ourselves. - insinto /usr/include - doins bzlib.h - into /usr - dobin bz{diff,grep,more} - doman *.1 - - dosym bzdiff /usr/bin/bzcmp - dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 - - dosym bzmore /usr/bin/bzless - dosym bzmore.1 /usr/share/man/man1/bzless.1 - - local x - for x in bunzip2 bzcat bzip2recover ; do - dosym bzip2.1 /usr/share/man/man1/${x}.1 - done - for x in bz{e,f}grep ; do - dosym bzgrep /usr/bin/${x} - dosym bzgrep.1 /usr/share/man/man1/${x}.1 - done - - einstalldocs - - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 -} diff --git a/app-arch/bzip2/bzip2-1.0.7-r1.ebuild b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild deleted file mode 100644 index 37ab7244dad5..000000000000 --- a/app-arch/bzip2/bzip2-1.0.7-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly -# (since we're building shared libs) ... - -EAPI=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="static static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.7-saneso.patch - "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 - "${FILESDIR}"/${PN}-1.0.6-progress.patch - "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 - "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.7-out-of-tree-build.patch -) - -DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) -HTML_DOCS=( manual.html ) - -src_prepare() { - default - - # - Use right man path - # - Generate symlinks instead of hardlinks - # - pass custom variables to control libdir - sed -i \ - -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ - -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - Makefile || die -} - -bemake() { - emake \ - VPATH="${S}" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - "$@" -} - -multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -s libbz2.so.${PV} libbz2.so || die - bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" -} - -multilib_src_install() { - into /usr - - # Install the shared lib manually. We install: - # .x.x.x - standard shared lib behavior - # .x.x - SONAME some distros use #338321 - # .x - SONAME Gentoo uses - dolib.so libbz2.so.${PV} - local v - for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do - dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} - done - use static-libs && dolib.a libbz2.a - - if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover - into / - dobin bzip2 - fi -} - -multilib_src_install_all() { - # `make install` doesn't cope with out-of-tree builds, nor with - # installing just non-binaries, so handle things ourselves. - insinto /usr/include - doins bzlib.h - into /usr - dobin bz{diff,grep,more} - doman *.1 - - dosym bzdiff /usr/bin/bzcmp - dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 - - dosym bzmore /usr/bin/bzless - dosym bzmore.1 /usr/share/man/man1/bzless.1 - - local x - for x in bunzip2 bzcat bzip2recover ; do - dosym bzip2.1 /usr/share/man/man1/${x}.1 - done - for x in bz{e,f}grep ; do - dosym bzgrep /usr/bin/${x} - dosym bzgrep.1 /usr/share/man/man1/${x}.1 - done - - einstalldocs - - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 -} diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch deleted file mode 100644 index 74f8df000b1a..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch +++ /dev/null @@ -1,21 +0,0 @@ -bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those -with calls to sed so POSIX shells work - -http://bugs.gentoo.org/193365 - ---- a/bzgrep -+++ b/bzgrep -@@ -63,10 +63,9 @@ - bzip2 -cdfq "$i" | $grep $opt "$pat" - r=$? - else -- j=${i//\\/\\\\} -- j=${j//|/\\|} -- j=${j//&/\\&} -- j=`printf "%s" "$j" | tr '\n' ' '` -+ # the backslashes here are doubled up as we have to escape each one for the -+ # shell and then escape each one for the sed expression -+ j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '` - bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|" - r=$? - fi diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch deleted file mode 100644 index b031c808fef3..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Backport -https://bugzilla.suse.com/attachment.cgi?id=681334 - -CVE: CVE-2016-3189 -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: bzip2-1.0.6/bzip2recover.c -=================================================================== ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch deleted file mode 100644 index 51469ca4c96e..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch +++ /dev/null @@ -1,27 +0,0 @@ -make it build for mingw targets - -https://bugs.gentoo.org/393573 - ---- a/bzip2.c -+++ b/bzip2.c -@@ -129,7 +129,7 @@ - #if BZ_LCCWIN32 - # include <io.h> - # include <fcntl.h> --# include <sys\stat.h> -+# include <sys/stat.h> - - # define NORETURN /**/ - # define PATH_SEP '\\' ---- a/bzlib.h -+++ b/bzlib.h -@@ -81,6 +81,9 @@ typedef - /* windows.h define small to char */ - # undef small - # endif -+# ifndef WINAPI -+# define WINAPI -+# endif - # ifdef BZ_EXPORT - # define BZ_API(func) WINAPI func - # define BZ_EXTERN extern diff --git a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch deleted file mode 100644 index a7731f7de8f7..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001 -From: Amin Hassani <ahassani@chromium.org> -Date: Fri, 8 Mar 2019 09:58:20 -0800 -Subject: [PATCH] Check for upper bounds of nselectors. - -Currently there is no check for the upper bounds of the -nselectors. Hence, a corrupt input can cause a segfault. - -This issue was discovered by one of our fuzzers. The actual error was: - -../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]' ---- - decompress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/decompress.c b/decompress.c -index 311f566..391552d 100644 ---- a/decompress.c -+++ b/decompress.c -@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s ) - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); - if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.21.0.360.g471c308f928-goog - diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch deleted file mode 100644 index 806339ebb6b4..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,6 @@ libbz2.a: $(OBJS) - - check: test - test: bzip2 -- @cat words1 - ./bzip2 -1 < sample1.ref > sample1.rb2 - ./bzip2 -2 < sample2.ref > sample2.rb2 - ./bzip2 -3 < sample3.ref > sample3.rb2 -@@ -66,7 +65,6 @@ test: bzip2 - cmp sample1.tst sample1.ref - cmp sample2.tst sample2.ref - cmp sample3.tst sample3.ref -- @cat words3 - - install: bzip2 bzip2recover - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -@@ -115,25 +113,8 @@ clean: - sample1.rb2 sample2.rb2 sample3.rb2 \ - sample1.tst sample2.tst sample3.tst - --blocksort.o: blocksort.c -- @cat words0 -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c --bzip2.o: bzip2.c -- $(CC) $(CFLAGS) -c bzip2.c --bzip2recover.o: bzip2recover.c -- $(CC) $(CFLAGS) -c bzip2recover.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< - - - distclean: clean ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -36,9 +36,7 @@ OBJS= blocksort.o \ - - all: $(OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.6 libbz2.so.1.0 -+ ln -sf libbz2.so.1.0.6 libbz2.so.1.0 - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared -@@ -43,17 +43,5 @@ all: $(OBJS) - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared - --blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch deleted file mode 100644 index 52ea791ce34a..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -35,8 +35,8 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 - diff --git a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch deleted file mode 100644 index 84b811177ed5..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Manoj Gupta <manojgupta@google.com> - -Use unsigned 1 for shifting instead of signed 1. - -This fixed an issue with shift caught by undefined behavior -sanitizer in clang. -bzip2-1.0.6/blocksort.c:255:7 -runtime error: left shift of 1 by 31 places cannot be represented in type 'int' - ---- a/blocksort.c -+++ b/blocksort.c -@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap, - bhtab [ 0 .. 2+(nblock/32) ] destroyed - */ - --#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) --#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) --#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) -+#define SET_BH(zz) bhtab[(zz) >> 5] |= (1u << ((zz) & 31)) -+#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1u << ((zz) & 31)) -+#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1u << ((zz) & 31))) - #define WORD_BH(zz) bhtab[(zz) >> 5] - #define UNALIGNED_BH(zz) ((zz) & 0x01f) - diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch deleted file mode 100644 index 64cca58eac34..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- bzip2-1.0.7/Makefile -+++ bzip2-1.0.7/Makefile -@@ -54,7 +54,6 @@ - - check: test - test: bzip2 -- @cat words1 - ./bzip2 -1 < sample1.ref > sample1.rb2 - ./bzip2 -2 < sample2.ref > sample2.rb2 - ./bzip2 -3 < sample3.ref > sample3.rb2 -@@ -67,7 +66,6 @@ - cmp sample1.tst sample1.ref - cmp sample2.tst sample2.ref - cmp sample3.tst sample3.ref -- @cat words3 - - install: bzip2 bzip2recover - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -@@ -113,25 +111,8 @@ - sample1.rb2 sample2.rb2 sample3.rb2 \ - sample1.tst sample2.tst sample3.tst - --blocksort.o: blocksort.c -- @cat words0 -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c --bzip2.o: bzip2.c -- $(CC) $(CFLAGS) -c bzip2.c --bzip2recover.o: bzip2recover.c -- $(CC) $(CFLAGS) -c bzip2recover.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< - - - distclean: clean ---- bzip2-1.0.7/Makefile-libbz2_so -+++ bzip2-1.0.7/Makefile-libbz2_so -@@ -36,24 +36,10 @@ - - all: $(OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.7 libbz2.so.1.0 -+ ln -sf libbz2.so.1.0.7 libbz2.so.1.0 - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 libbz2.so.1.0 bzip2-shared - --blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch deleted file mode 100644 index d63226684f66..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- bzip2-1.0.7/Makefile-libbz2_so -+++ bzip2-1.0.7/Makefile-libbz2_so -@@ -35,8 +35,8 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.7 libbz2.so.1.0 - diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 19142566ccb9..35f57ddea0fe 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,4 +1,6 @@ AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614 DIST file-roller-3.38.1.tar.xz 875572 BLAKE2B 29a05d48971c2172177bd1aa52448ed5432a69733644b131517dbd7dd50cab971801d1bff5837dba74ae48ea0487614c7c7ebd4669f04f7d42e6257161fe1776 SHA512 b1936481140084c84d7bdbf361859b0ff1fed8329e26b692f0f0c8d1a3a1ec494b493aa0fb4de9f0ea5004b18e4bd69859656fe424bf413d720b04fc56e453f6 +DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26 EBUILD file-roller-3.38.1.ebuild 2180 BLAKE2B c2c10d784a90e57eb4a3f44511689e02042db061636c3055a97f54ed7449d6b8aa4b5dde339bd445025c395046a3b1aaf207763409c735e0d15def8b706d3ef4 SHA512 7b6bac2e9da061aa93d8b5da88d44090e20ad1dc01bf1bf3b95ba2532489ae5911f4c809fab528b5101c9d22a54b5813a1a8fcd0e589245ffb09f8c0d7c35a7c +EBUILD file-roller-3.40.0.ebuild 2195 BLAKE2B 316198d0d16c5480edb28ea6c141209e645acf760ba4223b069a02a0f6a79330122f9b18d96455f71bba8dcb5e2d8cc2a8ae6e651eb442d5d19eb70dd5b29a4d SHA512 11c0c1b25ff40ade00ab0a934616de2fbd1487d4ec25b23a7eca2b48c6e10df5814d88d0602e2a026fccbf22d1a680909bbb18031ee38f10f79f93f49756322e MISC metadata.xml 522 BLAKE2B 555fc1eb7ab102a7bd439544e158c0a554b8dee1d3891dbc3b9441c5063ad2666795c682e9ade30a920daabe5788017a67680095832e760b9c9c666dcba94928 SHA512 6a8988a025352b00d1dff7b4ab3f75bfb4f95b890a1e1b0fcfdd840a67fe4897dfcce275f8ff439345f094924c72171b1d03e70106f84bd8e0aff8de5510d698 diff --git a/app-arch/file-roller/file-roller-3.40.0.ebuild b/app-arch/file-roller/file-roller-3.40.0.ebuild new file mode 100644 index 000000000000..bcde653bb444 --- /dev/null +++ b/app-arch/file-roller/file-roller-3.40.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg + +DESCRIPTION="Archive manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" +IUSE="libnotify nautilus" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# gdk-pixbuf used extensively in the source +# cairo used in eggtreemultidnd.c +# pango used in fr-window +RDEPEND=" + >=app-arch/libarchive-3.2:= + >=dev-libs/glib-2.38:2 + >=dev-libs/json-glib-0.14 + >=x11-libs/gtk+-3.22.0:3 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango + libnotify? ( >=x11-libs/libnotify-0.4.3:= ) + nautilus? ( >=gnome-base/nautilus-3.28.0 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +${PN} is a frontend for several archiving utilities. If you want a +particular archive format support, see ${HOMEPAGE} +and install the relevant package. For example: +7-zip - app-arch/p7zip +ace - app-arch/unace +arj - app-arch/arj +brotli - app-arch/brotli +cpio - app-arch/cpio +deb - app-arch/dpkg +iso - app-cdr/cdrtools +jar,zip - app-arch/zip and app-arch/unzip +lha - app-arch/lha +lzop - app-arch/lzop +lz4 - app-arch/lz4 +rar - app-arch/unrar or app-arch/unar +rpm - app-arch/rpm +unstuff - app-arch/stuffit +zstd - app-arch/zstd +zoo - app-arch/zoo" + +src_prepare() { + # File providing Gentoo package names for various archivers + cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die + + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Drun-in-place=false + $(meson_feature nautilus nautilus-actions) + $(meson_feature libnotify notification) + -Dpackagekit=false + -Dlibarchive=enabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest index f928ffdd5e0f..b76dad601bbe 100644 --- a/app-arch/gnome-autoar/Manifest +++ b/app-arch/gnome-autoar/Manifest @@ -1,3 +1,5 @@ DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc +DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968 EBUILD gnome-autoar-0.3.1.ebuild 936 BLAKE2B 1127152a69f70e7027e61eaccb6e8ae84c399e057ae17db77d0cd1484e596e9b0c5f203bb6ee6862decffeb3e7a2d91d40287085ceb92f6f2e1cffdda4d8d748 SHA512 83f69975a3ab7345ee07ca627ecd7bee5be1a9aa5890f7e4ff0d72e2ff783134d97aff66e3cc267074bfa0bd1b895f33325c57c5e027464850078334edb96c73 +EBUILD gnome-autoar-0.3.2.ebuild 939 BLAKE2B fea7fb981052b074386410ba62748af7a4fd09e08c11794a8f330123fcf988a92f132e30277b4ea632680e2ccb963dd8d4ab03583ff0629294234a2deac18c58 SHA512 afd3808574bd3a393e77ade4779ec49ccaa889a543d31e01d3dbec0dd92dfc5bf77d9f5946cacc3cb24da68ca8b357b61168363a7a932074c1c2fa7d053dad04 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild new file mode 100644 index 000000000000..5ef87130fe55 --- /dev/null +++ b/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 vala + +DESCRIPTION="Automatic archives creating and extracting library" +HOMEPAGE="https://git.gnome.org/browse/gnome-autoar" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="gtk +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + >=app-arch/libarchive-3.4.0 + >=dev-libs/glib-2.35.6:2 + gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) + introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/gtk-doc-am-1.14 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) \ + $(use_enable vala) \ + $(use_enable gtk) +} diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index c3f9c3dbe804..d20c9e6360d7 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,5 +1,4 @@ -AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996 -EBUILD libarchive-3.5.1.ebuild 3890 BLAKE2B ba23ff4c95a0a4022f7175fb30f626ba3fea138220ad3c9075849001e30ac101739ade752458fe48753ea3eb5501ed84e9048464a7a7f4fd4f7e5dd54135e414 SHA512 c8062458251fad902c29b39a57284631a2d3babe7ca4ecc4a2b1b46ea1b5b8babf05a174be2ea4910f5768bf1db32b88dffa7c6b272bbfc7b63e31b78f2a8a37 +EBUILD libarchive-3.5.1.ebuild 3768 BLAKE2B c2d8d0cfe99fedfa134f22d9f7147fe443270a9bc1ea31c1277459b52bb2ec6bd2db0b9c2e3b9962fd7b0516d20231abbf2efeecd30ec4bad204ebf945813c49 SHA512 275df5dfeef66002bf0005049f3d82eff1f7b59ed9bcc42b14b026492962b842c67b3ba342259cecfca5d2dab1cd4668e86cee8e177dab2c1669d378b8d74d15 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7 diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch deleted file mode 100644 index 4d7c0ec7cf37..000000000000 --- a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libarchive/archive_openssl_evp_private.h -+++ b/libarchive/archive_openssl_evp_private.h -@@ -28,7 +28,8 @@ - #include <openssl/evp.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include <stdlib.h> /* malloc, free */ - #include <string.h> /* memset */ - static inline EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild index 2db8781cfd2a..1319a7f8b960 100644 --- a/app-arch/libarchive/libarchive-3.5.1.ebuild +++ b/app-arch/libarchive/libarchive-3.5.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" +IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" RDEPEND=" acl? ( virtual/acl[${MULTILIB_USEDEP}] ) @@ -23,8 +23,7 @@ RDEPEND=" kernel_linux? ( xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) @@ -38,7 +37,6 @@ DEPEND="${RDEPEND} )" PATCHES=( - "${FILESDIR}"/${PN}-3.3.3-libressl.patch "${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch # drop on next release ) diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest index a341a4d94120..3749a0453c16 100644 --- a/app-arch/ncompress/Manifest +++ b/app-arch/ncompress/Manifest @@ -1,7 +1,3 @@ -DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3 -DIST ncompress-4.2.4.6.tar.gz 36006 BLAKE2B 1460fe803ed621e5e6e5ab506d8909acbfb1d3b91421cf7c7bc10b6b03b0cb6bb4ea616240a7aa500813d5fbf0a958e1e981da8a5f752d985ddcbf7fe9280d9c SHA512 03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42 -EBUILD ncompress-4.2.4.5.ebuild 714 BLAKE2B 5ca2a9af0133f965c7efa35f8c9d3d63baf65feac1d3fc80473fe2d21be7335b0723da863d9af705fe7bbf62509cf1e909f87c98c0d648ef8be7101370fa46d1 SHA512 1331f5cb39d5d9346f61ff944985c72c134ccd3e016981bc363bb52eda85c9f97c7d069288477b724c20e26fe27b8db1d007a15b61a6abeab1c76e210f73ca56 -EBUILD ncompress-4.2.4.6.ebuild 757 BLAKE2B 1d2c306d614db2608463f3d1db440c6c96732642a94c1dadb69dcc790c4b2f728ba80ed9308a326669bb57d21b37d228be54dbaa73742028b98ad099838c7ef5 SHA512 86704d7ea8d9cba09042fb814c464878787c028ad3d6509133ca2df00f823eda37f61b466a21374a35967a23f46480504f861c55bbcc28cb2e3988f902279c5c EBUILD ncompress-5.0.ebuild 750 BLAKE2B ac8723df91a087aa45d41904b9586cfd0055f0e67cecbf0aca2ef009c70926af8e4e397a9a40fc4bb45741c203d533bf32e4927be9bd485554d1581ad74f6dbd SHA512 e4aa5c3b4e261f2bd6810f212a224ac9e5a6714071e477db1067212d71707406172edb34af8bd0e9481db6fbc63e7516326210ed3d296c5f6ef3359fbdbb00aa MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13 diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild deleted file mode 100644 index 6e674e404fac..000000000000 --- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files" -HOMEPAGE="https://github.com/vapier/ncompress" -SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -src_compile() { - tc-export CC - emake -} - -src_install() { - dobin compress - dosym compress /usr/bin/uncompress - doman compress.1 uncompress.1 - dodoc Acknowleds Changes LZW.INFO README.md -} diff --git a/app-arch/ncompress/ncompress-4.2.4.6.ebuild b/app-arch/ncompress/ncompress-4.2.4.6.ebuild deleted file mode 100644 index b6a8705dfcee..000000000000 --- a/app-arch/ncompress/ncompress-4.2.4.6.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files" -HOMEPAGE="https://vapier.github.io/ncompress/" -SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - default - sed -i 's:\bln :ln -s :' Makefile.def || die -} - -src_configure() { - tc-export CC -} - -src_install() { - emake install_core DESTDIR="${ED}" PREFIX="/usr" - dodoc Acknowleds Changes LZW.INFO README.md -} diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest index 1e5fa619de16..f8bc85ea2ba2 100644 --- a/app-arch/sharutils/Manifest +++ b/app-arch/sharutils/Manifest @@ -2,6 +2,5 @@ AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b6 AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d -EBUILD sharutils-4.15.2-r1.ebuild 1096 BLAKE2B 5e92d730f975a4e4c6e0dd929cb8060148af9c8a2b028392960aeec2fd0e6d08dba11216cb0e13b0b8c8dd9edf4a13e58e4562ca496435e3fd92205059a265b8 SHA512 9ec4c419729eb958a797b53b944fb7bfbb383bb765cfb7f10f9261096ffb2ed045734a2625125cac3a8114a822378f75086f3cb8bbb5af3f020898f88548e602 EBUILD sharutils-4.15.2-r2.ebuild 1069 BLAKE2B f61c80d519df1a6eae837be805e91397a6f090cd410573966dd89b046ce4393ea25879821365191090bbe5628a6b761b9329b476a4537683f5b52e8e3de7356a SHA512 8c3ac5cc174e7fc4ef557ba5cf9246889139164de365d0d347bdbadcd67c0a9cbfe492cc09f621b61e5ce9486ac33d690b8e0f7cddd00b8d75b2583e0004a7f1 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94 diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild deleted file mode 100644 index 8b17c701b23b..000000000000 --- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch l10n flag-o-matic - -MY_P="${P/_/-}" -DESCRIPTION="Tools to deal with shar archives" -HOMEPAGE="https://www.gnu.org/software/sharutils/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="nls" - -DEPEND="app-arch/xz-utils - sys-apps/texinfo - nls? ( >=sys-devel/gettext-0.10.35 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - epatch "${FILESDIR}/sharutils-4.15.2-glibc228.patch" - epatch "${FILESDIR}/sharutils-4.15.2-CVE-2018-1000097.patch" - epatch "${FILESDIR}/sharutils-4.15.2-gcc-10.patch" - - # Upstream is aware but thinks this isn't a bug/problem in sharutils itself - # See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html - append-cflags $(test-flags-CC -Wno-error=format-security) -} - -src_configure() { - strip-linguas -u po - econf $(use_enable nls) -} diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest index dbb22d45f038..93aee68bae49 100644 --- a/app-arch/unshield/Manifest +++ b/app-arch/unshield/Manifest @@ -1,4 +1,4 @@ AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa -EBUILD unshield-1.4.3.ebuild 912 BLAKE2B 5803850c79d2a0363d0445adf383ba60cce30d93e38edc3f9d541b6afff4014467a858a4588418079d7fa5a0ff488f38ea2ab08c3f5c495538409710ba5e6442 SHA512 c5072b15623ff9927bcbd822a23a80430cd57aacf590c16a72de9e5b6a0e3a0f7c33cf92a3d472dbae85185baaff16f5dadc72fcc2de8f6ae4e151e669bac5dd +EBUILD unshield-1.4.3.ebuild 825 BLAKE2B 4189b7544ffbba11f833d3447b7ab76ad7ea8fd011c17760215a21a0dea3bb611df3c50d0cd73ca8dfc2ff44814e655419e821ab2750cbe4137916c992c1f9c9 SHA512 1919b5fced6ad0f9b667839239f2b6dfeae724a7e2c8d4ce2af254b085abf8aadc13317c2b8f08f9b41b9533ddef96341a00a1ea1b0d16f920e88053f038ca21 MISC metadata.xml 251 BLAKE2B 2a365fe10b8039e015f37a0d9600d841dae51c6b14197a58f901c55af5eca111ee054674bbc294961c042e4445b6953b424f57149ef3f153c74999bd4613ccf8 SHA512 b8b90af336a046be33f7296d073b2be30c006fb5997ad3e65666231efa3fe55eebbaf7da468529831d79cbca17fbfc9be9e7c12189f1faca083d356eec765a73 diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild index 6f191e78c819..7cd9b3ff46e4 100644 --- a/app-arch/unshield/unshield-1.4.3.ebuild +++ b/app-arch/unshield/unshield-1.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,17 +13,15 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86" -# OpenSSL (or LibreSSL) is detected at build time, and used to determine +# OpenSSL is detected at build time, and used to determine # whether or not a hand-rolled md5 implementation is used. The build # system prefers OpenSSL's implementation if it's available, and OpenSSL # is common enough, so we prefer it too. Since the dependency is -# automagic (there's no way to hide it), we require Open/LibreSSL +# automagic (there's no way to hide it), we require OpenSSL # unconditionally. -IUSE="libressl" DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/zlib" RDEPEND="${DEPEND}" diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest index 11648292c9fd..e92854104c15 100644 --- a/app-arch/xar/Manifest +++ b/app-arch/xar/Manifest @@ -4,7 +4,7 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762 -EBUILD xar-1.8-r2.ebuild 1496 BLAKE2B 737b07466392835311009bdb16f0fef85471a8ce6b395381d55477e83448a31d44f6e4fc7c6da67770339b67c79dcc53da6d0e3ea1cac115fe26cfa37789aa24 SHA512 9c7d378512c85960e83ed94089b2971f73ac9888f2357fa5ca0aff031cb3296679d2989360452dc76900c5fd92a2a3806814997d23d81981d62658abd4663d5b -EBUILD xar-1.8-r3.ebuild 2045 BLAKE2B 183951d2e5503fac78474dee403c64087acd87e3ead8fd6d5ff0f0012eba80b37c1dd3e3a4cc0577cb77a2f3be451342eeb247c7ce21e606b34a971398aa3079 SHA512 853148a764583ebbf2f4ae492bd4880945c1584a33ae1512c2d9de33c3d39e3423c37eee48154c166ce12fa61c8afdc67364db35b597cdc7e28daecdf8dd3ca9 -EBUILD xar-1.8-r4.ebuild 2511 BLAKE2B f8ef096dd9d6f81b4b4443e65cd06168f3ae9ca4e248cbd3a44ab8a66b086dd1729ef9517600ebcf7f2e532bc83f9a72f0197b1c8532e52edba7023283d9299e SHA512 9993026f1a7013d283fd452690f555577199e1e818370123bcc174cfa055c67bc9a61f5568c303c969d9eaef0d53cb0add268553cd90645815d69db5f2464e13 +EBUILD xar-1.8-r2.ebuild 1415 BLAKE2B f55f09ee399e2f99aad1a0b3f488edea094085132dcf6498370ae366ec62effaa079d90806dfd77a72f1452f4380ce4a0762ed5bb3c9442119dca8fae5294f60 SHA512 5a7198d75841f02f8da6ecf53b861511afdfb586b092c55867e7f5969db66121076d9968322d4e3a2c3e3dc3ccbc6e02ceed1ab8246b34bffe027d5cbf20006e +EBUILD xar-1.8-r3.ebuild 1964 BLAKE2B 753173b5aee76ec4348b1ef2a263800c0145dbc6c7ecee05f8d0654e79396fed6debf19960412d527456e5d71dd84495ffd672a375eb39cc07314c217f9efbe3 SHA512 294295ed07c38ec2f248192875d72fd2bfd8ad3ece0045c7930bd8dde61547017b08287695a7ae212dcc3a3d638603df2baa46d8bb8d42fdf293cbb116e9762f +EBUILD xar-1.8-r4.ebuild 2419 BLAKE2B 79f316c9983b4d02e7c344f3604e3c9d74b26179482998e1fd9e9ca797aa90d50a5a7791ff0075d163260a99565ba61e3eb11b33ef6ebd6ca3e5afb8bf724abc SHA512 d3849273275eba79b7888f7774853f96b53bac5291cafe1617f714ed29b0fd0ae78d8333ecefa10fa0d4de796f0280b55eb1f8fb526556e7b08f7bebbad9583f MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1 diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild index 3f30d62f1a98..6fb089e9d2eb 100644 --- a/app-arch/xar/xar-1.8-r2.ebuild +++ b/app-arch/xar/xar-1.8-r2.ebuild @@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libressl kernel_Darwin" +IUSE="kernel_Darwin" RDEPEND=" !kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) app-arch/bzip2[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild index d3b4fc4be1a4..c7375f6ef613 100644 --- a/app-arch/xar/xar-1.8-r3.ebuild +++ b/app-arch/xar/xar-1.8-r3.ebuild @@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libressl kernel_Darwin" +IUSE="kernel_Darwin" RDEPEND=" !kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) app-arch/bzip2[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild index d73ec3eae709..bd2ed21471e2 100644 --- a/app-arch/xar/xar-1.8-r4.ebuild +++ b/app-arch/xar/xar-1.8-r4.ebuild @@ -12,13 +12,11 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libressl" DEPEND=" elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] app-arch/bzip2[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] dev-libs/libxml2[${MULTILIB_USEDEP}] @@ -54,7 +52,7 @@ src_prepare() { # drop Darwin specific reliance on CommonCrypto Framework, for it # depends on what version of Darwin we're on, and it is much simpler - # to just use open/libressl instead, which we maintain and control + # to just use openessl instead, which we maintain and control cd "${S}" || die sed -i -e 's/__APPLE__/__NO_APPLE__/' \ include/archive.h \ |