diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-07 17:49:35 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-07 17:49:35 +0000 |
| commit | e6b606d3a4611bac95e48273005bed6452f1b9a9 (patch) | |
| tree | bd54f0f3519ef95c0cc6f0c7021f9763698c6f4d | |
| parent | e7dd7a91d3e665d1f007d469c2395dcb9fa045e0 (diff) | |
| download | baldeagleos-repo-e6b606d3a4611bac95e48273005bed6452f1b9a9.tar.gz baldeagleos-repo-e6b606d3a4611bac95e48273005bed6452f1b9a9.tar.xz baldeagleos-repo-e6b606d3a4611bac95e48273005bed6452f1b9a9.zip | |
Updating liguros repo
83 files changed, 1288 insertions, 907 deletions
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest index 5f6e91b411cd..3ef15e1c78a0 100644 --- a/app-arch/rar/Manifest +++ b/app-arch/rar/Manifest @@ -1,9 +1,12 @@ DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147 +DIST rarlinux-6.0.0_p20201201.tar.gz 609227 BLAKE2B 8cf0052a7b2d53c57ae5e24290f24f4815815682a199d99a9b4fe120d01b3c31699bf6cdf46ddabc144944ab7437fff4043f16153770c7e732ee337082308978 SHA512 1c7abf04b2fc67dbc329210ffba707faf2d368750789cab695a45f25381f219cf9c7ad09a071b9caf4889ffae24b87260ebdfd18900891230c1fc2d8ba7a9fd7 DIST rarlinux-6.0_beta1_p20201022.tar.gz 609438 BLAKE2B ab4793431f5d1d1570e1046868004722a39614ca4c3174d8f0cb2c67db0d138565e524deace2319dbbb853e3d4b33f35ae583596c6f77f52724e48484787c776 SHA512 668d0a4fa610aa71d5b69cace186c8d33683337bb88aa5e7f5ffeb5a314b666277205f0d6962cf6203dc3bfe0c2ec4fe2b38ede90754709f89479168bdd050d8 DIST rarlinux-6.0_beta2_p20201112.tar.gz 609761 BLAKE2B 77acd1811cdafd85f317f7e96cfe5d69113ff25cbd9409bbb8d653bdc28f51a349f1df91c729543498d19704e253b2f58bee86ab1046e4ff51872fcf827c14f9 SHA512 510df1dece1154e1a0d951866965cc002a5044adf86a2e01b50a65a6a05e762bcb611d25ee051a4fcb1f8721d1b43bfb1bf69bccffc8c407b93a5de2d06a0d3d DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562 +DIST rarlinux-x64-6.0.0_p20201201.tar.gz 598314 BLAKE2B 778e4f2360617ae04a30cafdec54485c757c0aae66c925c353047850a9873a536e258d8835d78cdcf6b69b4000814c242db311fda74a8dee492bd5916c879e79 SHA512 7a9fbed46954c06b15109a5af6a945702e0dec949349e17b7e31753a04298abfb80c6f2514224926aea920d26f2f2578ae8fca61c8ee3f1883e9ed60139e0968 DIST rarlinux-x64-6.0_beta1_p20201022.tar.gz 598338 BLAKE2B a0af6342f71a6ae448ce8b3fdc49dfd022337d74364d17f8135eb3c32d3d778857e9a4ef7e819d336581f477713a647be22377ced2d50faba4ab4a0c6e14f49c SHA512 312c1a59236cb32df69462bead45df5fa4f8180a8c075c964d508326027f2182cc8a1e31347fcb7570ff18d105a8df7abb5adf463a34f41c8f3e091cfba7f0fc DIST rarlinux-x64-6.0_beta2_p20201112.tar.gz 598386 BLAKE2B 49202329698dd8c26fecd74e48cad2583507a727049281e36130cb7408f64e0530245fab8aba4a8ad6ca6a48af6bd35beefec777d185b578a02a81e1bf00cc10 SHA512 6b61b2ce0efb8c44db5217ccb8e52d5e7e1efd95a9daeb3be6af30eed08993269389ab16faf5d9cfc0f562a0e9fb26ec4f8c73b72e4e0edefdc936e7f3821f66 DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6 +DIST winrar-x64-6.0.0_p20201201.exe 3334088 BLAKE2B 37d7d4c3ede27a049eb3ca42b944e49570cd109c2c940ddaa40139700ed7ad32d292bdec6d9d6b60908bbeba2e363b8013cc91331419325dc4d3c1613b93d782 SHA512 c161d760070a133f249fba8730fa7268435b3c7f32f5cfa59ec228f3c7a94e915f0a201749e234df0314f1b436d8d46365bf1a7fc118a9b34e8f7419cb556b71 DIST winrar-x64-6.0_beta1_p20201022.exe 3334400 BLAKE2B 61615920c38671649fe44b3c50f0427c82ba36cc5d610eeeeda5ec8acbc465b2e2a9573875a3efc5082bef24b3e1f1490e47eaf47d0a326aaade8ed3c3231cad SHA512 26bcfef84aa20eaed415b088e5a69fd2833baf3f660c38e58f26a04e6754335603f0d5e89e802b02acbef43ecbe43b45f810f5682c5857fbad1689c44c80bc9a DIST winrar-x64-6.0_beta2_p20201112.exe 3335984 BLAKE2B 2c9a3a44887990bb3ca36ca6797cf968bb65f082abaf4a843b5b69c1d562d331ec0622e79d631255519d769252e6c29e2a44db1a7555a05a290401c8eff30533 SHA512 b90290214254322acad10e6e56f904b3719d46c1c16bf384801050f8fc5a826a22de6e8d031fca2c67ab9da74916f3f6294152a43ab640d027ae2fa375a30ac9 diff --git a/app-arch/rar/rar-6.0.0_p20201201.ebuild b/app-arch/rar/rar-6.0.0_p20201201.ebuild new file mode 100644 index 000000000000..7623c5c7ee5d --- /dev/null +++ b/app-arch/rar/rar-6.0.0_p20201201.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="RAR compressor/uncompressor" +HOMEPAGE="https://rarlab.com/" +URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz" +URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz" +URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe" +SRC_URI="x86? ( ${URI_x86} ) + amd64? ( ${URI_amd64} ) + all_sfx? ( + ${URI_x86} + ${URI_amd64} + ${URI_w64} + )" + +LICENSE="RAR BSD BSD-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="all_sfx" +RESTRICT="mirror bindist" + +DEPEND="all_sfx? ( app-arch/unrar )" +RDEPEND="sys-libs/glibc" + +S="${WORKDIR}/${PN}" + +QA_FLAGS_IGNORED="opt/rar/default.sfx + opt/rar/default-elf32.sfx + opt/rar/default-elf64.sfx + opt/rar/default-win32.sfx + opt/rar/default-win64.sfx + opt/rar/WinCon.SFX + opt/rar/WinCon64.SFX + opt/rar/Zip.SFX + opt/rar/Zip64.SFX + opt/rar/unrar + opt/rar/rar" +QA_PRESTRIPPED=${QA_FLAGS_IGNORED} + +src_unpack() { + local _file + + for _file in ${A}; do + if [[ "${_file}" == rarli* ]]; then + if [[ "${_file}" =~ x64 ]]; then + if ! use amd64; then + continue + fi + + unpack "${_file}" + elif [[ ! "${_file}" =~ x64 ]]; then + if ! use x86; then + continue + fi + + unpack "${_file}" + else + die "Unknown SRC file '${_file}'!" + fi + fi + done + + rm -f "${S}"/license.txt + + if use all_sfx ; then + mkdir sfx + cd sfx + for _file in ${A}; do + if [[ "${_file}" == rarli* ]]; then + unpack "${_file}" + if [[ "${_file}" =~ x64 ]]; then + mv rar/default.sfx default-elf64.sfx || die + else + mv rar/default.sfx default-elf32.sfx || die + fi + elif [[ "${_file}" == winrar* ]]; then + ln -s "${DISTDIR}"/${_file} w64.rar || die + unpack ./w64.rar + mv Default.SFX default-win32.sfx || die + mv Default64.SFX default-win64.sfx || die + else + die "Unknown SFX file '${_file}'!" + fi + done + fi +} + +src_compile() { :; } + +src_install() { + exeinto /opt/rar + doexe rar unrar + + dodir /opt/bin + dosym ../rar/rar /opt/bin/rar + dosym ../rar/unrar /opt/bin/unrar + + insinto /opt/rar + if use all_sfx ; then + doins "${WORKDIR}"/sfx/*.{sfx,SFX} + else + doins default.sfx + fi + doins rarfiles.lst + dodoc *.txt +} diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index d179adc75de0..2373dcf538df 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -3,9 +3,10 @@ EAPI=7 +LUA_COMPAT=( lua5-2 ) PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit autotools flag-o-matic perl-module python-single-r1 +inherit autotools flag-o-matic lua-single perl-module python-single-r1 DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="https://rpm.org @@ -20,7 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ RESTRICT="test" IUSE="acl caps doc dbus lua nls python selinux test +zstd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND="!app-arch/rpm5 app-arch/libarchive @@ -36,7 +38,7 @@ CDEPEND="!app-arch/rpm5 dev-libs/nss python? ( ${PYTHON_DEPS} ) nls? ( virtual/libintl ) - lua? ( dev-lang/lua:5.2 ) + lua? ( ${LUA_DEPS} ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) @@ -52,6 +54,7 @@ RDEPEND="${CDEPEND} " pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index 744bb8e8413a..e681321b7406 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -1,3 +1,4 @@ DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1 DIST unrar-6.0.1.tar.gz 232142 BLAKE2B 0f048f67769b31c67988131b5d8cca33dc9fa2abc6b39e5be63aa8f6061cbf93fa7d7e2055641f286f6be4de2733d2a123441d26381335e2779b3c7d7004ad11 SHA512 2c88dd05252237d7d62ad34332673ac9e457bb43b0ed980be977d557d0deb3d5bd19372d41ac2e254d94e20ecb1ca62b1c15781320cf231f2a7bfa12fe176d8a DIST unrar-6.0.2.tar.gz 232306 BLAKE2B d0f410364d2be74dbcc061b8f54b79eb37f7d66e1910e3c6a80c59cf3d4e14a39cf0fb2f465f94757a2c30b886dff0b970fc44dbc166c50f5357e56148f82367 SHA512 fd5598499863f734563213acb67cee41c997eac69c5814d275468c9eb627286c016de23ddbf9c96ef9ba0b985ac57476b26382c8263d8f81c55b8bca1c013671 +DIST unrar-6.0.3.tar.gz 232331 BLAKE2B bcea5219daf8338cbb73fc43131d1c7e7a4c576164a30d79352d1bb3a96b3c66fd190dc40a5149b9bf38e723c0654bc5d5d45e246276c2ea18c1c8dc9904e555 SHA512 1ec20e7a122cb7f48936c691a8c3dc96b4dd989aa8416e6a96332733a0839490996baa22f709af3eb07be17e5987d871f995b5dbc36284cb951bed8047bdfb7c diff --git a/app-arch/unrar/unrar-6.0.3.ebuild b/app-arch/unrar/unrar-6.0.3.ebuild new file mode 100644 index 000000000000..bd059f18fdd7 --- /dev/null +++ b/app-arch/unrar/unrar-6.0.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib toolchain-funcs + +MY_PN="${PN}src" + +DESCRIPTION="Uncompress rar files" +HOMEPAGE="https://www.rarlab.com/rar_add.htm" +SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="unRAR" +# subslot = soname version +SLOT="0/6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" + +S="${WORKDIR}/unrar" + +PATCHES=( + "${FILESDIR}"/${PN}-5.9.3-build.patch + "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch +) + +src_prepare() { + default + + local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) + if [[ ${CHOST} == *-darwin* ]] ; then + sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) + else + sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" ) + fi + sed -i "${sed_args[@]}" makefile || die +} + +src_configure() { + mkdir -p build-{lib,bin} + printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die + cp build-{lib,bin}/Makefile || die +} + +src_compile() { + unrar_make() { + emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" + } + + unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die + + unrar_make -C build-bin +} + +src_install() { + dobin build-bin/unrar + dodoc readme.txt + + dolib.so build-lib/libunrar* + + insinto /usr/include/libunrar${PV%.*.*} + doins *.hpp + dosym libunrar${PV%.*.*} /usr/include/libunrar + + find "${ED}" -type f -name "*.a" -delete || die +} diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-4.4.4-r10.ebuild new file mode 100644 index 000000000000..cc44dcb5cad6 --- /dev/null +++ b/app-editors/scite/scite-4.4.4-r10.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +inherit lua-single toolchain-funcs xdg-utils + +DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" +HOMEPAGE="https://www.scintilla.org/SciTE.html" +SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" + +LICENSE="HPND lua? ( MIT )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="lua" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/pango + lua? ( ${LUA_DEPS} )" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig" + +DOCS=("../README") + +S="${WORKDIR}/${PN}/gtk" + +pkg_pretend() { + if tc-is-clang ; then + # need c++17 features + [[ "${MERGE_TYPE}" != "binary" && + $(clang-major-version) -lt 5 ]] && + die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5 + ($(clang-major-version))." + + elif tc-is-gcc; then + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && + $(gcc-major-version) -lt 7 ]] && + die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7." + else + die "Either gcc or clang should be configured for building scite" + fi +} + +src_prepare() { + tc-export AR CC CXX RANLIB + + # remove hardcoded CC, Optimizations and clang unknown flags + sed -i "${WORKDIR}/scintilla/gtk/makefile" \ + -e "s#^CC = gcc#CC = ${CC}#" \ + -e "s#^CC = clang#CC = ${CC}#" \ + -e "s#^CXX = clang++#CXX = ${CXX}#" \ + -e "s#-Os##" \ + -e "s#-Wno-misleading-indentation##" \ + || die "error patching /scintilla/gtk/makefile" + + sed -i "${S}/makefile" \ + -e "s#^CC = clang#CC = ${CC}#" \ + -e "s#^CXX = clang++#CXX = ${CXX}#" \ + -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ + -e "s#-Os##" \ + || die "error patching gtk/makefile" + + # repair and enhance the .desktop file + sed -i "${S}/SciTE.desktop" \ + -e "s#text/plain#text/\*;application/xhtml+xml#" \ + -e "s#^Categories=\(.*\)#Categories=Development;#" \ + || die "error patching /scite/gtk/SciTe.desktop" + + # add the ebuild suffix as shell type for working with ebuilds + sed -i "${WORKDIR}/scite/src/perl.properties" \ + -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ + || die "error patching /scite/src/perl.properties" + + # it seems that pwd here is ${S}, but user patches are relative to ${workdir} + # Bug #576162 + + cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" + eapply_user +} + +src_compile() { + # prepare make options + local emake_pars=("GTK3=1") + + tc-is-clang && emake_pars+=("CLANG=1") + use !lua && emake_pars+=("NO_LUA=1") + + emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" + emake "${emake_pars[@]}" +} + +# want to use the base src_install() as base_src_install() + +src_install() { + default + dosym SciTE /usr/bin/scite +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index b0938cd2c57b..7cd135ccfa6e 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,6 +1,2 @@ -DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7 -DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f -DIST docker-compose-1.27.2.tar.gz 309004 BLAKE2B 1017016989b25afa812d2e7251c6dbf45922867d66ef0c69292889a5de8f31908c8d2f418b2c29c319fbd7d0ba4e213d932665e7128b61164295105f35b23579 SHA512 2156a2b283d0ace6a8bfb0d6bbe93bfca7cd651c30fdeea4e1fa2acc6a85790d34a869d4625ef83ad11e9ecc1fbc1e9acac6f40eb8ef5225ccc36bab2ddcf847 -DIST docker-compose-1.27.3.tar.gz 309220 BLAKE2B eaf066f24bfff893e515a460be9abba79a59e5112a3a34a9002870babefd93950cf92ef66db469102c37e781d7fb986de069eef3fa09e4041b3a43d8bf1a3d30 SHA512 43e34760574d1ec009faa7a1fa09d621a2708f01f05819b46c67fe7ebf280807f97d9a5867cbfe75e9af6f097cd3f7c8c8fee66aa5392a4c62cdf44c7fb38075 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80 DIST docker-compose-1.28.0_rc1.tar.gz 313984 BLAKE2B 3307aab3ec842d21de73ab282905016f6b0934a2ce9d1dde474ea1e7c5894cea028363c03ec9f597cb3e9b2910e9286b2ffb3070885b20787f28767fec909a73 SHA512 87704f16bd2d6551fed0b3d38264e10cf12604f40a68637ac9dacc3aebe618872f54a890aa6bb1412143055021751bcba1b542d51b252e78b0b8948e2b8cc8fd diff --git a/app-emulation/docker-compose/docker-compose-1.25.5.ebuild b/app-emulation/docker-compose/docker-compose-1.25.5.ebuild deleted file mode 100644 index 4c5c31e1e139..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.25.5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - dev-python/ddt[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.25.2-setup-py.patch -) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/docker-compose/docker-compose-1.26.2.ebuild b/app-emulation/docker-compose/docker-compose-1.26.2.ebuild deleted file mode 100644 index 43ef4d191590..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.26.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.2.2[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.26.2-setup-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/docker-compose/docker-compose-1.27.2.ebuild b/app-emulation/docker-compose/docker-compose-1.27.2.ebuild deleted file mode 100644 index b14e56f561f0..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.27.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/docker-compose/docker-compose-1.27.3.ebuild b/app-emulation/docker-compose/docker-compose-1.27.3.ebuild deleted file mode 100644 index b14e56f561f0..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.27.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch deleted file mode 100644 index 3af8d2de06e6..000000000000 --- a/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 19d9b58b97127f24e2280e3119e420393e7d239f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Mon, 20 Jan 2020 19:27:46 +0100 -Subject: [PATCH] setup.py: Drop generic upper version boundaries - ---- - setup.py | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/setup.py b/setup.py -index 110441d..3f6a46f 100644 ---- a/setup.py -+++ b/setup.py -@@ -30,35 +30,35 @@ def find_version(*file_paths): - - - install_requires = [ -- 'cached-property >= 1.2.0, < 2', -- 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 6', -- 'requests >= 2.20.0, < 3', -- 'texttable >= 0.9.0, < 2', -- 'websocket-client >= 0.32.0, < 1', -- 'docker[ssh] >= 3.7.0, < 5', -- 'dockerpty >= 0.4.1, < 1', -- 'six >= 1.3.0, < 2', -- 'jsonschema >= 2.5.1, < 4', -+ 'cached-property >= 1.2.0', -+ 'docopt >= 0.6.1', -+ 'PyYAML >= 3.10', -+ 'requests >= 2.20.0', -+ 'texttable >= 0.9.0', -+ 'websocket-client >= 0.32.0', -+ 'docker[ssh] >= 3.7.0', -+ 'dockerpty >= 0.4.1', -+ 'six >= 1.3.0', -+ 'jsonschema >= 2.5.1', - ] - - - tests_require = [ -- 'pytest < 6', -+ 'pytest', - ] - - - if sys.version_info[:2] < (3, 4): -- tests_require.append('mock >= 1.0.1, < 4') -+ tests_require.append('mock >= 1.0.1') - - extras_require = { -- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', -- 'ipaddress >= 1.0.16, < 2'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], -+ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], -+ ':python_version < "3.4"': ['enum34 >= 1.0.4'], -+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -+ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', -+ 'ipaddress >= 1.0.16'], -+ ':sys_platform == "win32"': ['colorama >= 0.4'], -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], - } - - --- -2.24.1 - diff --git a/app-emulation/docker-compose/files/docker-compose-1.26.2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.26.2-setup-py.patch deleted file mode 100644 index 6c678326952c..000000000000 --- a/app-emulation/docker-compose/files/docker-compose-1.26.2-setup-py.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 067109b44ae049c3f6d72c6dc80e387ff8750b17 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Tue, 30 Jun 2020 21:00:28 +0200 -Subject: [PATCH] setup.py: Drop generic upper version boundaries - ---- - setup.py | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/setup.py b/setup.py -index ac55ce4..dd69bba 100644 ---- a/setup.py -+++ b/setup.py -@@ -30,38 +30,38 @@ def find_version(*file_paths): - - - install_requires = [ -- 'cached-property >= 1.2.0, < 2', -- 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 6', -- 'requests >= 2.20.0, < 3', -- 'texttable >= 0.9.0, < 2', -- 'websocket-client >= 0.32.0, < 1', -- 'distro >= 1.5.0, < 2', -- 'docker[ssh] >= 4.2.2, < 5', -- 'dockerpty >= 0.4.1, < 1', -- 'six >= 1.3.0, < 2', -- 'jsonschema >= 2.5.1, < 4', -- 'python-dotenv >= 0.13.0, < 1', -+ 'cached-property >= 1.2.0', -+ 'docopt >= 0.6.1', -+ 'PyYAML >= 3.10', -+ 'requests >= 2.20.0', -+ 'texttable >= 0.9.0', -+ 'websocket-client >= 0.32.0', -+ 'distro >= 1.5.0', -+ 'docker[ssh] >= 4.2.2', -+ 'dockerpty >= 0.4.1', -+ 'six >= 1.3.0', -+ 'jsonschema >= 2.5.1', -+ 'python-dotenv >= 0.13.0', - ] - - - tests_require = [ -- 'ddt >= 1.2.2, < 2', -- 'pytest < 6', -+ 'ddt >= 1.2.2', -+ 'pytest', - ] - - - if sys.version_info[:2] < (3, 4): -- tests_require.append('mock >= 1.0.1, < 4') -+ tests_require.append('mock >= 1.0.1') - - extras_require = { -- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', -- 'ipaddress >= 1.0.16, < 2'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], -+ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], -+ ':python_version < "3.4"': ['enum34 >= 1.0.4'], -+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -+ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', -+ 'ipaddress >= 1.0.16'], -+ ':sys_platform == "win32"': ['colorama >= 0.4'], -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], - 'tests': tests_require, - } - --- -2.26.2 - diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest index 2828f6596759..31ac8cfa2924 100644 --- a/app-portage/fetchcommandwrapper/Manifest +++ b/app-portage/fetchcommandwrapper/Manifest @@ -1,4 +1 @@ -DIST fetchcommandwrapper-0.8.1.tar.gz 3579 BLAKE2B c2bf9bf5c463c264ace781a513e4943c4dc4196bfbef1e14112f673d0662c89b947daa860abe3b9b4a2cbf88d5cf6743670da7dbcec13876db7fdad2051e8e7f SHA512 087cbeaeb3126fe43708e453bc1a21a8957c47a9dedaac336bc9e6222191bf8aaafea17031b3e6d011b8bfd34483b521410eb84be43d226e5fb1ce1eccf4d4af -DIST fetchcommandwrapper-0.8.2.tar.gz 3878 BLAKE2B aefedc663cb59190353b9148807466cc26855ff2c9693e6152cac3d4137e3f0426d2f2787d34a5f3c620f4014e5cd7fbb11463929a635e8e0d261e2e487b8921 SHA512 b6417aa0db803f00591d07fcd065ec769cf8de307e59b91690b7bbb671124ce143f29776498fada873aaa234b714cb6eefb5578333f91ce74cf76d98d62d6da7 -DIST fetchcommandwrapper-0.8.3.tar.gz 4467 BLAKE2B c6ad1d6ccfc7bc320836a371899cf43496138398a8ade7d47f8b1d8bbd8b2b7c7203c378f5628438b3a831b5a24c7b761ed9f7dbe96a21a2ddc50a8f5ba21905 SHA512 7aeb1eb55c63b7f68b4c99c5d10a102d130cccd6cd13d4012afe2d2a3a63e170457e93ff532634837cf16c625618e639da2e977cf0589a5c677ed69d85109653 DIST fetchcommandwrapper-0.8.4.tar.gz 4553 BLAKE2B 10cf10ec5e4af355940d3f02eb7e9d4dd79ed8c13b06ed2e4c4c5c23f257e54e0825387b3b646451f3229ae6e7ec4e9c2074734204caf20389a3009fa7767a3c SHA512 e32b1a774bcc2a52356ccde8ec29a2d42de08b1e4672a0cad11a187e7996ade491dfda4fb09526e77ff5a55abfda91130cec1d0b075541d227d0e34ecb55f019 diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild deleted file mode 100644 index 312938ef3115..000000000000 --- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND" -HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper" -SRC_URI="https://github.com/hartwork/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]" - -pkg_postinst() { - ewarn 'You need to append' - ewarn ' source /usr/share/fetchcommandwrapper/make.conf' - ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.' -} diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild deleted file mode 100644 index eaaaa154c950..000000000000 --- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND" -HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]" - -pkg_postinst() { - ewarn 'You need to append' - ewarn ' source /usr/share/fetchcommandwrapper/make.conf' - ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.' -} diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild index 4f9faf594b50..4f9faf594b50 100644 --- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.3.ebuild +++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4.ebuild deleted file mode 100644 index 4f9faf594b50..000000000000 --- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND" -HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]" - -pkg_postinst() { - ewarn 'You need to append' - ewarn ' source /usr/share/fetchcommandwrapper/make.conf' - ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.' -} diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild index c4ad7ff93a2f..574be3c28a5f 100644 --- a/app-portage/metagen/metagen-9999.ebuild +++ b/app-portage/metagen/metagen-9999.ebuild @@ -9,7 +9,7 @@ inherit distutils-r1 git-r3 DESCRIPTION="metadata.xml generator for ebuilds" HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git" -EGIT_REPO_URI="git://anongit.gentoo.org/proj/metagen.git" +EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/metagen.git" LICENSE="GPL-2" SLOT="0" @@ -29,7 +29,8 @@ src_install() { distutils-r1_src_install # Address expected path warning for /usr/share/doc/metagen-<not-9999> - mv "${D}"/usr/share/doc/metagen-{*,${PV}}/ || die + mv "${D}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die + rmdir "${D}"/usr/share/doc/metagen-*.*.*/ || die } python_test() { diff --git a/app-shells/bash/bash-5.1.ebuild b/app-shells/bash/bash-5.1.ebuild index 7022b7cfac6b..c107730261fd 100644 --- a/app-shells/bash/bash-5.1.ebuild +++ b/app-shells/bash/bash-5.1.ebuild @@ -103,6 +103,7 @@ src_prepare() { touch -r . doc/* || die eapply -p0 "${PATCHES[@]}" + eapply "${FILESDIR}/${PN}-5.1-parallel_make.patch" eapply_user } diff --git a/app-shells/bash/files/bash-5.1-parallel_make.patch b/app-shells/bash/files/bash-5.1-parallel_make.patch new file mode 100644 index 000000000000..b341a8a06e28 --- /dev/null +++ b/app-shells/bash/files/bash-5.1-parallel_make.patch @@ -0,0 +1,15 @@ +bashline.c:65:10: fatal error: builtins/builtext.h: No such file or directory + 65 | #include "builtins/builtext.h" /* for read_builtin */ + | ^~~~~~~~~~~~~~~~~~~~~ + +--- bash-5.1/Makefile.in ++++ bash-5.1/Makefile.in +@@ -584,6 +584,8 @@ + ls -l $(Program) + -$(SIZE) $(Program) + ++$(CSOURCES): $(DEFDIR)/builtext.h ++ + .build: $(SOURCES) config.h Makefile version.h $(VERSPROG) + @echo + @echo " ***********************************************************" diff --git a/dev-embedded/esptool/esptool-2.8-r1.ebuild b/dev-embedded/esptool/esptool-2.8-r1.ebuild index d6b0d2bb80b9..d02ba22d35a6 100644 --- a/dev-embedded/esptool/esptool-2.8-r1.ebuild +++ b/dev-embedded/esptool/esptool-2.8-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) # apps work with 3_9 but test depend is not fulfilled DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend diff --git a/dev-lang/lua/files/lua-5.1.4-test.patch b/dev-lang/lua/files/lua-5.1.4-test.patch index 99b4ad648cc7..4dcfbb9d6969 100644 --- a/dev-lang/lua/files/lua-5.1.4-test.patch +++ b/dev-lang/lua/files/lua-5.1.4-test.patch @@ -1,5 +1,5 @@ ---- test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100 -+++ test/sieve.lua 2008-02-20 17:44:22.468281121 +0100 +--- a/test/sieve.lua ++++ b/test/sieve.lua @@ -14,7 +14,7 @@ while 1 do local n = g() diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild index f027d4aad103..6070aff6e581 100644 --- a/dev-libs/libevdev/libevdev-1.10.0.ebuild +++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-r3 else SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="MIT" diff --git a/dev-libs/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild index e315a08479e3..617b39f655af 100644 --- a/dev-libs/libinput/libinput-1.16.4.ebuild +++ b/dev-libs/libinput/libinput-1.16.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" LICENSE="MIT" SLOT="0/10" [[ "$(ver_cut 3)" -gt 900 ]] || \ -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="doc input_devices_wacom test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild new file mode 100644 index 000000000000..a383afedf853 --- /dev/null +++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +USE_RUBY="ruby25 ruby26 ruby27" +DISTUTILS_OPTIONAL=1 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools distutils-r1 lua-single ruby-single + +DESCRIPTION="Prelude-SIEM Framework Library" +HOMEPAGE="https://www.prelude-siem.org" +SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="lua perl python ruby" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="net-libs/gnutls:= + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( ${RUBY_DEPS} )" + +DEPEND="${RDEPEND}" + +BDEPEND=">=dev-lang/swig-4.0.0 + dev-util/gtk-doc-am + sys-devel/flex + lua? ( dev-lang/lua:* ) + perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) + python? ( ${PYTHON_DEPS} ) + ruby? ( ${RUBY_DEPS} ) + virtual/pkgconfig + virtual/yacc" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch" + "${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch" +) + +src_prepare() { + default + + # Avoid null runpaths in Perl bindings. + sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed" + + eautoreconf + + if use python; then + cd bindings/python || die + distutils-r1_src_prepare + fi +} + +src_configure() { + local myconf=( + --enable-easy-bindings + --with-swig + --without-python2 + --localstatedir="${EPREFIX}/var" + $(use_with lua) + $(use_with perl) + $(usex perl '--with-perl-installdirs=vendor' '') + $(use_with ruby) + ) + + if use python; then + python_setup + myconf+=( --with-python3="${EPYTHON}" ) + else + myconf+=( --without-python3 ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + cd bindings/python || die + distutils-r1_src_compile + fi +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + if use python; then + cd bindings/python || die + distutils-r1_src_install + fi + + keepdir /var/spool/prelude +} diff --git a/dev-python/eventlet/eventlet-0.29.1.ebuild b/dev-python/eventlet/eventlet-0.29.1.ebuild index c1a6a203dce2..cd71f19d3c4a 100644 --- a/dev-python/eventlet/eventlet-0.29.1.ebuild +++ b/dev-python/eventlet/eventlet-0.29.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_9 ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit distutils-r1 DESCRIPTION="Highly concurrent networking library" diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest index c92614128e3e..dfee0ef42ad7 100644 --- a/dev-python/pandas/Manifest +++ b/dev-python/pandas/Manifest @@ -1,2 +1,3 @@ DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5 DIST pandas-1.1.4.tar.gz 5226971 BLAKE2B 9386eefdd1be566dee7e950d6c791a1127f5736b61a2f062f0cfbf1a83879c68b39fade863ed77acc38f619b681060b0e73ff290fbcba6d8d2d2d3332f4e32e4 SHA512 abc6e23ccc066bd9aaea5688df4803ef2fe2f038df9f45bd59696e94b589174d9bc79bfe6b36315307ab39b31a4e8cf32217f9135ac977320bf29968e12cb271 +DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68273ee870b386aa8562be4c8f667137a4a078eafb2a62847bdd6f73c390254e8024d483c21e1834a8c49d44d32 SHA512 a213690ea658554b78e003a30cc88a59e34195457401d84b1cafdf74433ad27c801c12b8138371bb0206f6dc083ae882eabf0e33cb5733fa313e9f3257d48823 diff --git a/dev-python/pandas/pandas-1.1.5.ebuild b/dev-python/pandas/pandas-1.1.5.ebuild new file mode 100644 index 000000000000..d780a546a792 --- /dev/null +++ b/dev-python/pandas/pandas-1.1.5.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" + +VIRTUALX_REQUIRED="manual" + +inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx + +DESCRIPTION="Powerful data structures for data analysis and statistics" +HOMEPAGE="https://pandas.pydata.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz" +S="${WORKDIR}/${P/_/}" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="doc full-support minimal test X" +RESTRICT="!test? ( test )" + +RECOMMENDED_DEPEND=" + >=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}] + >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] +" + +# TODO: add pandas-gbq to the tree +OPTIONAL_DEPEND=" + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/blosc[${PYTHON_USEDEP}] + || ( + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + || ( + dev-python/openpyxl[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] + ) + >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}] + dev-python/statsmodels[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/xarray-0.10.8[${PYTHON_USEDEP}] + ' python3_{6,7}) + >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}] + >=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] + X? ( + || ( + dev-python/PyQt5[${PYTHON_USEDEP}] + x11-misc/xclip + x11-misc/xsel + ) + ) +" +COMMON_DEPEND=" + >dev-python/numpy-1.15.4[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] +" +DEPEND="${COMMON_DEPEND} + >=dev-python/cython-0.29.21[${PYTHON_USEDEP}] + doc? ( + ${VIRTUALX_DEPEND} + app-text/pandoc + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/nbsphinx[${PYTHON_USEDEP}] + >=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}] + >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] + >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/rpy[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/xlrd[${PYTHON_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + x11-misc/xclip + ) + test? ( + ${VIRTUALX_DEPEND} + ${RECOMMENDED_DEPEND} + ${OPTIONAL_DEPEND} + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/openpyxl[${PYTHON_USEDEP}] + dev-python/pymysql[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/psycopg:2[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] + x11-misc/xclip + x11-misc/xsel + ) +" +# dev-python/statsmodels invokes a circular dep +# hence rm from doc? ( ), again +RDEPEND="${COMMON_DEPEND} + !minimal? ( ${RECOMMENDED_DEPEND} ) + full-support? ( ${OPTIONAL_DEPEND} ) +" + +python_prepare_all() { + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" \ + -i doc/source/conf.py || die + + # requires package installed + sed -e 's:test_register_entrypoint:_&:' \ + -i pandas/tests/plotting/test_backend.py || die + + sed -e '/extra_compile_args =/s:"-Werror"::' \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + # To build docs the need be located in $BUILD_DIR, + # else PYTHONPATH points to unusable modules. + if use doc; then + cd "${BUILD_DIR}"/lib || die + cp -ar "${S}"/doc . && cd doc || die + LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html + fi +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + local -x LC_ALL=C.UTF-8 + pushd "${BUILD_DIR}"/lib > /dev/null || die + "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die + PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \ + -m "not single" || die "Tests failed with ${EPYTHON}" + find . '(' -name .pytest_cache -o -name .hypothesis ')' \ + -exec rm -r {} + || die + popd > /dev/null || die +} + +python_install_all() { + if use doc; then + dodoc -r "${BUILD_DIR}"/lib/doc/build/html + einfo "An initial build of docs is absent of references to statsmodels" + einfo "due to circular dependency. To have them included, emerge" + einfo "statsmodels next and re-emerge pandas with USE doc" + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck + optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1" + optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml + optfeature "for msgpack compression using blosc" dev-python/blosc + optfeature "Template engine for conditional HTML formatting" dev-python/jinja + optfeature "Plotting support" dev-python/matplotlib + optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt + optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1" + optfeature "R I/O support" dev-python/rpy + optfeature "Needed for parts of pandas.stats" dev-python/statsmodels + optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1" + optfeature "miscellaneous statistical functions" dev-python/scipy + optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel +} diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild index 8037d9e8a98a..93186850f5dd 100644 --- a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild +++ b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild @@ -16,6 +16,10 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] +" + python_test() { ${EPYTHON} tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}" ${EPYTHON} tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}" diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index c8c321783cc8..dd980078d013 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,2 +1,3 @@ DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e +DIST setuptools-51.0.0.zip 2059134 BLAKE2B 449e87e413490181136ffa80a109e68b086fd0b1b56b2391e8cc612fb4c9cd4bb89acf05b464a5fa86c3984d3f22bc103dc9a21a2948598b7a17f770c4037008 SHA512 ec8c8a43ef176b5a4029f42c900690c1b9cb304efeb2cf8d36f3f2cb4343af4c1b1770f83ffb0e80ef237f58e6eeb233a97d6b3b8c6c6a2557bc4f14ccff9e90 diff --git a/dev-python/setuptools/setuptools-51.0.0.ebuild b/dev-python/setuptools/setuptools-51.0.0.ebuild new file mode 100644 index 000000000000..297d66935a3d --- /dev/null +++ b/dev-python/setuptools/setuptools-51.0.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +# Set to 'manual' to avoid triggering install QA check +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +LICENSE="MIT" +SLOT="0" +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/unzip + test? ( + dev-python/jaraco-envs[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +" +PDEPEND=" + >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( {CHANGES,README}.rst ) + +python_prepare_all() { + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + distutils_install_for_testing --via-root + local deselect=( + setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts + ) + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" pytest -vv setuptools ${deselect[@]/#/--deselect } || + die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-python/simplekml/Manifest b/dev-python/simplekml/Manifest index e726ea5a9876..ba3601989050 100644 --- a/dev-python/simplekml/Manifest +++ b/dev-python/simplekml/Manifest @@ -1 +1 @@ -DIST simplekml-1.3.1.tar.gz 37070 BLAKE2B 33d4c9bb7d77f80dd65901dc1f1f0d1f1586b6a800ac63a011b398d8bc13591b50e21d3e0ba36ff6f3b728ccf355fb021225a63846f4784b2b52d59526045154 SHA512 a72d378b44ccbe5f597f100784f3e802255c9a47216132f6ad13e594a2fb70058224428df5b7450ad7e498b9cfbfd846191d30dae225169957ea35659dd0968a +DIST simplekml-1.3.5.tar.gz 39069 BLAKE2B 3aceacc028618e553cd7c9a9d7d4b9a9223c8942816c193a68e6e6b8ead41b68d6a55a89ae4811ff0eb5d5f167605e8e58686384b5981735569d6db34a1259b9 SHA512 5f9c57b953fa27f533905536c4abfc580098e912d937cdce543ae55fb8da22f31ed84a35a0a0526cfb208c050fb407445ee81ad8cbe4ec823c8d896179446182 diff --git a/dev-python/simplekml/simplekml-1.3.1.ebuild b/dev-python/simplekml/simplekml-1.3.5.ebuild index 35927a8e4e1d..35927a8e4e1d 100644 --- a/dev-python/simplekml/simplekml-1.3.1.ebuild +++ b/dev-python/simplekml/simplekml-1.3.5.ebuild diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index b8b52e17acc9..a57a34037502 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -80,6 +80,16 @@ src_fetch() { src_unpack() { _egit_repo_handler ${EBUILD_PHASE} + + if [[ "${PV}" == 9999 ]] ; then + # Need to copy stuff from dlg submodule (#758902) + local dlg_inc_dir="${S}/submodules/dlg/include/dlg" + local dlg_src_dir="${S}/submodules/dlg/src/dlg" + local dlg_dest_dir="${S}/src/dlg" + mkdir -p "${dlg_dest_dir}/dlg" || die + cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die + cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die + fi } src_prepare() { diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild new file mode 100644 index 000000000000..b066ce9a07b0 --- /dev/null +++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +inherit lua-single + +DESCRIPTION="Embedded lua scripts for libquvi" +HOMEPAGE="https://sourceforge.net/projects/quvi/" +SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="offensive" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# tests fetch data from live websites +RESTRICT="test" + +RDEPEND="$(lua_gen_cond_dep ' + >=dev-lua/LuaBitOp-1.0.1-r1[${LUA_USEDEP}] + >=dev-lua/luaexpat-1.3.0-r1[${LUA_USEDEP}] + >=dev-lua/luajson-1.1.1[${LUA_USEDEP}] + >=dev-lua/luasocket-3.0_rc1-r2[${LUA_USEDEP}] +')" + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +src_configure() { + econf $(use_with offensive nsfw) --with-manual +} diff --git a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild new file mode 100644 index 000000000000..ca3a26297013 --- /dev/null +++ b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) +LUA_REQ_USE="deprecated" + +inherit autotools lua-single + +DESCRIPTION="Library for parsing video download links" +HOMEPAGE="https://sourceforge.net/projects/quvi/" +SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz" + +LICENSE="AGPL-3" +SLOT="0/8" # subslot = libquvi soname version +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples nls static-libs" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.34.3:2 + >=dev-libs/libgcrypt-1.5.3:0= + >=media-libs/libquvi-scripts-0.9.20130903[${LUA_SINGLE_USEDEP}] + !<media-libs/quvi-0.4.0 + >=net-libs/libproxy-0.4.11-r1 + >=net-misc/curl-7.36.0 + nls? ( >=virtual/libintl-0-r1 ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + --with-manual + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + einstalldocs + use examples && dodoc -r examples + + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild index 041502241bd2..28525b72335e 100644 --- a/media-libs/mesa/mesa-20.2.4.ebuild +++ b/media-libs/mesa/mesa-20.2.4.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index b8641491316c..deb36206b54e 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,5 +1,6 @@ DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac DIST kodi-19.0b1.tar.gz 52314501 BLAKE2B 35090e969160f7ea6619d6c720f92a3ecf97391d12548927fcfd03ccc15091132f795f4636a4c4b8c15b2a623ee8b892c4b395e2e4e811152c63ffc19474ff90 SHA512 51a5a060c9ee51dd05303259cf59164bf273b05430f0987998a90879dfb52c1e95669e1c432476df65247fb70e920058119713a627ed7e12bf8dcd13645ffc40 +DIST kodi-19.0b2.tar.gz 52329859 BLAKE2B 79b9606b48d1a4a2a2ad7c2799bddf539edd04e1954892299507f245fd1c1db057dc22f753877fd0ba56f414c1addb32168c73328d5cf62dec1428941eebb590 SHA512 0f6598c90fbe0a1e2bee2bea5c6fe3d6579e7b0bd58c68590023629f92dd35d092b4de9b697759558ceb381f558cc53d8a74a412567b14683847b3c5e3d6a314 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 diff --git a/media-tv/kodi/kodi-19.0_beta2.ebuild b/media-tv/kodi/kodi-19.0_beta2.ebuild new file mode 100644 index 000000000000..81dc057c7b5c --- /dev/null +++ b/media-tv/kodi/kodi-19.0_beta2.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_REQ_USE="libressl?,sqlite,ssl" +LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" +LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" +LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" +FFMPEG_VERSION="4.3.1" +CODENAME="Matrix" +FFMPEG_KODI_VERSION="Beta1" +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz + https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz + https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz + !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" + inherit git-r3 +else + MY_PV=${PV/_p/_r} + MY_PV=${MY_PV/_alpha/a} + MY_PV=${MY_PV/_beta/b} + MY_PV=${MY_PV/_rc/rc} + MY_P="${PN}-${MY_PV}" + SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} +fi + +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg + +DESCRIPTION="A free and open source media-player and entertainment hub" +HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" + +LICENSE="GPL-2+" +SLOT="0" +# use flag is called libusb so that it doesn't fool people in thinking that +# it is _required_ for USB support. Otherwise they'll disable udev and +# that's going to be worse. +IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + || ( gles opengl ) + || ( gbm wayland X ) + ?? ( mariadb mysql ) + bluray? ( udf ) + udev? ( !libusb ) + udisks? ( dbus ) + upower? ( dbus ) +" +RESTRICT="!test? ( test )" + +COMMON_DEPEND="${PYTHON_DEPS} + airplay? ( + >=app-pda/libplist-2.0.0 + net-libs/shairplay + ) + alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) + bluetooth? ( net-wireless/bluez ) + bluray? ( >=media-libs/libbluray-1.1.2 ) + caps? ( sys-libs/libcap ) + dbus? ( sys-apps/dbus ) + dev-db/sqlite + dev-libs/expat + >=dev-libs/flatbuffers-1.11.0 + >=dev-libs/fribidi-1.0.5 + cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) + dev-libs/libpcre[cxx] + >=dev-libs/libinput-1.10.5 + >=dev-libs/libxml2-2.9.4 + >=dev-libs/lzo-2.04 + >=dev-libs/spdlog-1.5.0:= + dev-libs/tinyxml[stl] + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] + ') + >=dev-libs/libcdio-2.1.0 + >=dev-libs/libfmt-6.1.2 + dev-libs/libfstrcmp + gbm? ( media-libs/mesa[gbm] ) + gles? ( + !raspberry-pi? ( media-libs/mesa[gles2] ) + ) + lcms? ( media-libs/lcms:2 ) + libusb? ( virtual/libusb:1 ) + virtual/ttf-fonts + media-fonts/roboto + media-libs/dav1d + >=media-libs/fontconfig-2.13.1 + >=media-libs/freetype-2.10.1 + >=media-libs/libass-0.13.4 + !raspberry-pi? ( media-libs/mesa[egl] ) + >=media-libs/taglib-1.11.1 + system-ffmpeg? ( + >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc] + libressl? ( media-video/ffmpeg[libressl,-openssl] ) + !libressl? ( media-video/ffmpeg[-libressl,openssl] ) + ) + mysql? ( dev-db/mysql-connector-c:= ) + mariadb? ( dev-db/mariadb-connector-c:= ) + >=net-misc/curl-7.68.0[http2] + nfs? ( >=net-fs/libnfs-2.0.0:= ) + opengl? ( media-libs/glu ) + !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) + libressl? ( dev-libs/libressl:0= ) + raspberry-pi? ( + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + >=sys-libs/zlib-1.2.11 + udf? ( >=dev-libs/libudfread-1.0.0 ) + udev? ( virtual/udev ) + vaapi? ( + x11-libs/libva:= + opengl? ( x11-libs/libva[opengl] ) + system-ffmpeg? ( media-video/ffmpeg[vaapi] ) + vdpau? ( x11-libs/libva[vdpau] ) + wayland? ( x11-libs/libva[wayland] ) + X? ( x11-libs/libva[X] ) + ) + virtual/libiconv + vdpau? ( + || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) + system-ffmpeg? ( media-video/ffmpeg[vdpau] ) + ) + wayland? ( + >=dev-cpp/waylandpp-0.2.3:= + media-libs/mesa[wayland] + >=dev-libs/wayland-protocols-1.7 + ) + webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) + X? ( + media-libs/mesa[X] + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libXrender + system-ffmpeg? ( media-video/ffmpeg[X] ) + ) + x11-libs/libdrm + >=x11-libs/libxkbcommon-0.4.1 + xslt? ( dev-libs/libxslt ) + zeroconf? ( net-dns/avahi[dbus] ) +" +RDEPEND="${COMMON_DEPEND} + lirc? ( app-misc/lirc ) + udisks? ( sys-fs/udisks:2 ) + upower? ( sys-power/upower ) +" +DEPEND="${COMMON_DEPEND} + app-arch/bzip2 + app-arch/xz-utils + dev-lang/swig + dev-libs/crossguid + dev-libs/rapidjson + dev-util/cmake + dev-util/gperf + media-libs/giflib + >=media-libs/libjpeg-turbo-2.0.4:= + >=media-libs/libpng-1.6.26:0= + test? ( >=dev-cpp/gtest-1.10.0 ) + virtual/pkgconfig + virtual/jre + x86? ( dev-lang/nasm ) +" + +CONFIG_CHECK="~IP_MULTICAST" +ERROR_IP_MULTICAST=" +In some cases Kodi needs to access multicast addresses. +Please consider enabling IP_MULTICAST under Networking options. +" + +pkg_setup() { + check_extra_config + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + else + default + fi +} + +src_prepare() { + cmake_src_prepare + + # avoid long delays when powerkit isn't running #348580 + sed -i \ + -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ + xbmc/platform/linux/*.cpp || die + + # Prepare tools and libs witch are configured with autotools during compile time + AUTOTOOLS_DIRS=( + "${S}"/tools/depends/native/TexturePacker/src + "${S}"/tools/depends/native/JsonSchemaBuilder/src + ) + + local d + for d in "${AUTOTOOLS_DIRS[@]}" ; do + pushd ${d} >/dev/null || die + AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf + popd >/dev/null || die + done + elibtoolize + + # Prevent autoreconf rerun + sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ + "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ + "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ + || die +} + +src_configure() { + local platform=() + use gbm && platform+=( gbm ) + use wayland && platform+=( wayland ) + use X && platform+=( x11 ) + local core_platform_name="${platform[@]}" + local mycmakeargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 + -DENABLE_ALSA=$(usex alsa) + -DENABLE_AIRTUNES=$(usex airplay) + -DENABLE_AVAHI=$(usex zeroconf) + -DENABLE_BLUETOOTH=$(usex bluetooth) + -DENABLE_BLURAY=$(usex bluray) + -DENABLE_CCACHE=OFF + -DENABLE_CEC=$(usex cec) + -DENABLE_DBUS=$(usex dbus) + -DENABLE_DVDCSS=$(usex css) + -DENABLE_INTERNAL_CROSSGUID=OFF + -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" + -DENABLE_INTERNAL_FSTRCMP=OFF + -DENABLE_INTERNAL_GTEST=OFF + -DENABLE_INTERNAL_UDFREAD=OFF + -DENABLE_CAP=$(usex caps) + -DENABLE_LCMS2=$(usex lcms) + -DENABLE_LIRCCLIENT=$(usex lirc) + -DENABLE_MARIADBCLIENT=$(usex mariadb) + -DENABLE_MICROHTTPD=$(usex webserver) + -DENABLE_MYSQLCLIENT=$(usex mysql) + -DENABLE_NFS=$(usex nfs) + -DENABLE_OPENGLES=$(usex gles) + -DENABLE_OPENGL=$(usex opengl) + -DENABLE_OPTICAL=$(usex dvd) + -DENABLE_PLIST=$(usex airplay) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) + -DENABLE_SMBCLIENT=$(usex samba) + -DENABLE_TESTING=$(usex test) + -DENABLE_UDEV=$(usex udev) + -DENABLE_UDFREAD=$(usex udf) + -DENABLE_UPNP=$(usex upnp) + -DENABLE_VAAPI=$(usex vaapi) + -DENABLE_VDPAU=$(usex vdpau) + -DENABLE_XSLT=$(usex xslt) + -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" + -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" + -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)" + -DCORE_PLATFORM_NAME="${core_platform_name}" + ) + + use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + + if use system-ffmpeg; then + mycmakeargs+=( -DWITH_FFMPEG="yes" ) + else + mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all +} + +src_test() { + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 + KODI_HOME="${BUILD_DIR}" cmake_build check +} + +src_install() { + cmake_src_install + + pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin + + newicon media/icon48x48.png kodi.png + + rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die + dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ + usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf + + python_domodule tools/EventClients/lib/python/xbmcclient.py + python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send +} diff --git a/net-analyzer/carl/carl-0.9-r3.ebuild b/net-analyzer/carl/carl-0.9-r3.ebuild index 878ae450a036..4057d21464e2 100644 --- a/net-analyzer/carl/carl-0.9-r3.ebuild +++ b/net-analyzer/carl/carl-0.9-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3) +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) inherit distutils-r1 diff --git a/net-analyzer/carl/carl-0.9-r4.ebuild b/net-analyzer/carl/carl-0.9-r4.ebuild index a69735f5b3bd..6a430c84bc10 100644 --- a/net-analyzer/carl/carl-0.9-r4.ebuild +++ b/net-analyzer/carl/carl-0.9-r4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3) +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) inherit distutils-r1 diff --git a/net-misc/sb-hosts/Manifest b/net-misc/sb-hosts/Manifest index 210f349bebfe..a19ae4ede6af 100644 --- a/net-misc/sb-hosts/Manifest +++ b/net-misc/sb-hosts/Manifest @@ -1,2 +1,2 @@ -DIST sb-hosts-3.2.7.tar.gz 9321494 BLAKE2B 913ab76bc34d647561aca9a2055aaef6fc86ee055020806cf1def0fe2f0dc6b36eca4d2e52257f76bed2388aecbf1c5e3917967e06a8652e1de9c26fbc8beaeb SHA512 9ef0c52c492dacebfdc864e3a0d37c8aa87d297001fa2193eae5ccd6e150e0a6200de393886fc8790a1c3a4131992710b80e904bf6402b5e87b1ad985177624c DIST sb-hosts-3.2.8.tar.gz 9326564 BLAKE2B 5ee71f5f384e211e210f71f87657db43a595d9191da75f1ea7cd0884f2cdfbf05711cd7d800f4bc0cf7d0b2555735e23e687ebb48d2d6d4fea1eef9267c96508 SHA512 4a39aed2633c359ccbc0e1d83f0a99c211e284319255ba55a0414a18b74def5924df8868b6d7c13ae7c56900270e4383e202acb23912fdcfadfdf4239ca306ec +DIST sb-hosts-3.2.9.tar.gz 9013171 BLAKE2B f659e2c4e6d90f9012ad0d0e3876b3a1fa25cb077195bb808ae695a001c695a1c7fe0b9830ea7ce310871fd7ef1208fc8daf5229b3c9b38d8883e0b75e3638e4 SHA512 edccb0200e0231a5f655cc07708e87de04357ac8a3d1e23738ba3ef7775e5d54d6e6a44239060b4b9f1b7ab45b1fb6d6f7a37b636a9ed85e7f2683bf3f051cb7 diff --git a/net-misc/sb-hosts/sb-hosts-3.2.7.ebuild b/net-misc/sb-hosts/sb-hosts-3.2.9.ebuild index eb870000425b..eb870000425b 100644 --- a/net-misc/sb-hosts/sb-hosts-3.2.7.ebuild +++ b/net-misc/sb-hosts/sb-hosts-3.2.9.ebuild diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo index 7a77f1e32733..ca43ca5ec749 100644 --- a/profiles/package.mask/00-gentoo +++ b/profiles/package.mask/00-gentoo @@ -505,21 +505,26 @@ gnome-base/libbonobo gnome-base/libgnome-keyring gnome-base/orbit +# Thomas Deutschmann <whissi@gentoo.org> (2018-12-10) # Marek Szuba <marecki@gentoo.org> (2020-10-13) # Ulrich Müller <ulm@gentoo.org> (2020-11-06) +# Joonas Niilola <juippis@gentoo.org> (2020-11-07) # Robin H. Johnson <robbat2@gentoo.org> (2020-11-28) # Conrad Kostecki <conikost@gentoo.org> (2020-12-05) # ...and others who have not added their names here # All these ebuilds require slotted Lua, which is still masked. >=app-admin/conky-1.11.4 +>=app-admin/lsyncd-2.2.3 >=app-benchmarks/sysbench-1.0.20-r100 >=app-benchmarks/wrk-4.1.0-r100 >=app-crypt/cardpeek-0.8.4 >=app-crypt/ekeyd-1.1.5-r100 +=app-editors/scite-4.4.4-r10 >=app-misc/worker-3.8.3-r100 >=dev-games/cegui-0.8.7-r100 =dev-games/openscenegraph-openmw-3.4_p20200425-r100 =dev-libs/efl-1.25.1-r10 +=dev-libs/libprelude-5.2.0-r10 >=dev-lua/busted-2.0.0-r100 >=dev-lua/busted-htest-1.0.0-r100 >=dev-lua/dkjson-2.5-r100 @@ -583,6 +588,8 @@ gnome-base/orbit >=games-util/slade-3.1.12a-r100 >=mail-filter/imapfilter-2.6.16-r100 >=media-gfx/geeqie-1.5.1-r1 +>=media-libs/libquvi-0.9.4-r100 +>=media-libs/libquvi-scripts-0.9.20131130-r100 >=media-sound/aqualung-1.1-r100 >=net-analyzer/suricata-6.0.1-r100 >=net-im/prosody-0.11.7-r100 @@ -592,6 +599,7 @@ gnome-base/orbit >=sci-libs/plplot-5.15.0-r100 >=sci-visualization/gnuplot-5.4.0-r100 >=sci-visualization/fityk-1.3.1-r100 +>=sys-apps/likwid-4.3.4 >=www-apache/mod_security-2.9.3-r100 >=www-client/elinks-0.13.5-r100 >=www-client/luakit-2.2.1-r100 @@ -807,10 +815,6 @@ app-office/texmacs # Requires >=dev-lang/lua-5.3 which is masked sys-apps/likwid -# Thomas Deutschmann <whissi@gentoo.org> (2018-12-10) -# Requires >=dev-lang/lua-5.2 which is masked ->=app-admin/lsyncd-2.2.3 - # Andreas Sturmlechner <asturm@gentoo.org> (2018-11-25) # Masked per security vulnerability CVE-2018-14345, bug #661510 # Keeping it masked while users have unsolved issues with >0.15.0. diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild index d2eaa752c274..2ba8aa986ce9 100644 --- a/sci-libs/btf/btf-1.2.6.ebuild +++ b/sci-libs/btf/btf-1.2.6.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="static-libs" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/hypre/hypre-2.18.2.ebuild b/sci-libs/hypre/hypre-2.18.2.ebuild index 71a4fd5fdacd..69e57eddbaaf 100644 --- a/sci-libs/hypre/hypre-2.18.2.ebuild +++ b/sci-libs/hypre/hypre-2.18.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug examples fortran int64 openmp mpi" RDEPEND=" diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild index dede9990cca1..2022b5d8cc8b 100644 --- a/sci-libs/klu/klu-1.3.9.ebuild +++ b/sci-libs/klu/klu-1.3.9.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild index fb50f916f614..9b9ad05f9840 100644 --- a/sci-libs/sundials/sundials-5.2.0.ebuild +++ b/sci-libs/sundials/sundials-5.2.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz" LICENSE="BSD" SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads" REQUIRED_USE="hypre? ( mpi )" diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild index 19413f6bc157..fe3e07689242 100644 --- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild +++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://crd.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz" LICENSE="BSD" SLOT="0/${SOVERSION}" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples int64 openmp static-libs test threads" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( openmp threads )" diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild b/sci-mathematics/octave/octave-6.1.0-r1.ebuild index cbd2dd72530a..a1b62fde1d35 100644 --- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild +++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild @@ -14,7 +14,7 @@ SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild index 02a836a19c6d..914ca442fe63 100644 --- a/sys-apps/likwid/likwid-4.3.4.ebuild +++ b/sys-apps/likwid/likwid-4.3.4.ebuild @@ -1,31 +1,32 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 FORTRAN_NEEDED=fortran +LUA_COMPAT=( lua5-{2..3} ) #PYTHON_COMPAT=( python3_{6,7} ) # 4.3.4 will need python-single-r1 -inherit fcaps fortran-2 linux-info toolchain-funcs +inherit fcaps fortran-2 linux-info lua-single toolchain-funcs DESCRIPTION="A performance-oriented tool suite for x86 multicore environments" HOMEPAGE="https://github.com/rrze-likwid/likwid" SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz" -# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be -# added to the LICENSE field. LICENSE="GPL-3+ BSD" SLOT="0" KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64 -IUSE="fortran" # ${PYTHON_REQUIRED_USE} +IUSE="fortran" + +REQUIRED_USE="${LUA_REQUIRED_USE}" # ${PYTHON_REQUIRED_USE} # lua: # likwid's primary functionality is driven by a set of lua scripts installed in # /usr/bin/ # likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or -# lua-5.3, which we use. This ebuild uses the system copy of Lua instead. +# lua-5.3. # # hwloc: # likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration @@ -41,7 +42,7 @@ IUSE="fortran" # ${PYTHON_REQUIRED_USE} # Python: # Python3 is used for one helper script, filter/json, added after 4.3.3 CDEPEND="dev-lang/perl - dev-lang/lua:5.3" + ${LUA_DEPS}" # filter/json uses Python3 RDEPEND="${CDEPEND}" @@ -68,6 +69,7 @@ PATCHES=( pkg_setup() { fortran-2_pkg_setup + lua-single_pkg_setup #python-single-r1_pkg_setup } @@ -104,8 +106,8 @@ export_emake_opts() { local INSTALLED_PREFIX=/usr local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib' local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable. - # TODO: support LUA_SINGLE_TARGET here later for Lua 5.2 - local LUASLOT='5.3' + # WARNING: setting LUA_LIB_NAME=${ELUA} does *not* work with LuaJIT, keep this on mind + # should likwid upstream ever begin to support it. # If the build is too loud, pass 'Q=@' src_compile_opts=( "Q=" @@ -118,9 +120,9 @@ export_emake_opts() { "CC=$(tc-getCC)" "ANSI_CFLAGS=${CFLAGS}" "INSTRUMENT_BENCH=true" - "LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}" - "LUA_LIB_DIR=/usr/$(get_libdir)" - "LUA_LIB_NAME=lua${LUASLOT}" + "LUA_INCLUDE_DIR=$(lua_get_include_dir)" + "LUA_LIB_DIR=$(dirname "$(lua_get_shared_lib)")" + "LUA_LIB_NAME=${ELUA}" "LUA_BIN=/usr/bin" "FORTRAN_INTERFACE=$(usex fortran likwid.mod false)" "FC=$(usex fortran "${FC}" false)" diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild index 4644aa1d2620..092a4f7fb048 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild @@ -20,7 +20,7 @@ SRC_URI+=" S=${WORKDIR} LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" !sys-kernel/gentoo-kernel:${SLOT} diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild index 0c806189a34d..01e84f9f0986 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild @@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x S=${WORKDIR}/${MY_P} LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="debug" RDEPEND=" diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index 07ecf183204f..c6eae48c37a8 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,3 +1,4 @@ DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2d2c59fd7fbeaf827233f658ea819f4c69832af5cfd4f836d3d66c223a9580037cf8d6d2ae28c6a6b3499b5 SHA512 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868 +DIST htop-3.0.3.tar.gz 292925 BLAKE2B 7e227188e3954c0cb273b4bc95eaf2e11237daca3d929d4674dcdfc987c4af26e4b08da2b0f184d6d3e06952dee5704e468bf4b7bc03dfa0b6602c058beac495 SHA512 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch new file mode 100644 index 000000000000..ea65a799ed7a --- /dev/null +++ b/sys-process/htop/files/htop-3.0.3-tinfo.patch @@ -0,0 +1,38 @@ +From ead978bce6236a55d75b72e059686766fa708db4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> +Date: Mon, 7 Dec 2020 15:30:56 +0100 +Subject: [PATCH] configure: check for additional linker flags for keypad(3) + +Gentoo requires an explicit addition of -ltinfo + +Resolves: https://bugs.gentoo.org/show_bug.cgi?id=690840 +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 460b16aa..f91d8e92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -217,6 +217,10 @@ if test "x$enable_unicode" = xyes; then + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) ++ ++ # check if additional linker flags are needed for keypad(3) ++ # (at this point we already link against a working ncurses library with wide character support) ++ AC_SEARCH_LIBS([keypad], [tinfow tinfo]) + else + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", +@@ -229,6 +233,10 @@ else + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) ++ ++ # check if additional linker flags are needed for keypad(3) ++ # (at this point we already link against a working ncurses library) ++ AC_SEARCH_LIBS([keypad], [tinfo]) + fi + + if test "$my_htop_platform" = "freebsd"; then diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild index 7aa5e10db7e8..2bd758f16304 100644 --- a/sys-process/htop/htop-3.0.2.ebuild +++ b/sys-process/htop/htop-3.0.2.ebuild @@ -25,7 +25,9 @@ DOCS=( ChangeLog README ) CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" -PATCHES=() +PATCHES=( + "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 +) pkg_setup() { if ! has_version sys-process/lsof; then diff --git a/sys-process/htop/htop-3.0.3.ebuild b/sys-process/htop/htop-3.0.3.ebuild new file mode 100644 index 000000000000..b0c8193d042c --- /dev/null +++ b/sys-process/htop/htop-3.0.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit autotools linux-info python-any-r1 + +DESCRIPTION="interactive process viewer" +HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" +SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +LICENSE="BSD GPL-2" +SLOT="0" +IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver" + +BDEPEND="virtual/pkgconfig" +RDEPEND="sys-libs/ncurses:0=[unicode?] + hwloc? ( sys-apps/hwloc ) + lm-sensors? ( sys-apps/lm-sensors )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +DOCS=( ChangeLog README ) + +CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" + +S="${WORKDIR}/${P/_}" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 +) + +pkg_setup() { + if ! has_version sys-process/lsof; then + ewarn "To use lsof features in htop (what processes are accessing" + ewarn "what files), you must have sys-process/lsof installed." + fi + + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 + + local myeconfargs=( + $(use_enable debug) + $(use_enable hwloc) + $(use_enable openvz) + $(use_enable unicode) + $(use_enable vserver) + $(use_with lm-sensors sensors) + ) + + if ! use hwloc && use kernel_linux ; then + myeconfargs+=( --enable-linux-affinity ) + else + myeconfargs+=( --disable-linux-affinity ) + fi + + econf ${myeconfargs[@]} +} diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml index 39dd0116f83f..e34c6c99ecb4 100644 --- a/sys-process/htop/metadata.xml +++ b/sys-process/htop/metadata.xml @@ -10,6 +10,7 @@ <name>Lars Wendler</name> </maintainer> <use> + <flag name="hwloc">Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support</flag> <flag name="openvz">Enable openvz support</flag> <flag name="vserver">Enable vserver support</flag> </use> diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest index 59942cd426c0..f422906b7320 100644 --- a/www-servers/gatling/Manifest +++ b/www-servers/gatling/Manifest @@ -1,2 +1 @@ -DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716 DIST gatling-0.16.tar.xz 126844 BLAKE2B 33dd2e93833b216ffadae4dbd5650af87b23ed5d62caf181d8005acb4dce889b86d1afb711676377ba2b7c4fe08b8f2350a32965cf6292a268281b28c4310c27 SHA512 9446ea0ae862509b1a892e5bdef14d3a2320c3c3e846362b4679c0834aa906ab5b16ef54e4a7c8e7ee839d30317436dd411e891e3105035a9ee31b0facc0b8c1 diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch b/www-servers/gatling/files/gatling-0.15-gcc10.patch deleted file mode 100644 index 446ea5cffdec..000000000000 --- a/www-servers/gatling/files/gatling-0.15-gcc10.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b815fc02179e8f25a6bea2bc1ee7306ffea37258 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Thu, 26 Nov 2020 16:05:26 +0100 -Subject: [PATCH] Fix build with -fno-common or GCC 10 - ---- - dirfd.c | 1 + - dirfd.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dirfd.c b/dirfd.c -index 6a0217e..792bd29 100644 ---- a/dirfd.c -+++ b/dirfd.c -@@ -34,6 +34,7 @@ struct hashtable dc; - - #ifdef __linux__ - int rootwd; -+int ifd; - #endif - - /* initialize a hashtable as empty */ -diff --git a/dirfd.h b/dirfd.h -index cdfc4a3..a76c5d8 100644 ---- a/dirfd.h -+++ b/dirfd.h -@@ -21,7 +21,7 @@ - * given dir, and it will return the fd or -1 on error. */ - - #ifdef __linux__ --int ifd; /* inotify fd */ -+extern int ifd; /* inotify fd */ - #endif - - struct dircacheentry { --- -2.27.0 - diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild deleted file mode 100644 index c18fb7fe8684..000000000000 --- a/www-servers/gatling/gatling-0.15.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils toolchain-funcs user - -DESCRIPTION="High performance web server" -HOMEPAGE="https://www.fefe.de/gatling/" -SRC_URI="https://www.fefe.de/gatling/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="libressl ssl diet" -REQUIRED_USE="ssl? ( !diet )" - -DEPEND=">=dev-libs/libowfat-0.32-r2[diet=] - diet? ( dev-libs/dietlibc ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.13-compile.patch" - "${FILESDIR}/${P}-ar.patch" - "${FILESDIR}/${P}-gcc10.patch" -) - -src_prepare() { - default - rm Makefile # leaves us with GNUmakefile -} - -src_compile() { - local DIET= - use diet && DIET='/usr/bin/diet' - - local targets='gatling' - use ssl && targets+=' tlsgatling' - - emake DIET="${DIET}" CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \ - LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} -} - -src_install() { - doman gatling.1 - - newconfd "${FILESDIR}/gatling.confd" gatling - newinitd "${FILESDIR}/gatling.initd-3" gatling - dodoc README.{ftp,http} - - dobin gatling - use ssl && { - dodoc README.tls - dobin tlsgatling - } -} - -pkg_setup() { - ebegin "Creating gatling user and group" - enewgroup gatling - enewuser ${PN} -1 -1 /var/www/localhost ${PN} -} diff --git a/www-servers/gatling/gatling-0.16.ebuild b/www-servers/gatling/gatling-0.16.ebuild deleted file mode 100644 index c1b0e8bf0abe..000000000000 --- a/www-servers/gatling/gatling-0.16.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils toolchain-funcs user - -DESCRIPTION="High performance web server" -HOMEPAGE="https://www.fefe.de/gatling/" -SRC_URI="https://www.fefe.de/gatling/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="libressl ssl diet" -REQUIRED_USE="ssl? ( !diet )" - -DEPEND=">=dev-libs/libowfat-0.32-r2[diet=] - diet? ( dev-libs/dietlibc ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.13-compile.patch" - "${FILESDIR}/${PN}-0.15-ar.patch" -) - -src_prepare() { - default - rm Makefile # leaves us with GNUmakefile -} - -src_compile() { - local DIET= - use diet && DIET='/usr/bin/diet' - - local targets='gatling' - use ssl && targets+=' tlsgatling' - - emake DIET="${DIET}" CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} -I${ROOT}/usr/include/libowfat" \ - LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} -} - -src_install() { - doman gatling.1 - - newconfd "${FILESDIR}/gatling.confd" gatling - newinitd "${FILESDIR}/gatling.initd-3" gatling - dodoc README.{ftp,http} - - dobin gatling - use ssl && { - dodoc README.tls - dobin tlsgatling - } -} - -pkg_setup() { - ebegin "Creating gatling user and group" - enewgroup gatling - enewuser ${PN} -1 -1 /var/www/localhost ${PN} -} diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild index 9df4ad7918b3..4fe8dd59d6ea 100644 --- a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild +++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit xorg-3 DESCRIPTION="X.Org fonttosfnt application" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" RDEPEND="media-libs/freetype:2 x11-libs/libX11 diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild index bacfcf8c7321..6614471437e6 100644 --- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild +++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit xorg-3 DESCRIPTION="XKB keyboard description compiler" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" DEPEND=" >=x11-libs/libX11-1.6.9 diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild index efd91a652756..1d09b76ebeea 100644 --- a/x11-apps/xprop/xprop-1.2.5.ebuild +++ b/x11-apps/xprop/xprop-1.2.5.ebuild @@ -7,7 +7,7 @@ inherit xorg-3 DESCRIPTION="property displayer for X" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch new file mode 100644 index 000000000000..c61033bf2a92 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch @@ -0,0 +1,18 @@ +Patch taken from + https://forums.developer.nvidia.com/t/455-23-04-page-allocation-failure-in-kernel-module-at-random-points/155250/55 +Bug: https://bugs.gentoo.org/755497 +Credits go to Gregory Beauregard for pointing this out + +--- a/kernel/nvidia-modeset/nvidia-modeset-linux.c ++++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c +@@ -282,8 +282,8 @@ + * are called while nvkms_lock is held. + *************************************************************************/ + +-/* Don't use kmalloc for allocations larger than 128k */ +-#define KMALLOC_LIMIT (128 * 1024) ++/* Don't use kmalloc for allocations larger than one page */ ++#define KMALLOC_LIMIT PAGE_SIZE + + void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero) + { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild index 836ce3fa1243..f549e169c640 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild @@ -78,6 +78,7 @@ QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch + "${FILESDIR}"/${PN}-455.45.01-reduce-kmalloc-limit.patch ) NV_KV_MAX_PLUS="5.10" CONFIG_CHECK=" diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild index bfdb0ca517f0..8cc5988d13a5 100644 --- a/x11-libs/libX11/libX11-1.7.0.ebuild +++ b/x11-libs/libX11/libX11-1.7.0.ebuild @@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3 DESCRIPTION="X.Org X11 library" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="ipv6 test" RESTRICT="!test? ( test )" diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild index 5570b864800e..0eedddc69c5d 100644 --- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild +++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild @@ -8,6 +8,6 @@ inherit xorg-3 DESCRIPTION="X.Org X authorization library" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild index 45ef1a3e3cce..3c196046276d 100644 --- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild +++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild @@ -9,7 +9,7 @@ inherit xorg-3 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] diff --git a/x11-libs/libdrm/libdrm-2.4.103.ebuild b/x11-libs/libdrm/libdrm-2.4.103.ebuild index 23f115cdc10f..dba4fd1e1820 100644 --- a/x11-libs/libdrm/libdrm-2.4.103.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.103.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" else SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild index a6a0a5f581f1..368311cacc6a 100644 --- a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild +++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/xkbcommon/${PN}" else SRC_URI="https://xkbcommon.org/download/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi inherit meson multilib-minimal ${GIT_ECLASS} diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild index b0897faaabd3..21575c927bae 100644 --- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild +++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild @@ -8,6 +8,6 @@ inherit xorg-3 DESCRIPTION="Shared memory fences using futexes" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" DEPEND="x11-base/xorg-proto" diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild index f86d5c6b554a..3897323ede68 100644 --- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild +++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX} S="${WORKDIR}/libX11-${PV}/" DESCRIPTION="X.Org Compose Key tables from libX11" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # Only needed by configure DEPEND=" diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index 66cfeabe570d..f2e6ee953d72 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1,3 +1 @@ -DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a -DIST grub2-theme-preview-1.5.1.tar.gz 197976 BLAKE2B 561090bc4ab7fc6d170521380fe595e8db6ef553a5359bd5a1b42e986f2aab52a6c08ce0f5183dd8aa6d87d8bb44410cf6df80cb69781557cadb9f35b19ee5cf SHA512 a96ee503b793707ce59a0a691c3a0b7eaf206d0780de4f3ef53c6d6c05ab23c9dc58774a40043a35bbebdc4becc5414e520b9e5c805953c9145435d644aabfe9 DIST grub2-theme-preview-2.1.0.tar.gz 198805 BLAKE2B ef0417d49462a78678abfbcaa6b2ad31010cc033467c76291be8f66d4a3e412ac6d015ed4ff55a4aa557e7ed5a7cd33d25a2dd04111fe1ee78af413505fdab78 SHA512 9e8f21b5b84e2564654ffff84149f8421e168bc83c39ad9adf1ba0522de3b3d041c4be3853c6749bfa4d0693e629f43f359724c14b652a599f9c202fe00ba6b1 diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild deleted file mode 100644 index 41158dea21b0..000000000000 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU" -HOMEPAGE="https://github.com/hartwork/grub2-theme-preview" -SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-emulation/qemu - dev-libs/libisoburn - sys-fs/mtools - sys-boot/grub:2[grub_platforms_pc]" diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild deleted file mode 100644 index d1e880bd9f19..000000000000 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU" -HOMEPAGE="https://github.com/hartwork/grub2-theme-preview" -SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="grub_platforms_efi-64" - -RDEPEND="app-emulation/qemu - dev-python/distro[${PYTHON_USEDEP}] - dev-libs/libisoburn - sys-fs/mtools - grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_efi-64] - sys-firmware/edk2-ovmf - ) - !grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_pc] - ) -" diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest index 9aa91080cf18..5ad0f9486da4 100644 --- a/x11-misc/safeeyes/Manifest +++ b/x11-misc/safeeyes/Manifest @@ -1,3 +1 @@ -DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7 -DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2 diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild deleted file mode 100644 index c1d03e56cfa7..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit gnome2-utils xdg distutils-r1 - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND="${PYTHON_DEPS}" -DEPEND="${CDEPEND} - >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}] - " -RDEPEND="${CDEPEND} - dev-libs/libappindicator:3 - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - media-sound/alsa-utils - x11-apps/xprop - x11-misc/xprintidle - " - -DOCS=( - README.md -) - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild index c1d03e56cfa7..66738a3749d8 100644 --- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit gnome2-utils xdg distutils-r1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit xdg distutils-r1 DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" @@ -35,16 +37,12 @@ DOCS=( README.md ) -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild deleted file mode 100644 index c1d03e56cfa7..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit gnome2-utils xdg distutils-r1 - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND="${PYTHON_DEPS}" -DEPEND="${CDEPEND} - >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}] - " -RDEPEND="${CDEPEND} - dev-libs/libappindicator:3 - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - media-sound/alsa-utils - x11-apps/xprop - x11-misc/xprintidle - " - -DOCS=( - README.md -) - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild index 13f90aecaa88..7757cb148d6f 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then LIVE_DEPEND=">=x11-misc/util-macros-1.18" else SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" fi LICENSE="MIT" |