diff options
281 files changed, 3049 insertions, 3329 deletions
diff --git a/app-admin/monit/monit-5.27.2.ebuild b/app-admin/monit/monit-5.27.2.ebuild index b7eba45836fe..89edd3be0a49 100644 --- a/app-admin/monit/monit-5.27.2.ebuild +++ b/app-admin/monit/monit-5.27.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux" IUSE="ipv6 libressl pam ssl" RDEPEND=" diff --git a/app-admin/needrestart/needrestart-3.5.ebuild b/app-admin/needrestart/needrestart-3.5.ebuild index c61ed75e51bf..cf3fcc8ac735 100644 --- a/app-admin/needrestart/needrestart-3.5.ebuild +++ b/app-admin/needrestart/needrestart-3.5.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="Restart daemons after library updates" diff --git a/app-editors/dhex/Manifest b/app-editors/dhex/Manifest index 77ef42a48b34..db47f58f19af 100644 --- a/app-editors/dhex/Manifest +++ b/app-editors/dhex/Manifest @@ -1,2 +1 @@ -DIST dhex_0.68.tar.gz 58602 BLAKE2B c29d5af598b731bc415e2626e945253641ea61c8a744deaeee3f7a2e7b1636ccfb3f8b7696efd33d36fab59d59da408ff4f59b44a88a36a4d7afc27542326c9e SHA512 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421 DIST dhex_0.69.tar.gz 57362 BLAKE2B 26bfeaffc65b0f3b0193ee940da3ad866ea1354d0e5bec021a68a6c515da956500bfd7561ba675d0a67526d09b1a72e8372ee7bb52ec372f2b59249313cf77c6 SHA512 76115fd6b67bf1f61af6acfbc4dac9ac54c14aeb291de6a190aa1ffa599cf8b3e40a422ed34c237cf1f5c7406b07e38e38fb1c9c9dd36ce93d05265238060ba0 diff --git a/app-editors/dhex/dhex-0.68.ebuild b/app-editors/dhex/dhex-0.68.ebuild deleted file mode 100644 index bce05d75ad52..000000000000 --- a/app-editors/dhex/dhex-0.68.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -MY_P=${PN}_${PV} - -DESCRIPTION="ncurses-based hex-editor with diff mode" -HOMEPAGE="http://www.dettus.net/dhex/" -SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips x86" -IUSE="" - -DEPEND="sys-libs/ncurses:=" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.63-Makefile.patch -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin dhex - dodoc README.txt - doman dhex.1 dhex_markers.5 dhex_searchlog.5 dhexrc.5 -} diff --git a/app-editors/dhex/dhex-0.69.ebuild b/app-editors/dhex/dhex-0.69.ebuild index 23c12e031f43..93a5aa2c899d 100644 --- a/app-editors/dhex/dhex-0.69.ebuild +++ b/app-editors/dhex/dhex-0.69.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips x86" +KEYWORDS="amd64 ~arm ~mips x86" IUSE="" DEPEND="sys-libs/ncurses:=" diff --git a/app-editors/dhex/files/dhex-0.63-Makefile.patch b/app-editors/dhex/files/dhex-0.63-Makefile.patch deleted file mode 100644 index f99c9ff1bf2d..000000000000 --- a/app-editors/dhex/files/dhex-0.63-Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN dhex_0.63.orig/Makefile dhex_0.63/Makefile ---- dhex_0.63.orig/Makefile 2011-01-29 00:19:37.000000000 +0100 -+++ dhex_0.63/Makefile 2011-01-30 17:13:51.000000000 +0100 -@@ -1,11 +1,4 @@ --CC= gcc --LDFLAGS= -L/usr/lib -L/usr/local/lib -L/usr/lib/ncurses -L/usr/local/lib/ncurses --CPPFLAGS= -I/usr/include -I/usr/local/include -I/usr/include/ncurses -I/usr/local/include/ncurses --CFLAGS= -O3 -Wall -std=c99 --#CFLAGS+= -ffunction-sections -fdata-sections --#LDFLAGS+= --gc-sections - LIBS= -lncurses --DESTDIR= /usr/local/ - - OFILES=buffers.o input.o output.o machine_type.o main.o menu.o ui.o hexcalc.o search.o gpl.o configfile.o markers.o - diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild index c5d9f0f46db0..c957b4a10f3a 100644 --- a/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild +++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" RESTRICT="test strip" diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild index c8d53efcad41..a5c7b379e5d3 100644 --- a/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild +++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" RESTRICT="test strip" diff --git a/app-misc/mmv/mmv-1.01b_p19.ebuild b/app-misc/mmv/mmv-1.01b_p19.ebuild index c5125cc5d68f..d61f2fc9ff90 100644 --- a/app-misc/mmv/mmv-1.01b_p19.ebuild +++ b/app-misc/mmv/mmv-1.01b_p19.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}/${PN}-${MY_VER}.orig" diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild index 91c76012d1da..94b9034c1074 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit dotnet autotools base +WANT_AUTOMAKE="1.11" +inherit autotools dotnet -SLOT="2" -DESCRIPTION="gtk bindings for mono" -LICENSE="GPL-2" +DESCRIPTION="GTK bindings for mono" HOMEPAGE="http://www.mono-project.com/GtkSharp" -KEYWORDS="amd64 x86" SRC_URI="http://download.mono-project.com/sources/gtk-sharp212/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="amd64 x86" IUSE="debug" RESTRICT="test" @@ -30,33 +32,31 @@ RDEPEND=" !dev-dotnet/glib-sharp !dev-dotnet/glade-sharp !dev-dotnet/pango-sharp - !dev-dotnet/atk-sharp" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/automake:1.11" + !dev-dotnet/atk-sharp +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-2.12.21-mono-ambiguous-range.patch" ) src_prepare() { - base_src_prepare + default + eautoreconf - libtoolize } src_configure() { - econf --disable-static \ + econf \ + --disable-static \ --disable-maintainer-mode \ $(use_enable debug) } -src_compile() { - emake -} - src_install() { default + dotnet_multilib_comply sed -i "s/\\r//g" "${D}"/usr/bin/* || die "sed failed" } diff --git a/dev-games/guichan/guichan-0.8.2.ebuild b/dev-games/guichan/guichan-0.8.2.ebuild index 9ecf5c198b84..3c7dbd3c59ff 100644 --- a/dev-games/guichan/guichan-0.8.2.ebuild +++ b/dev-games/guichan/guichan-0.8.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://guichan.googlecode.com/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="allegro opengl sdl static-libs" +IUSE="allegro opengl sdl" DEPEND=" allegro? ( media-libs/allegro:0 ) @@ -42,7 +42,7 @@ src_configure() { $(use_enable opengl) \ $(use_enable sdl) \ $(use_enable sdl sdlimage) \ - $(use_enable static-libs static) + --disable-static } src_install() { diff --git a/dev-lang/php/php-7.3.27-r1.ebuild b/dev-lang/php/php-7.3.27-r1.ebuild index b350d7454cad..5dc1f526bd80 100644 --- a/dev-lang/php/php-7.3.27-r1.ebuild +++ b/dev-lang/php/php-7.3.27-r1.ebuild @@ -19,7 +19,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/php/php-7.4.16.ebuild b/dev-lang/php/php-7.4.16.ebuild index 592c09770ef7..d5845afe9858 100644 --- a/dev-lang/php/php-7.4.16.ebuild +++ b/dev-lang/php/php-7.4.16.ebuild @@ -21,7 +21,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/spidermonkey/spidermonkey-78.9.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.9.0.ebuild index 0d7f939c9646..2d555e359475 100644 --- a/dev-lang/spidermonkey/spidermonkey-78.9.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-78.9.0.ebuild @@ -60,7 +60,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES} DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++" HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 x86" +KEYWORDS="~amd64 ~arm arm64 ~mips ~ppc64 ~s390 x86" SLOT="78" LICENSE="MPL-2.0" diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild index f532d433da5d..7dbd9f64654b 100644 --- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild +++ b/dev-libs/libcss/libcss-0.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild index e15065a43d35..f24e96b09343 100644 --- a/dev-libs/libdbh/libdbh-5.0.22.ebuild +++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND=" dev-util/gtk-doc-am diff --git a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild index 0e4bb3ed2549..32d9f63adb80 100644 --- a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="sdl test vnc wayland X" RESTRICT="!test? ( test )" diff --git a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild index 84b713406a96..14931dd56ae4 100644 --- a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild +++ b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" BDEPEND="dev-util/netsurf-buildsystem" diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest index 9bc6d98f27fd..4566a60ba7d8 100644 --- a/dev-libs/libsigc++/Manifest +++ b/dev-libs/libsigc++/Manifest @@ -1,5 +1,3 @@ -DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f -DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549 DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f36ee15eedd8d2ed0ad1b19933600d04669f9082053ba20543d2195e8833b46a2056055da23fc2ceb1784d5c96cc9 SHA512 4ec5319eda5c0809f1971044152ec7aa142742941644f43ec3944b248667d5694b97a30de8ea0e2260265bbf26a2ffdefbfa8cac5016799d26b92b02411b1c51 diff --git a/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch b/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch deleted file mode 100644 index 3b4703631909..000000000000 --- a/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sigc++/Makefile.am.orig 2010-11-27 20:40:35.301189910 +0930 -+++ sigc++/Makefile.am 2010-11-27 20:40:46.871110361 +0930 -@@ -12,7 +12,7 @@ - sigc_built_h = bind_return.h \ - object_slot.h retype_return.h slot.h bind.h \ - class_slot.h hide.h retype.h signal.h \ -- method_slot.h method_slot.h -+ method_slot.h - - built_sources = $(sigc_built_cc) $(sigc_built_h) - dist_sources = $(sigc_fixed_cc) $(sigc_fixed_h) diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild deleted file mode 100644 index 25b6ed8ce022..000000000000 --- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools gnome2 eutils - -DESCRIPTION="Typesafe callback system for standard C++" -HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ - https://github.com/libsigcplusplus/libsigcplusplus" - -LICENSE="GPL-2 LGPL-2.1+" -SLOT="1.2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -DEPEND="sys-devel/m4" -RDEPEND="" - -src_prepare() { - DOCS="AUTHORS ChangeLog FEATURES IDEAS README NEWS TODO" - - # fixes bug #219041 - sed -e 's:ACLOCAL_AMFLAGS = -I $(srcdir)/scripts:ACLOCAL_AMFLAGS = -I scripts:' \ - -i Makefile.{in,am} - - # fixes bug #469698 - sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' -i configure.in || die - - # Fix duplicated file installation, bug #346949 - epatch "${FILESDIR}/${P}-fix-install.patch" - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-maintainer-mode \ - --enable-threads -} diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild deleted file mode 100644 index 79f39c3b14d1..000000000000 --- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 flag-o-matic multilib-minimal - -DESCRIPTION="Typesafe callback system for standard C++" -HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ - https://github.com/libsigcplusplus/libsigcplusplus" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( dev-libs/boost[${MULTILIB_USEDEP}] )" -# Needs mm-common for eautoreconf - -src_prepare() { - # don't waste time building examples - sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \ - Makefile.am Makefile.in || die "sed examples failed" - - # don't waste time building tests unless USE=test - if ! use test ; then - sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \ - Makefile.am Makefile.in || die "sed tests failed" - fi - - gnome2_src_prepare -} - -multilib_src_configure() { - filter-flags -fno-exceptions #84263 - - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(multilib_native_use_enable doc documentation) \ - $(use_enable static-libs static) \ - $(use_enable test benchmark) -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - einstalldocs - - # Note: html docs are installed into /usr/share/doc/libsigc++-2.0 - # We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs - use doc && dodoc -r examples -} diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild index 4bfd12648e23..3d4c8aa78358 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/nettle/nettle-3.7.2.ebuild b/dev-libs/nettle/nettle-3.7.2.ebuild index 3ed804fd7f91..3ab22392b654 100644 --- a/dev-libs/nettle/nettle-3.7.2.ebuild +++ b/dev-libs/nettle/nettle-3.7.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" SLOT="0/8-6" # subslot = libnettle - libhogweed soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha" RESTRICT="!test? ( test )" diff --git a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild index 353b0a1d9722..6026522fef7c 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild +++ b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" BDEPEND=" diff --git a/dev-perl/Module-Find/Module-Find-0.130.0.ebuild b/dev-perl/Module-Find/Module-Find-0.130.0.ebuild index 8f77451a3352..788587a637d4 100644 --- a/dev-perl/Module-Find/Module-Find-0.130.0.ebuild +++ b/dev-perl/Module-Find/Module-Find-0.130.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Find and use installed modules in a (sub)category" SLOT="0" -KEYWORDS="amd64 ~arm x86 ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild index 76bad1fae993..78da0c5e7788 100644 --- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild +++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Recursively scan Perl code for dependencies" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild index 8c751a9c58ea..5dda7836d621 100644 --- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild +++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Unix process table information" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="examples" PATCHES=( diff --git a/dev-perl/Sort-Naturally/Sort-Naturally-1.30.0-r1.ebuild b/dev-perl/Sort-Naturally/Sort-Naturally-1.30.0-r1.ebuild index 1384f70d61c6..28601209d1d0 100644 --- a/dev-perl/Sort-Naturally/Sort-Naturally-1.30.0-r1.ebuild +++ b/dev-perl/Sort-Naturally/Sort-Naturally-1.30.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="sort lexically, but sort numeral parts numerically" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="" SRC_TEST=do diff --git a/dev-python/GitPython/GitPython-3.1.13.ebuild b/dev-python/GitPython/GitPython-3.1.13.ebuild deleted file mode 100644 index ef1dd01cb94d..000000000000 --- a/dev-python/GitPython/GitPython-3.1.13.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -TEST_P=GitPython-${PV} -GITDB_P=gitdb-4.0.5-r1 -SMMAP_P=smmap-3.0.4 - -DESCRIPTION="Library used to interact with Git repositories" -HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz - test? ( - https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle - https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle - https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle - )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-vcs/git - >=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - >=dev-python/ddt-1.1.1[${PYTHON_USEDEP}] - )" - -distutils_enable_tests unittest - -src_test() { - git config --global user.email "travis@ci.com" || die - git config --global user.name "Travis Runner" || die - - git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die - git clone "${DISTDIR}/${GITDB_P}.gitbundle" \ - "${T}"/test/git/ext/gitdb || die - git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \ - "${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die - - cd "${T}"/test || die - TRAVIS=1 ./init-tests-after-clone.sh || die - cat test/fixtures/.gitconfig >> ~/.gitconfig || die - rm -r test/performance || die - # tests requiring network access - sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die - rm test/test_installation.py || die - # broken with git 2.30+ - sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die - - distutils-r1_src_test -} diff --git a/dev-python/GitPython/GitPython-3.1.14.ebuild b/dev-python/GitPython/GitPython-3.1.14.ebuild index f1e63e903be0..ef1dd01cb94d 100644 --- a/dev-python/GitPython/GitPython-3.1.14.ebuild +++ b/dev-python/GitPython/GitPython-3.1.14.ebuild @@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-vcs/git diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest index 2ff1883edac7..981dccdfc978 100644 --- a/dev-python/GitPython/Manifest +++ b/dev-python/GitPython/Manifest @@ -1,5 +1,3 @@ -DIST GitPython-3.1.13.gitbundle 4434559 BLAKE2B d8a2478d40f908d7913d08a3a5e98bea3a50366659838a8d3ec335ce7864e7ddbe290de0581b7c4315c83f1cd9ed517af06a7b9232378ee299090accde0b595e SHA512 6d62488a3c9ff66b4f25dd3f1419835591379736ca3faf57055121a8ccb5b8da933e3b37836a6da59de29cb62b03ebef6c38d7387c86dc95da2206024c58f289 -DIST GitPython-3.1.13.tar.gz 171249 BLAKE2B ec653a40654e42d93ba552e1b0a40c5241cd7f86a110f1a0570d6a3ca35cb7522955650a171a8a4113248e508f84a4f5cd021edf941fb41057aec01ef6f30194 SHA512 9618be674e592e3653eb8f59e5878f72b3583d2052184f6321d24130e4cdd16236c9ee4823ee38036c2361685d78ab7ed79660746506a8f98285ab776e1c98b0 DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e877bf3dedde61665754c1d4b14b98d0ddc863666ff1dceb313174a908f8fbacbda0586e53e874a1397e6eeb562cf1ddf1f SHA512 ecd570bdb85dfa64f42ce447bf381868d584eb56897954d893ba1f1ee193fa4e45f3847fe842a67276da0cf155a2501ed4c25d34d300a9776b0f068b659ba014 DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675 DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7 diff --git a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild index 89eb9710f38e..06a6c5128633 100644 --- a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild +++ b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" BDEPEND=" diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest index af29eb5a8252..16660a614352 100644 --- a/dev-python/cfn-python-lint/Manifest +++ b/dev-python/cfn-python-lint/Manifest @@ -1,5 +1,3 @@ -DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4 DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104 DIST cfn-python-lint-0.47.2.tar.gz 6478541 BLAKE2B 1955c6aa43512d4249741db982a6e4e5fe46daa3197d028590269d74690de2f67a1615e4907bfc434fb1e265770780a5c0da2a19c2bdfa8b44dfc7b0386e4405 SHA512 26e2e4cc26090e6da54ff0f90b9e35767e1d5677321cfb84ff00f820477d6ab576e7f58219346f48eb838dccf662df3a8a75e709cfa9690868d85130745f0cc8 -DIST cfn-python-lint-0.48.0.tar.gz 6528354 BLAKE2B 083f154f04c301dda2e84bbfdbf82f84f38516b865e085b16c9d4acdaff47849dd143cdbd7c26dbfca44608d9a402a16ecf627c8a89c01a69e1a9980d1b1ea61 SHA512 2df97e731c01d9cfe5d85dbed9bb03e487bbb86b293187f8ae66022cc2b7f85916397bcbb1b67ab179136599e4204fd058ba37d0f69f0d1c5605e34d8e56e4ce DIST cfn-python-lint-0.48.1.tar.gz 6531054 BLAKE2B 76aab248bf8d043c274b6a6d17c9ecada3b92fb0688a32989095771206a2f37728216fe1eb5d247237457d88279b04870a5808f7a93c15f77cf53c6734a3e4aa SHA512 11373f9755d0955d57dfb48fb806565cc22d2f6deeba261dbf1446b95960bce915b4b2d0bb3e1884b59a7874ead18b0cc196bd599bcdcc935a4ab0f18b4276aa diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild deleted file mode 100644 index 864a47207182..000000000000 --- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="CloudFormation Linter" -HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint" -SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -RDEPEND=" - >=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/importlib_resources[${PYTHON_USEDEP}] - ' python3_6) - dev-python/jsonpatch[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/junit-xml[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/requests-2.15.0[${PYTHON_USEDEP}] - >=dev-python/six-1.11[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests --install unittest - -PATCHES=( - "${FILESDIR}/cfn-python-lint-0.30.1-tests.patch" -) - -src_prepare() { - # unpin the deps - sed -e 's:~=[0-9.]*::' -i setup.py || die - # requires git checkout - sed -e 's:test_update_docs:_&:' \ - -i test/unit/module/maintenance/test_update_documentation.py || die - distutils-r1_src_prepare -} diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild deleted file mode 100644 index c3edcec5c4eb..000000000000 --- a/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="CloudFormation Linter" -HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint" -SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - >=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/importlib_resources[${PYTHON_USEDEP}] - ' python3_6) - dev-python/jsonpatch[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/junit-xml[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/requests-2.15.0[${PYTHON_USEDEP}] - >=dev-python/six-1.11[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests --install unittest - -PATCHES=( - "${FILESDIR}/cfn-python-lint-0.30.1-tests.patch" -) - -src_prepare() { - # unpin the deps - sed -e 's:~=[0-9.]*::' -i setup.py || die - # requires git checkout - sed -e 's:test_update_docs:_&:' \ - -i test/unit/module/maintenance/test_update_documentation.py || die - # requires Internet - sed -e 's:test_update_resource_specs_python:_&:' \ - -i test/unit/module/maintenance/test_update_resource_specs.py || die - distutils-r1_src_prepare -} diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest index 3a4007df06f5..8959199117de 100644 --- a/dev-python/chameleon/Manifest +++ b/dev-python/chameleon/Manifest @@ -1,2 +1 @@ -DIST chameleon-3.8.1.gh.tar.gz 137012 BLAKE2B 20b0a830ae932ad0e8b28015b233049ee78a74f06f26d2652ee297f366eda6f54fa7650fa20a3c4da3802a2466c0f6a4c4cdfd9608761a20986c86673c61a242 SHA512 d4a4b3ac0b59865a7ea1d9ede7f08d991296c1d08a48c7290b9e2864afa6527237d8dee604114918f3b5035f2cc915bf6218d0758ebcd393f2103bb0751f6ea2 DIST chameleon-3.9.0.gh.tar.gz 136548 BLAKE2B bdea62d4eb13dc6e830fccf72c7798c97f1f3a72c8f749ce43ce53ea0a3f8521f52f86591796d2850d84d8ee53a22a976e45f9a8b51f6ea2377dce10b8e2c226 SHA512 72cbd21f083d14b056539c515e43daaca01d923e065b6eca511f4e09486eb8e3fa61d6823dc78cca75f71926050aa04e0f961c9ddd728e15f55408e405f3c7aa diff --git a/dev-python/chameleon/chameleon-3.8.1.ebuild b/dev-python/chameleon/chameleon-3.8.1.ebuild deleted file mode 100644 index f9026b3176a8..000000000000 --- a/dev-python/chameleon/chameleon-3.8.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Fast HTML/XML template compiler for Python" -HOMEPAGE="https://github.com/malthe/chameleon - https://pypi.org/project/Chameleon/" -SRC_URI=" - https://github.com/malthe/chameleon/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="repoze" -SLOT="0" -KEYWORDS="amd64 x86" - -distutils_enable_tests setup.py diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest index d6486c5cd4ef..fdc92972dcec 100644 --- a/dev-python/docker-py/Manifest +++ b/dev-python/docker-py/Manifest @@ -1,2 +1 @@ -DIST docker-py-4.4.3.tar.gz 247491 BLAKE2B 1cc69a700e58abf89588831bd6f99da4b3bab0d8d51e7c193568a9291bce9f13c3d0415a135612439154d2e0651a3ac79b0365386eabcf47059f2ed8e0ed66d9 SHA512 270323f2f096714d7b63f2382da233d061a3dc228279aa3fb89a1dd295321f63f8dd1a883d5cf7afb400341962ec4e060607a03e5e6df43f4f1e629d4e217d73 DIST docker-py-4.4.4.tar.gz 247640 BLAKE2B 68b2e0d41e68fdf4826d61b7ab167321467b1b30f122f0b29955a62ac5f036fc0b60b02a8c9a6776ffd9a7cafb5744de44ec3b9284d0f266a1dd5c72fbec2879 SHA512 4106ffe353ce8c3227c30c38347f107e0f7da660f1c3ae68bf2c576fc6b270f6fae6774747c46491eae0fc85a48dfe246b7a22d8e45c74eff89ed43be285f0df diff --git a/dev-python/docker-py/docker-py-4.4.3.ebuild b/dev-python/docker-py/docker-py-4.4.3.ebuild deleted file mode 100644 index 911b9fb84a08..000000000000 --- a/dev-python/docker-py/docker-py-4.4.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="Python client for Docker" -HOMEPAGE="https://github.com/docker/docker-py" -SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" - -RDEPEND=" - >=dev-python/requests-2.24.0[${PYTHON_USEDEP}] - >=dev-python/six-1.4.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] -" -DEPEND=" - test? ( - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs \ - 'dev-python/recommonmark' \ - '>=dev-python/sphinx-1.4.6' -distutils_enable_tests pytest - -src_prepare() { - # localhost has a better chance of being in /etc/hosts - sed -e 's:socket[.]gethostname():"localhost":' \ - -i tests/unit/api_test.py || die - - distutils-r1_src_prepare -} - -python_test() { - pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/docker-py/docker-py-4.4.4.ebuild b/dev-python/docker-py/docker-py-4.4.4.ebuild index 6cfc62e02e87..911b9fb84a08 100644 --- a/dev-python/docker-py/docker-py-4.4.4.ebuild +++ b/dev-python/docker-py/docker-py-4.4.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" RDEPEND=" >=dev-python/requests-2.24.0[${PYTHON_USEDEP}] diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest index df450842d873..eb3df5b9f268 100644 --- a/dev-python/googleapis-common-protos/Manifest +++ b/dev-python/googleapis-common-protos/Manifest @@ -1,2 +1 @@ -DIST googleapis-common-protos-1.52.0.tar.gz 39383 BLAKE2B 0b2a21b62c1e48cec91b6fe0d141baa1c1081b621c27d60d0a045932388d8c1b8c1eaee3219cdc3af1919b19358e6ec759e109865367b1b7879b3af05f7ec9be SHA512 470d949379a6aa21875b1c5851de54391847f89136b0b7ee84ac68931388a6294f53be167b6095265b2c2c0f30c7d8c71a4e5a546638670d24a9bd544538ff1a DIST googleapis-common-protos-1.53.0.tar.gz 106651 BLAKE2B a38ae93d0fe639bad571d74c9f2d011504cd82175e19aad27deda467676936c7df804ded50ee51544615609ce4fb6a6ec629fa175fbda7b2119c73747b6c58a7 SHA512 2ae8230b712ab6fc8328d3e3ba55ace28b9ba5fe3a300899b4a1f13d5d8b3bfd19eef9d1829747b57c56169351e4aa14380551d009fe6bd46e27aa22e7d3b9a5 diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild deleted file mode 100644 index 54aed44eb3d1..000000000000 --- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="python classes generated from the common protos in the googleapis repository" -HOMEPAGE="https://pypi.org/project/googleapis-common-protos/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -RDEPEND=" - dev-python/namespace-google[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] -" - -python_install_all() { - distutils-r1_python_install_all - find "${D}" -name '*.pth' -delete || die -} - -# no tests as this is all generated code diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild index c804a5294fd8..614c18bba21a 100644 --- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild +++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" dev-python/namespace-google[${PYTHON_USEDEP}] diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest index 0cbf326fbe7b..c28ab91001fe 100644 --- a/dev-python/ipython/Manifest +++ b/dev-python/ipython/Manifest @@ -1,3 +1,2 @@ -DIST ipython-7.20.0.tar.gz 5140776 BLAKE2B ec01caf874ab9c331eb1f074f9e70acb521fe6d4abe3e8f086d9e9e77cd710c3b0d88c6d7b071abc6962eee8141b65a012ec772cbec3450db25f086fc66cf1c6 SHA512 2fff1a64c3d83e794e76bcbdf54e105f499321d9a7e5d3221cdc3e15a96e90543fd465b8dbee4836965286e7c1f1ea6d13e4d3d88c095164858bf71c161111fe DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0 diff --git a/dev-python/ipython/ipython-7.20.0.ebuild b/dev-python/ipython/ipython-7.20.0.ebuild deleted file mode 100644 index a6700d2b28b3..000000000000 --- a/dev-python/ipython/ipython-7.20.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='readline,sqlite,threads(+)' - -inherit distutils-r1 optfeature virtualx - -DESCRIPTION="Advanced interactive shell for Python" -HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test" -RESTRICT="!test? ( test )" - -CDEPEND=" - dev-python/backcall[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - >=dev-python/jedi-0.16[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.3[${PYTHON_USEDEP}] - dev-python/pickleshare[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}] - <dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/traitlets[${PYTHON_USEDEP}] - matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) -" - -RDEPEND="${CDEPEND} - nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )" - -BDEPEND=" - test? ( - ${CDEPEND} - app-text/dvipng[truetype] - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/numpy-1.14[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/testpath[${PYTHON_USEDEP}] - ) - doc? ( - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/sphinx-2[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - )" - -PDEPEND=" - notebook? ( - dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/widgetsnbextension[${PYTHON_USEDEP}] - ) - qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) - smp? ( - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - >=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch ) - -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - # Remove out of date insource files - rm IPython/extensions/cythonmagic.py || die - rm IPython/extensions/rmagic.py || die - - # Prevent un-needed download during build - if use doc; then - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html_noapi - HTML_DOCS=( docs/build/html/. ) - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - distutils_install_for_testing - pushd "${TEST_DIR}" >/dev/null || die - "${TEST_DIR}"/scripts/iptest || die - popd >/dev/null || die -} - -python_install() { - distutils-r1_python_install - - # Create ipythonX.Y symlinks. - # TODO: - # 1. do we want them for pypy? No. pypy has no numpy - # 2. handle it in the eclass instead (use _python_ln_rel). - # With pypy not an option the dosym becomes unconditional - dosym ../lib/python-exec/${EPYTHON}/ipython \ - /usr/bin/ipython${EPYTHON#python} -} - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -pkg_postinst() { - optfeature "sympyprinting" dev-python/sympy - optfeature "cythonmagic" dev-python/cython - optfeature "%lprun magic command" dev-python/line_profiler - optfeature "%mprun magic command" dev-python/memory_profiler - - if use nbconvert; then - if ! has_version app-text/pandoc ; then - einfo "Node.js will be used to convert notebooks to other formats" - einfo "like HTML. Support for that is still experimental. If you" - einfo "encounter any problems, please use app-text/pandoc instead." - fi - fi -} diff --git a/dev-python/ipython/ipython-7.21.0.ebuild b/dev-python/ipython/ipython-7.21.0.ebuild index e314d1de9986..a6700d2b28b3 100644 --- a/dev-python/ipython/ipython-7.21.0.ebuild +++ b/dev-python/ipython/ipython-7.21.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test" RESTRICT="!test? ( test )" diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest index 8e1746e9e8d0..c1697381f87b 100644 --- a/dev-python/keep/Manifest +++ b/dev-python/keep/Manifest @@ -1,2 +1 @@ DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f -DIST keep-2.10.tar.gz 12959 BLAKE2B a6c7c507f3e6f905fcc4878909cfaa56c767266499a12fa12b6850a1dfade3b33d5ade1d2f53b69ecc0480816b496c75250742672fd1a9de14c747abeae7f3df SHA512 a72901e1f66d756626ceca1550b0e539e4c9f56ebb80d96f87696482420b7f75e07d06eded538acf8866e0d1e65e83da00a23ed328a4e37a6f82a607bd5c3bfc diff --git a/dev-python/keep/keep-2.10.1.ebuild b/dev-python/keep/keep-2.10.1.ebuild index f471b77bd944..b6873ec74c68 100644 --- a/dev-python/keep/keep-2.10.1.ebuild +++ b/dev-python/keep/keep-2.10.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/dev-python/keep/keep-2.10.ebuild b/dev-python/keep/keep-2.10.ebuild deleted file mode 100644 index 0d9fe3384522..000000000000 --- a/dev-python/keep/keep-2.10.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_{7..9} ) - -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit distutils-r1 - -DESCRIPTION="Personal shell command keeper and snippets manager" -HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] - dev-python/PyGithub[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/terminaltables[${PYTHON_USEDEP}] -" diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest index bd0c7037ce2f..39c05de7fa8a 100644 --- a/dev-python/nbclient/Manifest +++ b/dev-python/nbclient/Manifest @@ -1,2 +1 @@ -DIST nbclient-0.5.2.gh.tar.gz 69270 BLAKE2B 8365e8097846239f22682784408a944ba6fa97ed71e8a57f0fcd6f87630ccb4ddf3f7a2636aa051342be00d8bac866eec2e259d4c2e914ea437398a562166f58 SHA512 e5c5dae3be9fc37078d358093307f45f30ada67c52d4cdcde56a09846e924d892f6ac98d0acf80207b59de2f4b08f64d12f62b98733e7776cc2a894d6e3516e9 DIST nbclient-0.5.3.gh.tar.gz 69340 BLAKE2B ef2908037b350879b4494a9676550754b51c218c0b344c8f26882fac63d3de65b37329fc8aa586f71f0fcb24d0508c2aec81d1066021abd4c66ee1b220574ef8 SHA512 16a92bdab931c2cec133389bfd491c9f3f4ca7ff3b11a3eb70fcdb568a0aecb8cca65d5a1fb25ff9a6ed6d581bed04de8e51ac2d856fad386b22aa6a2424c991 diff --git a/dev-python/nbclient/nbclient-0.5.2.ebuild b/dev-python/nbclient/nbclient-0.5.2.ebuild deleted file mode 100644 index ac9c8e17af10..000000000000 --- a/dev-python/nbclient/nbclient-0.5.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="A client library for executing Jupyter notebooks" -HOMEPAGE=" - https://nbclient.readthedocs.io/en/latest/ - https://github.com/jupyter/nbclient/ - https://pypi.org/project/nbclient/" -SRC_URI=" - https://github.com/jupyter/nbclient/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -RDEPEND=" - dev-python/async_generator[${PYTHON_USEDEP}] - >=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}] - >=dev-python/nbformat-5.0[${PYTHON_USEDEP}] - dev-python/nest_asyncio[${PYTHON_USEDEP}] - >=dev-python/traitlets-4.2[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/dev-python/nbclient/nbclient-0.5.3.ebuild b/dev-python/nbclient/nbclient-0.5.3.ebuild index 6dfa8f2ac375..ac9c8e17af10 100644 --- a/dev-python/nbclient/nbclient-0.5.3.ebuild +++ b/dev-python/nbclient/nbclient-0.5.3.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-python/async_generator[${PYTHON_USEDEP}] diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest index 61458879f1d2..29cda08883c2 100644 --- a/dev-python/pecan/Manifest +++ b/dev-python/pecan/Manifest @@ -1,2 +1 @@ -DIST pecan-1.3.3.tar.gz 120595 BLAKE2B d1169b6af4fe822259a6bad75068475324cd9c7811a8e62ae6f9c2b9bbfe69b7688a03de9c4a1a4b27666f22c34fdac95ebddbb50feba6ccda60fd2a7f190d38 SHA512 ffa171d4847e549f959dd5ed71f32b3d689ef7e2548302adfadd007f5217c4e1a16088612c27005ac6ae38bb5a99aa532e84be71ae4abf6b06dfdb26ff5cac89 DIST pecan-1.4.0.tar.gz 124233 BLAKE2B 42ac41d9e4aba2ad40b89d2ec742ae82a3d9f599c79d0ac5cce199b8ee50ba5e0765f02dc8812defd3e7276176d0e4dadf06b56256e9808771805df64811e9d4 SHA512 102ac8549fcb8c1f29aaf6facf1fba3dd06c454ed6262c3b0e9a009063033defbf0011b4117d854da1f4770368d3dbce1e3930daabfb0c7ee069eb2522bac7e1 diff --git a/dev-python/pecan/pecan-1.3.3-r2.ebuild b/dev-python/pecan/pecan-1.3.3-r2.ebuild deleted file mode 100644 index aeb02c9ea7cc..000000000000 --- a/dev-python/pecan/pecan-1.3.3-r2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies." -HOMEPAGE="https://pypi.org/project/pecan/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="" - -RDEPEND=" - >=dev-python/webob-1.4[${PYTHON_USEDEP}] - >=dev-python/mako-0.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-1.3.1[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]" diff --git a/dev-python/pecan/pecan-1.4.0.ebuild b/dev-python/pecan/pecan-1.4.0.ebuild index 0582e6a2ec9b..af04251ebf34 100644 --- a/dev-python/pecan/pecan-1.4.0.ebuild +++ b/dev-python/pecan/pecan-1.4.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest index 86c8b7bf3c8d..3e6d8515b582 100644 --- a/dev-python/pikepdf/Manifest +++ b/dev-python/pikepdf/Manifest @@ -1,9 +1,3 @@ -DIST pikepdf-2.5.2.tar.gz 2368463 BLAKE2B dcf7e2c6f8a2a9d41073f2528fa6a13d5d79c0915d4dba810fb13a989039beafebbbfe0c8211f0a769ade9889af0c99ce1ca5052c74d0d88d817447dfdb3a7d5 SHA512 52e13805d4712f623af6c91eb287009abb6179d28451ab0a32b3472c4b8e484cc5700c3a32bb98cd7a188d4249128b2a2ef7fb19e8bc5aee4488627df161c38d -DIST pikepdf-2.6.0.tar.gz 2368553 BLAKE2B 9bffcb7ed046f0337392fc27bcdaf8bc7ddd451d6c238fc5cf7ef952658f154e6cd0ae553f84fe10c4df946756fb8011a449e90b7f886db11b2330fe452f75d7 SHA512 0a57df99156dfe34d129231cd9ee703cb4d00f44d65e767aa71d7094e1e0896afda1d8f770f4efa33e156ac083ede9741ac7765a415a101bf38f1eab8da04bf1 DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437ef41e49ad922a2f29c46f74cba9570aa1e3f9dffeacfe2bf31f6abee27bc393200620ebf23184f80ce3b40a93c3 SHA512 d3291e15461ebf9cb20d6ed145d6327e25595375a0b9e4ca9f6ee26a4b698d094f8f938cf766ee530cdd565b0f10bec78f228f70479e2777907376d24ea3b34f -DIST pikepdf-2.8.0.post1.tar.gz 2370159 BLAKE2B 336f2034f3a0207d1f5522b13ff2d0a02945862341eab78de00276cfeb9cb9c2bce17d2951b388045ef40e59bbb225988ed6443642a129b1b088908326c04bfa SHA512 8021afbc33625d5990543e315769534b9c886cb1487ad20ef00d00246c6b58edc0104f717fcfc575347e33533144af79114c5828303901d907d4756a052fcfba DIST pikepdf-2.8.0.post2.tar.gz 2369810 BLAKE2B 67b2f88a0718076d9f28148342832ec646443b6bdf0f9ca3717a9a9caa6518563564f25e4532c3ebc5d05e18b78f2db4a9bab17f0d0cf6cf329dcc41f7c3332f SHA512 adf28106dbf58bf4b29c3930280c6f54c04ac4fc40adb4d9e7fe3a288293b077f2e4b063e4be91e661c835b474ba2b46167ce05d9f5d2c7c13ae180f6b3b76dc -DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435 -DIST pikepdf-2.9.0.tar.gz 2371794 BLAKE2B 7a32542d428d67e1eb940d34ba7efc21bb3002cc573e02de383d7beeb795a0680709c0fdecb933fc7b63a09cc1fb616df9fd514d734f13b6c0ad022c6482c64c SHA512 e1c5ee04946f8c43d20ea1ff857ec463cf8ea531d5d579d0855669401b8dc931bc3ac08be20e3231aafbbc5fc8984608cd8f8aece214ebb7068c21e94981b9a1 -DIST pikepdf-2.9.1.tar.gz 2373727 BLAKE2B ae6b15384c4f01f257a00893c30212281c7ed16dc311e5409355a71db4bef20b64aaab29b52e5b951c6842100fb0cd9bb247d90dcf0a17bac85f788a4c0f7a35 SHA512 e2d87f8b3ce1b78e8153ce79bdbc33f10e85364de912a94f0629f52e654db2c7d911a5d344778c8e632a3037d4151dd4f717e4cc73161e004ac62ea3f07a526c DIST pikepdf-2.9.2.tar.gz 2375015 BLAKE2B 775a523ec7543bd112a673e352c5835b84f28fc3a1b762447d4366d6195cf423c284ab638286afd1f768a2a475957695252e473b7b4d8d16c48fcab733a138bc SHA512 909f98519f2eb685225ed19e4ed4a7bcf018a5eb21be42833635e76a09d1c89254980f628875eebfc2b937ae8030d11d916503da28888421971540964d8ffd39 diff --git a/dev-python/pikepdf/pikepdf-2.5.2.ebuild b/dev-python/pikepdf/pikepdf-2.5.2.ebuild deleted file mode 100644 index 4390d9079ef7..000000000000 --- a/dev-python/pikepdf/pikepdf-2.5.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pikepdf/pikepdf-2.6.0.ebuild b/dev-python/pikepdf/pikepdf-2.6.0.ebuild deleted file mode 100644 index 597751526446..000000000000 --- a/dev-python/pikepdf/pikepdf-2.6.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pikepdf/pikepdf-2.7.0.ebuild b/dev-python/pikepdf/pikepdf-2.7.0.ebuild index 597751526446..4390d9079ef7 100644 --- a/dev-python/pikepdf/pikepdf-2.7.0.ebuild +++ b/dev-python/pikepdf/pikepdf-2.7.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND="app-text/qpdf:0=" RDEPEND="${DEPEND} diff --git a/dev-python/pikepdf/pikepdf-2.8.0.ebuild b/dev-python/pikepdf/pikepdf-2.8.0.ebuild deleted file mode 100644 index 597751526446..000000000000 --- a/dev-python/pikepdf/pikepdf-2.8.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild b/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild deleted file mode 100644 index 2a76869d388e..000000000000 --- a/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -MY_P=${P/_p/.post} -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pikepdf/pikepdf-2.9.0.ebuild b/dev-python/pikepdf/pikepdf-2.9.0.ebuild deleted file mode 100644 index 2a76869d388e..000000000000 --- a/dev-python/pikepdf/pikepdf-2.9.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -MY_P=${P/_p/.post} -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pikepdf/pikepdf-2.9.1.ebuild b/dev-python/pikepdf/pikepdf-2.9.1.ebuild deleted file mode 100644 index 2a76869d388e..000000000000 --- a/dev-python/pikepdf/pikepdf-2.9.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -MY_P=${P/_p/.post} -DESCRIPTION="Python library to work with pdf files based on qpdf" -HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-text/qpdf:0=" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5[${PYTHON_USEDEP}] - >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] - >=dev-python/psutil-5[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] - )" - -#distutils_enable_sphinx docs \ -# dev-python/ipython \ -# dev-python/matplotlib \ -# dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/wheel/d' setup.py || die - sed -i -e '/-n auto/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest index 5350f892e14a..0f9aa76befef 100644 --- a/dev-python/pynvim/Manifest +++ b/dev-python/pynvim/Manifest @@ -1,2 +1 @@ -DIST pynvim-0.4.2.tar.gz 52809 BLAKE2B 0bc2c3b509b602d7c46df9c54e867d1833bcadc792d5e1b27e45d99a57c33ff531e85841d8cbccdcb104892a994fcd71ac1c6ba2e86b4785cf890b1f8445d577 SHA512 d24d18fd158b318396cbd4e4ca3a0a304cb12b6790b84fc5f78bbb4aaa4b325d0fea6e281ff3cb27efbec0130d193d4871806750f6d1b792ef8a3558b5c37501 DIST pynvim-0.4.3.tar.gz 52807 BLAKE2B 2ac8894af71a28f8008dca1f9e34a0cda6a68aa108ddfe122e4e9cac4c7669262483729aafb238d0e8eb0022ddea9bb222ec7b718e9a9c59fbb349821b6b8dbe SHA512 5d8fc7623a5bc2e069991b901dbd4dcc6005ddab31e2f0a70ee50c2d6febf3b5c29a61fc4dce454aa494779d7a869a1e92a2a97cb66212ed858c3d3fd77c0f55 diff --git a/dev-python/pynvim/pynvim-0.4.2.ebuild b/dev-python/pynvim/pynvim-0.4.2.ebuild deleted file mode 100644 index dce10932cf47..000000000000 --- a/dev-python/pynvim/pynvim-0.4.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="Python client for Neovim" -HOMEPAGE="https://github.com/neovim/pynvim" -SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" - -DEPEND=" - dev-python/msgpack[${PYTHON_USEDEP}] - virtual/python-greenlet[${PYTHON_USEDEP}] - test? ( app-editors/neovim )" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/pynvim/pynvim-0.4.3.ebuild b/dev-python/pynvim/pynvim-0.4.3.ebuild index c761d8d7cf7c..dce10932cf47 100644 --- a/dev-python/pynvim/pynvim-0.4.3.ebuild +++ b/dev-python/pynvim/pynvim-0.4.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" DEPEND=" dev-python/msgpack[${PYTHON_USEDEP}] diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 3ab3aae592fb..f16d4c2f2710 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,4 +1,3 @@ -DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379 DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642 diff --git a/dev-python/setuptools/setuptools-53.0.0.ebuild b/dev-python/setuptools/setuptools-53.0.0.ebuild deleted file mode 100644 index 4231ee0d4ba4..000000000000 --- a/dev-python/setuptools/setuptools-53.0.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 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_{7..9} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 multiprocessing - -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}.tar.gz" - -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -BDEPEND=" - test? ( - dev-python/jaraco-envs[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${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}]" - -distutils_enable_tests pytest - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst ) - -python_test() { - distutils_install_for_testing --via-root - local deselect=( - # TODO - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - # this one's unhappy about pytest-xdist but one test is not worth - # losing the speed gain - setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import - ) - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \ - setuptools || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest index 1ad2d623dc1e..15b3b575d3cb 100644 --- a/dev-python/txaio/Manifest +++ b/dev-python/txaio/Manifest @@ -1,2 +1 @@ -DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c DIST txaio-21.2.1.tar.gz 53383 BLAKE2B ff245c7e303a88e0e0f71bfa99ec5cfa2e6ec026e43e9477beb711cc753d73d4f49079727f9f86499779819fda74747edee00ebe22c0ac59c764c1403b983960 SHA512 762875b9c10304dab31dd54f7830f56b0cc26dd6e7a98c8faf57891a2810e36f53004833f872f0f51bad61cb62be033cfc228c99fd6aff60cd4dd2ae2f2e5c37 diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild deleted file mode 100644 index 0ae1647e9e78..000000000000 --- a/dev-python/txaio/txaio-20.12.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius" -HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux" - -BDEPEND=" - test? ( - >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] - ) -" -distutils_enable_sphinx docs \ - '>=dev-python/sphinxcontrib-spelling-2.1.2' \ - '>=dev-python/sphinx_rtd_theme-0.1.9' -distutils_enable_tests pytest - -src_prepare() { - default_src_prepare - # Take out failing tests known to pass when run manually - # we certainly don't need to test "python setup.py sdist" here - rm "${S}/test/test_packaging.py" || die -} diff --git a/dev-python/txaio/txaio-21.2.1.ebuild b/dev-python/txaio/txaio-21.2.1.ebuild index d4a805dd4f33..0ae1647e9e78 100644 --- a/dev-python/txaio/txaio-21.2.1.ebuild +++ b/dev-python/txaio/txaio-21.2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux" BDEPEND=" test? ( diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild index 1ce46b172f5b..fe07d8cc2617 100644 --- a/dev-python/uvloop/uvloop-0.15.2.ebuild +++ b/dev-python/uvloop/uvloop-0.15.2.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv" HOMEPAGE="https://github.com/magicstack/uvloop" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" LICENSE="MIT" SLOT="0" IUSE="doc examples" diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest index 6de0f10a97ea..fa44d517761e 100644 --- a/dev-util/babeltrace/Manifest +++ b/dev-util/babeltrace/Manifest @@ -1 +1,2 @@ DIST babeltrace-1.2.4.tar.bz2 995829 BLAKE2B 99b4455000dd403bc86917ce1c5c6f32b7df8754c61197a03cbd3ec28c5756ae858965b81b06ed8cd72b910c2f0e5885c986d229f607f5c9179688cd1ccdd3b5 SHA512 5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9 +DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96 diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild b/dev-util/babeltrace/babeltrace-1.5.8.ebuild new file mode 100644 index 000000000000..0186c4a6342b --- /dev/null +++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +DESCRIPTION="A command-line tool and library to read and convert trace files" +HOMEPAGE="https://babeltrace.org/" +SRC_URI="https://www.efficios.com/files/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/glib:2 + dev-libs/popt + dev-libs/elfutils + sys-apps/util-linux + " + +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + " +src_configure() { + econf $(use_enable test glibtest) \ + --disable-python-bindings +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass index 79f14d81b134..e83326314261 100644 --- a/eclass/alternatives.eclass +++ b/eclass/alternatives.eclass @@ -1,9 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: alternatives.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org # @AUTHOR: -# Original author: Alastair Tse <liquidx@gentoo.org> (03 Oct 2003) +# Alastair Tse <liquidx@gentoo.org> (03 Oct 2003) # @BLURB: Creates symlink to the latest version of multiple slotted packages. # @DESCRIPTION: # When a package is SLOT'ed, very often we need to have a symlink to the diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 42f801a84d70..ea347fd706af 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -1,4 +1,4 @@ -# Copyright 2007-2020 Gentoo Authors +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ant-tasks.eclass @@ -33,12 +33,14 @@ inherit java-pkg-2 java-ant-2 EXPORT_FUNCTIONS src_unpack src_compile src_install # @ECLASS-VARIABLE: ANT_TASK_JDKVER +# @PRE_INHERIT # @DESCRIPTION: # Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can # be overridden from ebuild BEFORE inheriting this eclass. ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8} # @ECLASS-VARIABLE: ANT_TASK_JREVER +# @PRE_INHERIT # @DESCRIPTION: # Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can # be overridden from ebuild BEFORE inheriting this eclass. @@ -51,6 +53,7 @@ ANT_TASK_JREVER=${ANT_TASK_JREVER-1.8} ANT_TASK_NAME="${PN#ant-}" # @ECLASS-VARIABLE: ANT_TASK_DEPNAME +# @PRE_INHERIT # @DESCRIPTION: # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package # that this one depends on. Defaults to the name of ant task, ebuild can @@ -60,12 +63,14 @@ ANT_TASK_NAME="${PN#ant-}" ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # If set, no JDK/JRE deps are added. # @VARIABLE: ANT_TASK_PV # @INTERNAL +# @DESCRIPTION: # Version of ant-core this task is intended to register and thus load with. ANT_TASK_PV="${PV}" @@ -80,7 +85,7 @@ MY_P="apache-ant-${MY_PV}" # Default values for standard ebuild variables, can be overridden from ebuild. DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}" -HOMEPAGE="http://ant.apache.org/" +HOMEPAGE="https://ant.apache.org/" SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2" LICENSE="Apache-2.0" diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass index 4d0e64ed4e79..24bc5ff27996 100644 --- a/eclass/aspell-dict-r1.eclass +++ b/eclass/aspell-dict-r1.eclass @@ -15,6 +15,7 @@ # Support for aspell-0.60 has been added by Sergey Ulanov. # @ECLASS-VARIABLE: ASPELL_LANG +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # Pure cleartext string that is included into DESCRIPTION. @@ -28,6 +29,7 @@ readonly ASPELL_SPELLANG=${PN/aspell-/} # @ECLASS-VARIABLE: ASPELL_VERSION +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # What major version of Aspell is this dictionary for? Valid values are 5, 6 or undefined. diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 4ae360aa24d4..3e6906cb469a 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -34,16 +34,19 @@ esac inherit libtool # @ECLASS-VARIABLE: WANT_AUTOCONF +# @PRE_INHERIT # @DESCRIPTION: # The major version of autoconf your package needs : ${WANT_AUTOCONF:=latest} # @ECLASS-VARIABLE: WANT_AUTOMAKE +# @PRE_INHERIT # @DESCRIPTION: # The major version of automake your package needs : ${WANT_AUTOMAKE:=latest} # @ECLASS-VARIABLE: WANT_LIBTOOL +# @PRE_INHERIT # @DESCRIPTION: # Do you want libtool? Valid values here are "latest" and "none". : ${WANT_LIBTOOL:=latest} @@ -61,9 +64,9 @@ inherit libtool # version. # If a newer slot is stable on any arch, and is NOT reflected in this list, # then circular dependencies may arise during emerge @system bootstraps. -# -# See bug 312315 and 465732 for further information and context. -# +# +# See bug #312315 and bug #465732 for further information and context. +# # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: <PV>:<WANT_AUTOMAKE> @@ -75,7 +78,7 @@ if [[ -n ${WANT_AUTOMAKE} ]]; then case ${WANT_AUTOMAKE} in # Even if the package doesn't use automake, we still need to depend # on it because we run aclocal to process m4 macros. This matches - # the autoreconf tool, so this requirement is correct. #401605 + # the autoreconf tool, so this requirement is correct, bug #401605. none) ;; latest) # Use SLOT deps if we can. For EAPI=0, we get pretty close. @@ -117,6 +120,7 @@ AUTOTOOLS_DEPEND="${_automake_atom} RDEPEND="" # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND +# @PRE_INHERIT # @DESCRIPTION: # Set to 'no' to disable automatically adding to DEPEND. This lets # ebuilds form conditional depends by using ${AUTOTOOLS_DEPEND} in @@ -159,11 +163,13 @@ unset _automake_atom _autoconf_atom # particular options # @ECLASS-VARIABLE: AT_M4DIR +# @DEFAULT_UNSET # @DESCRIPTION: # Additional director(y|ies) aclocal should search : ${AT_M4DIR:=} # @ECLASS-VARIABLE: AT_SYS_M4DIR +# @DEFAULT_UNSET # @INTERNAL # @DESCRIPTION: # For system integrators, a list of additional aclocal search paths. @@ -182,13 +188,13 @@ unset _automake_atom _autoconf_atom eautoreconf() { local x g - # Subdirs often share a common build dir #529404. If so, we can't safely + # Subdirs often share a common build dir, bug #529404. If so, we can't safely # run in parallel because many tools clobber the content in there. Libtool # and automake both `rm && cp` while aclocal reads the output. We might be # able to handle this if we split the steps and grab locks on the dirs the # tools actually write to. Then we'd run all the common tools that use # those inputs. Doing this in bash does not scale easily. - # If we do re-enable parallel support, make sure #426512 is handled. + # If we do re-enable parallel support, make sure bug #426512 is handled. if [[ -z ${AT_NO_RECURSIVE} ]] ; then # Take care of subdirs for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do @@ -294,8 +300,8 @@ eaclocal_amflags() { [[ -e ${amflags_file} ]] || continue # setup the env in case the pkg does something crazy # in their ACLOCAL_AMFLAGS. like run a shell script - # which turns around and runs autotools. #365401 - # or split across multiple lines. #383525 + # which turns around and runs autotools (bug #365401) + # or split across multiple lines (bug #383525) autotools_env_setup aclocal_opts=$(sed -n \ "/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \ @@ -317,7 +323,7 @@ eaclocal_amflags() { # specified parametes. The name of the tool run is the same of the function # without e prefix. # They also force installing the support files for safety. -# Respects AT_M4DIR for additional directories to search for macro's. +# Respects AT_M4DIR for additional directories to search for macros. eaclocal() { [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \ autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) @@ -366,7 +372,7 @@ eautoconf() { fi # Install config.guess and config.sub which are required by many macros - # in Autoconf >=2.70. + # in autoconf >=2.70. local _gnuconfig case ${EAPI:-0} in 0|1|2|3|4|5|6) @@ -424,7 +430,7 @@ eautomake() { || extra_opts+=( --foreign ) # Older versions of automake do not support --force-missing. But we want - # to use this whenever possible to update random bundled files #133489. + # to use this whenever possible to update random bundled files, bug #133489. case $(_automake_version) in 1.4|1.4[.-]*) ;; *) extra_opts+=( --force-missing ) ;; @@ -518,17 +524,17 @@ autotools_run_tool() { done if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then - ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" + ewarn "QA Warning: running '$1' in ${EBUILD_PHASE} phase" fi if ${missing_ok} && ! type -P ${1} >/dev/null ; then - einfo "Skipping '$*' due $1 not installed" + einfo "Skipping '$*' because '$1' not installed" return 0 fi autotools_env_setup - # Allow people to pass in full paths. #549268 + # Allow people to pass in full paths, bug #549268 local STDERR_TARGET="${T}/${1##*/}.out" # most of the time, there will only be one run, but if there are # more, make sure we get unique log filenames @@ -557,13 +563,13 @@ autotools_run_tool() { "$@" >> "${STDERR_TARGET}" 2>&1 if ! eend $? && ${autofail} ; then echo - eerror "Failed Running $1 !" + eerror "Failed running '$1'!" eerror - eerror "Include in your bugreport the contents of:" + eerror "Include in your bug report the contents of:" eerror eerror " ${STDERR_TARGET}" echo - die "Failed Running $1 !" + die "Failed running '$1'!" fi } diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index e763ac3468c5..e2894b4588b6 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cargo.eclass @@ -204,7 +204,6 @@ cargo_src_unpack() { # @FUNCTION: cargo_live_src_unpack # @DESCRIPTION: # Runs 'cargo fetch' and vendors downloaded crates for offline use, used in live ebuilds - cargo_live_src_unpack() { debug-print-function ${FUNCNAME} "$@" @@ -316,7 +315,6 @@ cargo_live_src_unpack() { # In some cases crates may need '--no-default-features' option, # as there is no way to disable single feature, except disabling all. # It can be passed directly to cargo_src_configure(). - cargo_src_configure() { debug-print-function ${FUNCNAME} "$@" @@ -361,7 +359,6 @@ cargo_src_compile() { # In come case workspaces need alternative --path parameter # default is '--path ./' if nothing specified. # '--path ./somedir' can be passed directly to cargo_src_install() - cargo_src_install() { debug-print-function ${FUNCNAME} "$@" diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass index 4bbe6aa31759..623a19867d42 100644 --- a/eclass/cdrom.eclass +++ b/eclass/cdrom.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cdrom.eclass @@ -21,6 +21,7 @@ inherit portability # @ECLASS-VARIABLE: CDROM_OPTIONAL # @DEFAULT_UNSET +# @PRE_INHERIT # @DESCRIPTION: # By default, the eclass sets PROPERTIES="interactive" on the assumption # that people will be using these. If your package optionally supports @@ -229,13 +230,13 @@ cdrom_load_next_cd() { if [[ ${showedmsg} -eq 0 ]] ; then if [[ ${CDROM_NUM_CDS} -eq 1 ]] ; then - einfo "Please insert+mount the ${CDROM_NAME:-CD for ${PN}} now !" + einfo "Please insert+mount the ${CDROM_NAME:-CD for ${PN}} now!" else local var="CDROM_NAME_${CDROM_CURRENT_CD}" if [[ -z ${!var} ]] ; then - einfo "Please insert+mount CD #${CDROM_CURRENT_CD} for ${PN} now !" + einfo "Please insert+mount CD #${CDROM_CURRENT_CD} for ${PN} now!" else - einfo "Please insert+mount the ${!var} now !" + einfo "Please insert+mount the ${!var} now!" fi fi showedmsg=1 diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index a45cbd15fee7..5c4a420ee06e 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2020 Gentoo Authors +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: check-reqs.eclass @@ -350,8 +350,8 @@ check-reqs_unsatisfied() { ${msg} "There is NOT at least ${sizeunit} ${location}" # @ECLASS-VARIABLE: CHECKREQS_FAILED - # @DESCRIPTION: # @INTERNAL + # @DESCRIPTION: # If set the checks failed and eclass should abort the build. # Internal, do not set yourself. CHECKREQS_FAILED="true" diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index e6d8fe64a02f..1266b5b42ed6 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -20,6 +20,7 @@ # phase rather than 'default'. # @ECLASS-VARIABLE: CMAKE_ECLASS +# @PRE_INHERIT # @DESCRIPTION: # Default is "cmake-utils" for compatibility in EAPI-7. Specify "cmake" for # ebuilds that ported to cmake.eclass already. Future EAPI is "cmake" only. diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index aae859a44cc8..8a4405bef86c 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -94,6 +94,7 @@ _CMAKE_UTILS_ECLASS=1 # "no" to disable (default) or anything else to enable. # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF @@ -101,6 +102,7 @@ _CMAKE_UTILS_ECLASS=1 # Should be set by user in a per-package basis in /etc/portage/package.env. # @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # After running cmake-utils_src_prepare, sets ${S} to read-only. This is diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 196c60e0b15c..4bd09459ea62 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -48,6 +48,7 @@ _CMAKE_ECLASS=1 # Set to enable in-source build. # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Specify a makefile generator to be used by cmake. @@ -81,6 +82,7 @@ _CMAKE_ECLASS=1 : ${CMAKE_WARN_UNUSED_CLI:=yes} # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF @@ -88,6 +90,7 @@ _CMAKE_ECLASS=1 # Should be set by user in a per-package basis in /etc/portage/package.env. # @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # After running cmake_src_prepare, sets ${S} to read-only. This is diff --git a/eclass/cron.eclass b/eclass/cron.eclass index b9f436a4a5aa..5548b190f9a7 100644 --- a/eclass/cron.eclass +++ b/eclass/cron.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cron.eclass @@ -16,7 +16,6 @@ # NOTE on defaults: the default settings in the below functions were # chosen based on the most common setting among cron ebuilds. # -# Please assign any bugs regarding this eclass to cron-bugs@gentoo.org. inherit eutils flag-o-matic diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index dd3cbe135a39..a8e5ee4cc9a0 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cvs.eclass @@ -62,6 +62,7 @@ _CVS_ECLASS=1 # CVS options given after the cvs checkout command. # @ECLASS-VARIABLE: ECVS_OFFLINE +# @USER_VARIABLE # @DESCRIPTION: # Set this variable to a non-empty value to disable the automatic updating of # a CVS source tree. This is intended to be set outside the cvs source @@ -131,6 +132,7 @@ _CVS_ECLASS=1 #: ${ECVS_BRANCH:="HEAD"} # @ECLASS-VARIABLE: ECVS_AUTH +# @PRE_INHERIT # @DESCRIPTION: # Authentication method to use # diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass index 12e7289cc7d0..1ed886fb4dce 100644 --- a/eclass/darcs.eclass +++ b/eclass/darcs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: darcs.eclass @@ -71,6 +71,7 @@ SRC_URI="" : ${EDARCS_REPOSITORY:=} # @ECLASS-VARIABLE: EDARCS_OFFLINE +# @USER_VARIABLE # @DESCRIPTION: # Set this variable to a non-empty value to disable the automatic updating of # a darcs repository. This is intended to be set outside the darcs source @@ -100,6 +101,7 @@ case ${EAPI:-0} in esac # @FUNCTION: darcs_patchcount +# @INTERNAL # @DESCRIPTION: # Internal function to determine amount of patches in repository. darcs_patchcount() { @@ -109,6 +111,7 @@ darcs_patchcount() { } # @FUNCTION: darcs_fetch +# @INTERNAL # @DESCRIPTION: # Internal function is called from darcs_src_unpack darcs_fetch() { diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass index ae861daf6e79..fd25ad1d5856 100644 --- a/eclass/dotnet.eclass +++ b/eclass/dotnet.eclass @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: dotnet.eclass -# @MAINTAINER: dotnet@gentoo.org +# @MAINTAINER: +# dotnet@gentoo.org # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 # @BLURB: common settings and functions for mono and dotnet related packages # @DESCRIPTION: @@ -24,6 +25,7 @@ esac inherit mono-env # @ECLASS-VARIABLE: USE_DOTNET +# @PRE_INHERIT # @DESCRIPTION: # Use flags added to IUSE diff --git a/eclass/dune.eclass b/eclass/dune.eclass index 03857d25a2d4..a6b499cfbdb1 100644 --- a/eclass/dune.eclass +++ b/eclass/dune.eclass @@ -15,6 +15,7 @@ # src_install for dune-based packages. # @ECLASS-VARIABLE: DUNE_PKG_NAME +# @PRE_INHERIT # @DESCRIPTION: # Sets the actual dune package name, if different from gentoo package name. # Set before inheriting the eclass. diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 7876928c7fb2..a092041009bf 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 2002-2020 Gentoo Authors +# Copyright 2002-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp.eclass @@ -27,6 +27,7 @@ # ${PN}.el in src_unpack(). # @ECLASS-VARIABLE: NEED_EMACS +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # If you need anything different from Emacs 23, use the NEED_EMACS diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass index 1f09805f8541..680b7b7e4d61 100644 --- a/eclass/emboss-r2.eclass +++ b/eclass/emboss-r2.eclass @@ -23,6 +23,7 @@ # inherit emboss-r2 # @ECLASS-VARIABLE: EBO_DESCRIPTION +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Completes the generic description of the embassy module as follows: diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index fbb4f0b5bc0d..0c7ca0cf045a 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: epatch.eclass @@ -294,7 +294,7 @@ epatch() { local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}") if [[ -n ${rel_paths} ]] ; then echo - eerror "Rejected Patch: ${patchname} !" + eerror "Rejected Patch: ${patchname}!" eerror " ( ${PATCH_TARGET} )" eerror eerror "Your patch uses relative paths '../':" @@ -359,14 +359,14 @@ epatch() { if [[ ${count} -ge 5 ]] ; then echo - eerror "Failed Patch: ${patchname} !" + eerror "Failed patch: ${patchname}!" eerror " ( ${PATCH_TARGET} )" eerror - eerror "Include in your bugreport the contents of:" + eerror "Include in your bug report the contents of:" eerror eerror " ${STDERR_TARGET}" echo - die "Failed Patch: ${patchname}!" + die "Failed patch: ${patchname}!" fi # if everything worked, delete the full debug patch log diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass index 475b182843a5..f1df8242b6fd 100644 --- a/eclass/fixheadtails.eclass +++ b/eclass/fixheadtails.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fixheadtails.eclass @@ -8,6 +8,12 @@ # Original author John Mylchreest <johnm@gentoo.org> # @BLURB: functions to replace obsolete head/tail with POSIX compliant ones +# @FUNCTION: _do_sed_fix +# @INTERNAL +# @USAGE: <file> +# @DESCRIPTION: +# Apply series of regular expressions via sed to file +# to make head/tail compliant _do_sed_fix() { einfo " - fixed $1" sed -i \ @@ -37,5 +43,5 @@ ht_fix_all() { MATCHES=$(grep -l -s -i -R -e "head -[ 0-9]" -e "tail [+-][ 0-9]" * | sort -u) [[ -n ${MATCHES} ]] \ && ht_fix_file ${MATCHES} \ - || einfo "No need for ht_fix_all anymore !" + || einfo "No need for ht_fix_all anymore!" } diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass index 2af79666aa20..20603adc8427 100644 --- a/eclass/freedict.eclass +++ b/eclass/freedict.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # maintainer-needed@gentoo.org # @AUTHOR: -# Original author: Seemant Kulleen +# Original author: Seemant Kulleen <seemant@gentoo.org> # @SUPPORTED_EAPIS: 7 # @BLURB: Ease the installation of freedict translation dictionaries # @DESCRIPTION: @@ -37,7 +37,7 @@ S="${WORKDIR}" # @FUNCTION: freedict_src_install # @DESCRIPTION: -# Installs translation specific dict.dz and index files. +# Installs translation-specific dict.dz and index files. freedict_src_install() { insinto /usr/$(get_libdir)/dict doins ${FREEDICT_P}.dict.dz diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 72d668ca0e2e..7e8a5aa0cba8 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ghc-package.eclass @@ -37,6 +37,7 @@ ghc-getghc() { } # @FUNCTION: ghc-getghcpkg +# @INTERNAL # @DESCRIPTION: # Internal function determines returns the name of the ghc-pkg executable ghc-getghcpkg() { diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index cda7ac161e92..9c4f2c9d778e 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: git-r3.eclass @@ -36,6 +36,7 @@ if [[ ! ${_INHERITED_BY_GIT_2} ]]; then fi # @ECLASS-VARIABLE: EGIT_CLONE_TYPE +# @USER_VARIABLE # @DESCRIPTION: # Type of clone that should be used against the remote repository. # This can be either of: 'mirror', 'single', 'shallow'. diff --git a/eclass/gkrellm-plugin.eclass b/eclass/gkrellm-plugin.eclass index d6eb57ad0eca..3d13409933e7 100644 --- a/eclass/gkrellm-plugin.eclass +++ b/eclass/gkrellm-plugin.eclass @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gkrellm-plugin.eclass # @MAINTAINER: # maintainer-needed@gentoo.org # @AUTHOR: -# Original author: Jim Ramsay -# EAPI 6 author: David Seifert +# Original author: Jim Ramsay <lack@gentoo.org> +# EAPI 6 author: David Seifert <soap@gentoo.org> # @SUPPORTED_EAPIS: 6 # @BLURB: Provides src_install used by (almost) all gkrellm plugins # @DESCRIPTION: diff --git a/eclass/golang-base.eclass b/eclass/golang-base.eclass index e700d17a4d8f..8e859d0fdf63 100644 --- a/eclass/golang-base.eclass +++ b/eclass/golang-base.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-base.eclass @@ -15,7 +15,7 @@ case "${EAPI:-0}" in 5|6|7) ;; *) - die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" + die "${ECLASS}: Unsupported EAPI (EAPI=${EAPI})" ;; esac diff --git a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass index 306db1f26c98..abdb7fa119dd 100644 --- a/eclass/golang-vcs-snapshot.eclass +++ b/eclass/golang-vcs-snapshot.eclass @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-vcs-snapshot.eclass # @MAINTAINER: # William Hubbs <williamh@gentoo.org> # @SUPPORTED_EAPIS: 5 6 7 -# @BLURB: support eclass for unpacking VCS snapshot tarballs for -# software written in the Go programming language +# @BLURB: eclass to unpack VCS snapshot tarballs for Go software # @DESCRIPTION: # This eclass provides a convenience src_unpack() which unpacks the # first tarball mentioned in SRC_URI to its appropriate location in diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass index 159b32f952f9..4d4a38bffe8c 100644 --- a/eclass/golang-vcs.eclass +++ b/eclass/golang-vcs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-vcs.eclass @@ -41,6 +41,7 @@ PROPERTIES+=" live" # @CODE # @ECLASS-VARIABLE: EGO_STORE_DIR +# @USER_VARIABLE # @DESCRIPTION: # Storage directory for Go sources. # diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 6099363bc9a5..b4741a0840c1 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: haskell-cabal.eclass @@ -42,6 +42,7 @@ inherit eutils ghc-package multilib toolchain-funcs # @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup configure'. # example: /etc/portage/make.conf: @@ -49,12 +50,14 @@ inherit eutils ghc-package multilib toolchain-funcs : ${CABAL_EXTRA_CONFIGURE_FLAGS:=} # @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup build'. # example: /etc/portage/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v : ${CABAL_EXTRA_BUILD_FLAGS:=} # @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters for ghc when building # _only_ 'setup' binary bootstrap. @@ -63,6 +66,7 @@ inherit eutils ghc-package multilib toolchain-funcs : ${GHC_BOOTSTRAP_FLAGS:=} # @ECLASS-VARIABLE: CABAL_EXTRA_HADDOCK_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup haddock'. # example: /etc/portage/make.conf: @@ -70,6 +74,7 @@ inherit eutils ghc-package multilib toolchain-funcs : ${CABAL_EXTRA_HADDOCK_FLAGS:=} # @ECLASS-VARIABLE: CABAL_EXTRA_HOOGLE_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup haddock --hoogle'. # example: /etc/portage/make.conf: @@ -77,6 +82,7 @@ inherit eutils ghc-package multilib toolchain-funcs : ${CABAL_EXTRA_HOOGLE_FLAGS:=} # @ECLASS-VARIABLE: CABAL_EXTRA_HSCOLOUR_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup hscolour'. # example: /etc/portage/make.conf: @@ -85,6 +91,7 @@ inherit eutils ghc-package multilib toolchain-funcs # @ECLASS-VARIABLE: CABAL_EXTRA_TEST_FLAGS +# @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup test'. # example: /etc/portage/make.conf: diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 733d1d1f6bf7..69e3f7d46d8e 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -1,11 +1,12 @@ -# Copyright 2004-2019 Gentoo Authors +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-ant-2.eclass # @MAINTAINER: # java@gentoo.org # @AUTHOR: -# kiorky (kiorky@cryptelium.net), Petteri Räty (betelgeuse@gentoo.org) +# kiorky <kiorky@cryptelium.net> +# Petteri Räty <betelgeuse@gentoo.org> # @BLURB: eclass for ant based Java packages # @DESCRIPTION: # Eclass for Ant-based Java packages. Provides support for both automatic and diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass index bb8c1d8575bd..f9a77b8490fa 100644 --- a/eclass/java-osgi.eclass +++ b/eclass/java-osgi.eclass @@ -1,11 +1,11 @@ -# Copyright 2007-2015 Gentoo Foundation +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-osgi.eclass # @MAINTAINER: # java@gentoo.org # @AUTHOR: -# Java maintainers (java@gentoo.org) +# Java maintainers <java@gentoo.org> # @BLURB: Java OSGi eclass # @DESCRIPTION: # This eclass provides functionality which is used by packages that need to be diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index bd5e92da6a27..4b690be13751 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2015 Gentoo Foundation +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-2.eclass @@ -14,6 +14,7 @@ inherit java-utils-2 # @ECLASS-VARIABLE: JAVA_PKG_IUSE +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that @@ -42,7 +43,6 @@ esac # @FUNCTION: java-pkg-2_pkg_setup # @DESCRIPTION: # pkg_setup initializes the Java environment - java-pkg-2_pkg_setup() { java-pkg_init } @@ -51,7 +51,6 @@ java-pkg-2_pkg_setup() { # @FUNCTION: java-pkg-2_src_prepare # @DESCRIPTION: # wrapper for java-utils-2_src_prepare - java-pkg-2_src_prepare() { java-utils-2_src_prepare } @@ -72,7 +71,6 @@ java-pkg-2_src_prepare() { # EANT_EXTRA_ARGS - extra arguments to pass to eant # EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment # @CODE - java-pkg-2_src_compile() { if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then # auto generate classpath @@ -96,7 +94,6 @@ java-pkg-2_src_compile() { # @FUNCTION: java-pkg-2_src_test # @DESCRIPTION: # src_test, not exported. - java-pkg-2_src_test() { [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return @@ -149,7 +146,6 @@ java-pkg-2_src_test() { # @FUNCTION: java-pkg-2_pkg_preinst # @DESCRIPTION: # wrapper for java-utils-2_pkg_preinst - java-pkg-2_pkg_preinst() { java-utils-2_pkg_preinst } diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index a1ab0afb3162..ca03fea78cf4 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,11 +1,11 @@ -# Copyright 2004-2020 Gentoo Authors +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-simple.eclass # @MAINTAINER: # java@gentoo.org # @AUTHOR: -# Java maintainers (java@gentoo.org) +# Java maintainers <java@gentoo.org> # @BLURB: Eclass for packaging Java software with ease. # @DESCRIPTION: # This class is intended to build pure Java packages from Java sources diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index b0d4d8acbefc..a5c06a689ced 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2020 Gentoo Authors +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -1484,7 +1484,6 @@ java-pkg_ensure-vm-version-sufficient() { # @FUNCTION: java-pkg_is-vm-version-sufficient # @INTERNAL -# @DESCRIPTION: # @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient java-pkg_is-vm-version-sufficient() { debug-print-function ${FUNCNAME} $* @@ -2592,14 +2591,14 @@ java-pkg_needs-vm() { # @FUNCTION: java-pkg_get-current-vm # @INTERNAL -# @RETURN - The current VM being used +# @RETURN: The current VM being used java-pkg_get-current-vm() { java-config -f } # @FUNCTION: java-pkg_get-vm-vendor # @INTERNAL -# @RETURN - The vendor of the current VM +# @RETURN: The vendor of the current VM java-pkg_get-vm-vendor() { debug-print-function ${FUNCNAME} $* @@ -2610,7 +2609,7 @@ java-pkg_get-vm-vendor() { # @FUNCTION: java-pkg_get-vm-version # @INTERNAL -# @RETURN - The version of the current VM +# @RETURN: The version of the current VM java-pkg_get-vm-version() { debug-print-function ${FUNCNAME} $* @@ -2619,12 +2618,12 @@ java-pkg_get-vm-version() { # @FUNCTION: java-pkg_build-vm-from-handle # @INTERNAL +# @RETURN: VM handle of an available JDK # @DESCRIPTION: # Selects a build vm from a list of vm handles. First checks for the system-vm # beeing usable, then steps through the listed handles till a suitable vm is # found. # -# @RETURN - VM handle of an available JDK java-pkg_build-vm-from-handle() { debug-print-function ${FUNCNAME} "$*" diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index dccd39ec8f2f..67ad4acc1fef 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kernel-2.eclass @@ -1631,9 +1631,9 @@ kernel-2_pkg_setup() { echo ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!" ewarn "Either switch to another gcc-version (via gcc-config) or use a" - ewarn "newer kernel that supports gcc-4." + ewarn "newer kernel that supports >=sys-devel/gcc-4." echo - ewarn "Also be aware that bugreports about gcc-4 not working" + ewarn "Also, be aware that bug reports about gcc-4 not working" ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" echo fi diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass index f5f63065f223..ff7b629d63b5 100644 --- a/eclass/libretro-core.eclass +++ b/eclass/libretro-core.eclass @@ -1,4 +1,4 @@ -# Copyright 2018-2020 Gentoo Authors +# Copyright 2018-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: libretro-core.eclass @@ -53,11 +53,13 @@ if [[ -z "${LIBRETRO_CORE_NAME}" ]]; then fi # @ECLASS-VARIABLE: LIBRETRO_COMMIT_SHA +# @PRE_INHERIT # @DESCRIPTION: # Commit SHA used for SRC_URI will die if not set in <9999 ebuilds. # Needs to be set before inherit. # @ECLASS-VARIABLE: LIBRETRO_REPO_NAME +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # Contains the real repo name of the core formatted as "repouser/reponame". diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 11a890889e4f..55f38af0ffd8 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-info.eclass @@ -951,9 +951,9 @@ linux-info_pkg_setup() { ewarn "linux-2.4 (or modules building against a linux-2.4 kernel)!" echo ewarn "Either switch to another gcc-version (via gcc-config) or use a" - ewarn "newer kernel that supports gcc-4." + ewarn "newer kernel that supports >=sys-devel/gcc-4." echo - ewarn "Also be aware that bugreports about gcc-4 not working" + ewarn "Also, be aware that bug reports about gcc-4 not working" ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" echo fi diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index e0444eacc61a..11b0fd0cfb5e 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -18,11 +18,13 @@ # These are as follows: # @ECLASS-VARIABLE: MODULES_OPTIONAL_USE +# @PRE_INHERIT # @DESCRIPTION: # A string containing the USE flag to use for making this eclass optional # The recommended non-empty value is 'modules' # @ECLASS-VARIABLE: MODULES_OPTIONAL_USE_IUSE_DEFAULT +# @PRE_INHERIT # @DESCRIPTION: # A boolean to control the IUSE default state for the MODULES_OPTIONAL_USE USE # flag. Default value is unset (false). True represented by 1 or 'on', other diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index faf38306db38..dc0d19f59ae2 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mercurial.eclass @@ -35,6 +35,7 @@ DEPEND="dev-vcs/mercurial" : ${EHG_REVISION:="default"} # @ECLASS-VARIABLE: EHG_STORE_DIR +# @USER_VARIABLE # @DESCRIPTION: # Mercurial sources store directory. Users may override this in /etc/portage/make.conf [[ -z "${EHG_STORE_DIR}" ]] && EHG_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/hg-src" diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index c6276908b9f5..3966dfd9f53f 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.eclass @@ -1,11 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # + # @ECLASS: mozextension.eclass # @MAINTAINER: # Mozilla team <mozilla@gentoo.org> -# @BLURB: Install extensions for use in mozilla products. -# +# @BLURB: Install extensions for use in Mozilla products. + if [[ ! ${_MOZEXTENSION} ]]; then # @ECLASS-VARIABLE: MOZEXTENSION_TARGET diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass index be01ef6aca50..423f0bdcc71a 100644 --- a/eclass/mozlinguas-v2.eclass +++ b/eclass/mozlinguas-v2.eclass @@ -28,6 +28,7 @@ esac EXPORT_FUNCTIONS src_unpack src_compile src_install # @ECLASS-VARIABLE: MOZ_LANGS +# @DEFAULT_UNSET # @DESCRIPTION: # Array containing the list of language pack xpis available for # this release. The list can be updated with scripts/get_langs.sh from the @@ -35,34 +36,40 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install : ${MOZ_LANGS:=()} # @ECLASS-VARIABLE: MOZ_PV +# @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package version converted to equivalent upstream version. # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs : ${MOZ_PV:="${PV}"} # @ECLASS-VARIABLE: MOZ_PN +# @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package name converted to equivalent upstream name. # Defaults to ${PN}, and should be overridden for binary ebuilds. : ${MOZ_PN:="${PN}"} # @ECLASS-VARIABLE: MOZ_P +# @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package name + version converted to upstream equivalent. # Defaults to ${MOZ_PN}-${MOZ_PV} : ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"} # @ECLASS-VARIABLE: MOZ_FTP_URI +# @DEFAULT_UNSET # @DESCRIPTION: # The ftp URI prefix for the release tarballs and language packs. : ${MOZ_FTP_URI:=""} # @ECLASS-VARIABLE: MOZ_HTTP_URI +# @PRE_INHERIT # @DESCRIPTION: # The http URI prefix for the release tarballs and language packs. : ${MOZ_HTTP_URI:=""} # @ECLASS-VARIABLE: MOZ_LANGPACK_HTTP_URI +# @PRE_INHERIT # @DESCRIPTION: # An alternative http URI if it differs from official mozilla URI. # Defaults to whatever MOZ_HTTP_URI was set to. @@ -91,6 +98,8 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install : ${MOZ_LANGPACK_UNOFFICIAL:=""} # @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS +# @PRE_INHERIT +# @DEFAULT_UNSET # @DESCRIPTION: # This flag specifies whether or not the langpacks should be # generated directly during the build process, rather than @@ -106,6 +115,8 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install : ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"} # @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX +# @PRE_INHERIT +# @DEFAULT_UNSET # @DESCRIPTION: # The full URI prefix of the distfile for each l10n locale. The # AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the @@ -115,12 +126,14 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install : ${MOZ_L10N_URI_PREFIX:=""} # @ECLASS-VARIABLE: MOZ_L10N_URI_SUFFIX +# @DEFAULT_UNSET # @DESCRIPTION: # The suffix of l10n source distfiles. # Defaults to '.tar.xz' : ${MOZ_L10N_URI_SUFFIX:=".tar.xz"} # @ECLASS-VARIABLE: MOZ_FORCE_UPSTREAM_L10N +# @DEFAULT_UNSET # @DESCRIPTION: # Set this to use upstream langpaks even if the package normally # shouldn't (ie it is an alpha or beta package) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 585364de6273..e85cee1b94ce 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass @@ -663,7 +663,6 @@ multilib_native_with() { # of <false1> (or 'no' if unspecified) and <false2>. Arguments # are the same as for usex in the EAPI. # -# Note: in EAPI 4 you need to inherit eutils to use this function. multilib_native_usex() { if multilib_is_native_abi; then usex "${@}" diff --git a/eclass/netsurf.eclass b/eclass/netsurf.eclass index 065ed1e568f3..07b5ab3b5284 100644 --- a/eclass/netsurf.eclass +++ b/eclass/netsurf.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: netsurf.eclass @@ -19,7 +19,7 @@ inherit toolchain-funcs # @FUNCTION: netsurf_define_makeconf # @USAGE: # @DESCRIPTION: -# This function sets NETSURF_MAKECONF as needed by netsurf build system +# This function sets NETSURF_MAKECONF as needed by the netsurf build system netsurf_define_makeconf() { NETSURF_MAKECONF=( PREFIX="${EPREFIX}/usr" diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass index 83e68ae75335..42ad9368f735 100644 --- a/eclass/oasis.eclass +++ b/eclass/oasis.eclass @@ -19,6 +19,7 @@ # Ebuilds using oasis.eclass must be EAPI>=3. # @ECLASS-VARIABLE: OASIS_BUILD_DOCS +# @PRE_INHERIT # @DESCRIPTION: # Will make oasis_src_compile build the documentation if this variable is # defined and the doc useflag is enabled. @@ -27,6 +28,7 @@ # Set before inheriting the eclass. # @ECLASS-VARIABLE: OASIS_BUILD_TESTS +# @PRE_INHERIT # @DESCRIPTION: # Will make oasis_src_configure enable building the tests if the test useflag is # enabled. oasis_src_test will then run them. @@ -38,6 +40,7 @@ # @ECLASS-VARIABLE: OASIS_NO_DEBUG +# @PRE_INHERIT # @DESCRIPTION: # Disable debug useflag usage. Old oasis versions did not support it so we allow # disabling it in those cases. @@ -45,6 +48,7 @@ # Set before inheriting the eclass. # @ECLASS-VARIABLE: OASIS_DOC_DIR +# @PRE_INHERIT # @DESCRIPTION: # Specify where to install documentation. Default is for ocamldoc HTML. # Change it before inherit if this is not what you want. diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index a1649ac8d6aa..a81eea4b6107 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -20,6 +20,7 @@ esac EXPORT_FUNCTIONS src_unpack src_install # @ECLASS-VARIABLE: OFFICE_REQ_USE +# @PRE_INHERIT # @DESCRIPTION: # Useflags required on office implementation for the extension. # @@ -45,6 +46,7 @@ fi [[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" ) # @ECLASS-VARIABLE: OFFICE_EXTENSIONS +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # Array containing list of extensions to install. diff --git a/eclass/opam.eclass b/eclass/opam.eclass index 338ba842cd9c..2789e32d315a 100644 --- a/eclass/opam.eclass +++ b/eclass/opam.eclass @@ -22,6 +22,7 @@ esac QA_FLAGS_IGNORED='.*' # @ECLASS-VARIABLE: OPAM_INSTALLER_DEP +# @PRE_INHERIT # @DESCRIPTION: # Override dependency for OPAM_INSTALLER : ${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"} diff --git a/eclass/openib.eclass b/eclass/openib.eclass index a36f5cd85d02..7810062fae36 100644 --- a/eclass/openib.eclass +++ b/eclass/openib.eclass @@ -1,9 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: openib.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org # @AUTHOR: -# Original Author: Alexey Shvetsov <alexxy@gentoo.org> +# Author: Alexey Shvetsov <alexxy@gentoo.org> # @BLURB: Simplify working with OFED packages inherit eutils rpm versionator diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass index 1e109c884b14..209e4831f960 100644 --- a/eclass/pax-utils.eclass +++ b/eclass/pax-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: pax-utils.eclass @@ -176,6 +176,10 @@ host-is-pax() { # them elsewhere as they are not supported (i.e. they may be removed # or their function may change arbitrarily). +# @FUNCTION: _pax_list_files +# @INTERNAL +# @USAGE: <command to display items> [items] +# @DESCRIPTION: # Display a list of things, one per line, indented a bit, using the # display command in $1. _pax_list_files() { diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 7a839bc7288c..4c43c0e67ea1 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-module.eclass @@ -172,6 +172,7 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" # Named MODULE_SECTION in EAPI=5. # @ECLASS-VARIABLE: DIST_EXAMPLES +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # (EAPI=6 and later) This Bash array allows passing a list of example files to be installed @@ -358,6 +359,7 @@ perl-module_src_compile() { # network : do not try to disable network tests # @ECLASS-VARIABLE: DIST_TEST_OVERRIDE +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # (EAPI=6 and later) Variable that controls if tests are run in the test phase diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass index 8df60a372053..19040a7e762b 100644 --- a/eclass/php-ext-pecl-r3.eclass +++ b/eclass/php-ext-pecl-r3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-ext-pecl-r3.eclass @@ -11,6 +11,7 @@ # see https://pecl.php.net/ # @ECLASS-VARIABLE: PHP_EXT_PECL_PKG +# @PRE_INHERIT # @DESCRIPTION: # Set in ebuild before inheriting this eclass if the tarball name # differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE get set @@ -22,6 +23,7 @@ [[ -z "${PHP_EXT_PECL_PKG}" ]] && PHP_EXT_PECL_PKG="${PN/pecl-/}" # @ECLASS-VARIABLE: PHP_EXT_PECL_FILENAME +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Set in ebuild before inheriting this eclass if the tarball name diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index b2eae22fb74d..a782081b72a7 100644 --- a/eclass/php-ext-source-r3.eclass +++ b/eclass/php-ext-source-r3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-ext-source-r3.eclass @@ -22,6 +22,7 @@ case ${EAPI:-0} in esac # @ECLASS-VARIABLE: PHP_EXT_NAME +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # The extension name. This must be set, otherwise the eclass dies. @@ -87,6 +88,7 @@ esac : ${PHP_INI_NAME:=${PHP_EXT_NAME}} # @ECLASS-VARIABLE: PHP_EXT_NEEDED_USE +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # A list of USE flags to append to each PHP target selected diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass index d3887492047d..f0fe4b96f8ef 100644 --- a/eclass/php-pear-r2.eclass +++ b/eclass/php-pear-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-pear-r2.eclass @@ -39,7 +39,8 @@ RDEPEND=">=dev-php/pear-1.8.1" # @ECLASS-VARIABLE: PEAR-P # @INTERNAL -# @DESCRIPTION: Combines PHP_PEAR_PKG_NAME and PEAR_PV +# @DESCRIPTION: +# Combines PHP_PEAR_PKG_NAME and PEAR_PV PEAR_P="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" # @ECLASS-VARIABLE: PHP_PEAR_DOMAIN diff --git a/eclass/portability.eclass b/eclass/portability.eclass index 333a9590b39c..3b085d6c4e70 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: portability.eclass @@ -13,7 +13,6 @@ _PORTABILITY_ECLASS=1 # @FUNCTION: treecopy # @USAGE: <orig1> [orig2 orig3 ....] <dest> -# @RETURN: # @DESCRIPTION: # mimic cp --parents copy, but working on BSD userland as well treecopy() { @@ -118,7 +117,6 @@ get_bmake() { # @FUNCTION: get_mounts # @USAGE: # @RETURN: table of mounts in form "point node fs opts" -# @MAINTAINER: # @DESCRIPTION: # Portable method of getting mount names and points. # Returns as "point node fs options" diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass index 49d5c6a9c684..acaa5077217f 100644 --- a/eclass/postgres-multi.eclass +++ b/eclass/postgres-multi.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 inherit multibuild postgres @@ -8,7 +8,8 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test # @ECLASS: postgres-multi.eclass # @MAINTAINER: # PostgreSQL <pgsql-bugs@gentoo.org> -# @AUTHOR: Aaron W. Swenson <titanofold@gentoo.org> +# @AUTHOR: +# Aaron W. Swenson <titanofold@gentoo.org> # @SUPPORTED_EAPIS: 5 6 7 # @BLURB: An eclass to build PostgreSQL-related packages against multiple slots # @DESCRIPTION: @@ -24,6 +25,7 @@ esac # @ECLASS-VARIABLE: POSTGRES_COMPAT +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # A Bash array containing a list of compatible PostgreSQL slots as diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index 2e2ac85ead6f..7652a8625184 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 inherit user @@ -7,7 +7,8 @@ EXPORT_FUNCTIONS pkg_setup # @ECLASS: postgres.eclass # @MAINTAINER: # PostgreSQL <pgsql-bugs@gentoo.org> -# @AUTHOR: Aaron W. Swenson <titanofold@gentoo.org> +# @AUTHOR: +# Aaron W. Swenson <titanofold@gentoo.org> # @SUPPORTED_EAPIS: 5 6 7 # @BLURB: An eclass for PostgreSQL-related packages # @DESCRIPTION: @@ -32,6 +33,7 @@ _POSTGRES_ALL_VERSIONS=( 9999 13 12 11 10 9.6 9.5 9.4 9.3 9.2 ) # @ECLASS-VARIABLE: POSTGRES_COMPAT +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # A Bash array containing a list of compatible PostgreSQL slots as @@ -49,6 +51,7 @@ _POSTGRES_ALL_VERSIONS=( 9999 13 12 11 10 9.6 9.5 9.4 9.3 9.2 ) POSTGRES_DEP="dev-db/postgresql:=" # @ECLASS-VARIABLE: POSTGRES_USEDEP +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Add the 2-Style and/or 4-Style use dependencies without brackets to be used diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 6698b69b32f4..e94f3f33a101 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -51,6 +51,7 @@ esac # system to obtain the global qmodule.pri file. # @ECLASS-VARIABLE: VIRTUALX_REQUIRED +# @PRE_INHERIT # @DESCRIPTION: # For proper description see virtualx.eclass man page. # Here we redefine default value to be manual, if your package needs virtualx diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 2779a0353ecb..b6f10ce6202d 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ros-catkin.eclass @@ -61,11 +61,13 @@ DEPEND="${RDEPEND} " # @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES +# @PRE_INHERIT # @DESCRIPTION: # Set it to a non-empty value before inherit to tell the eclass the package has messages to build. # Messages will be built based on ROS_MESSAGES USE_EXPANDed variable. # @ECLASS-VARIABLE: CATKIN_MESSAGES_TRANSITIVE_DEPS +# @PRE_INHERIT # @DESCRIPTION: # Some messages have dependencies on other messages. # In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a space-separated list of atoms diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 6fee9eb3e157..715c1df44f6c 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -17,12 +17,14 @@ inherit ruby-ng # @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME +# @PRE_INHERIT # @DESCRIPTION: # Sets the Gem name for the generated fake gemspec. # This variable MUST be set before inheriting the eclass. RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION +# @PRE_INHERIT # @DESCRIPTION: # Sets the Gem version for the generated fake gemspec. # This variable MUST be set before inheriting the eclass. diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index e52c507d8010..1933049f4ac2 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-ng.eclass @@ -111,6 +111,7 @@ ruby_implementation_depend() { # @FUNCTION: _ruby_get_all_impls # @INTERNAL # @RETURN: list of valid values in USE_RUBY +# @DESCRIPTION: # Return a list of valid implementations in USE_RUBY, skipping the old # implementations that are no longer supported. _ruby_get_all_impls() { diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass index 4ca5f5ef207b..bf339bc9b601 100644 --- a/eclass/ruby-single.eclass +++ b/eclass/ruby-single.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-single.eclass @@ -39,6 +39,7 @@ inherit ruby-utils # @ECLASS-VARIABLE: USE_RUBY # @DEFAULT_UNSET +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # This variable contains a space separated list of targets (see above) a package diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index fdd6775ffc77..a774f9b8b9ec 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ssl-cert.eclass # @MAINTAINER: +# maintainer-needed@gentoo.org # @AUTHOR: # Max Kalika <max@gentoo.org> # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 @@ -26,16 +27,19 @@ case "${EAPI:-0}" in esac # @ECLASS-VARIABLE: SSL_CERT_MANDATORY +# @PRE_INHERIT # @DESCRIPTION: # Set to non zero if ssl-cert is mandatory for ebuild. : ${SSL_CERT_MANDATORY:=0} # @ECLASS-VARIABLE: SSL_CERT_USE +# @PRE_INHERIT # @DESCRIPTION: # Use flag to append dependency to. : ${SSL_CERT_USE:=ssl} # @ECLASS-VARIABLE: SSL_DEPS_SKIP +# @PRE_INHERIT # @DESCRIPTION: # Set to non zero to skip adding to DEPEND and IUSE. : ${SSL_DEPS_SKIP:=0} @@ -61,12 +65,12 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then fi # @FUNCTION: gen_cnf +# @INTERNAL # @USAGE: # @DESCRIPTION: # Initializes variables and generates the needed # OpenSSL configuration file and a CA serial file # -# Access: private gen_cnf() { # Location of the config file SSL_CONF="${T}/${$}ssl.cnf" @@ -113,13 +117,13 @@ gen_cnf() { } # @FUNCTION: get_base +# @INTERNAL # @USAGE: [if_ca] # @RETURN: <base path> # @DESCRIPTION: # Simple function to determine whether we're creating # a CA (which should only be done once) or final part # -# Access: private get_base() { if [ "${1}" ] ; then echo "${T}/${$}ca" @@ -129,11 +133,11 @@ get_base() { } # @FUNCTION: gen_key +# @INTERNAL # @USAGE: <base path> # @DESCRIPTION: # Generates an RSA key # -# Access: private gen_key() { local base=$(get_base "$1") ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" @@ -149,12 +153,12 @@ gen_key() { } # @FUNCTION: gen_csr +# @INTERNAL # @USAGE: <base path> # @DESCRIPTION: # Generates a certificate signing request using # the key made by gen_key() # -# Access: private gen_csr() { local base=$(get_base "$1") ebegin "Generating Certificate Signing Request${1:+ for CA}" @@ -166,6 +170,7 @@ gen_csr() { } # @FUNCTION: gen_crt +# @INTERNAL # @USAGE: <base path> # @DESCRIPTION: # Generates either a self-signed CA certificate using @@ -173,7 +178,6 @@ gen_csr() { # a signed server certificate using the CA cert previously # created by gen_crt() # -# Access: private gen_crt() { local base=$(get_base "$1") if [ "${1}" ] ; then @@ -196,12 +200,12 @@ gen_crt() { } # @FUNCTION: gen_pem +# @INTERNAL # @USAGE: <base path> # @DESCRIPTION: # Generates a PEM file by concatinating the key # and cert file created by gen_key() and gen_cert() # -# Access: private gen_pem() { local base=$(get_base "$1") ebegin "Generating PEM Certificate" @@ -220,7 +224,6 @@ gen_pem() { # # Example: "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} # -# Access: public install_cert() { if [ $# -lt 1 ] ; then eerror "At least one argument needed" diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 36b1fbb0c685..6ed8a62dbe35 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: subversion.eclass @@ -40,6 +40,7 @@ case ${EAPI} in esac # @ECLASS-VARIABLE: ESVN_STORE_DIR +# @USER_VARIABLE # @DESCRIPTION: # subversion sources store directory. Users may override this in /etc/portage/make.conf [[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" @@ -151,6 +152,8 @@ ESVN_PATCHES="${ESVN_PATCHES:-}" ESVN_RESTRICT="${ESVN_RESTRICT:-}" # @ECLASS-VARIABLE: ESVN_OFFLINE +# @USER_VARIABLE +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable to a non-empty value to disable the automatic updating of # an svn source tree. This is intended to be set outside the subversion source @@ -158,6 +161,7 @@ ESVN_RESTRICT="${ESVN_RESTRICT:-}" ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}" # @ECLASS-VARIABLE: ESVN_UMASK +# @USER_VARIABLE # @DESCRIPTION: # Set this variable to a custom umask. This is intended to be set by users. # By setting this to something like 002, it can make life easier for people @@ -168,6 +172,7 @@ ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}" ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}" # @ECLASS-VARIABLE: ESVN_UP_FREQ +# @USER_VARIABLE # @DESCRIPTION: # Set the minimum number of hours between svn up'ing in any given svn module. This is particularly # useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same @@ -175,6 +180,7 @@ ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}" ESVN_UP_FREQ="${ESVN_UP_FREQ:=}" # @ECLASS-VARIABLE: ESCM_LOGDIR +# @USER_VARIABLE # @DESCRIPTION: # User configuration variable. If set to a path such as e.g. /var/log/scm any # package inheriting from subversion.eclass will record svn revision to diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 15988fb4b54d..22b74237a4fb 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-module.eclass @@ -24,6 +24,7 @@ # bash array. # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # The list of packages that will be installed. This variable will be expanded to @@ -31,12 +32,14 @@ # foo -> texlive-module-foo-${PV}.tar.xz # @ECLASS-VARIABLE: TEXLIVE_MODULE_DOC_CONTENTS +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # The list of packages that will be installed if the doc useflag is enabled. # Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. # @ECLASS-VARIABLE: TEXLIVE_MODULE_SRC_CONTENTS +# @PRE_INHERIT # @REQUIRED # @DESCRIPTION: # The list of packages that will be installed if the source useflag is enabled. diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass index 632343821648..b9238a6434a0 100644 --- a/eclass/tmpfiles.eclass +++ b/eclass/tmpfiles.eclass @@ -1,4 +1,4 @@ -# Copyright 2016-2019 Gentoo Authors +# Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: tmpfiles.eclass @@ -61,6 +61,7 @@ case "${EAPI}" in esac # @ECLASS-VARIABLE: TMPFILES_OPTIONAL +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # When not empty, disables the dependency on virtual/tmpfiles. diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 3a1dc9f29f33..d01a6e8e648a 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: unpacker.eclass @@ -20,6 +20,7 @@ _UNPACKER_ECLASS=1 inherit toolchain-funcs # @ECLASS-VARIABLE: UNPACKER_BZ2 +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # Utility to use to decompress bzip2 files. Will dynamically pick between @@ -27,6 +28,7 @@ inherit toolchain-funcs # Note: this is meant for users to set, not ebuilds. # @ECLASS-VARIABLE: UNPACKER_LZIP +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # Utility to use to decompress lzip files. Will dynamically pick between diff --git a/eclass/user.eclass b/eclass/user.eclass index f8993b827741..96d3757233b9 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: user.eclass @@ -100,7 +100,7 @@ enewuser() { # get the username local euser=$1; shift if [[ -z ${euser} ]] ; then - eerror "No username specified !" + eerror "No username specified!" die "Cannot call enewuser without a username" fi @@ -122,7 +122,7 @@ enewuser() { euid="next" fi else - eerror "Userid given but is not greater than 0 !" + eerror "Userid given but is not greater than 0!" die "${euid} is not a valid UID" fi else @@ -142,7 +142,7 @@ enewuser() { local eshell=$1; shift if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then if [[ ! -e ${ROOT}${eshell} ]] ; then - eerror "A shell was specified but it does not exist !" + eerror "A shell was specified but it does not exist!" die "${eshell} does not exist in ${ROOT}" fi if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then @@ -254,7 +254,7 @@ enewgroup() { # get the group local egroup=$1; shift if [[ -z ${egroup} ]] ; then - eerror "No group specified !" + eerror "No group specified!" die "Cannot call enewgroup without a group" fi @@ -273,7 +273,7 @@ enewgroup() { egid="next available; requested gid taken" fi else - eerror "Groupid given but is not greater than 0 !" + eerror "Groupid given but is not greater than 0!" die "${egid} is not a valid GID" fi else @@ -339,7 +339,7 @@ esethome() { # get the username local euser=$1; shift if [[ -z ${euser} ]] ; then - eerror "No username specified !" + eerror "No username specified!" die "Cannot call esethome without a username" fi @@ -352,7 +352,7 @@ esethome() { # handle homedir local ehome=$1; shift if [[ -z ${ehome} ]] ; then - eerror "No home directory specified !" + eerror "No home directory specified!" die "Cannot call esethome without a home directory or '-1'" fi @@ -408,7 +408,7 @@ esetshell() { # get the username local euser=$1; shift if [[ -z ${euser} ]] ; then - eerror "No username specified !" + eerror "No username specified!" die "Cannot call esetshell without a username" fi @@ -421,7 +421,7 @@ esetshell() { # handle shell local eshell=$1; shift if [[ -z ${eshell} ]] ; then - eerror "No shell specified !" + eerror "No shell specified!" die "Cannot call esetshell without a shell or '-1'" fi @@ -468,7 +468,7 @@ esetcomment() { # get the username local euser=$1; shift if [[ -z ${euser} ]] ; then - eerror "No username specified !" + eerror "No username specified!" die "Cannot call esetcomment without a username" fi @@ -481,7 +481,7 @@ esetcomment() { # handle comment local ecomment=$1; shift if [[ -z ${ecomment} ]] ; then - eerror "No comment specified !" + eerror "No comment specified!" die "Cannot call esetcomment without a comment" fi diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass index 828a45310e9d..f762a6bfd315 100644 --- a/eclass/vim-spell.eclass +++ b/eclass/vim-spell.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vim-spell.eclass @@ -62,8 +62,6 @@ # spell files. It's best to let upstream know if you've generated spell files # for another language rather than keeping them Gentoo-specific. -inherit eutils - EXPORT_FUNCTIONS src_install pkg_postinst SRC_URI="mirror://gentoo/${P}.tar.bz2" diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index fa16784bd943..a95f8a7e1c14 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: virtualx.eclass @@ -25,6 +25,7 @@ esac [[ ${EAPI} == [45] ]] && inherit eutils # @ECLASS-VARIABLE: VIRTUALX_REQUIRED +# @PRE_INHERIT # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. # Possible special values are "always" and "manual", which specify diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index b0a8f7a34d4d..6907ef1c321d 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: webapp.eclass @@ -16,12 +16,14 @@ WEBAPP_DEPEND=">=app-admin/webapp-config-1.50.15" # @ECLASS-VARIABLE: WEBAPP_NO_AUTO_INSTALL +# @PRE_INHERIT # @DESCRIPTION: # An ebuild sets this to `yes' if an automatic installation and/or upgrade is # not possible. The ebuild should overwrite pkg_postinst() and explain the # reason for this BEFORE calling webapp_pkg_postinst(). # @ECLASS-VARIABLE: WEBAPP_OPTIONAL +# @PRE_INHERIT # @DESCRIPTION: # An ebuild sets this to `yes' to make webapp support optional, in which case # you also need to take care of USE-flags and dependencies. diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass index a40487bae78e..372e4c5301cf 100644 --- a/eclass/xemacs-packages.eclass +++ b/eclass/xemacs-packages.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xemacs-packages.eclass @@ -15,6 +15,7 @@ # mule, or contrib. # @ECLASS-VARIABLE: XEMACS_EXPERIMENTAL +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # If set then the package is downloaded from the experimental packages diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 21b3da5374a9..e6ec80523ae2 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -43,6 +43,7 @@ if [[ ${CATEGORY} = media-fonts ]]; then fi # @ECLASS-VARIABLE: XORG_MULTILIB +# @PRE_INHERIT # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set # before inheriting this eclass. @@ -68,18 +69,21 @@ EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} IUSE="" # @ECLASS-VARIABLE: XORG_EAUTORECONF +# @PRE_INHERIT # @DESCRIPTION: # If set to 'yes' and configure.ac exists, eautoreconf will run. Set # before inheriting this eclass. : ${XORG_EAUTORECONF:="no"} # @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI +# @PRE_INHERIT # @DESCRIPTION: # Set up SRC_URI for individual modular releases. If set to an empty # string, no SRC_URI will be provided by the eclass. : ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"} # @ECLASS-VARIABLE: XORG_MODULE +# @PRE_INHERIT # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, # doc, data, util, driver, font, lib, proto, xserver. Set above the @@ -99,6 +103,7 @@ if [[ ${XORG_MODULE} == auto ]]; then fi # @ECLASS-VARIABLE: XORG_PACKAGE_NAME +# @PRE_INHERIT # @DESCRIPTION: # For git checkout the git repository might differ from package name. # This variable can be used for proper directory specification @@ -148,6 +153,7 @@ if [[ ${FONT} == yes ]]; then >=x11-apps/mkfontscale-1.2.0" # @ECLASS-VARIABLE: FONT_DIR + # @PRE_INHERIT # @DESCRIPTION: # If you're creating a font package and the suffix of PN is not equal to # the subdirectory of /usr/share/fonts/ it should install into, set diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 811168ead986..7ed96c60848a 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -42,6 +42,7 @@ if [[ ${CATEGORY} = media-fonts ]]; then fi # @ECLASS-VARIABLE: XORG_MULTILIB +# @PRE_INHERIT # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set # before inheriting this eclass. @@ -67,18 +68,21 @@ EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} IUSE="" # @ECLASS-VARIABLE: XORG_EAUTORECONF +# @PRE_INHERIT # @DESCRIPTION: # If set to 'yes' and configure.ac exists, eautoreconf will run. Set # before inheriting this eclass. : ${XORG_EAUTORECONF:="no"} # @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI +# @PRE_INHERIT # @DESCRIPTION: # Set up SRC_URI for individual modular releases. If set to an empty # string, no SRC_URI will be provided by the eclass. : ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"} # @ECLASS-VARIABLE: XORG_MODULE +# @PRE_INHERIT # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, # doc, data, util, driver, font, lib, proto, xserver. Set above the @@ -99,6 +103,7 @@ if [[ ${XORG_MODULE} == auto ]]; then fi # @ECLASS-VARIABLE: XORG_PACKAGE_NAME +# @PRE_INHERIT # @DESCRIPTION: # For git checkout the git repository might differ from package name. # This variable can be used for proper directory specification @@ -107,6 +112,7 @@ fi HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}" # @ECLASS-VARIABLE: XORG_TARBALL_SUFFIX +# @PRE_INHERIT # @DESCRIPTION: # Most X11 projects provide tarballs as tar.bz2 or tar.xz. This eclass defaults # to bz2. @@ -156,6 +162,7 @@ if [[ ${FONT} == yes ]]; then BDEPEND+=" x11-apps/bdftopcf" # @ECLASS-VARIABLE: FONT_DIR + # @PRE_INHERIT # @DESCRIPTION: # If you're creating a font package and the suffix of PN is not equal to # the subdirectory of /usr/share/fonts/ it should install into, set @@ -172,6 +179,7 @@ fi BDEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI +# @PRE_INHERIT # @DESCRIPTION: # Possible values are "always" or the value of the useflag DRI capabilities # are required for. Default value is "no" @@ -205,6 +213,7 @@ fi # @ECLASS-VARIABLE: XORG_DOC +# @PRE_INHERIT # @DESCRIPTION: # Possible values are "always" or the value of the useflag doc packages # are required for. Default value is "no" diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild index 681cf67602c6..1958455b3b12 100644 --- a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild +++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/2" # ABI is v2. See Makefile.am -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild deleted file mode 100644 index 409d5823d80e..000000000000 --- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus" -HOMEPAGE="https://lxde.org/" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -# ABI is v2. See Makefile.am -SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="dev-libs/glib:2 - x11-libs/libfm-extra" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -# Fix for gcc 10 / -fno-common -# https://github.com/lxde/menu-cache/pull/19 -PATCHES="${FILESDIR}/${P}-fno-common.diff" - -src_configure() { - econf "--disable-static" -} diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest index 3929e7e5b2e9..62975884754c 100644 --- a/media-fonts/culmus/Manifest +++ b/media-fonts/culmus/Manifest @@ -8,7 +8,9 @@ DIST TaameyDavidCLM.zip 572761 BLAKE2B f33bf233a5da417b0edc364e13d39f58b9746997e DIST TaameyFrankCLM.zip 742392 BLAKE2B 91eeea273e69a570ecf8c30fdba37dbc7d65a819748dfe8e131b6f9b87f2c08e53a3aa295e7b7a4616f6d005440028b91bd5a77dc43bbc303f71b43703915be6 SHA512 6f87d95f2359f1facba32594a0bf0fc3c69b1faf895cb9dbc48325b757ec1446eb70cef6f1cbc88f38025a0d549d310bb3c2b34f52617846da3702938ff01b1a DIST anka.tar.gz 21210 BLAKE2B 04d40f828a94f7aa58e4ddb83bf47e73f369aee1cafd2ae01126d9cbd34c6119681cf46a589eac9de901662a89547cb0a017ee3b3b8f6d8aec7d24f4dce5c66e SHA512 e343918245a05aa11243dfda65a00295d09f04a04bb56594155129e5744a7f100793940eb0d417d708e6f25a1856c20d09d5198bab03a2c8fba258816bd2d14b DIST comix.tar.gz 100296 BLAKE2B 038e09da9a33f57be3fc983185d2ce9054fecb65c00c522071730fc27419dfc9e6767440bdb50f5e3fab65c19d658e787ec64bb48b72d1d1ec70c62e13e1effb SHA512 eacf751e7d9503db1cab95190c4b9473d4e5b459bc4baeb9341f35a7859ff6068ceffdcb27bee2294ead9a18d3471ee21b725ae48d80c946817d9b420f7adb9f +DIST culmus-0.120.tar.gz 1190095 BLAKE2B 8bc67812f2afda337ac5354c1f18c50b2e74ae5668c351f0130f88f2b010d742f80829b9b2af84a74c7933fc749c8623e27befd9ce8255c980fbb6ca1b637831 SHA512 e99578fc92d4184f92cb6fb8b990ecfb1da1a84e77e400218f40087380d36edd3a65ca4f776330c3d867bbe8b32e58fb13d8485e1ece689336756d3d7d69ccc3 DIST culmus-0.133.tar.gz 1174687 BLAKE2B 17674939dab12b76280cf420edd00c8a39059415a0abfe3af79a3cddfa33e05826068d71c6bf6355f9032641b7391e763c36d39de4713d0fe1b44b7b4d6f1bb6 SHA512 97c17dbe4ad5b542a2bfd6c9c7a7afeeabae942cbbd3a718d46ceb18b4020fe7fdf93ade07a65a2da93dadff645abf0da4648713e3452d30bf2a9a79201f2845 +DIST culmus-src-0.120.tar.gz 1180742 BLAKE2B 0453dbb778c7e6cbad68165bcd9b8b1bbc54a646f70864c9ce6f8315b8c7ad269dafdc15b4360acf58b6d826ec7db8b31deee2e461c2c56aaf2eee5254259322 SHA512 1c57024e7cfbcf6a5237db317cdaf73327fe4bbd06b84cb9f1218f560723f3bd421ecc53c27e523c600f50586f9daf1223ecc641f81bdc45f6fbef82fdcc0146 DIST culmus-src-0.133.tar.gz 2054572 BLAKE2B 12ecc62b0e0eb2fe665750c6abba7bf1673904013287afef8ba10b98bbe8d5fb0cf345753b6e48aa4c7ea893c015aee24ba7ec48d6b470987a2b25dc0ef73f08 SHA512 d15eafe199bdb1071fbd434797e4f83d37b757d97bf480e68d6a8181dc642352b698b637a9bbebe380cf6f52367d55a4a8a3573077bb5e7508950af81ad1eb63 DIST culmus-type1-0.105.tar.gz 465679 BLAKE2B 4ba8a9fa14507c19df16ba9cf80325fa7ed01de6db9be8aaed535e20ecfba65c5b5e8ab98ac2795f5a6ecbe780817da567a280f6b426ffd2ee0b7b4a68ae0649 SHA512 f2cc3ddb31e72936802998a3f64fd265aacb40f8390f9f3f8556ce4ce546b90eeeca0fe3a8a326b4dbc79ed943c886900d08bc5f5e6dfd3508fa5b3eeb173f7d DIST dorian.tar.gz 141215 BLAKE2B 44e92f5c7534598e2b4de7ae2edc87f73482d185997fefd52d7f1b85baa190bb303efb9d77e39cd429e4c0be64cd507a763d8cdd4f9b1dea4ff4409a17d4b691 SHA512 f05b602528fb9a4ddb4eb876d48f3ef67d446180fb9374bb8b82bca61c9922bfa7cb7ad85a79d04a9ed7fcdf3690ab1ae574ff5e4b595ea9cc5a7d5516aa6fca diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild new file mode 100644 index 000000000000..572a3bfcc36c --- /dev/null +++ b/media-fonts/culmus/culmus-0.120-r5.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit font + +# Maintainer: also check culmus.conf file in ${P}.tar.gz + +MY_A_P=AncientSemiticFonts-0.06-1 +# The Type 1 fonts are just a stripped version of TrueType fonts and they are +# not updated unless there is a meaningful change and we need them for +# culmus-latex, see bug #350657 +TYPE1_PV=0.105 + +DESCRIPTION="Hebrew Type1 fonts" +HOMEPAGE="http://culmus.sourceforge.net/" + +FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia horev" +FANCY_YG_FONTS="ShmuelCLM MakabiYG" +TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG" + +SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz + mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz + fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz ) + ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz ) + fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )" +SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )" +SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )" +SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )" +S="${WORKDIR}" + +# Some fonts are available in otf format too. Do we need them? +# http://culmus.sourceforge.net/fancy/anka-otf.zip +# http://culmus.sourceforge.net/fancy/hillel-otf.zip +# http://culmus.sourceforge.net/fancy/journal-otf.zip + +LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86" +IUSE="ancient fancy fontforge taamey" + +RDEPEND="!media-fonts/culmus-ancient" +# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required +BDEPEND=" + app-arch/unzip + >=x11-apps/mkfontscale-1.0.9-r1 + fontforge? ( media-gfx/fontforge ) +" + +FONT_CONF=( "${T}/65-culmus.conf" ) +# Put all fonts, generated or not here +FONT_S=${S}/FONTS + +src_unpack() { + unpack ${P}.tar.gz # For type1 fonts... + unpack ${PN}-type1-${TYPE1_PV}.tar.gz + use fontforge && unpack ${PN}-src-${PV}.tar.gz + + use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz + + if use fancy; then + unpack $(printf "%s.tar.gz " ${FANCY_FONTS}) + unpack $(printf "%s.zip " ${FANCY_YG_FONTS}) + mv TTF/* . || die + fi + + if use taamey; then + for font in ${TAAMEY_FONTS}; do + mkdir ${font} || die + pushd ${font} || die + unpack ${font}.zip + popd >/dev/null || die + done + fi +} + +src_prepare() { + default + cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die +} + +src_compile() { + mkdir -p "${FONT_S}" + if use fontforge; then + pushd ${P} || die + + mv *.afm *.pfa "${FONT_S}" || die + rm *.ttf || die + + popd >/dev/null || die + + pushd ${PN}-type1-${TYPE1_PV} || die + + mv *.afm *.pfa "${FONT_S}" || die + + popd >/dev/null || die + + pushd ${PN}-src-${PV} || die + + for f in *.sfd; do + "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die + done + + popd >/dev/null || die + + if use ancient; then + pushd ${MY_A_P}/src || die + + export FONTFORGE_LANGUAGE=ff + + emake clean + emake all + + mv *.ttf "${FONT_S}" || die + + popd >/dev/null || die + fi + + if use taamey; then + for font in ${TAAMEY_FONTS}; do + rm -rf ${font}/TTF || die + + pushd ${font}/SFD || die + + for f in *.sfd; do + "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die + done + + popd >/dev/null || die + done + fi + else + pushd ${P} || die + + mv *.afm *.pfa *.ttf "${FONT_S}" || die + + popd >/dev/null || die + + pushd ${PN}-type1-${TYPE1_PV} || die + + mv *.afm *.pfa "${FONT_S}" || die + + popd >/dev/null || die + + if use ancient; then + pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts || die + + mv *.ttf "${FONT_S}" || die + + popd >/dev/null || die + fi + + if use taamey; then + for font in ${TAAMEY_FONTS}; do + pushd ${font}/TTF || die + + mv *.ttf "${FONT_S}" || die + + popd >/dev/null || die + done + fi + fi + + if use fancy; then + mv *.afm *.pfa *.ttf "${FONT_S}" || die + fi +} + +src_install() { + einstalldocs + + FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \ + font_src_install + + rm -rf "${FONT_S}" || die + find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' | + while read font; do + eqawarn "Missed font file: ${font}" + done + + pushd ${PN}$(use fontforge && echo -src)-${PV} || die + + dodoc CHANGES + + popd >/dev/null || die + + if use ancient; then + pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" || die + + newdoc CHANGES{,.ancient} || die + newdoc README{,.ancient} || die + + popd >/dev/null || die + fi + + if use taamey; then + for font in ${TAAMEY_FONTS}; do + pushd ${font} || die + + [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}} + newdoc README{,.${font}} + docinto ${font} + doins -r Samples + + popd >/dev/null || die + done + fi +} diff --git a/media-fonts/culmus/culmus-0.133-r1.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild index 1d3fec0e13b8..170ad94a7b61 100644 --- a/media-fonts/culmus/culmus-0.133-r1.ebuild +++ b/media-fonts/culmus/culmus-0.133-r1.ebuild @@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )" SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )" SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )" +S="${WORKDIR}" # Some fonts are available in otf format too. Do we need them? # http://culmus.sourceforge.net/fancy/anka-otf.zip @@ -39,8 +40,6 @@ SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="ancient fancy fontforge taamey" -FONT_CONF=( "${T}"/65-culmus.conf ) - RDEPEND="!media-fonts/culmus-ancient" # >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required BDEPEND=" @@ -49,7 +48,7 @@ BDEPEND=" fontforge? ( media-gfx/fontforge ) " -S="${WORKDIR}" +FONT_CONF=( "${T}"/65-culmus.conf ) # Put all fonts, generated or not here FONT_S="${S}/FONTS" @@ -58,8 +57,8 @@ PATCHES=( "${FILESDIR}/${P}-fontconfig-test.patch" ) # bug 695708 src_unpack() { unpack ${P}.tar.gz # For type1 fonts... unpack ${PN}-type1-${TYPE1_PV}.tar.gz - use fontforge && unpack ${PN}-src-${PV}.tar.gz + use fontforge && unpack ${PN}-src-${PV}.tar.gz use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz if use fancy; then @@ -71,8 +70,11 @@ src_unpack() { if use taamey; then for font in ${TAAMEY_FONTS}; do mkdir ${font} || die + pushd ${font} > /dev/null || die - unpack ${font}.zip + + unpack ${font}.zip + popd > /dev/null || die done fi @@ -85,60 +87,78 @@ src_prepare() { src_compile() { mkdir -p "${FONT_S}" || die + if use fontforge; then pushd ${P} > /dev/null || die - mv *.afm *.pfa "${FONT_S}" || die - rm *.ttf || die + + mv *.afm *.pfa "${FONT_S}" || die + rm *.ttf || die + popd > /dev/null || die pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die - mv *.afm *.pfa "${FONT_S}" || die + + mv *.afm *.pfa "${FONT_S}" || die + popd > /dev/null || die pushd ${PN}-src-${PV} > /dev/null || die - for f in *.sfd; do - "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die - done + + for f in *.sfd; do + "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die + done + popd > /dev/null || die if use ancient; then pushd ${MY_A_P}/src > /dev/null || die - export FONTFORGE_LANGUAGE=ff - make clean || die - make all || die "Failed to build fonts" - mv *.ttf "${FONT_S}" || die + + export FONTFORGE_LANGUAGE=ff + + emake clean + emake all + + mv *.ttf "${FONT_S}" || die + popd > /dev/null || die fi if use taamey; then for font in ${TAAMEY_FONTS}; do rm -rf ${font}/TTF || die + pushd ${font}/SFD > /dev/null || die - for f in *.sfd; do - "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die - done + + for f in *.sfd; do + "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die + done + popd > /dev/null || die done fi else pushd ${P} > /dev/null || die - mv *.afm *.pfa *.ttf "${FONT_S}" || die + mv *.afm *.pfa *.ttf "${FONT_S}" || die popd >/dev/null || die pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die - mv *.afm *.pfa "${FONT_S}" || die + mv *.afm *.pfa "${FONT_S}" || die popd > /dev/null || die if use ancient; then pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die - mv *.ttf "${FONT_S}" || die + + mv *.ttf "${FONT_S}" || die + popd > /dev/null || die fi if use taamey; then for font in ${TAAMEY_FONTS}; do pushd ${font}/TTF > /dev/null || die - mv *.ttf "${FONT_S}" || die + + mv *.ttf "${FONT_S}" || die + popd > /dev/null || die done fi @@ -158,27 +178,31 @@ src_install() { rm -rf "${FONT_S}" || die find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' | while read font; do - ewarn "QA: missed font file: ${font}" + eqawarn "Missed font file: ${font}" done pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die - dodoc CHANGES + dodoc CHANGES popd > /dev/null || die if use ancient; then pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die - newdoc CHANGES{,.ancient} || die - newdoc README{,.ancient} || die + + newdoc CHANGES{,.ancient} + newdoc README{,.ancient} + popd > /dev/null || die fi if use taamey; then for font in ${TAAMEY_FONTS}; do pushd ${font} > /dev/null || die - docinto ${font} - [[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; } - newdoc README{,.${font}} || die - dodoc -r Samples + + docinto ${font} + [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}} + newdoc README{,.${font}} + dodoc -r Samples + popd > /dev/null || die done fi diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest deleted file mode 100644 index dd864f9214f5..000000000000 --- a/media-gfx/openexr_viewers/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch deleted file mode 100644 index 9d118e362d4c..000000000000 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 -index 7e38708..b5675b1 100644 ---- a/m4/path.cb.m4 -+++ b/m4/path.cb.m4 -@@ -10,9 +10,17 @@ dnl - AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (optional)], - cg_prefix="$withval", cg_prefix="") - -+AC_ARG_WITH(cg-libdir, [ --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)], -+ cg_libdir="$withval", cg_libdir="") -+ - if test x$cg_prefix != x ; then - CG_CXXFLAGS="-I$cg_prefix/include" -- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" -+ if test x$cg_libdir != x; then -+ CG_LDFLAGS="-L$cg_libdir" -+ else -+ CG_LDFLAGS="-L$cg_prefix/lib" -+ fi -+ CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut" - else - case $host_os in - darwin*) diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch deleted file mode 100644 index f9d51d5045b6..000000000000 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0ae7531..f2cdfee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0) - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(playexr/main.cpp) - AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h) --AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better --AM_MAINTAINER_MODE -+AM_INIT_AUTOMAKE - - - LIBTOOL_CURRENT=24 -@@ -19,7 +18,7 @@ AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_CC - AC_PROG_LN_S --AC_PROG_LIBTOOL -+LT_INIT - AC_PROG_MAKE_SET - - dnl -@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading, - [multithread="${enableval}"], [multithread=yes]) - - if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then -- ACX_PTHREAD( -- [ -- AC_DEFINE(HAVE_PTHREAD) -- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS" -- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS" -- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS" -- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS" -- CC="$PTHREAD_CC" -- -- AM_POSIX_SEM() -- ], -- [AC_MSG_ERROR([POSIX thread support required])]) -- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS]) -+ AX_PTHREAD -+ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available]) - fi - - -@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no) - dnl - dnl check for Cg - dnl --if test "${have_fltk}" = yes; then -+AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg], -+ [enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes]) -+ -+if test "${have_fltk}" = yes -a "${want_cg}" != no; then - AM_PATH_CG(have_cg=yes, have_cg=no) - if test "${have_cg}" = yes; then -- AC_DEFINE(HAVE_FRAGMENT_SHADERS) -+ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available]) - fi - else have_cg=no - fi -@@ -251,20 +176,10 @@ AC_C_CONST - AC_C_INLINE - AC_TYPE_SIZE_T - --dnl gcc optimization --AC_MSG_CHECKING(for gcc optimization flags) --old_cflags=$CFLAGS --CFLAGS="$CFLAGS -pipe" --AC_TRY_COMPILE([#include <stdio.h>], --[ printf ("hello, world"); ], --[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) --CFLAGS=$old_cflags --AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) -- - dnl Platform-specific stuff - case "$host" in - *darwin*) -- AC_DEFINE(HAVE_DARWIN) -+ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) - - dnl OS X universal binary support, requires --disable-dependency-tracking - AC_ARG_ENABLE(osx-universal-binaries, diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml deleted file mode 100644 index 80b95a6d4e5c..000000000000 --- a/media-gfx/openexr_viewers/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>media-video@gentoo.org</email> - </maintainer> - <use> - <flag name="cg">Add support for nvidia's cg shaders</flag> - </use> - <upstream> - <remote-id type="github">openexr/openexr</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild deleted file mode 100644 index 3c0b4ab63350..000000000000 --- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="OpenEXR Viewers" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cg" - -RDEPEND=" - ~media-libs/ilmbase-${PV}:= - ~media-libs/openexr-${PV}:= - virtual/opengl - x11-libs/fltk:1[opengl] - cg? ( media-gfx/nvidia-cg-toolkit ) -" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( ChangeLog README.md ) - -PATCHES=( - "${FILESDIR}/${P}-fix-configure.patch" - "${FILESDIR}/${P}--with-cg-libdir.patch" -) - -src_prepare() { - default - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-openexrctltest - --with-fltk-config="/usr/bin/fltk-config" - ) - - if use cg; then - myeconfargs+=( - --enable-cg - --with-cg-prefix="/opt/nvidia-cg-toolkit" - --with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)" - ) - append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF}/pdf \ - install - - einstalldocs -} diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild index 38fc32f1023f..8cb72bbfcc98 100644 --- a/media-libs/dav1d/dav1d-0.8.2.ebuild +++ b/media-libs/dav1d/dav1d-0.8.2.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then SCM="git-r3" EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" else - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86" SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2" fi diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch new file mode 100644 index 000000000000..310b5aaca935 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch @@ -0,0 +1,42 @@ +From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mon, 22 Mar 2021 16:15:37 -0700 +Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code + `libtool`. + +--- + Makefile | 3 +-- + mac/Makefile | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 810142f..949402f 100644 +--- a/Makefile ++++ b/Makefile +@@ -165,8 +165,7 @@ else + + ifeq ($(PLATFORM),unix) + override CC = $(CCraw) +- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ +- --mode=link $(CC) \ ++ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \ + $(subst /,$(COMPILER_SEP),$(LDFLAGS)) + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME) + else +diff --git a/mac/Makefile b/mac/Makefile +index 73ae99c..52038a4 100644 +--- a/mac/Makefile ++++ b/mac/Makefile +@@ -68,8 +68,7 @@ else + LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<) + + CC = $(CCraw) +- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ +- --mode=link $(CC) \ ++ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \ + $(subst /,$(COMPILER_SEP),$(LDFLAGS)) + ifeq ($(findstring CoreServices,$(LDFLAGS)),) + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \ +-- +GitLab + diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch new file mode 100644 index 000000000000..895a86c444d6 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch @@ -0,0 +1,40 @@ +From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mon, 22 Mar 2021 16:15:09 -0700 +Subject: [PATCH] [graph] Fix build with `slibtool`. + +* graph/rules.mk (GRAPH_LIB): Handle the case specially where +`LIBTOOL` is defined. +(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`. +--- + rules.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/graph/rules.mk b/graph/rules.mk +index 4903a38..a3f0de1 100644 +--- a/graph/rules.mk ++++ b/graph/rules.mk +@@ -12,7 +12,6 @@ + + + GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph) +-GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA) + + GRAPH := $(TOP_DIR_2)/graph + +@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O) \ + # this value can be modified by the system-specific graphics drivers. + # + ifneq ($(LIBTOOL),) +- COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \ ++ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(A) ++ COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \ + -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS)) + else ++ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA) + COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS)) + endif + +-- +GitLab + diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch new file mode 100644 index 000000000000..f3d7f8de43e4 --- /dev/null +++ b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch @@ -0,0 +1,58 @@ +From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 24 Mar 2021 09:04:41 -0700 +Subject: [PATCH] [build] Add an `install` target for binaries and man pages. + +* Makefile (MANPAGES): New variable. +(install) <unix>: New target. +--- + Makefile | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 949402f..8352f61 100644 +--- a/Makefile ++++ b/Makefile +@@ -194,7 +194,7 @@ else + $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \ + $(GRAPH_LINK) $(MATH) + +- .PHONY: exes clean distclean ++ .PHONY: exes clean distclean install + + + ################################################################### +@@ -317,6 +317,11 @@ else + # EXES += fttimer + # EXES += testname + ++ # Not all demo programs have a man page; we thus check for existence in a ++ # loop. ++ # ++ MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1)) ++ + exes: $(EXES:%=$(BIN_DIR_2)/%$E) + + +@@ -567,6 +572,18 @@ else + $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ) + $(LINK_NEW) + ++ ifeq ($(PLATFORM),unix) ++ install: exes ++ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ ++ $(DESTDIR)$(mandir)/man1 ++ $(foreach bin,$(EXES), \ ++ $(LIBTOOL) --mode=install \ ++ $(INSTALL) $(BIN_DIR_2)/$(bin) \ ++ $(DESTDIR)$(bindir)/$(bin);) ++ $(foreach man,$(MANPAGES), \ ++ $(INSTALL) $(man) \ ++ $(DESTDIR)$(mandir)/man1/$(notdir $(man));) ++ endif + endif + + +-- +GitLab + diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild index 6ede5206ae84..2a38b5388bee 100644 --- a/media-libs/freetype/freetype-2.10.4.ebuild +++ b/media-libs/freetype/freetype-2.10.4.ebuild @@ -148,6 +148,11 @@ src_prepare() { if ! use X; then sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die fi + + # Taken from upstream (https://bugs.gentoo.org/775881) + eapply "${FILESDIR}/${P}-slibtool_build_fix.patch" + eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch" + eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch" cd "${S}" || die fi @@ -204,15 +209,10 @@ multilib_src_compile() { multilib_src_install() { default - if multilib_is_native_abi && use utils; then + if multilib_is_native_abi && use utils ; then einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED}"/usr/bin || die - done + emake DESTDIR="${D}" FT2DEMOS=1 \ + TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install fi } diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index ea176ee0222e..a14cb2468582 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,2 +1 @@ -DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch deleted file mode 100644 index 214285293910..000000000000 --- a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch +++ /dev/null @@ -1,214 +0,0 @@ ---- a/configure -+++ b/configure -@@ -15253,7 +15253,7 @@ else - fi - - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - ax_cxx_compile_alternatives="17 1z" ax_cxx_compile_cxx17_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not - - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde - - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde - - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h - - CXXFLAGS="$CXXFLAGS -std=c++03" -@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5 - $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;} - -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -22768,7 +22768,7 @@ LIB_SUFFIX="" - lib_suffix_valid="no" - - lib_namespace="" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - cat >>confdefs.h <<_ACEOF - #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API} - _ACEOF -@@ -22787,7 +22787,7 @@ _ACEOF - lib_namespace="${ILMBASE_VERSION_API}" - LIB_SUFFIX="${ILMBASE_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - cat >>confdefs.h <<_ACEOF - #define IMATH_INTERNAL_NAMESPACE Imath - _ACEOF -@@ -22823,7 +22823,7 @@ _ACEOF - fi - - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - LIB_SUFFIX_DASH="-${LIB_SUFFIX}" - - if true; then -@@ -22858,7 +22858,7 @@ else - fi - - --if test "x${custom_public_namespace}" == xyes ; then -+if test "x${custom_public_namespace}" = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5 - $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;} - $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h -@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus - - public_namespace="" - custom_public_namespace=no --elif test "x${custom_public_namespace}" == xno ; then -+elif test "x${custom_public_namespace}" = xno ; then - $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h - - $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h -@@ -22912,12 +22912,11 @@ fi - - - if test "${osx_arch}" != default ; then -- osx_arch_flags="-arch ${osx_arch// / -arch }" -+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch}) - CXXFLAGS="$CXXFLAGS $osx_arch_flags" - - if test "$enable_dependency_tracking" != no ; then -- osx_arch_array=( ${osx_arch} ) -- if test ${#osx_arch_array[@]} -gt 1 ; then -+ if echo "$osx_arch" | grep >/dev/null " " ; then - as_fn_error $? "building multiple OS X architectures requires --disable-dependency-tracking. - Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking ---- a/configure.ac -+++ b/configure.ac -@@ -45,19 +45,19 @@ AC_ARG_ENABLE(cxxstd, - [enable ISO c++ standard 11/14 [[default=auto]]]), - [cxxstd="${enableval}"], [cxxstd=14]) - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - AC_DEFINE(ILMBASE_FORCE_CXX03) - CXXFLAGS="$CXXFLAGS -std=c++03" - else -@@ -65,11 +65,11 @@ else - AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([14], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([17], [noext], [optional]) -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -212,7 +212,7 @@ lib_suffix_valid="no" - dnl Internal library namespace - dnl - lib_namespace="" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE, Imath_${ILMBASE_VERSION_API}) - AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex_${ILMBASE_VERSION_API}) - AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread_${ILMBASE_VERSION_API}) -@@ -221,7 +221,7 @@ if test "x${library_namespace_versioning - lib_namespace="${ILMBASE_VERSION_API}" - LIB_SUFFIX="${ILMBASE_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE, Imath) - AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex) - AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread) -@@ -238,7 +238,7 @@ else - fi - AC_SUBST(LIB_SUFFIX) - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}") - AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true) - else -@@ -257,7 +257,7 @@ AC_ARG_ENABLE(customusernamespace, - [custom_public_namespace="${enableval}"], - [custom_public_namespace=no]) - --if test "x${custom_public_namespace}" == xyes ; then -+if test "x${custom_public_namespace}" = xyes ; then - AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to default]) - AC_DEFINE(IMATH_NAMESPACE, Imath) - AC_DEFINE(IEX_NAMESPACE, Iex) -@@ -265,7 +265,7 @@ if test "x${custom_public_namespace}" == - - public_namespace="" - custom_public_namespace=no --elif test "x${custom_public_namespace}" == xno ; then -+elif test "x${custom_public_namespace}" = xno ; then - AC_DEFINE(IMATH_NAMESPACE, Imath) - AC_DEFINE(IEX_NAMESPACE, Iex) - AC_DEFINE(ILMTHREAD_NAMESPACE, IlmThread) -@@ -296,14 +296,12 @@ case "$host" in - [osx_arch="${enableval}"], [osx_arch=default]) - - if test "${osx_arch}" != default ; then -- dnl Replace "a b c" with "-arch a -arch b -arch c". Should probably use an all-whitespace regexp rather than a single character for the search string. -- osx_arch_flags="-arch ${osx_arch// / -arch }" -+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch}) - CXXFLAGS="$CXXFLAGS $osx_arch_flags" - - dnl If multiple archs specified, make sure that --disable-dependency-tracking was also specified - if test "$enable_dependency_tracking" != no ; then -- osx_arch_array=( ${osx_arch} ) -- if test ${#osx_arch_array[@]} -gt 1 ; then -+ if echo "$osx_arch" | grep >/dev/null " " ; then - AC_MSG_ERROR([building multiple OS X architectures requires --disable-dependency-tracking. - Please re-run configure with these options: - --enable-osx-arch="${osx_arch}" --disable-dependency-tracking diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch deleted file mode 100644 index 8211846b09b6..000000000000 --- a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch +++ /dev/null @@ -1,104 +0,0 @@ -Subject: testBox: allow fuzzy comparison of floats, doubles -From: Steven Chamberlain <steven@pyro.eu.org> -Date: Wed, 24 Feb 2016 01:10:11 +0000 - -Allow for inexact values, as long as the error is smaller than the -epsilon of the data type. - -On 32-bit x86, allow even greater discrepency at double -precision, due to possible double-rounding. See -https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html - -Index: ilmbase/ImathTest/testBox.cpp -=================================================================== ---- ilmbase.orig/ImathTest/testBox.cpp -+++ ilmbase/ImathTest/testBox.cpp -@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE - - namespace { - -+template <class T> -+bool -+approximatelyEqual (const T &p1, const T &p2) -+{ -+ /* int and short should be exact */ -+ return (p1 == p2); -+} -+ -+bool -+approximatelyEqual (const Vec2<float> &p1, const Vec2<float> &p2) -+{ -+ float e = limits<float>::epsilon(); -+ float m = 0; -+ -+ for (int i = 0; i < 2; ++i) -+ { -+ m = max (m, abs (p1[i])); -+ m = max (m, abs (p2[i])); -+ } -+ -+ for (int i = 0; i < 2; ++i) -+ if (!equalWithAbsError (p1[i], p2[i], m * e)) -+ return false; -+ -+ return true; -+} -+ -+bool -+approximatelyEqual (const Vec2<double> &p1, const Vec2<double> &p2) -+{ -+#if defined(__i386__) || defined(_M_IX86) -+ /* double-rounding on 32-bit x86 may cause larger error: -+ use epsilon of float rather than double */ -+ double e = limits<float>::epsilon(); -+#else -+ double e = limits<double>::epsilon(); -+#endif -+ double m = 0; -+ -+ for (int i = 0; i < 2; ++i) -+ { -+ m = max (m, abs (p1[i])); -+ m = max (m, abs (p2[i])); -+ } -+ -+ for (int i = 0; i < 2; ++i) -+ if (!equalWithAbsError (p1[i], p2[i], m * e)) -+ return false; -+ -+ return true; -+} -+ - // - // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4} - // with all permutations of integers 1..T::dimensions(). -@@ -250,7 +302,8 @@ testExtendByPoint(const char *type) - - IMATH_INTERNAL_NAMESPACE::Box<T> b; - b.extendBy(p); -- assert(b.min == p && b.max == p); -+ assert (approximatelyEqual (b.min, p)); -+ assert (approximatelyEqual (b.max, p)); - } - - // -@@ -283,7 +336,8 @@ testExtendByPoint(const char *type) - - b.extendBy(p); - -- assert(b.min == min && b.max == max); -+ assert (approximatelyEqual (b.min, min)); -+ assert (approximatelyEqual (b.max, max)); - } - } - } -@@ -358,7 +412,8 @@ testExtendByBox(const char *type) - } - b.extendBy(IMATH_INTERNAL_NAMESPACE::Box<T>(p0, p1)); - -- assert(b.min == min && b.max == max); -+ assert (approximatelyEqual (b.min, min)); -+ assert (approximatelyEqual (b.max, max)); - } - } - } diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild deleted file mode 100644 index e994e236f280..000000000000 --- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib-minimal - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/" -SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/24" # based on SONAME -KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.0-testBox.patch - "${FILESDIR}"/${PN}-2.3.0-fix-bashisms.patch -) - -DOCS=( AUTHORS ChangeLog NEWS README.md ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) - -multilib_src_configure() { - # Disable use of ucontext.h wrt #482890 - if use hppa || use ppc || use ppc64; then - export ac_cv_header_ucontext_h=no - fi - - ECONF_SOURCE=${S} econf "$(use_enable static-libs static)" -} - -multilib_src_install_all() { - einstalldocs - - # package provides pkg-config files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild index f2da283bd6ac..dad9d8f1c506 100644 --- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild +++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" BDEPEND=" diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild index dc77fa36d30a..68a4a03b8767 100644 --- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild +++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" BDEPEND=" diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild index 7079dc81f265..73c0b7ed565e 100644 --- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild +++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" DEPEND="dev-util/netsurf-buildsystem" diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild index c326a787bba0..5b62e937edcc 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="" RDEPEND=" diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 44ef0c20a7cf..bdbd8277f8a8 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,2 +1 @@ -DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf diff --git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch deleted file mode 100644 index 1075cd9a30fa..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs <j.scruggs@gmail.com> -Date: Sat, 23 Sep 2017 10:36:40 +0100 -Subject: [PATCH] OpenEXR: Install missing header files - -Some header files are not installed via Autotools, but are with -CMake which breaks compatibility with certain programs. This patch -enables Autotools to install these header files. - -Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com> ---- - OpenEXR/IlmImf/Makefile.am | 3 ++- - OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++ - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am -index a7c219c..b7b96ac 100644 ---- a/IlmImf/Makefile.am -+++ b/IlmImf/Makefile.am -@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \ - ImfMisc.h \ - ImfPartHelper.h \ - ImfDeepImageState.h \ -- ImfDeepImageStateAttribute.h -+ ImfDeepImageStateAttribute.h \ -+ ImfFloatVectorAttribute.h - - noinst_HEADERS = ImfCompressor.h \ - ImfRleCompressor.h \ -diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am -index 8005ee1..e1d3674 100644 ---- a/IlmImfUtil/Makefile.am -+++ b/IlmImfUtil/Makefile.am -@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf - - libIlmImfUtilincludedir = $(includedir)/OpenEXR - -+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \ -+ ImfDeepImage.h \ -+ ImfDeepImageChannel.h \ -+ ImfImageLevel.h \ -+ ImfDeepImageLevel.h \ -+ ImfDeepImageIO.h \ -+ ImfImageChannelRenaming.h \ -+ ImfImageIO.h \ -+ ImfFlatImageChannel.h \ -+ ImfImage.h \ -+ ImfFlatImageLevel.h \ -+ ImfImageDataWindow.h \ -+ ImfSampleCountChannel.h \ -+ ImfFlatImageIO.h \ -+ ImfImageChannel.h -+ -+ - EXTRA_DIST = CMakeLists.txt - - INCLUDES = \ --- -2.14.1 - diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch deleted file mode 100644 index 53421194c2da..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch +++ /dev/null @@ -1,43 +0,0 @@ -Rename enum from VERSION to MYVERSION due to -collision with VERSION from autoheader. - ---- a/IlmImf/ImfDwaCompressor.cpp -+++ b/IlmImf/ImfDwaCompressor.cpp -@@ -1944,7 +1944,7 @@ - - #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)] - -- Int64 *version = OBIDX (VERSION); -+ Int64 *version = OBIDX (MYVERSION); - Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE); - Int64 *unknownCompressedSize = OBIDX (UNKNOWN_COMPRESSED_SIZE); - Int64 *acCompressedSize = OBIDX (AC_COMPRESSED_SIZE); -@@ -2356,7 +2356,7 @@ - - const Int64 *inPtr64 = (const Int64*) inPtr; - -- Int64 version = *(inPtr64 + VERSION); -+ Int64 version = *(inPtr64 + MYVERSION); - Int64 unknownUncompressedSize = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE); - Int64 unknownCompressedSize = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE); - Int64 acCompressedSize = *(inPtr64 + AC_COMPRESSED_SIZE); -@@ -3142,7 +3142,7 @@ - - - // --// Setup channel classification rules when reading files with VERSION < 2 -+// Setup channel classification rules when reading files with MYVERSION < 2 - // - - void ---- a/IlmImf/ImfDwaCompressor.h -+++ b/IlmImf/ImfDwaCompressor.h -@@ -124,7 +124,7 @@ - - enum DataSizesSingle - { -- VERSION = 0, // Version number: -+ MYVERSION = 0, // Version number: - // 0: classic - // 1: adds "end of block" to the AC RLE - diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch deleted file mode 100644 index 1dc13c724074..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $ - -Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3) -This get's over issues such as encountered with PIC builds. -Upstream issue : https://github.com/openexr/openexr/issues/128 - -https://raw.githubusercontent.com/jsonn/pkgsrc/trunk/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp -https://github.com/jsonn/pkgsrc/commit/5158af44e65b6d7b9f1a8aca2eb24cb87d003724 -https://bugs.gentoo.org/show_bug.cgi?id=626760 - ---- a/IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57.000000000 +0000 -+++ b/IlmImf/ImfSystemSpecific.cpp -@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN - - namespace { - #if defined(IMF_HAVE_SSE2) && defined(__GNUC__) -- - // Helper functions for gcc + SSE enabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { -+#ifdef __i386__ -+ __asm__ __volatile__ ( -+ "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx" -+ : /* Output */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx) -+ : /* Input */ "a"(n) -+ : /* Clobber */); -+#else - __asm__ __volatile__ ( - "cpuid" - : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : /* Input */ "a"(n) - : /* Clobber */); -+#endif - } - - #else // IMF_HAVE_SSE2 && __GNUC__ - - // Helper functions for generic compiler - all disabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { - eax = ebx = ecx = edx = 0; - } -@@ -64,7 +73,7 @@ namespace { - - #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - __asm__ __volatile__ ( - "xgetbv" -@@ -75,7 +84,7 @@ namespace { - - #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - eax = edx = 0; - } -@@ -94,8 +103,8 @@ CpuId::CpuId(): - f16c(false) - { - bool osxsave = false; -- int max = 0; -- int eax, ebx, ecx, edx; -+ unsigned int max = 0; -+ unsigned int eax, ebx, ecx, edx; - - cpuid(0, max, ebx, ecx, edx); - if (max > 0) diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch deleted file mode 100644 index 0851fe957354..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch +++ /dev/null @@ -1,71 +0,0 @@ -Description: Fix test-suite on some big-endian archs -Author: Dennis Gilmore <dennis@ausil.us> -Bug-Debian: https://bugs.debian.org/793040 -Origin: vendor, https://github.com/openexr/openexr/issues/81 -Reviewed-by: Mathieu Malaterre <malat@debian.org> - -Index: openexr/IlmImfTest/testFutureProofing.cpp -=================================================================== ---- openexr.orig/IlmImfTest/testFutureProofing.cpp -+++ openexr/IlmImfTest/testFutureProofing.cpp -@@ -40,6 +40,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <assert.h> -+#include <byteswap.h> - - #include "tmpDir.h" - #include "testFutureProofing.h" -@@ -64,6 +65,7 @@ - #include <ImfNamespace.h> - #include <ImathNamespace.h> - #include <IlmThreadNamespace.h> -+#include <ImfSystemSpecific.h> - - namespace IMF = OPENEXR_IMF_NAMESPACE; - using namespace IMF; -@@ -1234,6 +1236,12 @@ modifyType (bool modify_version) - - //length of attribute - fread(&length,4,1,f); -+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) -+ { -+ int tmp = bswap_32(length); -+ length = tmp; -+ } -+ - if(!modify_version && attrib_name=="type") - { - // modify the type of part 1 to be 'X<whatevever>' -Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp -=================================================================== ---- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp -+++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp -@@ -40,6 +40,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <assert.h> -+#include <byteswap.h> - - #include "tmpDir.h" - #include "testMultiPartFileMixingBasic.h" -@@ -59,6 +60,7 @@ - #include <ImfDeepScanLineInputPart.h> - #include <ImfPartType.h> - #include <ImfMisc.h> -+#include <ImfSystemSpecific.h> - - namespace IMF = OPENEXR_IMF_NAMESPACE; - using namespace IMF; -@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn - - //length of attribute - fread(&length,4,1,f); -+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) -+ { -+ int tmp = bswap_32(length); -+ length = tmp; -+ } - - //value of attribute - for(int i=0;i<length;i++) diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch deleted file mode 100644 index cf1ad7b09027..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Upstream is not interested in big endian arch - Seems to only affect the test suite. -Author: Mathieu Malaterre <malat@debian.org> - -Index: openexr/IlmImfTest/main.cpp -=================================================================== ---- openexr.orig/IlmImfTest/main.cpp -+++ openexr/IlmImfTest/main.cpp -@@ -153,7 +153,7 @@ main (int argc, char *argv[]) - TEST (testHuf, "core"); - TEST (testWav, "core"); - TEST (testRgba, "basic"); -- TEST (testSharedFrameBuffer, "basic"); -+ //TEST (testSharedFrameBuffer, "basic"); - TEST (testRgbaThreading, "basic"); - TEST (testChannels, "basic"); - TEST (testAttributes, "core"); diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch deleted file mode 100644 index f633eb0e49f1..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch +++ /dev/null @@ -1,117 +0,0 @@ -From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001 -From: Kimball Thurston <kdt3rd@gmail.com> -Date: Sun, 21 Jul 2019 23:07:01 +1200 -Subject: [PATCH] Fixes #139 - -Removes bash-isms from the autoconf bootstrap / configure.ac files - -Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> ---- - IlmBase/bootstrap | 4 ++-- - IlmBase/configure.ac | 22 ++++++++++------------ - OpenEXR/bootstrap | 4 ++-- - OpenEXR/configure.ac | 26 +++++++++++++------------- - OpenEXR_Viewers/bootstrap | 4 ++-- - OpenEXR_Viewers/configure.ac | 15 +++++++-------- - PyIlmBase/bootstrap | 4 ++-- - PyIlmBase/configure.ac | 15 +++++++-------- - 8 files changed, 45 insertions(+), 49 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd, - [enable ISO c++ standard 11/14 [[default=auto]]]), - [cxxstd="${enableval}"], [cxxstd=14]) - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - CXXFLAGS="$CXXFLAGS -std=c++03" - else - dnl automatically determine... - AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([14], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([17], [noext], [optional]) -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE( - [sysconf_nproc="no"] - ) - AC_MSG_RESULT([$sysconf_nproc]) --if test "x${sysconf_nproc}" == xyes ; then -+if test "x${sysconf_nproc}" = xyes ; then - AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count]) - fi - -@@ -297,14 +297,14 @@ LIB_SUFFIX="" - lib_suffix_valid="no" - - lib_namespace="Imf" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR]) - AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR]) - - lib_namespace="Imf_${OPENEXR_VERSION_API}" - LIB_SUFFIX="${OPENEXR_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR]) - - lib_namespace="Imf" -@@ -318,7 +318,7 @@ else - fi - AC_SUBST(LIB_SUFFIX) - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}") - AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true) - else -@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace, - [custom_usr_namespace="${enableval}"], - [custom_usr_namespace=no]) - --if test "x${custom_usr_namespace}" == xyes ; then -+if test "x${custom_usr_namespace}" = xyes ; then - AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf']) - AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) - usr_namespace="Imf" --elif test "x${custom_usr_namespace}" == xno ; then -+elif test "x${custom_usr_namespace}" = xno ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) - usr_namespace="Imf" - else -@@ -386,7 +386,7 @@ enable large stack optimizations $large_stack - internal library namespace $lib_namespace - user-client namespace $usr_namespace]) - --if test "x$build_osxuniversal" == xyes; then -+if test "x$build_osxuniversal" = xyes; then - AC_MSG_RESULT([ - build OS X universal binaries $build_osxuniversal]) - fi diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch deleted file mode 100644 index 811a7af38758..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 067f9d0..fdbe2f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) - AC_CONFIG_HEADERS([config/OpenEXRConfig.h]) --AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better --AM_MAINTAINER_MODE -+AM_INIT_AUTOMAKE - - - LIBTOOL_CURRENT=24 -@@ -28,7 +27,7 @@ AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_CC - AC_PROG_LN_S --AC_PROG_LIBTOOL -+LT_INIT - AC_PROG_MAKE_SET - - dnl -@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG( - [ILMBASE]) - - dnl Define the version string --AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string]) --AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string]) -+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string]) -+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string]) -@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading, - [multithread="${enableval}"], [multithread=yes]) - - AS_IF([test "x${multithread}" != xno], [ -- ACX_PTHREAD( -- [ -- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD) -- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS" -- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS" -- CC="$PTHREAD_CC" -- -- AM_POSIX_SEM() -- ], -- [AC_MSG_ERROR([POSIX thread support required])]) -+ AX_PTHREAD - - AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available]) - -@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip) - dnl AC_LANG_RESTORE - AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available]) - --AC_MSG_CHECKING(for gcc optimization flags) --old_cflags=$CFLAGS --CFLAGS="$CFLAGS -pipe" --AC_TRY_COMPILE([#include <stdio.h>], --[ printf ("hello, world"); ], --[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) --CFLAGS=$old_cflags --AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) -- - - dnl Check to see if the toolset supports AVX instructions in inline asm - AC_ARG_ENABLE([avx], diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch deleted file mode 100644 index 360b9609b2dc..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Remove bogus test from suite -Author: Mathieu Malaterre <malat@debian.org> -Bug-Debian: https://bugs.debian.org/790495 -Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15 - ---- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp -+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp -@@ -162,15 +162,15 @@ testSampleImages (const std::string&) - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr", - ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr"); - -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr", -+// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr", -+// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); - -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr", -+// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr", -+// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); - - - cout << "ok\n" << endl; diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch deleted file mode 100644 index bb3917d79961..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Usual double rounding issue with x87 -Author: Mathieu Malaterre <malat@debian.org> -Bug-Debian: https://bugs.debian.org/909865 -Forwarded: https://github.com/openexr/openexr/issues/346 -Last-Update: 2018-12-19 - ---- openexr-2.3.0.orig/IlmImfTest/Makefile.am -+++ openexr-2.3.0/IlmImfTest/Makefile.am -@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t - - AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\" - -+AM_CPPFLAGS += -ffloat-store -+ - if BUILD_IMFHUGETEST - IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h - AM_CPPFLAGS += -DENABLE_IMFHUGETEST diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch deleted file mode 100644 index 430bb20bcfae..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Fix test-suite on some 32bits archs -Author: Mathieu Malaterre <malat@debian.org> -Bug-Debian: https://bugs.debian.org/791478 - -Index: openexr/IlmImfTest/Makefile.am -=================================================================== ---- openexr.orig/IlmImfTest/Makefile.am -+++ openexr/IlmImfTest/Makefile.am -@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t - testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp \ - testPartHelper.h testPartHelper.cpp \ - testOptimized.cpp testOptimized.h \ -- testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \ - testBadTypeAttributes.cpp testBadTypeAttributes.h \ - testFutureProofing.cpp testFutureProofing.h \ - compareDwa.cpp compareDwa.h \ -Index: openexr/IlmImfTest/main.cpp -=================================================================== ---- openexr.orig/IlmImfTest/main.cpp -+++ openexr/IlmImfTest/main.cpp -@@ -82,7 +82,6 @@ - #include "testCopyMultiPartFile.h" - #include "testPartHelper.h" - #include "testOptimized.h" --#include "testOptimizedInterleavePatterns.h" - #include "testBadTypeAttributes.h" - #include "testFutureProofing.h" - #include "testPartHelper.h" -@@ -174,7 +173,6 @@ main (int argc, char *argv[]) - TEST (testExistingStreams, "core"); - TEST (testStandardAttributes, "core"); - TEST (testOptimized, "basic"); -- TEST (testOptimizedInterleavePatterns, "basic"); - TEST (testYca, "basic"); - TEST (testTiledYa, "basic"); - TEST (testNativeFormat, "basic"); diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild deleted file mode 100644 index 69309c6d2019..000000000000 --- a/media-libs/openexr/openexr-2.3.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs multilib-minimal - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/24" # based on SONAME -KEYWORDS="amd64 -arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx examples static-libs" - -RDEPEND=" - >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2016.09.16 - virtual/pkgconfig -" - -RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680 - -DOCS=( AUTHORS ChangeLog NEWS README.md ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h ) - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch" - "${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch" - "${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch" - "${FILESDIR}/${P}-fix-build-system.patch" - "${FILESDIR}/${P}-fix-bashisms.patch" - # From Debian - "${FILESDIR}/${PN}-2.3.0-tests-32bits.patch" - "${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch" - "${FILESDIR}/${PN}-2.3.0-bigendian.patch" - "${FILESDIR}/${PN}-2.3.0-bigendian2.patch" - "${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch" -) - -src_prepare() { - default - # Fix path for testsuite - sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-imffuzztest - --disable-imfhugetest - --enable-threading - $(use_enable cpu_flags_x86_avx avx) - $(use_enable examples imfexamples) - $(use_enable static-libs static) - ) - - # TODO: check if this still applies on updates! - # internal tool dwaLookup fails to run when linked with gold linker - tc-ld-disable-gold - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die - fi - - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest index 648aa7b92f7d..fccd4b6aa37e 100644 --- a/media-libs/waffle/Manifest +++ b/media-libs/waffle/Manifest @@ -1,3 +1 @@ -DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f -DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B 62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf SHA512 2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2 diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch deleted file mode 100644 index ef31275de08e..000000000000 --- a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001 -From: Dylan Baker <dylan@pnwbakers.com> -Date: Fri, 7 Jun 2019 15:36:09 -0700 -Subject: [PATCH] meson: Generate cmake config and version files if meson is - new enough - -Meson 0.50.0 added a module similar to the pkg-config module for -generating cmake config files. Since the CMake build system provides -these the meson build system should as well. - -v2: - Bump version to 0.50 instead of incorrect 0.49 -v3: - remove TODO comment that this fixes - - Add a definition of set_and_check for meson-generated Config - files. - -Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> ---- - cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++ - meson.build | 2 -- - src/waffle/meson.build | 20 ++++++++++++++++++++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in -index b60b470..4e19755 100644 ---- a/cmake/Modules/WaffleConfig.cmake.in -+++ b/cmake/Modules/WaffleConfig.cmake.in -@@ -7,6 +7,16 @@ - - @PACKAGE_INIT@ - -+# This should only be used for meson -+if (NOT DEFINED set_and_check) -+ macro(set_and_check _var _file) -+ set(${_var} "${_file}") -+ if(NOT EXISTS "${_file}") -+ message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") -+ endif() -+ endmacro() -+endif() -+ - set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@") - set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") - set(Waffle_LIBRARIES "@waffle_libname@") -diff --git a/meson.build b/meson.build -index 29fda22..22b7f59 100644 ---- a/meson.build -+++ b/meson.build -@@ -231,5 +231,3 @@ endif - if get_option('build-examples') - subdir('examples') - endif -- --# TODO: CMake config file -diff --git a/src/waffle/meson.build b/src/waffle/meson.build -index 322df40..cd68ddf 100644 ---- a/src/waffle/meson.build -+++ b/src/waffle/meson.build -@@ -211,6 +211,26 @@ pkg.generate( - description : 'A library for selecting an OpenGL API and windows system at runtime.', - ) - -+if meson.version().version_compare('>= 0.50') -+ cmake = import('cmake') -+ cmake.write_basic_package_version_file( -+ name : 'Waffle', -+ version : meson.project_version(), -+ compatibility : 'SameMajorVersion', -+ ) -+ -+ cmake_conf = configuration_data() -+ cmake_conf.set('waffle_libname', waffle_name) -+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir'))) -+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir'))) -+ -+ cmake.configure_package_config_file( -+ name : 'Waffle', -+ input : '../../cmake/Modules/WaffleConfig.cmake.in', -+ configuration : cmake_conf, -+ ) -+endif -+ - if get_option('build-tests') - if get_option('default_library') == 'shared' - # The unit tests need to poke at internals of the library, but with a --- -2.24.1 - diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild deleted file mode 100644 index 6bd3d6db7455..000000000000 --- a/media-libs/waffle/waffle-1.6.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" - GIT_ECLASS="git-r3" -else - SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz" - KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" -fi -inherit meson multilib-minimal ${GIT_ECLASS} - -DESCRIPTION="Library that allows selection of GL API and of window system at runtime" -HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle" - -LICENSE="BSD-2" -SLOT="0" -IUSE="doc +egl +gbm wayland X" -RESTRICT="test" # gl_basic tests don't work when run from portage - -RDEPEND=" - >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] - gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xml-dtd:4.2 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/wflinfo$(get_exeext) -) - -multilib_src_configure() { - local emesonargs=( - $(meson_feature X glx) - $(meson_feature wayland) - $(meson_feature X x11_egl) - $(meson_feature gbm) - $(meson_feature egl surfaceless_egl) - -Dbuild-manpages=true - -Dbuild-tests=false - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install - - ! use doc && rm -rf "${D}"/usr/share/doc/waffle1 -} diff --git a/media-libs/waffle/waffle-1.6.2.ebuild b/media-libs/waffle/waffle-1.6.2.ebuild deleted file mode 100644 index a1d9e8bbbf26..000000000000 --- a/media-libs/waffle/waffle-1.6.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" - GIT_ECLASS="git-r3" -else - SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" - KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" - S="${WORKDIR}"/${PN}-v${PV} -fi -inherit meson multilib-minimal ${GIT_ECLASS} - -DESCRIPTION="Library that allows selection of GL API and of window system at runtime" -HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle" - -LICENSE="BSD-2" -SLOT="0" -IUSE="doc +egl +gbm wayland X" -RESTRICT="test" # gl_basic tests don't work when run from portage - -RDEPEND=" - >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] - gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xml-dtd:4.2 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/wflinfo$(get_exeext) -) - -multilib_src_configure() { - local emesonargs=( - $(meson_feature X glx) - $(meson_feature wayland) - $(meson_feature X x11_egl) - $(meson_feature gbm) - $(meson_feature egl surfaceless_egl) - -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false) - -Dbuild-tests=false - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install - - ! use doc && rm -rf \ - "${D}"/usr/share/doc/waffle1 \ - "${D}"/usr/share/man/man{3,7} -} diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r1.ebuild index 82b02421a7d5..1d436b930237 100644 --- a/media-sound/pamix/pamix-1.6-r1.ebuild +++ b/media-sound/pamix/pamix-1.6-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/PAmix-${PV}" fi diff --git a/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild index ebdcd8df08d9..a76a058cd96f 100644 --- a/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild +++ b/media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/nicklan/${PN}/releases/download/v${PV}/${MY_P}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc libnotify nls" RDEPEND=" diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2.ebuild deleted file mode 100644 index ed3446af74c8..000000000000 --- a/media-sound/pnmixer/pnmixer-0.7.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils - -MY_PV="v${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Volume mixer for the system tray" -HOMEPAGE="https://github.com/nicklan/pnmixer" -SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc libnotify nls" - -RDEPEND="dev-libs/glib:2 - media-libs/alsa-lib - x11-libs/gtk+:3 - x11-libs/libX11 - libnotify? ( x11-libs/libnotify )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} - -src_configure() { - local mycmakeargs=( - -DWITH_LIBNOTIFY="$(usex libnotify)" - -DENABLE_NLS="$(usex nls)" - -DBUILD_DOCUMENTATION="$(usex doc)" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 8dfd9fb24b06..00e323e19eeb 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,2 +1,2 @@ -DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2 SHA512 c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404 -DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd SHA512 12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199 +DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543 +DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0 diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch new file mode 100644 index 000000000000..d7a2f1be16c5 --- /dev/null +++ b/media-video/makemkv/files/makemkv-flags.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000 ++++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100 +@@ -112,7 +112,7 @@ + + out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h + mkdir -p out +- $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ ++ $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ + -ffunction-sections -Wl,--gc-sections -Wl,-z,defs + + tmp/gen_buildinfo.h: diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild index f28d5a01e2db..06832f14e6ac 100644 --- a/media-video/makemkv/makemkv-1.16.1.ebuild +++ b/media-video/makemkv/makemkv-1.16.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.makemkv.com/" SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz http://www.makemkv.com/download/${MY_PB}.tar.gz" -LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" +LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="+gui libressl" @@ -37,7 +37,6 @@ DEPEND=" " RDEPEND=" ${DEPEND} - media-video/ccextractor net-misc/wget " BDEPEND=" @@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-path.patch + "${FILESDIR}"/${PN}-flags.patch ) src_configure() { @@ -64,6 +64,13 @@ src_configure() { } src_install() { + local myarch + case "${ARCH}" in + arm) myarch=armel ;; + x86) myarch=i386 ;; + *) myarch=${ARCH} ;; + esac + default # add missing symlinks for QA @@ -77,7 +84,7 @@ src_install() { cd "${WORKDIR}"/${MY_PB} || die # install prebuilt bin - dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon + dobin bin/"${myarch}"/makemkvcon # additional tool is actually part of makemkvcon dosym makemkvcon /usr/bin/sdftool @@ -85,9 +92,6 @@ src_install() { # install profiles and locales insinto /usr/share/MakeMKV doins src/share/* - - # add symlink rather than relying on MMCCEXTRACTOR env var - dosym ccextractor /usr/bin/mmccextr } pkg_postinst() { diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch new file mode 100644 index 000000000000..2b31a7c7d22a --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch @@ -0,0 +1,33 @@ +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index b594679c..adf9a221 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -87,6 +87,28 @@ endif (NOT KSBA) + message (STATUS "Looking for pcap...") + find_library (PCAP pcap) + ++message (STATUS "Looking for pcap... ${PCAP}") ++if (NOT PCAP) ++ message (SEND_ERROR "The pcap library is required.") ++endif (NOT PCAP) ++ ++message (STATUS "Looking for pcap-config...") ++find_program (PCAP_CONFIG pcap-config) ++ ++if (PCAP_CONFIG) ++ message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}") ++ execute_process (COMMAND pcap-config --libs ++ OUTPUT_VARIABLE PCAP_LDFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process (COMMAND pcap-config --cflags ++ OUTPUT_VARIABLE PCAP_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++else (PCAP_CONFIG) ++ message (STATUS "pcap-config not found, using defaults...") ++ set (PCAP_LDFLAGS "-L/usr/lib -lpcap") ++ set (PCAP_CFLAGS "-I/usr/include") ++endif (PCAP_CONFIG) ++ + find_library (GPGME gpgme) + message (STATUS "Looking for gpgme... ${GPGME}") + if (NOT GPGME) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild index 22bdb9fec932..5d4642e49c58 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild @@ -51,6 +51,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch + "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch #qa fix for rpath "${FILESDIR}"/${P}-rpath-qa-fix.patch ) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild index 1fc5a9111794..6b20b2711f21 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild @@ -50,6 +50,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-disable-automagic-dep.patch + "${FILESDIR}"/${P}-fix-linking-with-lld.patch ) BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild index 4f812a8d3984..b0142154c53f 100644 --- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild +++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild @@ -29,7 +29,7 @@ RDEPEND=" SLOT="0" LICENSE="GPL-2" -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" IUSE="+fax fidonet split-usr" PATCHES=( diff --git a/net-fs/s3fs/s3fs-1.86.ebuild b/net-fs/s3fs/s3fs-1.86.ebuild index e0f2f2606867..29e2862df293 100644 --- a/net-fs/s3fs/s3fs-1.86.ebuild +++ b/net-fs/s3fs/s3fs-1.86.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="gnutls nettle nss +openssl test" REQUIRED_USE=" ^^ ( gnutls nss openssl ) diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild index 758b20c33cd9..6db493027e1b 100644 --- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild +++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib cmake-utils +inherit multilib cmake DESCRIPTION="A library to decode Bluetooth baseband packets" HOMEPAGE="http://libbtbb.sourceforge.net/" @@ -47,7 +47,7 @@ which_plugins() { src_prepare() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_prepare + cmake_src_prepare if use wireshark-plugins; then which_plugins @@ -60,7 +60,7 @@ src_prepare() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare + cmake_src_prepare done fi } @@ -73,7 +73,7 @@ src_configure() { -DBUILD_STATIC_LIB=$(usex static-libs) -DBUILD_ROOT="${ED}" ) - cmake-utils_src_configure + cmake_src_configure if use wireshark-plugins; then for i in ${plugins} @@ -87,7 +87,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" ) - cmake-utils_src_configure + cmake_src_configure done fi } @@ -95,7 +95,7 @@ src_configure() { src_compile() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_compile + cmake_src_compile if use wireshark-plugins; then for i in ${plugins} @@ -106,7 +106,7 @@ src_compile() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile + cmake_src_compile done fi } @@ -114,7 +114,7 @@ src_compile() { src_test() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_test + cmake_src_test if use wireshark-plugins; then for i in ${plugins} @@ -125,7 +125,7 @@ src_test() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test + cmake_src_test done fi } @@ -133,7 +133,7 @@ src_test() { src_install() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_install + cmake_src_install if use wireshark-plugins; then for i in ${plugins} @@ -144,7 +144,7 @@ src_install() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install + cmake_src_install done fi } diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index a1587cd739a2..6db493027e1b 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib cmake-utils +inherit multilib cmake DESCRIPTION="A library to decode Bluetooth baseband packets" HOMEPAGE="http://libbtbb.sourceforge.net/" @@ -47,7 +47,7 @@ which_plugins() { src_prepare() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_prepare + cmake_src_prepare if use wireshark-plugins; then which_plugins @@ -60,7 +60,7 @@ src_prepare() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare + cmake_src_prepare done fi } @@ -73,7 +73,7 @@ src_configure() { -DBUILD_STATIC_LIB=$(usex static-libs) -DBUILD_ROOT="${ED}" ) - cmake-utils_src_configure + cmake_src_configure if use wireshark-plugins; then for i in ${plugins} @@ -87,7 +87,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" ) - cmake-utils_src_configure + cmake_src_configure done fi } @@ -95,7 +95,7 @@ src_configure() { src_compile() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_compile + cmake_src_compile if use wireshark-plugins; then for i in ${plugins} @@ -106,7 +106,7 @@ src_compile() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile + cmake_src_compile done fi } @@ -114,7 +114,7 @@ src_compile() { src_test() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_test + cmake_src_test if use wireshark-plugins; then for i in ${plugins} @@ -125,7 +125,7 @@ src_test() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test + cmake_src_test done fi } @@ -133,7 +133,7 @@ src_test() { src_install() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_install + cmake_src_install if use wireshark-plugins; then for i in ${plugins} @@ -144,7 +144,7 @@ src_install() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install + cmake_src_install done fi } diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild index 19c4937b1fd3..bbe71b65dfb2 100644 --- a/net-libs/libdom/libdom-0.4.1-r1.ebuild +++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="expat test xml" RESTRICT="!test? ( test )" diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest index aecac7602c0c..d7597c7d3297 100644 --- a/net-libs/libhackrf/Manifest +++ b/net-libs/libhackrf/Manifest @@ -1,2 +1 @@ -DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139 diff --git a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild deleted file mode 100644 index 06468417d0d7..000000000000 --- a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils udev - -DESCRIPTION="library for communicating with HackRF SDR platform" -HOMEPAGE="http://greatscottgadgets.com/hackrf/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mossmann/hackrf.git" - inherit git-r3 - EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" - S="${WORKDIR}/hackrf/host/libhackrf" -else - S="${WORKDIR}/hackrf-${PV}/host/libhackrf" - SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -fi - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="+udev" - -DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DINSTALL_UDEV_RULES="$(usex udev)" - ) - if use udev; then - mycmakeargs+=( - -DUDEV_RULES_GROUP=usb - -DUDEV_RULES_PATH="$(get_udevdir)/rules.d" - ) - fi - cmake-utils_src_configure -} - -pkg_postinst() { - use udev && einfo "Users in the usb group can use hackrf." -} diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild index c5c30e59473a..fd72ef016bea 100644 --- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild +++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils udev +inherit cmake udev DESCRIPTION="library for communicating with HackRF SDR platform" HOMEPAGE="http://greatscottgadgets.com/hackrf/" @@ -36,7 +36,7 @@ src_configure() { -DUDEV_RULES_PATH="$(get_udevdir)/rules.d" ) fi - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild index 06468417d0d7..fd72ef016bea 100644 --- a/net-libs/libhackrf/libhackrf-9999.ebuild +++ b/net-libs/libhackrf/libhackrf-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils udev +inherit cmake udev DESCRIPTION="library for communicating with HackRF SDR platform" HOMEPAGE="http://greatscottgadgets.com/hackrf/" @@ -36,7 +36,7 @@ src_configure() { -DUDEV_RULES_PATH="$(get_udevdir)/rules.d" ) fi - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch index f5c5c39ee5c7..80b003917dc0 100644 --- a/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch +++ b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch @@ -1,5 +1,5 @@ ---- sendEmail 2013-05-21 16:44:18.000000000 +0100 -+++ sendEmail 2013-06-05 09:26:20.000000000 +0100 +--- a/sendEmail ++++ b/sendEmail @@ -1903,7 +1903,7 @@ if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) { printmsg("DEBUG => Starting TLS", 2); diff --git a/net-mail/sendEmail/files/1.56-overzealous-version-check.patch b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch index 5cd47b06788d..38a18df4acc5 100644 --- a/net-mail/sendEmail/files/1.56-overzealous-version-check.patch +++ b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch @@ -1,5 +1,5 @@ ---- a/sendEmail 2013-03-25 08:59:12.000000000 +0000 -+++ b/sendEmail 2013-03-25 08:59:22.000000000 +0000 +--- a/sendEmail ++++ b/sendEmail @@ -1903,7 +1903,7 @@ if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) { printmsg("DEBUG => Starting TLS", 2); diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild index 8b8af8e7a317..b84b856369c7 100644 --- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild +++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -MY_P="${PN}-v${PV}" - -inherit base +EAPI=7 +MY_P="${PN}-v${PV}" DESCRIPTION="Command line based, SMTP email agent" HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/" SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="ssl" -DEPEND="" -RDEPEND="dev-lang/perl - ssl? ( dev-perl/IO-Socket-SSL )" +RDEPEND=" + dev-lang/perl + ssl? ( dev-perl/IO-Socket-SSL ) +" -PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" - "${FILESDIR}/${PV}-overzealous-verify-mode-check.patch" ) -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PV}-overzealous-version-check.patch + "${FILESDIR}"/${PV}-overzealous-verify-mode-check.patch +) src_install() { dobin sendEmail - dodoc CHANGELOG README TODO + dodoc CHANGELOG README TODO } diff --git a/net-misc/electrum/electrum-4.0.9-r2.ebuild b/net-misc/electrum/electrum-4.0.9-r2.ebuild index 434ffec4d5b6..2a512c321f6f 100644 --- a/net-misc/electrum/electrum-4.0.9-r2.ebuild +++ b/net-misc/electrum/electrum-4.0.9-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="cli ncurses qrcode +qt5" REQUIRED_USE="|| ( cli ncurses qt5 )" diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild index 3dc03767e32c..9e16c18b16dc 100644 --- a/net-misc/frr/frr-7.5.1-r2.ebuild +++ b/net-misc/frr/frr-7.5.1-r2.ebuild @@ -57,36 +57,39 @@ src_prepare() { } src_configure() { - econf \ - --disable-static \ - --with-pkg-extra-version="-gentoo" \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/lib/frr \ - --sbindir="${EPREFIX}"/usr/lib/frr \ - --libexecdir="${EPREFIX}"/usr/lib/frr \ - --sysconfdir="${EPREFIX}"/etc/frr \ - --localstatedir="${EPREFIX}"/run/frr \ - --with-moduledir="${EPREFIX}"/usr/lib/frr/modules \ + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules --with-clippy="${BROOT}"/usr/bin/clippy - --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \ - --enable-user=frr \ - --enable-group=frr \ - --enable-vty-group=frr \ - --enable-multipath=64 \ - $(use_enable doc) \ - $(use_enable fpm) \ - $(use_enable grpc) \ - $(use_enable ipv6 ospf6d) \ - $(use_enable ipv6 ripngd) \ - $(use_enable ipv6 rtadv) \ - $(use_enable kernel_linux realms) \ - $(use_enable nhrp nhrpd) \ - $(usex ospfapi '--enable-ospfclient' '' '' '') \ - $(use_enable rpki) \ - $(use_enable snmp) \ + --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) $(use_enable systemd) + ) + + econf "${myconf[@]}" } src_compile() { diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild index 7c87e05723ff..4869d4ad827a 100644 --- a/net-misc/htpdate/htpdate-1.2.2.ebuild +++ b/net-misc/htpdate/htpdate-1.2.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" DEPEND="" RDEPEND="" diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild index f3271e63f6f5..48c99037369e 100644 --- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild @@ -33,7 +33,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 47c93e22f89c..6c445d2a2035 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,2 +1,3 @@ DIST Remmina-v1.4.11.tar.gz 2176470 BLAKE2B 1d0923e520716f1cf0d1d153dab6eb3d22ef2fb53b8b51f8cd65672c9a92e7bbcc254915a0a7e269dc478aa2d39a15ab388056dc8c435997c2f0a8f257e589bd SHA512 9b26002451d297e49c63e6ce39a51d434eb18f78b3c2ef8770e2ded319ead4478a4f1ad4d4fefa19ddf3390d740bc34ce27d0c0eb0c24e39a2d792f6f66079b5 DIST Remmina-v1.4.12.tar.gz 2338965 BLAKE2B 86ec07a2c5ff0957cc3d855a4cc86c9675aa474110d7d40d202817f01c4d5815c008a5f0f78802e9b3ef14b3590d58ccbb124e2b6c6f0b14ea8c8592a4d8bd50 SHA512 7ae8031ff64c113b0ed792c6ba56c42918ccce5a30fe0255f730ef7a5a712dc500495e591598fd6cc553c09c6d5a2457e33f4dc1019403e89b25cc02e491515d +DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc diff --git a/net-misc/remmina/remmina-1.4.13.ebuild b/net-misc/remmina/remmina-1.4.13.ebuild new file mode 100644 index 000000000000..cf2e96ea15d7 --- /dev/null +++ b/net-misc/remmina/remmina-1.4.13.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake optfeature xdg + +MY_P="${PN^}-v${PV}" + +DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client" +HOMEPAGE="https://remmina.org/" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" + +DEPEND=" + app-emulation/spice-protocol + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/wayland + net-libs/libsoup + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxkbfile + appindicator? ( dev-libs/libappindicator:3 ) + crypt? ( dev-libs/libgcrypt:0= ) + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] + <net-misc/freerdp-3[X] + cups? ( net-print/cups:= ) ) + gnome-keyring? ( app-crypt/libsecret ) + kwallet? ( kde-frameworks/kwallet ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh:0=[sftp] + x11-libs/vte:2.91 ) + telepathy? ( net-libs/telepathy-glib ) + vnc? ( net-libs/libvncserver[jpeg] ) + webkit? ( net-libs/webkit-gtk:4 ) + zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) +" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND=" + ${DEPEND} + virtual/freedesktop-icon-theme +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_APPINDICATOR=$(usex appindicator) + -DWITH_GCRYPT=$(usex crypt) + -DWITH_EXAMPLES=$(usex examples) + -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_KF5WALLET=$(usex kwallet) + -DWITH_GETTEXT=$(usex nls) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_FREERDP=$(usex rdp) + -DWITH_FREERDP3=OFF + -DWITH_CUPS=$(usex cups) + -DWITH_SPICE=$(usex spice) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_VTE=$(usex ssh) + -DWITH_TELEPATHY=$(usex telepathy) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_WWW=$(usex webkit) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_NEWS=$(usex telemetry) + -DWITH_ICON_CACHE=OFF + -DWITH_UPDATE_DESKTOP_DB=OFF + # when this feature is stable, add python eclass usage to optionally enable + -DWITH_PYTHON=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "To get additional features, some optional runtime dependencies" + elog "may be installed:" + elog "" + optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] + optfeature "XDMCP support" x11-base/xorg-server[xephyr] +} diff --git a/net-misc/socket/files/socket-1.5-makefile.patch b/net-misc/socket/files/socket-1.5-makefile.patch index 7dc3e7c1f5c3..a204791ce5b5 100644 --- a/net-misc/socket/files/socket-1.5-makefile.patch +++ b/net-misc/socket/files/socket-1.5-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-06-27 13:57:47.000000000 +0400 -+++ Makefile 2013-02-05 00:42:25.241748516 +0400 +--- a/Makefile ++++ b/Makefile @@ -38,9 +38,8 @@ INSTALLMANPATH = $(INSTALLBASE)/man INSTALLMANMODE = 444 diff --git a/net-misc/socket/socket-1.5.ebuild b/net-misc/socket/socket-1.5.ebuild index a08430d13f1f..be38d567737b 100644 --- a/net-misc/socket/socket-1.5.ebuild +++ b/net-misc/socket/socket-1.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit base toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A shell-level interface to TCP sockets" HOMEPAGE="http://www.jnickelsen.de/socket/" @@ -12,10 +12,11 @@ SRC_URI="http://www.jnickelsen.de/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" - IUSE="examples" -PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) src_compile() { emake CC="$(tc-getCC)" @@ -25,6 +26,7 @@ src_install() { dobin socket doman socket.1 dodoc BLURB CHANGES README + if use examples; then docinto examples dodoc scripts/* diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild index fd37e34a18e0..24a2589ab329 100644 --- a/net-misc/stunnel/stunnel-5.58.ebuild +++ b/net-misc/stunnel/stunnel-5.58.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6 selinux stunnel3 tcpd" DEPEND=" diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest index 53d948eb5aef..fdffa915747b 100644 --- a/net-nds/jxplorer/Manifest +++ b/net-nds/jxplorer/Manifest @@ -1,3 +1 @@ -DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 6e5fb357c19ab9fd8a40f38d01fc650b793e8a6058c5e94336a46690283afb8e8a0a489cbab225da8f85f10d9a54fe938cab752b3648264d43c751441fd0991a SHA512 a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9 -DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995 SHA512 aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb SHA512 6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch index 302b37c0061f..4b1009159f46 100644 --- a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch +++ b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch @@ -1,6 +1,6 @@ -diff -Nru /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java ---- /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:53:59.869914047 +0300 -+++ src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:54:47.836311029 +0300 +diff -Nru a/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java +--- a/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:53:59.869914047 +0300 ++++ b/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:54:47.836311029 +0300 @@ -502,7 +502,7 @@ // look for JXWorkBenchBrowser 'add on' module... diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild deleted file mode 100644 index c780b19b163a..000000000000 --- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix virtualx - -DESCRIPTION="A fully functional ldap browser written in java" -HOMEPAGE="http://jxplorer.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip" -LICENSE="CAOSL" - -IUSE="" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=">=virtual/jre-1.5 - >=dev-java/javahelp-2.0.02_p46:0" -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/junit:0 ) - ${RDEPEND}" - -S="${WORKDIR}/${PN}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="javahelp" -EANT_TEST_ANT_TASKS="ant-junit" - -src_prepare() { - rm -v jars/*.jar || die - sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die - - epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch - - if use test ; then - EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit) - else - find . -iname '*Test*.java' -delete || die - fi -} - -src_test() { - VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake -} - -src_install() { - java-pkg_dojar jars/${PN}.jar - - insinto /usr/share/${PN} - doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - - dodoc README*.TXT - - # By default the config dir is ${HOME}/jxplorer - java-pkg_dolauncher ${PN} \ - --main com.ca.directory.jxplorer.JXplorer \ - --pwd '"${HOME}/.jxplorer"' \ - -pre "${FILESDIR}/${PN}-3-pre" - - eprefixify "${ED}/usr/bin/${PN}" - - use source && java-pkg_dosrc src/com - use doc && java-pkg_dojavadoc docs/api - - make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System -} diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild index ff20bda345bc..04c1abce5c51 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild @@ -1,45 +1,44 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source test" +inherit desktop java-pkg-2 java-ant-2 prefix virtualx -inherit java-pkg-2 java-ant-2 prefix virtualx - -DESCRIPTION="A fully functional ldap browser written in Java" +DESCRIPTION="Fully functional LDAP browser written in Java" HOMEPAGE="http://jxplorer.org/" SRC_URI="mirror://sourceforge/${PN}/${P}-project.zip" -LICENSE="CAOSL" +S="${WORKDIR}/${PN}" -IUSE="" +LICENSE="CAOSL" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" RESTRICT="test" -CDEPEND=" - >=dev-java/javahelp-2.0.02_p46:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.5" - -DEPEND=" - ${CDEPEND} +COMMON_DEPEND=" + >=dev-java/javahelp-2.0.02_p46:0 +" +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.5 +" +DEPEND="${COMMON_DEPEND} virtual/jdk:1.8 - test? ( dev-java/junit:0 )" - -S="${WORKDIR}/${PN}" + test? ( dev-java/junit:0 ) +" JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_GENTOO_CLASSPATH="javahelp" EANT_TEST_ANT_TASKS="ant-junit" +PATCHES=( "${FILESDIR}"/3.3-disable-jxworkbench.patch ) + src_prepare() { - epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch + default rm -v jars/*.jar || die - sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die + sed -i -e 's/<fileset dir="${jasper}.*//g' build.xml || die if use test; then EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit) diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild deleted file mode 100644 index 8c647ff0f984..000000000000 --- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix virtualx - -DESCRIPTION="A fully functional ldap browser written in java" -HOMEPAGE="http://jxplorer.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip" -LICENSE="CAOSL" - -IUSE="" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" - -RDEPEND=">=virtual/jre-1.5 - >=dev-java/javahelp-2.0.02_p46:0" -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/junit:0 ) - ${RDEPEND}" - -S="${WORKDIR}/${PN}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="javahelp" -EANT_TEST_ANT_TASKS="ant-junit" - -src_prepare() { - rm -v jars/*.jar || die - sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die - - epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch - - if use test ; then - EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit) - else - find . -iname '*Test*.java' -delete || die - fi -} - -src_test() { - VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake -} - -src_install() { - java-pkg_dojar jars/${PN}.jar - - insinto /usr/share/${PN} - doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - - dodoc README*.TXT - - # By default the config dir is ${HOME}/jxplorer - java-pkg_dolauncher ${PN} \ - --main com.ca.directory.jxplorer.JXplorer \ - --pwd '"${HOME}/.jxplorer"' \ - -pre "${FILESDIR}/${PN}-3-pre" - - eprefixify "${ED}/usr/bin/${PN}" - - use source && java-pkg_dosrc src/com - use doc && java-pkg_dojavadoc docs/api - - make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System -} diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch index 4dbc33707263..4a1f579c62e0 100644 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch @@ -1,6 +1,5 @@ -diff -uNr tacacs+-F4.0.4.19.ORIG/configure.in tacacs+-F4.0.4.19/configure.in ---- tacacs+-F4.0.4.19.ORIG/configure.in 2013-02-28 21:26:31.724310410 +0000 -+++ tacacs+-F4.0.4.19/configure.in 2013-02-28 21:26:41.936309960 +0000 +--- a/configure.in ++++ b/configure.in @@ -126,7 +126,6 @@ # compiler specifics diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch index 556f75806fbd..a8ca67e73626 100644 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch @@ -1,7 +1,5 @@ -Index: tacacs+-F4.0.4.19/Makefile.am -=================================================================== ---- tacacs+-F4.0.4.19.orig/Makefile.am -+++ tacacs+-F4.0.4.19/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -16,7 +16,7 @@ if TACSKEY tac_plus_SOURCES += skey_fn.c endif diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch deleted file mode 100644 index ee1bcb231838..000000000000 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr tacacs+-F4.0.4.27a.ORIG/configure.in tacacs+-F4.0.4.27a/configure.in ---- tacacs+-F4.0.4.27a.ORIG/configure.in 2015-03-25 11:13:06.976024203 +0000 -+++ tacacs+-F4.0.4.27a/configure.in 2015-03-25 11:13:36.816025689 +0000 -@@ -126,7 +126,6 @@ - - # compiler specifics - AC_PROG_CC --AM_C_PROTOTYPES - AC_PROG_CPP - AC_C_CONST - AC_C_INLINE diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch index c75a05b0cd12..d77c4714e384 100644 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch @@ -1,6 +1,5 @@ -diff -uNr tacacs+-F4.0.4.27a.ORIG/Makefile.am tacacs+-F4.0.4.27a/Makefile.am ---- tacacs+-F4.0.4.27a.ORIG/Makefile.am 2015-03-25 11:10:26.821016226 +0000 -+++ tacacs+-F4.0.4.27a/Makefile.am 2015-03-25 11:11:04.954018126 +0000 +--- a/Makefile.am ++++ b/Makefile.am @@ -19,7 +19,7 @@ tac_plus_SOURCES += aceclnt_fn.c endif diff --git a/net-nds/tac_plus/files/tac_plus.conf b/net-nds/tac_plus/files/tac_plus.conf index 83403e0bc1cc..dfdf2186a816 100644 --- a/net-nds/tac_plus/files/tac_plus.conf +++ b/net-nds/tac_plus/files/tac_plus.conf @@ -6,7 +6,6 @@ #key = kEy4U #user = youruser { -# login = des ndkKAzNoc37VA +# login = des ndkKAzNoc37VA # enable = des ndkKAzNoc37VA #} - diff --git a/net-nds/tac_plus/files/tac_plus.conf2 b/net-nds/tac_plus/files/tac_plus.conf2 index 617e34420281..406fff33b800 100644 --- a/net-nds/tac_plus/files/tac_plus.conf2 +++ b/net-nds/tac_plus/files/tac_plus.conf2 @@ -6,7 +6,7 @@ #key = kEy4U #user = youruser { -# login = des ndkKAzNoc37VA +# login = des ndkKAzNoc37VA # enable = des ndkKAzNoc37VA #} diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild index f94caec0a181..6f9e32eef0dd 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild @@ -1,36 +1,38 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools base libtool +inherit autotools MY_P="tacacs+-F${PV}" -S="${WORKDIR}/${MY_P}" - DESCRIPTION="An updated version of Cisco's TACACS+ server" HOMEPAGE="http://www.shrubbery.net/tac_plus/" SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="HPND RSA GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="debug finger maxsess tcpd skey static-libs" -DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 ) +DEPEND=" + net-libs/libnsl + sys-libs/pam + skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) - sys-libs/pam" +" RDEPEND="${DEPEND}" PATCHES=( -"${FILESDIR}/${P}-parallelmake.patch" -"${FILESDIR}/${P}-deansification.patch" + "${FILESDIR}"/${P}-parallelmake.patch + "${FILESDIR}"/${P}-deansification.patch ) src_prepare() { - base_src_prepare + default + AT_M4DIR="." eautoreconf - elibtoolize } src_configure() { @@ -46,7 +48,10 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" + if use static-libs ; then + find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" + fi + dodoc CHANGES FAQ newinitd "${FILESDIR}/tac_plus.init2" tac_plus diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild new file mode 100644 index 000000000000..b4ca875a4c3c --- /dev/null +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam + +MY_P="tacacs+-F${PV}" +DESCRIPTION="An updated version of Cisco's TACACS+ server" +HOMEPAGE="http://www.shrubbery.net/tac_plus/" +SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND RSA GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug finger maxsess tcpd skey static-libs" + +DEPEND=" + net-libs/libnsl + sys-libs/pam + skey? ( >=sys-auth/skey-1.1.5-r1 ) + tcpd? ( sys-apps/tcp-wrappers ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-parallelmake.patch" + "${FILESDIR}/${PN}-4.0.4.19-deansification.patch" +) + +src_prepare() { + default + + mv configure.in configure.ac || die "Unable to quiet autoconf deprecation warning" + AT_M4DIR="." eautoreconf + +} + +src_configure() { + econf \ + $(use_with skey) \ + $(use_with tcpd libwrap) \ + $(use_enable debug) \ + $(use_enable finger) \ + $(use_enable maxsess) \ + $(use_enable static-libs static) +} + +src_install() { + emake DESTDIR="${D}" install + + if use static-libs ; then + find "${ED}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" + fi + + dodoc CHANGES FAQ + + newinitd "${FILESDIR}/tac_plus.init2" tac_plus + newconfd "${FILESDIR}/tac_plus.confd2" tac_plus + + # bug #474860 + pamd_mimic_system tac_plus auth account password session + + insinto /etc/tac_plus + newins "${FILESDIR}/tac_plus.conf2" tac_plus.conf +} diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild index 710eeb83ce89..97fcdb15581c 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild @@ -1,37 +1,40 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools base libtool +inherit autotools MY_P="tacacs+-F${PV}" -S="${WORKDIR}/${MY_P}" - DESCRIPTION="An updated version of Cisco's TACACS+ server" HOMEPAGE="http://www.shrubbery.net/tac_plus/" SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="HPND RSA GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="debug finger maxsess tcpd skey static-libs" -DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 ) +DEPEND=" + net-libs/libnsl + sys-libs/pam + skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) - sys-libs/pam" +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-parallelmake.patch" - "${FILESDIR}/${P}-deansification.patch" + "${FILESDIR}/${PN}-4.0.4.19-deansification.patch" ) src_prepare() { - base_src_prepare + default + mv configure.in configure.ac || die "Unable to quiet autoconf deprecation warning" AT_M4DIR="." eautoreconf - elibtoolize + } src_configure() { @@ -47,7 +50,10 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" + if use static-libs ; then + find "${ED}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" + fi + dodoc CHANGES FAQ newinitd "${FILESDIR}/tac_plus.init2" tac_plus diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 4cf683742b0b..e19c24f9df63 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -8,3 +8,4 @@ DIST haproxy-2.2.11.tar.gz 2907128 BLAKE2B 76ce4d75e6be1b3e169fe1f2a3ca4dc104f7b DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab SHA512 ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec DIST haproxy-2.3.8.tar.gz 2928770 BLAKE2B 198529d7b2ff359b9586b0e67a73682cad084276a009a99ce7fe798c2c62c3d1a6854f5c6c6d22f5969fb19443f5b1a6f33a3986ac9da1c11e10a1bb18948ae4 SHA512 edc211f9328af3ceb323b2f232585c08b3a592d53286b4b2af79797dc3036dbef25dceff93f3344cf8d02d3e6f235151777710d0e4c4368bb737e7171903c966 +DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd SHA512 49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6 diff --git a/net-proxy/haproxy/haproxy-2.3.9.ebuild b/net-proxy/haproxy/haproxy-2.3.9.ebuild new file mode 100644 index 000000000000..b7ea2373967e --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.3.9.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs flag-o-matic systemd linux-info $SCM + +MY_P="${PN}-${PV/_beta/-dev}" + +DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" +HOMEPAGE="http://www.haproxy.org" +if [[ ${PV} != *9999 ]]; then + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +else + EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" + EGIT_BRANCH=master +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/$(ver_cut 1-2)" +IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter +ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + pcre2-jit? ( pcre2 ) + pcre? ( !pcre2 ) + device-atlas? ( pcre ) + ?? ( slz zlib )" + +DEPEND=" + pcre? ( + dev-libs/libpcre + pcre-jit? ( dev-libs/libpcre[jit] ) + ) + pcre2? ( + dev-libs/libpcre + pcre2-jit? ( dev-libs/libpcre2[jit] ) + ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[zlib?] ) + libressl? ( dev-libs/libressl:0= ) + ) + slz? ( dev-libs/libslz:= ) + zlib? ( sys-libs/zlib ) + lua? ( dev-lang/lua:5.3 ) + device-atlas? ( dev-libs/device-atlas-api-c )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +CONTRIBS=( halog iprange ) +# ip6range is present in 1.6, but broken. +ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) +# TODO: mod_defender - requires apache / APR, modsecurity - the same +ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) + +haproxy_use() { + (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" + + usex "${1}" "USE_${2}=1" "USE_${2}=" +} + +pkg_setup() { + if use net_ns; then + CONFIG_CHECK="~NET_NS" + linux-info_pkg_setup + fi +} + +src_compile() { + local -a args=( + V=1 + TARGET=linux-glibc + ) + + # TODO: PCRE2_WIDTH? + args+=( $(haproxy_use threads THREAD) ) + args+=( $(haproxy_use crypt LIBCRYPT) ) + args+=( $(haproxy_use net_ns NS) ) + args+=( $(haproxy_use pcre PCRE) ) + args+=( $(haproxy_use pcre-jit PCRE_JIT) ) + args+=( $(haproxy_use pcre2 PCRE2) ) + args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) + args+=( $(haproxy_use ssl OPENSSL) ) + args+=( $(haproxy_use slz SLZ) ) + args+=( $(haproxy_use zlib ZLIB) ) + args+=( $(haproxy_use lua LUA) ) + args+=( $(haproxy_use 51degrees 51DEGREES) ) + args+=( $(haproxy_use device-atlas DEVICEATLAS) ) + args+=( $(haproxy_use wurfl WURFL) ) + args+=( $(haproxy_use systemd SYSTEMD) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + + if use prometheus-exporter; then + EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" + fi + + # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} + emake -C contrib/systemd SBINDIR=/usr/sbin + + if use tools ; then + for contrib in ${CONTRIBS[@]} ; do + # Those two includes are a workaround for hpack Makefile missing those + emake -C contrib/${contrib} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} + done + fi +} + +src_install() { + dosbin haproxy + dosym ../sbin/haproxy /usr/bin/haproxy + + newconfd "${FILESDIR}/${PN}.confd" $PN + newinitd "${FILESDIR}/${PN}.initd-r6" $PN + + doman doc/haproxy.1 + + systemd_dounit contrib/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc ROADMAP doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog + has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange + has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range + has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example + has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example + has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop + has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins contrib/syntax-highlight/haproxy.vim + fi +} + +pkg_postinst() { + if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then + ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." + ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." + ewarn "Make use of them with the \"user\" and \"group\" directives." + + if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then + einfo "Please consult the installed documentation for learning the configuration file's syntax." + einfo "The documentation and sample configuration files are installed here:" + einfo " ${EROOT}/usr/share/doc/${PF}" + fi + fi +} diff --git a/net-vpn/mullvad-netns/Manifest b/net-vpn/mullvad-netns/Manifest index 16498a9f93bc..9264f5aec42f 100644 --- a/net-vpn/mullvad-netns/Manifest +++ b/net-vpn/mullvad-netns/Manifest @@ -1 +1,2 @@ DIST mullvad-netns-0.2.tar.gz 12087 BLAKE2B 43f578a8a2d7f0317de9c2c0bc19f49a37ad7754dfcb50a5d698313fe6470ec6f2580d2e7629ac95dbeeddd6c1ac6d660b142c5c801830624c14e6c0e781dc6e SHA512 6f0942841fce19b35adb38b73ae7d692f22e551cf6bccd9c67acf6d248fe7d2684a6a20b9b6459429caf333e68c4d6e460632068b5eebd6a29654a46fb2ab64e +DIST mullvad-netns-0.3.tar.gz 12164 BLAKE2B e980e28c4dd734e5dc429354a2ab0fe9b653679af1d75122bd83f807d67fe289bc77471b6d5decc068f540bb321de0882f0daa7cf500d4e7ef85547da0e1b547 SHA512 fedc7e7a0c6aeb10ed00a82652d08b31e80f6c4077a6dc50c18410a20bb7bee4f8c9d74f54add711cff1c037722546c24db697fdecaaeeae91125f57c30ad138 diff --git a/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild b/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild new file mode 100644 index 000000000000..854abf1cf3ec --- /dev/null +++ b/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/chutz/mullvad-netns.git" +else + SRC_URI="https://github.com/chutz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Script to run a command within a Mullvad network namespace" +HOMEPAGE="https://github.com/chutz/mullvad-netns" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + app-misc/jq + app-shells/bash + net-misc/curl[ipv6,ssl] + net-vpn/wireguard-tools + sys-apps/baselayout + sys-apps/coreutils + sys-apps/grep + sys-apps/iproute2[ipv6] + sys-apps/util-linux +" +BDEPEND=" + sys-apps/coreutils + sys-devel/make +" diff --git a/net-wireless/airspy/airspy-1.0.9.ebuild b/net-wireless/airspy/airspy-1.0.9.ebuild index c87df5170b75..d214c535ef76 100644 --- a/net-wireless/airspy/airspy-1.0.9.ebuild +++ b/net-wireless/airspy/airspy-1.0.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils udev +inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com" @@ -29,11 +29,11 @@ src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES=$(usex udev) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use udev; then udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules diff --git a/net-wireless/airspy/airspy-9999.ebuild b/net-wireless/airspy/airspy-9999.ebuild index c87df5170b75..d214c535ef76 100644 --- a/net-wireless/airspy/airspy-9999.ebuild +++ b/net-wireless/airspy/airspy-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils udev +inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com" @@ -29,11 +29,11 @@ src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES=$(usex udev) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use udev; then udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest index aecac7602c0c..d7597c7d3297 100644 --- a/net-wireless/hackrf-tools/Manifest +++ b/net-wireless/hackrf-tools/Manifest @@ -1,2 +1 @@ -DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139 diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild deleted file mode 100644 index 1704b117cb69..000000000000 --- a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="tools for communicating with HackRF SDR platform" -HOMEPAGE="http://greatscottgadgets.com/hackrf/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mossmann/hackrf.git" - inherit git-r3 - EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" - S="${WORKDIR}/hackrf/host/hackrf-tools" -else - S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools" - SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="~net-libs/libhackrf-${PV}:= - sci-libs/fftw:3.0=" -RDEPEND="${DEPEND}" - -src_install() { - cmake_src_install - newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash - if [[ ${PV} != "9999" ]] ; then - insinto /usr/share/hackrf - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf - ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin" - ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin" - ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu" - ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu" - ln -s hackrf_cpld_default-${PV}.xsvf "${ED}/usr/share/hackrf/hackrf_cpld_default.xsvf" - else - ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this." - fi -} diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild index a54c764d58c3..391540f6c443 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild @@ -36,7 +36,7 @@ src_install() { newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu - newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf + newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin" ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin" ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu" diff --git a/profiles/package.mask b/profiles/package.mask index b20e9932cbbc..2b4ecb60fcf8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,23 @@ #--- END OF EXAMPLES --- +# Rick Farina <zerochaos@gentoo.org> (2021-03-30) +# Gentoo doesn't use this package, and the one package which needs it now uses the bundled version +# Masked for removal in 30 days +dev-libs/go-usb + +# Sam James <sam@gentoo.org> (2021-03-30) +# Seems to break dev-tex/culmus-latex +# Masking until we can investigate & fix +# bug #737406 +=media-fonts/culmus-0.133-r1 + +# Andreas Sturmlechner <asturm@gentoo.org> (2021-03-30) +# Completely broken since profile 17.1, package needs a real maintainer, +# bugfix and 3.0.4 version bump. Bugs #677374, #692928 +# Removal on 2021-04-29 +app-office/ical + # Michał Górny <mgorny@gentoo.org> (2021-03-30) # Too strict entry_points.txt parsing causes revdeps to crash when # dev-python/paste is installed. @@ -146,6 +163,8 @@ dev-haskell/encoding <lxde-base/lxsession-0.5.5 <lxde-base/lxtask-0.1.10 <lxde-base/lxterminal-0.3.2-r1 +<x11-libs/libfm-1.3.2 +<x11-libs/libfm-extra-1.3.2 <x11-misc/pcmanfm-1.3.2 # Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15) @@ -355,22 +374,6 @@ dev-ml/core_extended # bug #729098 ~sci-libs/proj-8.0.0 -# Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-27) -# Mask until removal of media-gfx/openexr_viewers. -# Version has several vulnerabilities. See #717474 -=media-libs/ilmbase-2.3.0 - -# Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-27) -# Mask until removal of media-gfx/openexr_viewers. -# Version has several vulnerabilities. See #717474 -=media-libs/openexr-2.3.0 - -# Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-27) -# No longer actively supported upstream. -# Removal needed to clean-up {ilmbase,openexr}-2.3.0 -# Masked for removal in 30 days. -media-gfx/openexr_viewers - # Sam James <sam@gentoo.org> (2021-02-18) # 0.9.27 included a regression wrt deletes # bug #768948 diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild index 5f2028a86005..40d177a4c260 100644 --- a/sys-apps/pciutils/pciutils-3.7.0.ebuild +++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="dns +kmod static-libs +udev zlib" # Have the sub-libs in RDEPEND with [static-libs] since, logically, diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 306588a477a5..6bb1b6cdb295 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,4 +1,4 @@ DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f SHA512 94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275 -DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef SHA512 56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03 +DIST ceph-14.2.19.tar.gz 129290834 BLAKE2B d1de69afcdacd4507a4d1d230a9a4cbd75067f7efa67c01b9f7100d29bf91b7196a36df6514d307affc3194bd83f1e91b5c274b424d0cb1931c9457f6321dc36 SHA512 69e3adba292d003e364f3b7eb16878992a3f3015a1ad0b73a9bd9b4ccb2f2f46518833346d40e024b62274985d30b684e1927e533a34a1e357a1780812c231fa DIST ceph-15.2.10.tar.gz 148500214 BLAKE2B c24679bc5e41da45b093dcd01fa103fd3dff45ddc7d244acebd182547851f426dd140e24ae5afafd71d797b185d6825fbdb9b84abd5c7ead41d5f29b06ed01fa SHA512 20202c07a068f99d5ce56b1969f703f996ad34c201ea3ab9bb05ea278afac71ccba43fb03e9de641dc3ab9692eecfcc6f52ff1ac03e13a1dc2f939bd8159fc2d DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00 SHA512 1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff diff --git a/sys-cluster/ceph/ceph-14.2.18.ebuild b/sys-cluster/ceph/ceph-14.2.19.ebuild index 9b819976edd8..9b819976edd8 100644 --- a/sys-cluster/ceph/ceph-14.2.18.ebuild +++ b/sys-cluster/ceph/ceph-14.2.19.ebuild diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild index 97b9d64eb6e1..7c9536d71828 100644 --- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild +++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit base bash-completion-r1 eutils toolchain-funcs udev +inherit bash-completion-r1 toolchain-funcs optfeature udev DESCRIPTION="OpenVZ ConTainers control utility" HOMEPAGE="http://openvz.org/" @@ -14,31 +14,35 @@ SLOT="0" KEYWORDS="amd64 ~ppc64 x86" IUSE="+ploop +vzmigrate" -RDEPEND="net-firewall/iptables - sys-apps/ed - >=sys-apps/iproute2-3.3.0 - >=sys-fs/vzquota-3.1 - ploop? ( - >=sys-cluster/ploop-1.13 - sys-block/parted - sys-fs/quota - dev-libs/libxml2 - ) - >=dev-libs/libcgroup-0.38 - vzmigrate? ( +BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=dev-libs/libcgroup-0.38 + net-firewall/iptables + sys-apps/attr + sys-apps/ed + >=sys-apps/iproute2-3.3.0 + >=sys-fs/vzquota-3.1 + virtual/udev + ploop? ( + dev-libs/libxml2 + sys-block/parted + >=sys-cluster/ploop-1.13 + sys-fs/quota + ) + vzmigrate? ( + app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] - app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk - ) - virtual/udev - sys-apps/attr - " + ) +" +DEPEND="${RDEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - " +PATCHES=( + "${FILESDIR}"/${P}-glibc225.patch + "${FILESDIR}"/${P}-glibc225-2.patch +) src_prepare() { # Set default OSTEMPLATE on gentoo @@ -46,13 +50,10 @@ src_prepare() { # Set proper udev directory sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' - epatch "${FILESDIR}/${P}-glibc225.patch" - epatch "${FILESDIR}/${P}-glibc225-2.patch" - epatch_user + default } src_configure() { - econf \ --localstatedir=/var \ --enable-udev \ @@ -64,11 +65,10 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo # install the bash-completion script into the right location - rm -rf "${ED}"/etc/bash_completion.d + rm -rf "${ED}"/etc/bash_completion.d || die newbashcomp etc/bash_completion.d/vzctl.sh ${PN} # We need to keep some dirs @@ -77,12 +77,9 @@ src_install() { } pkg_postinst() { - einfo "This vzctl release required kernel above 2.6.32.92" - - einfo "If you have checkpoint suspend/restore feature in vanilla kernel" - einfo "please install "sys-process/criu" " - einfo "This is experimental and not stable ( in gentoo ) now" + einfo "This vzctl release requires a kernel above 2.6.32.92" - einfo "if you have work with .xz compressed template, please install app-arch/xz-utils" - einfo "if you have check signature downloaded template - install gpg " + optfeature "Checkpoint suspend/restore support (experimental)" sys-process/criu + optfeature "Compressed .xz templates" app-arch/xz-utils + optfeature "Signed templates" app-crypt/gnupg } diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 951f4aafda16..0bb14d99c552 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -10,6 +10,9 @@ DIST genpatches-4.14-236.extras.tar.xz 3340 BLAKE2B 0853feef964c97f2c67e3022b010 DIST genpatches-4.14-237.base.tar.xz 4948692 BLAKE2B bd75b167cb66095b374c93d1ea1b6186d6e8073c24bad3db01d694031eb0ecbad43f978a51fb76d371696caab6fd5c51ce36ec2345b326ec9f7503a747b930c7 SHA512 03c346529cc46920cae71dcc575c7626ecee12633dfe824a68baffdb70aca62ecc89b44e97cabd1bca4a4f15244257451e167f98141b302f6202c38aaa23f065 DIST genpatches-4.14-237.experimental.tar.xz 6092 BLAKE2B b971688b791a63daf0ef6667d832c9c18adae13c9653d25bf71ffd4ed6fb2c1d3fdb3722fed9eb409dd7a114cf4a878f3da45660f1ce2232734195ea61310a86 SHA512 3d1e47c1aa4ec4b4fbd9ede8bddad4f40a32fc924f320e392de077ece2215d686ae509d1ba40a1dbcd2a337c3bfeef023adc6277a579aae6f84fb3b72e7d63a4 DIST genpatches-4.14-237.extras.tar.xz 3340 BLAKE2B 472edfd73bff93851d897fb9512970b4b49c5de852310716b85e231281f73caf34fa6082766179d9120dbc36638d2c3c40c6cd5ed41b1d96834bec021ac581e7 SHA512 47e4c6be243c181aca8062a2e66d1fbd756cdc4949caabde515ca2ffa41ab09f6bc636973dd04cbb071088b0e9328c1feecb4bd9b8c6b38a0fe4adc0a2c56ec4 +DIST genpatches-4.14-238.base.tar.xz 4958488 BLAKE2B bc8f9683f75806ac2b097b260b2945f5e94cfee79f1c93cead80548fbdc53ca50856bc606275f5886c0a8eda89d802b73c261591d78b4347e722b78a4bba1fc5 SHA512 3c684e4bd75543087265803cb04ba0b583f99a18f9457b622d7a5759332ea25466e8108b329f72be209b4b4de8f38053da7b4355302e70b377908667bc3d347f +DIST genpatches-4.14-238.experimental.tar.xz 6088 BLAKE2B cd7e9c9f0006636f3d5a887af29761b9b303f6598a67a142ced55484c2140339a5e6f9d58acb02f80e32651414153e8611e2a5f553ef2dd8339049cc1948f714 SHA512 a037c1f59ad7d05326b46ae751e77c10ca94f37dda9174529f6c2c1d6abb7132e97c7e497973128c22ae69cc063ff3a132beded8208a3e507d26c4dacab37e62 +DIST genpatches-4.14-238.extras.tar.xz 3340 BLAKE2B 68ad2adcef36600040c6f4458dc77ebc4648d7e2be2d7fa43e6273f4a50667a0372f395a149ebc9665fc64751cf5bdae62377b233eae9b7ed7217c83c13e5e36 SHA512 4da6c7ffb8807700a5992c9f573ea15db02dce7a6c7190a0e1e2c7379165e79fd5a8cde46a36ec368793ceaadf48da82c6953a7c12a496371a32e6336b68adfe DIST genpatches-4.19-174.base.tar.xz 4351748 BLAKE2B bd4838c6f6a0fa7b681d961c6d0e159f7ae2df805618b514175ec35bf634620962e74dbe3a02541c3a7b90c5d72d2b5ac21d098f6eeaffbeb41c618683bf6372 SHA512 a316e1d60668f86b40547d72aca498c9280da98490369687a1f182d957aa8997e416fcf8464bf7d569cf9c4e3c245b4257958f8623f4b6eca769271fd16eef2f DIST genpatches-4.19-174.experimental.tar.xz 6980 BLAKE2B 372def848bc5394179e6b0dcdf047ad4adeea472a094b573f8b430ce4fa0c45a015a2e423194c8c12909c83b71a80e2c4cee40eb2edb2c87f06f9662e8381301 SHA512 b06b976ecede2ff415303cba109a8cce240ba7110c2f7947f083d06d9b31ee9f28b0e7653acfa87e05579586ad073596a08b1024df65b4ec93f568da0c2485d3 DIST genpatches-4.19-174.extras.tar.xz 3312 BLAKE2B 3bffb0f36d9a383b5ef2b556fa4026c4d9046b58174f683e4c6f1e8c7f64460e8d5f0f97f8892218a6922674a31d41a2b7f04d3bb886ec4f4fa6d05d552e02f2 SHA512 178b929b5a193b9b8272c50ba9b6213cec4b73dcc7110a83231a89f778b90af098d19eba215d8b42557668f5e43c696fbb090f856c35278eaec8f804c94faa1e @@ -22,6 +25,9 @@ DIST genpatches-4.19-181.extras.tar.xz 3316 BLAKE2B 46cb5d8d13bcf054ee24c65dd573 DIST genpatches-4.19-182.base.tar.xz 4485552 BLAKE2B 05eff9175fb276fb521f12c3fb19ce06647c9adecee3bcab21936256076c25fc6a15e137c1832defb552ede406a76ea9ad583d57dc3f47dea47433a9a390123f SHA512 2d5bf1ccc29128950e8ea4489bb50f4e79c940e9c6c31374dd80b33b0d94fd55ea6de4515bad475d3d189d0e98600e960817945e9adde54cf2ef37597e1c1239 DIST genpatches-4.19-182.experimental.tar.xz 7496 BLAKE2B 5129f13202ef38bfa346bf3185dd04a644799419191ecdb5853d5f801a0916583993e09d6aaf38bf7346f8a9db08937a1e5910f39e505dfe2952c51060ad30f2 SHA512 467ff969803611d2bf9719ffed916b9cd8073833a54e7fcd9ef347eb23a38d97c0c3441bca7b737f9cc80298621f82e0994f9c2ce00ef54834dad119b2f5f5e4 DIST genpatches-4.19-182.extras.tar.xz 3316 BLAKE2B 43b8229cdb4b319b3b37d71c03de0a2f15f90582e7ce9e7a2d32a537b334e05f5c3c1c2ad4b0d99743cdabaaa815eb5d830a53f8660f4dff5875c4b3bcc51879 SHA512 0ee1c2859f1e183d1a3b400a8e37dc2c77fc223a07aedfbd73e5f1aae71794ebd69baac2e7dab2920338cfa032a78e63655425e3a984bcd0441a30f710286e2e +DIST genpatches-4.19-183.base.tar.xz 4496972 BLAKE2B 50b2a224e191ab6aac262b592752b78cc2259bde77a3191d069afc5f27a987b1749f9886883e3d20e2e52d2a1a38b01fb53d8bc5872220b88bf794476899136e SHA512 954ee22987946fa1961ed843fad5439e9adae501e7e6b37c9a5f42b3e89a87c0b4b688111bb3df2643db1febf6cd6297b0eaaef3484a4087cb5f41239978d3d4 +DIST genpatches-4.19-183.experimental.tar.xz 7500 BLAKE2B fa2afd996ff04ceda3c59126fe7de12085c9abbf91101d88c94e9c0e01e8590c8b129aeabef872a238f51d230eb3acb21b0f30e6169dcf5f9c8bf62e2c34a054 SHA512 e36f71faca3ad33c465148fcf8f5ae44bf1ae07e06cd03b32420930b09bd9a698306e26579d69c14a87735805380bef8424cdddd375df878eca920ed5f78986e +DIST genpatches-4.19-183.extras.tar.xz 3316 BLAKE2B 776b600248dbebfb9f87af1b6149ac9867f94559d1e7cb4b9018144d2fc6c901cda19099e0cbc07f1b5837d6cf9a0dfdfa2e034a1ead20dfb042c029a36a62b4 SHA512 00dca69d69edf3dc7c902d992e08c67a9907d398c29d60fab3df4703efb6ee296c2693fc5acc2c47f32bc93fb8be33ab0bee1be98ec1a009810e26cf12d94b14 DIST genpatches-4.4-259.base.tar.xz 4028152 BLAKE2B c01f5acc3523aea23b3d0d20e714db1a91b70b51b1ffe9bd57738882b28823ef8ef2fb2aa3766a050dd5efb597c1605d34be2584d83f170d4efa741ef49043c3 SHA512 8dc0bed820643799007068a1a00287c7cd55cc0df1c2b83a945c1ae7cb75fdbbf41a7f6df1cd3853079746dbd2b7e6c9ab21a531457ae1f71a4b03aafc8c23a5 DIST genpatches-4.4-259.experimental.tar.xz 83312 BLAKE2B 998cc7fbe38a981251691026abba9fdcb17bdd388ed92d7aa61745a772c3072ad630be7e8cebda4ca1c64642e94ca6ba5e46452641f306c65a04908f58c47659 SHA512 9944a0bc502db83edd04c683ebcd15552f02edbe34e19b5687b04830786f2dcc7baaaa2b613bbcb568cca6abcee73da830e1bc4bcb9248aae80bfe15eda0222c DIST genpatches-4.4-259.extras.tar.xz 1788 BLAKE2B 4512f1496b02147d6237c970b9330af46511bab342645467687cd7f7d0417ba2373a1ae07361e4b0020caa878665f3c76a3763cd92edc07d3d677661a50226e7 SHA512 464129ea698d8515a6d3d2cd8603adf0b3c9bc8a3c5436c10ce1e43ffc7ca4b8ac1def12d20356705707cf3d25d10c79ff714ecea842ce1fe4f439cdbe3427fc @@ -34,6 +40,9 @@ DIST genpatches-4.4-264.extras.tar.xz 1788 BLAKE2B 53d06b6e4eab4446712820a708f19 DIST genpatches-4.4-265.base.tar.xz 4093448 BLAKE2B cf90e39cb4af539c1db8999368757f5348fd1d4e7d1122935f39a9f72bfb2f6856119ecd714d34e9caeb1030864a385d8c505aefe29f13dd60473060f48dd9b6 SHA512 6bba11e69687d20f45e29ad53e0fd38a4f066952ede17b625cad048c979428011e8506f3fcbfcad3baeb8fec428ad3da06196acaea31275e247dd8d42f0e890a DIST genpatches-4.4-265.experimental.tar.xz 83296 BLAKE2B e4fdbf1523163f7a440b7f7078abd9c569431db55996d3072eda826db693be5ac67937decab0066f0362796d35d1482d8432ecc0eb6db0b88255b16d9bbca6cc SHA512 4e75189bc092731bcc0ba423eb23175f0618f7f5bf25b19f559e884ea493b37aafc3208be7077255e19f5d16339d37dfc0476995197c83e68d9e9e406adcc3af DIST genpatches-4.4-265.extras.tar.xz 1788 BLAKE2B eb6d66e239c4e1aa9e064982f63eaf5613d2ddf20c11fa4ec3c9f1ff7fafb38877f32e42e75a232c1cb54e2136e62d9fb27bb18b7419fb45a0c6ea090a24a293 SHA512 e384e8c64ed5354e98309108bb027048f0d441426406a5656d020e3cf4c304577d9df9e6dda3fe30b5b75dec8ddce42914c369783c2c5d594f12252f1ea33f96 +DIST genpatches-4.4-266.base.tar.xz 4099364 BLAKE2B 0bb0dfcabbd191b2dbfd73171ae5871580f75fba2a4343237c0ad6e68a9868d0818633bbf27abc82600f78bd983b50833b3d70d477369ecbbf16c87cfaeee2ec SHA512 cca98ce814f7eb12fb57163982111d2f063d0998d149e95c5bb8c06339461e5bc52e1201c1045342fbd2304be2838b9960272e5594dd62c89fcb4f100bb05ecb +DIST genpatches-4.4-266.experimental.tar.xz 83304 BLAKE2B d05c680a7df6aedbd790086b4654a90a810656b98dd912bcbd1d2cd1bc27e98104a3ea863315ccba7de2dfcefa4e337b510f604ab5a80059c9d090fe7d282a77 SHA512 b3e816541e7fa68f3bbfc443e9d89837c4bf8b28303853f3a05db4f2748725c3a7c4879820334b0850ed2f3b29e477f763aa004e7426bf2fb7d688b1221e63dc +DIST genpatches-4.4-266.extras.tar.xz 1788 BLAKE2B d7d582abe322309701d006c6744eebd331fac15bcb06ae76367e772fc815a28405fadfa9714669368b0a7c074ef1ac695dc7619da09ae9b70d2700bdb7a47726 SHA512 81ad23a472cc8052d6b94ab846850d796019314f6cded442572ed683c35bd99bb30f801c7f4d1b75262f633d299b0dde2df879d61848e3c6440b1a2760577904 DIST genpatches-4.9-261.base.tar.xz 4523340 BLAKE2B db59ac0593896867e8499c2f261cf86c51dad7072e4ede8d36f112f3f7571aa9e0e7f4da6de03b2222af4c2e6aa6464426c16dc1ee46629808fb5835865c4218 SHA512 a98c3891178a831ab7cfb2d2185d6dc5439a958ec7331f2a42cda0d59a9b1b19a04537271016c1183a5c69db1601462641bf2d90dcffbcbc5632c79cdbd23a07 DIST genpatches-4.9-261.experimental.tar.xz 106412 BLAKE2B ef9d97961ee9d92a73d026d6663827d8c1fcd4f6e5c5b88011d5a2648e0e9c2041089d443d5b5ffbef47ef5fcb21c79373293d5fe074d2ca5622cc7a4293960e SHA512 a9eabf021afddc52f08123a7fee8566bd102f5ce4dd484301c4626c8a97c514fb015ccd814441039e96e7415669d88333c82aa4415b397dcf9adf4978824e232 DIST genpatches-4.9-261.extras.tar.xz 3340 BLAKE2B 832c4297efd20a6699892a938867cd47c34fbcb77e1a993092ca4dca4d9113372b2362059295f0419db923da953713f7987e90bcff5c2771593166f77eaf1688 SHA512 950dad68d92c802fd844853cf0136db90b46dfff2ef26eac633b80f9a36610c03b9ea0dbbf20f1af80c43d1def26ee7492d040072c8c799ac22c9487cefade16 @@ -46,6 +55,9 @@ DIST genpatches-4.9-266.extras.tar.xz 3340 BLAKE2B 2b0836a128289214a3bb8cc8620ce DIST genpatches-4.9-267.base.tar.xz 4601508 BLAKE2B ce85b7ea7f994e2a412aca8af78b60b21e7a288567b64666017dbfd80a570971b91c6afe93604001b32f394e4c0d5748520825324355097b09e33dd76f7e84ab SHA512 cfaae07afcd6394cf91d40ec1ca62993e7dff7ffc3e0f317d9b1d452b03c686a4e18c6612e8a8d7fe557064d2c34e60290432408197b2a947439593c72a5c340 DIST genpatches-4.9-267.experimental.tar.xz 106400 BLAKE2B 349e2acb890200a4a9834c28151921ef9b97acdb4d70de2af0278ce6bc1c9a7ca4df904b82677f326727daffae1081116c188c63b58a44383dcc8542d39becdc SHA512 93fb0a961c409b104cdc137191d048d23e527f0c2884f945776ad1cd3992acb0b93f800e0c8ea6928f787e39c53d2b8ae6a56791e64ec860f1db94ae261f0e46 DIST genpatches-4.9-267.extras.tar.xz 3340 BLAKE2B e58330ea211da200ec2758e2370d45e62b33a7327a69096982ddc1d0a56b73c7bbb96c7a42b014bad3adc3ed370452fdda6b6a2fa9c2b455b17c2c28a502f39b SHA512 d7ef6f848c002ef7a1198a772c8be4686943ea0ef2e56669423b343b8f6753f9a1ab1315fd29182b3c117ed19e89debd181e3e0b814e7306d03c00fca08d2cd0 +DIST genpatches-4.9-268.base.tar.xz 4614764 BLAKE2B a5156251e1106347dcda111db6abbcb5f174c42dabfc3694f6b8fc45ded4414e41d8a56d062ae29828b8b033f08b3f541229c033c45d862bad6a52ab539667ac SHA512 468092419b2badd24cd4fbb87fcbe965b5e94145e4fb049916385dbcd1080d1b7a63fe0e17b046a5996a44ab915613d0d7389550fc74eb03f6669be0d6db60e4 +DIST genpatches-4.9-268.experimental.tar.xz 106408 BLAKE2B 31f60f4d61bfd60d001a708584aa3f84a688a4e0e28665c6d82c4c2ad60201e3fb64b69e0611a1e607dee3036a5dcc56bb0ef01766122b666136e104fe1d6dbe SHA512 1b9eb7c2881216e49c0cb81f541b3ed3042f86b3c1ed43f463456ea3f41feb453026d524860fd7b9eb1a51177a1a911b33d9b34162bbc5281552bab3fef33c2c +DIST genpatches-4.9-268.extras.tar.xz 3340 BLAKE2B ec67f3d538afcd97de03ced99050a5ffa7529a880b86ea2258e66e5de4981aa12f12c7127ff302084fec9ed71416c66b349de3727f46e4f0262eea7a2a20da8f SHA512 33e415c7360542bf1e8a0e77ef7e3f8b3c4b8f761f1b07607740222a1be15ec88b3036330a35daf900f93e25dbedef16506ff40553b65a8b6e3b3f5d1d79c6a1 DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047 DIST genpatches-5.10-27.experimental.tar.xz 17820 BLAKE2B 3f40cbb5088f808e0d1cb2520c4fd0cce9df35acbb88597f4331a540ce9c146321760abc2f36ba7838537007a024ea2912b4fb5a27bd0f999c1a595bc44fb599 SHA512 f9392abd6302860ec48db313389ec18233c445b0b0420dc4c135cfab8d7fc3c41e564885565b639de4445b5d8d596a1c019e60fd84b74f2f43782a27e534bd09 DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc @@ -55,6 +67,9 @@ DIST genpatches-5.10-28.extras.tar.xz 1772 BLAKE2B a38628309a29e636ab6499464d360 DIST genpatches-5.10-29.base.tar.xz 932392 BLAKE2B eff5249f3471134c5601aaabf1b470dcdf7d2e38c79ff79cc8bd4a0cf33e0dcce63e7e01370eda084c02862af422b442953e3ea4e8a8a6f012df5d8ebf8cca8b SHA512 0909fa9f9fb62dc87e5a18cb15aedf483c9a3c3470e917768e86d0b7eb4bf1240c1ab2b0f406e1c26819cbe7924f1898019c8a2b7981f1c6e8081c92f67de1a7 DIST genpatches-5.10-29.experimental.tar.xz 16556 BLAKE2B 1e7a36814db26d89f8455b241a1fd0dca3e46b8bb5715c5675e4fa8e790eac723f80c23d53755ae26f66777c0937b80ee57ab46d5cd6db2cc60614ab1bf4934b SHA512 2fef7301b5cb97e1616329e07a09734e8c3728511b1b9a19afba8e59f6e5651034936470f3d4ce665b94088579359030b0c6610426056c12adf8e72023f54dd2 DIST genpatches-5.10-29.extras.tar.xz 1772 BLAKE2B 30b3a5b57b99b046872907007fabffbed366cae11aebc2979129716be3c779ccfd87c6834f2e4b77dc1131c603ced8ffdd089c11264abc8b70d7590cdd191562 SHA512 ea9c1408543fa3b0a3a32ac11c7cd2591d7a5df73139b4ddff752b7a37963806fcea422f0cf23b8153b84e8dab1ed8169e51cce105c75c255d6ed91c03955a06 +DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4 SHA512 3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1 +DIST genpatches-5.10-30.experimental.tar.xz 16544 BLAKE2B 3d9225f0f460fe316053360606a8284faccef03af7e22e1156045e71a24ea83fa900258cc80439089b0d5b54ac2022f548bc3f47fc04d7645d3c27033bc9f2bb SHA512 fce31c497391aff783eab83aa3a23949e13009a0422b6b5b1cbf295e133b8140215690c56c9550bd8b532e95490e40626a33bff152da066933e5a5270e392953 +DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac DIST genpatches-5.11-11.base.tar.xz 410528 BLAKE2B cdc71103e3cf40231cddb71f320c10cb2f948636fd48d1d1df66d6cd535b2f291f22a7da0db9b8fea40e64ad503abe4542506cd928409cf1ac0c8e0944a44435 SHA512 451628c197f3544438f41fd5a604d451981c4e352ea40a53b60492b6f1b57438281c00b0209064cd7a46b57a70ae307a2108549cebef8574955fe0b66d277fc9 DIST genpatches-5.11-11.experimental.tar.xz 69424 BLAKE2B ae65060ce4bc38d46cae60bdf62809217a2f2b32ebc5f89af4bf95c460c643a474f7b0da89de83bb8747f30c2e4ca6a6754b37b825688b9df3307f3608213704 SHA512 92983999fcc1f710c80ecc48fb8510302d840e2f3ae39fe78aa369d8ace4bd9b85b7f3073d2d1d302cf48270595539bdf2e44894c53833c52c13fa60690c760b DIST genpatches-5.11-11.extras.tar.xz 1772 BLAKE2B aa1f6397aae7927d1aac1d29e98d8535b6e8f7b2b6b2009594497b846946cb5dda2dd3dac69a1f29989b54aa2ef9e2879418145a525865179f32e7ab76987e66 SHA512 a72b4fb93e09919aadc9c1d306d3817135f3e4160e1b10f69367e3cb49b1502706dd9cd6e399945f946cbecf047d53f8100459acda04dce231890fe9fe212a08 @@ -64,6 +79,9 @@ DIST genpatches-5.11-12.extras.tar.xz 1768 BLAKE2B b590414d965e422aeb00a1cf719f9 DIST genpatches-5.11-13.base.tar.xz 437712 BLAKE2B 3120f9e413b8bf9c0630a9d11eae4c77d0162f67e1b84f9a84b3ea9321ddda5ce2872d61d9451bc363ff23c3fe8bc409693ac903641ca4f1e42c405099b77fef SHA512 7c2488f2e5e857b50f5616f90f743df308686d5e671cb2186bc647ac74e79eb04550d7f6f1d12623d847cd168dcbaa431bbdf128e57863672b084addf8ac0c2d DIST genpatches-5.11-13.experimental.tar.xz 68148 BLAKE2B 4e8470e3fa3d9791a95e930a7be1b74f9eb7e5abc78181b5f52e46d734276b181ac0874a2bfe8f10b8871880781ba1896b95a3efa0e1e13fb677e44a1dc4ae23 SHA512 e00cf1bb1fdc833cd2242a439d6568bd4e716ced61496db5e6ed267569ce2b7e352fc75d52989cabf8cba327ad3ffc508466adc1b612e1beb0321d5c3ba44066 DIST genpatches-5.11-13.extras.tar.xz 1772 BLAKE2B 86e00dbb0dd3a48b83fc4c73d6c10f4dd0031bbb34a0f1b0e2cbc263ad6eadf55b32fff5e4c9bae5077101d90b2fb42758ad5517004a57661f2befdc745576ee SHA512 e8233834781ba3e6582ae26d8bef09490e755e9daca0396a8e94fe3dc65f49c399c422b1143a00eeb693b2f6885ade600d599c89165dba809b578d601aaedda1 +DIST genpatches-5.11-14.base.tar.xz 512392 BLAKE2B 96c67f4b7029c2368e14e3b02dc45dbe4e72108cda692483b32f6e036bd27e82faef0a950e9ede69bdbd8152bc2f88d446eaf04055d135f654753074fffb1ec2 SHA512 6ec28a0c1084046ebb4d201a550866a202d6a2852f5ffc8e327861fd8e964a22ab0a565fd99277010fd2d6038fd0d81f2bd126faa78a351d97c7310dd30904bc +DIST genpatches-5.11-14.experimental.tar.xz 68172 BLAKE2B ea082fc1705ce3ce95d97d5e4e7c656ca4a4b3968d3a47e39e70b95f2a15a41fed42353b7269033748058ba872273f7961ed4ba486f56523ba7e676bd7a249c8 SHA512 39f1ea31e148398cb3e2d85786bfcf13f978ae8af9ee685d452f61182536fc9b00810547988c209d2388293b9a67ef4a17654011add54f22a613dd481de24ae5 +DIST genpatches-5.11-14.extras.tar.xz 1772 BLAKE2B 811235dc06b33befddfc22a9e018d1e5447fcf361f637e3a58de2c14fa5860fd8ce027db43892a332eb0ffa99311a357b170ba2bd37a7a4c4888307dd8cc6354 SHA512 0a8fc3dfa7efbbf393b1f2ae65f6cc4bd440a5e4bc6a36eaacb5ca25cba5a154fd19621124c025143da1ff499ef24463efd58437b76147fed1bee7e4ec1155e7 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346 DIST genpatches-5.11-7.experimental.tar.xz 6440 BLAKE2B dd939c3f624cc84589cab0c3772c72d232038c32eb9a61f64d927a3e1f1de8a6af2c0dbff89ff542ff5332ecd4a7fe6e526db446373b63dc6591cfc801d94356 SHA512 c9a3702767bee74ab0ab13eb1ac65346ea8edc62feea5992a4b6a5ee564c15ffd4c3d21299f50d1996cf59ebce2fc03a15927398b2394428fc78cee3b6fc22d2 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d @@ -82,6 +100,9 @@ DIST genpatches-5.4-110.extras.tar.xz 1768 BLAKE2B 80dbb7f04b0984db4271d93af5579 DIST genpatches-5.4-111.base.tar.xz 3256780 BLAKE2B fa7af9b2cf10f383b81a8b9cadb2183a8f0227e00fc1214bd0e25df8bf58b0d0578024af9f6df6842a51b7ef7e6d7bb9b61577b38216d59113b53774e66bc681 SHA512 a9831a943e788fa479a481723f231b7610d37606ffb3af703906d88f52870159772f9ccfb96608c390af26f033b1b6e948e6cf7d09612e2e4f42414561fc036d DIST genpatches-5.4-111.experimental.tar.xz 18520 BLAKE2B fe031f161b9b8c3bc6b36942a152c7ea1486618da61ea31403087d14412b20b433932518db6091bc774ac8d989c45d4792f075d9765728decc8a5cce22313b9e SHA512 a76a831aa5ee94e18d31cf6e09f456f0506fedd68332736eb294e15ac1875f43cc3ad347296e92c5f984c3cba0e497bf85690351458631b940e467f1849a4b9a DIST genpatches-5.4-111.extras.tar.xz 1772 BLAKE2B d27e2763c7e802ebbcce7e9ac6207a6e73d8d710873d4c4a53d0bb1db973904ccc8a17553d6916eb3211036cb6f2bf30c80864f1339c9e194187dd5cb5ac3a7b SHA512 c38e92e22a5a92af06eef3176ab793ad9e85332dc8e37ac2d32a86b22bd072c47e45d13a7abff9fd6e864c2c063676c5fdbb7e94732f431a5a390b9597da75b2 +DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 11c4a33da1081ce777019604d06740368895e74893cb88f4ba6e3988fe3204f2d5a0ffe2204f77aed427ce8decdd77c5ea7dd374e893cbf7ab346b8fb87a918d SHA512 d2c5378076390358ec60346e832a9454f1b61e67c68da4c6652d7d6cfa29223417fd0b95ea526cead86af5692e4e702a0ee5a169a894d04644f95bbbdd7d727e +DIST genpatches-5.4-112.experimental.tar.xz 18528 BLAKE2B 94a47359c6c95a9775de669f02c14b0f7cbcc93b77aa8cbb20951ebc67d49fdfe1d0df1dc1b9b4431c91f64c96eff5a4d60d5888f75ecafa37e66194c1e61752 SHA512 53ce013556fd289ac5cce25c925877ca02ff9a4555dc3cc644437944f56bfd45358021f78e234276e2ac5e3725e22b336ae4ffc45acfab3c05c53ba82ddd573f +DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722 SHA512 6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f DIST genpatches-5.4-99.experimental.tar.xz 18092 BLAKE2B a6263f1dd87eb2f701e248ce34c48251cb3ab796fc38ac4a9477c14528436eac0a767a3f380f634f8a68b987dad500b3c11ddba873982e958b0c8d14aaba2691 SHA512 995c465b79f4f67678c325c84abf3d66970b2e3de786b1b83863b224f2a83335401384f236a71b9294daa6a2d815ae79c6b612b0e157463a317c507e447eda76 DIST genpatches-5.4-99.extras.tar.xz 1772 BLAKE2B 6ffe84c928fc61b306d3e9a096470c090b79bfe99c90981b64e324d40157e818b50c0aebbaf342f51eeba29867b8cf8a6e91394dd594c1ecdb4f2a64f8d76e00 SHA512 7f2db3353809e7922951e1e884d7fe4a426556750bf4e38619278185fb09d519b30a972f4b5aeda3f7aca335fc95372edcc5dadd0881febbf43403c4d5c1c497 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.ebuild new file mode 100644 index 000000000000..02d69d709d1d --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="238" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.184.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.184.ebuild new file mode 100644 index 000000000000..926c459fa429 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.184.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="183" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.264.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.264.ebuild new file mode 100644 index 000000000000..8c4486c8a5b9 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.264.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="266" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.264.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.264.ebuild new file mode 100644 index 000000000000..789b9d9e00d5 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.264.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="268" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild new file mode 100644 index 000000000000..a75f472c5337 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="30" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild new file mode 100644 index 000000000000..0be2f31b2432 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="14" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.109.ebuild new file mode 100644 index 000000000000..fc5821bf7915 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.109.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="112" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 7e53b725b29f..1400a968ea36 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -5,10 +5,10 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -DIST patch-4.14.227.xz 4193400 BLAKE2B 126c48a104ef2836aeea86965c9c5c5f09dfea0cdd8598e0a9c6d7aad9bdec21319a9557c41906f67d95e161584ab143b6f895e7b4012ba771eca804f40439e1 SHA512 26d5ee9fff8a9e03fee571780759196282dc46d385b5e8ba3f7fa0ebf42443c9e2d038472bca61190a8fda194f5f229b92af410a339401b6f0256564fc5aaea1 -DIST patch-4.19.183.xz 3876724 BLAKE2B 8a64e3aae05b3abbecff097f6bd2501665f3c3d7a918e7752404d976077377d33e754807e1007515fe624465ed6075449e392c9f124c462a69b85c01b8461658 SHA512 f0c93463ee1727d074018d140848099f87cc242868a48400c68adbdf068af15b25b007ff95ffc8a27ab17b36391448426b6b56471b9c6df0dfdaaa166fd967c4 -DIST patch-4.4.263.xz 3510104 BLAKE2B 8990b71d1d01bcf911ed15d0072fb0ee703c8d31ece9438cbf6d7bf4274d85af2bd86e4705fc0c84266acfea8d5a43ba57ba854ccb4b241e6b0bb58110011b48 SHA512 2dd607f4fb72ae411f1b357a3783ef552b98e4038de80293f08ed52a6f2a51b3b05a01cb3736980397eb92e221f1c366585de384edace72b1ecba00bf8a26258 -DIST patch-4.9.263.xz 3915708 BLAKE2B 6a8bdbeac9e41263b8002fa773f5c5c0877d91a6903b2f5d1895eeac6601bdca634a568ff3d258722ccba044b2d8e675cd8d3c26a2e84ee7091a063ada94eb0d SHA512 e01713011651af09672fcba8683c815f339293cef986568c8da1eab3740d2ec1f8fa1526ab98f3fd4866342d62a6ce803a5c231caebb14c1a9b3f1a4cf6480e8 -DIST patch-5.10.26.xz 893232 BLAKE2B 1725c11be56c1e4e17dcc9fa10d0da885772506d055a1b0f00bb5913484484739705688da6096b180e2c53662e4921481fd38257d80cdb55aff4f9c2e1c10c75 SHA512 0938834855a70ee5a77d7fc45f3f005983d0ad726f9d6367297970d885f19c433cf09c8592f74ba5c2861bf7eeb303455dd7ecebf4ff4c31baeff7c96357b9be -DIST patch-5.11.10.xz 426380 BLAKE2B 434458f668f17e79ebecce4085b027f3485f465efc56d8c3f5c28f30a18937237e39b4f30bcd81e033ea258f37c43dcc38cdb586dbb3983004471c3a6302079b SHA512 5c7a3dc972169363feab6f007af1105a9fb0ad52dbca2cb9d7546ab8bccee28f8faceb443a154a6349b2329400e264e91153d01685e48604dd9cb967eab04e1f -DIST patch-5.4.108.xz 2763084 BLAKE2B d19897ed03298867180bc967c00499eb5df26d9126bf027fb6ab9e074cb6bbb9729166da2318986f932c3b5e557cf50fa10a08c04cb002b11a892c242a59edce SHA512 6856033ad3af0306911c97a5c213054ff3bcb390c763d60a0a29767e80d22281e43ea6c32ecee95c6f0f2d8d5c3b4eeab78eea111087f47249a4034269ddde44 +DIST patch-4.14.228.xz 4200360 BLAKE2B b4468ceba942c5b6a52207f9fb2fc94a2d2d456c4dfd36d557c7b7f2ee86600b99c91da530a833c2db031c3cb2e97c02f08a23c66598f07529ef6f0ebe9e114f SHA512 7119ce1f97368f1ed8ab71fc984524e349a789f8d47a22b80229b908f39c1c3f0177b94b3830bc87d777f8d75f7caddd9a6c7527d8f127c3cc03c730cf350978 +DIST patch-4.19.184.xz 3883076 BLAKE2B 069f26d749af3e93b69245a7b579e99fb16c8bad988a3e2d0a5fad9936cd9af67f3605e6b0f6ad5cdeb6495b76853d0a79e373ce21494a1a66bfa8c685337ce5 SHA512 2b0859668115ac9efbffb025b70bc1900c06b978cee1c0196ae278993a71ff534179bb9bbcd7325203e99bf756e0ac5c004532f583b1771ff3f71cc47bae1714 +DIST patch-4.4.264.xz 3514824 BLAKE2B dc6a37ae0a994a755a5c2aba4a4df5cda35b8bccbdbf455e155f4b7291d7acdc5b37306a1b4324be6bfba0f38b679edb57bf6c1e5d1bf329772cd4e66a43b66d SHA512 522ed7378ccb2827a45b3eddae4bc2a2d553c3a8901beb90ff13b5d3f5fe9822f55f72d820e157995216eaddc4a4edbed0859816bf58afef2d8b6a14ba05d94d +DIST patch-4.9.264.xz 3925080 BLAKE2B c7dcf91f9a4c5fe167f7517a070bf49cf048848156b6c09558cb737dd7a875bcd14f9fdd4350a1d17d1812110006a109520843b202e16637c8a6e17781b6e20e SHA512 5932c439b6d161da03c77a6665f199a3754b70221fed9f1ba325d6bdd8cc283130467a63cecbfa94d874bb5902c4eec016283db95a8758f49298ac679a89829e +DIST patch-5.10.27.xz 947416 BLAKE2B 4fcc5b763399b0c0fd7d52c177ec305c277c063bb1aeb65f9a7c9346e99f62779e6270122b1e8ee4333ebcec819cd5101a1ddb1673c6ecb224909ea65aab9533 SHA512 fb18bbd9cfac84e438ea00e3a1a8e9e2a74ea91da57c3ed0f87c0028ffaa7be88be9b5c2f382ac4be06ff468b187480f719eed4df7b38bf9f7beaeddb352c0eb +DIST patch-5.11.11.xz 497760 BLAKE2B 277e6427be5aefffadf613fcfd4383c8a4e26ddd6e568ed7217453b3592882c90810fce65f475afbb70574767a84deb270d17bc943d04e25d5e2a7d8ebf81477 SHA512 2aed1fb05c93dcb1d8825639c5aba004a16d53af24b278eb036d0b85675e6a5f2738579d35301c9b6624fb7cc16bf3394d4a0e50fcaad5f030c91dd1382777a9 +DIST patch-5.4.109.xz 2776096 BLAKE2B 1b705558335df5ef12ee3f01654532b7bcefe23242599c749f31ca9d2c6509a81660e8977eb43c4dd052d586d47537d9d58a82930b9587d69142211baed25bdd SHA512 2033c11b03a6cac1770dbc9188c84881538212f7ed9bc419f594b637aef88934d9602c95d3d4d20af8e0a0a56a135a25905d4a6a358fb2334c9132082b66eb76 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.227.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.228.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.227.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.228.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.183.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.184.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.183.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.184.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.263.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.264.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.263.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.264.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.263.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.264.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.263.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.264.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.26.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.27.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.26.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.27.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.11.10.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.11.11.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.11.10.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.11.11.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.108.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.109.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.108.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.109.ebuild diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index 3b6989b4a533..b2f624669677 100644 --- a/sys-process/audit/Manifest +++ b/sys-process/audit/Manifest @@ -1,3 +1,4 @@ DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f SHA512 78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a +DIST audit-3.0.1.tar.gz 1180286 BLAKE2B f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43 SHA512 ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88 diff --git a/sys-process/audit/audit-3.0.1.ebuild b/sys-process/audit/audit-3.0.1.ebuild new file mode 100644 index 000000000000..bc901e6325be --- /dev/null +++ b/sys-process/audit/audit-3.0.1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript + +DESCRIPTION="Userspace utilities for storing and processing auditing records" +HOMEPAGE="https://people.redhat.com/sgrubb/audit/" +SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="gssapi ldap python static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# Testcases are pretty useless as they are built for RedHat users/groups and kernels. +RESTRICT="test" + +RDEPEND="gssapi? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + sys-libs/libcap-ng + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.34" # This is linux specific. +BDEPEND="python? ( dev-lang/swig:0 )" + +CONFIG_CHECK="~AUDIT" + +src_prepare() { + # audisp-remote moved in multilib_src_install_all + sed -i \ + -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \ + audisp/plugins/remote/au-remote.conf || die + + # Disable installing sample rules so they can be installed as docs. + echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null + + default +} + +multilib_src_configure() { + local -a myeconfargs=( + --sbindir="${EPREFIX}/sbin" + $(use_enable gssapi gssapi-krb5) + $(use_enable ldap zos-remote) + $(use_enable static-libs static) + --enable-systemd + --without-golang + --without-python + --without-python3 + ) + ECONF_SOURCE=${S} econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python; then + python_configure() { + mkdir -p "${BUILD_DIR}" + pushd "${BUILD_DIR}" &>/dev/null || die + ECONF_SOURCE=${S} econf "${myeconfargs[@]}" --with-python3 + popd &>/dev/null || die + } + python_foreach_impl python_configure + fi +} + +src_configure() { + tc-export_build_env BUILD_{CC,CPP} + local -x CC_FOR_BUILD="${BUILD_CC}" + local -x CPP_FOR_BUILD="${BUILD_CPP}" + multilib-minimal_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + + local native_build="${BUILD_DIR}" + python_compile() { + emake -C "${BUILD_DIR}"/bindings/swig top_builddir="${native_build}" + emake -C "${BUILD_DIR}"/bindings/python/python3 top_builddir="${native_build}" + } + use python && python_foreach_impl python_compile + else + emake -C common + emake -C lib + emake -C auparse + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install + + local native_build="${BUILD_DIR}" + python_install() { + emake -C "${BUILD_DIR}"/bindings/swig DESTDIR="${D}" top_builddir="${native_build}" install + emake -C "${BUILD_DIR}"/bindings/python/python3 DESTDIR="${D}" top_builddir="${native_build}" install + python_optimize + } + use python && python_foreach_impl python_install + + # things like shadow use this so we need to be in / + gen_usr_ldscript -a audit auparse + else + emake -C lib DESTDIR="${D}" install + emake -C auparse DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + dodoc AUTHORS ChangeLog README* THANKS + docinto contrib + dodoc contrib/avc_snap + docinto contrib/plugin + dodoc contrib/plugin/* + docinto rules + dodoc rules/*rules + + newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd + newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd + + [ -f "${ED}"/sbin/audisp-remote ] && \ + dodir /usr/sbin && \ + mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die + + # Gentoo rules + insinto /etc/audit + newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules + doins "${FILESDIR}"/audit.rules.stop* + + # audit logs go here + keepdir /var/log/audit + + find "${ED}" -type f -name '*.la' -delete || die + + # Security + lockdown_perms "${ED}" +} + +pkg_postinst() { + lockdown_perms "${EROOT}" +} + +lockdown_perms() { + # Upstream wants these to have restrictive perms. + # Should not || die as not all paths may exist. + local basedir="$1" + chmod 0750 "${basedir}"/sbin/au{ditctl,ditd,report,search,trace} 2>/dev/null + chmod 0750 "${basedir}"/var/log/audit 2>/dev/null + chmod 0640 "${basedir}"/etc/audit/{auditd.conf,audit*.rules*} 2>/dev/null +} diff --git a/sys-process/usbtop/Manifest b/sys-process/usbtop/Manifest index ddaf1a0ad299..3c2cb4f113e8 100644 --- a/sys-process/usbtop/Manifest +++ b/sys-process/usbtop/Manifest @@ -1,2 +1 @@ -DIST usbtop-0.2.tar.gz 10828 BLAKE2B d595fda23adee6778060c25176d1951250bb45cc25ea8040661222736c63aa356605ec8ca52b71e7142cf0f8e7807a77a54fffbc54165178f44af63dfb5ba712 SHA512 43a4512abcff6107ac7a56d65ee19c2b17f4aeb9d38e42e630d724c6744c7d23c85d2c66325c0e6b50404431312754646f1290202fa51f3dee1f94a9d211ba25 DIST usbtop-1.0.tar.gz 626770 BLAKE2B 4f14e1e8d926ce7f6ffd1a276871d7d9072979d844a55e477c402bcac343a3cc14faebbfd3886b386a48b01399bcb748fb843453a0eee48b8e09578841eab356 SHA512 bc2003c1085fae238d99347bbf3caa1da7e44aa8f5b07abbde3f96b4124b301bbbc896f7b5e341665db1cdba44a59752884e3b9fe3a6104ef804aa94c510a5c0 diff --git a/sys-process/usbtop/usbtop-0.2.ebuild b/sys-process/usbtop/usbtop-0.2.ebuild deleted file mode 100644 index 2661c02577d9..000000000000 --- a/sys-process/usbtop/usbtop-0.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils linux-info - -DESCRIPTION="utility that shows an estimated instantaneous bandwidth on USB buses and devices" -HOMEPAGE="https://github.com/aguinet/usbtop" -SRC_URI="https://github.com/aguinet/usbtop/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-libs/libpcap:=[usb] - dev-libs/boost:=[threads]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-release-${PV}" - -pkg_setup() { - linux-info_pkg_setup - if linux_config_exists; then - CONFIG_CHECK="~USB_MON" - check_extra_config - fi -} diff --git a/sys-process/usbtop/usbtop-1.0.ebuild b/sys-process/usbtop/usbtop-1.0.ebuild index 7b8e3d1fcb94..2a1c6be84ff0 100644 --- a/sys-process/usbtop/usbtop-1.0.ebuild +++ b/sys-process/usbtop/usbtop-1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils linux-info +inherit cmake linux-info DESCRIPTION="utility that shows an estimated instantaneous bandwidth on USB buses and devices" HOMEPAGE="https://github.com/aguinet/usbtop" diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest index 28c24340a807..5e1c2e2f4db1 100644 --- a/www-apps/grafana-bin/Manifest +++ b/www-apps/grafana-bin/Manifest @@ -1,2 +1,3 @@ DIST grafana-bin-7.4.5.tar.gz 51268864 BLAKE2B c59e16dd8cde882c8f7ffaa3352aeaf38f2fa1e5da3d340796403b0719d33b9eeb5fb7d8ac54b8321f2617d534a3121d2f8a86462e7cf07019baf2a08b141cc2 SHA512 8ad7e2fa9ca92a406690f5a14ea111ff329e6abb4330d4ede5bb34870c3d28cdec940db4c849bb99c097276ad10a3d4c70cf6b73ed8286d45fdf056673d0892f DIST grafana-bin-7.5.1.tar.gz 55420645 BLAKE2B 1100f68eeaeda5dd4d7928c0e16bcefe686427866472a750228eaa5612bc7c7d40db24d8767ae8e9766d70593de2504c57cb8a145efa1ff81074d38c69452ca7 SHA512 bee8b95820a8d8983aa430ee1e7de65da0b90ecfe0eeab8d8a5486af818a4bede73846bcc5aae2c9735204be004171ae98bccd7546d3c0220030260f1f1ed203 +DIST grafana-bin-7.5.2.tar.gz 52181388 BLAKE2B 7203ffb42169d9b92b2f251015195373abe58619ec7da7e65037d30a7a856e02dd07abc93c41b4f911fa1bd8b382d29e753f75b6717e65f211687127f0ce7ad9 SHA512 4eeff81371149f22f0c708d467623ace32ef1c9cd812d232c21323eeeb9bfa4e54658bca875b6c40c9b25caa4a56ea43e39b5389753348cc79710228ae135309 diff --git a/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild new file mode 100644 index 000000000000..229e2a789b9e --- /dev/null +++ b/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +MY_PN=${PN/-bin/} +MY_PV=${PV/_beta/-beta} +S=${WORKDIR}/${MY_PN}-${MY_PV} + +DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" +HOMEPAGE="https://grafana.org" +SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="acct-group/grafana + acct-user/grafana" +RDEPEND="${DEPEND} + media-libs/fontconfig" + +QA_PREBUILT="usr/bin/grafana-*" +QA_PRESTRIPPED=${QA_PREBUILT} + +src_install() { + keepdir /etc/grafana + insinto /etc/grafana + newins "${S}"/conf/sample.ini grafana.ini + rm "${S}"/conf/sample.ini || die + + # Frontend assets + insinto /usr/share/${MY_PN} + doins -r public conf + + dobin bin/grafana-cli + dobin bin/grafana-server + + newconfd "${FILESDIR}"/grafana-r1.confd grafana + newinitd "${FILESDIR}"/grafana.initd grafana + systemd_newunit "${FILESDIR}"/grafana.service grafana.service + + keepdir /var/{lib,log}/grafana + keepdir /var/lib/grafana/{dashboards,plugins} + fowners grafana:grafana /var/{lib,log}/grafana + fowners grafana:grafana /var/lib/grafana/{dashboards,plugins} + fperms 0750 /var/{lib,log}/grafana + fperms 0750 /var/lib/grafana/{dashboards,plugins} +} + +postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + + elog "${PN} has built-in log rotation. Please see [log.file] section of" + elog "/etc/grafana/grafana.ini for related settings." + elog + elog "You may add your own custom configuration for app-admin/logrotate if you" + elog "wish to use external rotation of logs. In this case, you also need to make" + elog "sure the built-in rotation is turned off." + fi +} diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index b8608e67981f..8ae1cf1ee8b3 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -384,7 +384,7 @@ DIST firefox-86.0.1-zh-CN.xpi 573532 BLAKE2B f62fd901e72388d6b0275e378d1910fe00b DIST firefox-86.0.1-zh-TW.xpi 573621 BLAKE2B 0965907ba7e28f5790559c2234b46c1a0fc4e078b9e926db218f6c63d178ff90168706d48dd6b4b3f392132e2a6c32a98dc9b2cab1085cc8e2cda1098c386dc4 SHA512 51a9a28ac1c2f0a4653bebbdde75d6806fdb22191d447f2a80198f21367360fd8a37023a15ce1d6bbbe632ff8e002882c17cb8ae02abe7d8b5a85cde9df316dd DIST firefox-86.0.1.source.tar.xz 369541992 BLAKE2B 3ba2912f1d641226698bfe0761912f7183e0afea3d4ff19178f3846331b5daf348a3b17665c599ff5ec0f0b6e9c3dfceda4bb576889c9e68703d24fe3f997332 SHA512 e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214 DIST firefox-86.0.source.tar.xz 371929688 BLAKE2B 64c122dd16b3d020fd5cd1098d32b7b3b4fe15e8f8b28e5b5986971bff71c80a72d12d2c9eeb192d3319661c3b06506c1548eef95ff3f84d13479664e68e8d58 SHA512 f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f -DIST firefox-87-patches-02.tar.xz 20156 BLAKE2B 7db892463cace7c79446048bba2a03cab7a6351780205eec19801bcef9d142bf2fc396de67a87496e2419257e7738ef5cbc31088d85bde30130a3e61c3d62a6b SHA512 6fad107ddec73c236c2b1c5d42aa52291a6f39b9b45f2ba5ec1b7a0f97e95f80af87caf162ab0449b1b0ea8d8234ba328c2cf1d07225076ce0b270b48eac191d +DIST firefox-87-patches-03.tar.xz 20900 BLAKE2B c420e47f2db2a1d94c157ec121445c59ce296b82f35a4385ce50f1f779e3381d54e9a8a715b6cc07f183e35d08295aea0e66d57b33ac444f2bb86a705f56427d SHA512 1b701b521b4a52f4bb9f5877c3c4c510cd47ebdbc0d78b90f33ec385f1fae8ca40f74f06f7cba56539d177dc889119a928d11603cefccf253a2bfb5dfd220db1 DIST firefox-87.0-ach.xpi 462227 BLAKE2B 84fe96ecaf2eb79fa35d25b9f42fdb28929a3901b02362140d812dcf553c226cdfb659752e03d339973590f9445b1bae376a25459d601d1930f2062633a77108 SHA512 ece3ac0c6a60c02e62df6851f65cdd57b4b8870e3ebc10c0383c77803c58cdb4bb0563738907ce87b05ab01f1962106964dcf0abd51d81ef7e676b1a12b1989c DIST firefox-87.0-af.xpi 425868 BLAKE2B 89ba7ecc204427f9b0712e12d063799c0169997fda5a5cd90e136807027ed947d0bb99f7bcb03c1c86c2d7cc89e4bdb5ca3e9ccf0d358bf426f86916b5db21c6 SHA512 d0b09c5a2efae3ba896974f1e01bee5214f9babbbd6721fdbabf3e942824f7607c45aa6c6187f975be9ea7adfbb8d7298a800eabd8ca8a9c9dbef3d3493455c4 DIST firefox-87.0-an.xpi 509574 BLAKE2B 3239d70305a7aae6cea54bad096f5c605b7efa59607c0d587731b27c310ab49a8e1786eba2fe1dc16d0e7a811f4b9ab9efb3d0dc94708ecddc44ed9a1e13f3c8 SHA512 f986d262a7fc65ea4387cbf0d98279638b304d9ea33b270a226648b96030912c734dded94d7f7c3ebb3c44f6749ca71db77c70fea8e0cfa8390f500cae4a42e3 diff --git a/www-client/firefox/firefox-78.9.0.ebuild b/www-client/firefox/firefox-78.9.0.ebuild index 657d965605b3..513f802e67cb 100644 --- a/www-client/firefox/firefox-78.9.0.ebuild +++ b/www-client/firefox/firefox-78.9.0.ebuild @@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES} DESCRIPTION="Firefox Web Browser" HOMEPAGE="https://www.mozilla.com/firefox" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" SLOT="0/esr$(ver_cut 1)" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" diff --git a/www-client/firefox/firefox-87.0.ebuild b/www-client/firefox/firefox-87.0.ebuild index 05f4494ae948..863cf66dd2d7 100644 --- a/www-client/firefox/firefox-87.0.ebuild +++ b/www-client/firefox/firefox-87.0.ebuild @@ -3,7 +3,7 @@ EAPI="7" -FIREFOX_PATCHSET="firefox-87-patches-02.tar.xz" +FIREFOX_PATCHSET="firefox-87-patches-03.tar.xz" LLVM_MAX_SLOT=11 diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index e0b342af9854..497a056d3178 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_89.0.4389.90-1_amd64.deb 75841728 BLAKE2B 1de16e3916e1dfe646d37327ec7c69417d40bf751e43d76a85f8e8f81e654669a994223a0f5c9a8bcbbe4abf3db2f50cbe4e2072742da3ae9aae855915098641 SHA512 768557218228c0129d478dd3da8d1a21c62002f0e2f1e533567dd50a2757a9de0ad141366a6927d0a4877d5f38be6dc3c246e4ec64e3113411bf90733ce477d1 +DIST google-chrome-stable_89.0.4389.114-1_amd64.deb 75857544 BLAKE2B b39c6db6aba2686f73ec31e7299f5bae3ed4b7abd074e28ea976b7f0f9beb515fe6faa89978a4eb20f2a87ebcea58b0e0fe152a1bf9b377f781dc692b7a42d90 SHA512 33813521e2ad77f261d91ce3d13480c76c7d4d4e58b2d3f1dc2201c9aa0caed51ea4e4470a539b39d6f4ce38d11c318243e02642d44979c636a8e83d12f79a10 diff --git a/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild b/www-client/google-chrome/google-chrome-89.0.4389.114.ebuild index 27569053bc68..27569053bc68 100644 --- a/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild +++ b/www-client/google-chrome/google-chrome-89.0.4389.114.ebuild diff --git a/www-client/netsurf/netsurf-3.10-r4.ebuild b/www-client/netsurf/netsurf-3.10-r4.ebuild index 1c1672618723..7ca24a577e3c 100644 --- a/www-client/netsurf/netsurf-3.10-r4.ebuild +++ b/www-client/netsurf/netsurf-3.10-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta LICENSE="GPL-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +png +psl rosprite +svg +svgtiny +webp" diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 6020e94fb6e8..91b6df26d391 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_90.0.4430.40-1_amd64.deb 77768616 BLAKE2B 109ba108a70c0796b64efb2f252394722ef3307fa70d2837fe73a3988634c867dd55eb30811908c00c63538e94dc23c15062e62f1160f9cd2f6c1e5259b2063b SHA512 c9b75ad0dd14325c8339c1a9f3cffb38b18690172900cbd425bb5af68b57572d28507bb94ed7dcc4e44a413cee38debe846f7d777733259c055e7d74b4b25eea -DIST google-chrome-stable_89.0.4389.90-1_amd64.deb 75841728 BLAKE2B 1de16e3916e1dfe646d37327ec7c69417d40bf751e43d76a85f8e8f81e654669a994223a0f5c9a8bcbbe4abf3db2f50cbe4e2072742da3ae9aae855915098641 SHA512 768557218228c0129d478dd3da8d1a21c62002f0e2f1e533567dd50a2757a9de0ad141366a6927d0a4877d5f38be6dc3c246e4ec64e3113411bf90733ce477d1 +DIST google-chrome-stable_89.0.4389.114-1_amd64.deb 75857544 BLAKE2B b39c6db6aba2686f73ec31e7299f5bae3ed4b7abd074e28ea976b7f0f9beb515fe6faa89978a4eb20f2a87ebcea58b0e0fe152a1bf9b377f781dc692b7a42d90 SHA512 33813521e2ad77f261d91ce3d13480c76c7d4d4e58b2d3f1dc2201c9aa0caed51ea4e4470a539b39d6f4ce38d11c318243e02642d44979c636a8e83d12f79a10 DIST google-chrome-unstable_91.0.4455.2-1_amd64.deb 78950724 BLAKE2B 79240cea248b27eacffb9abe74beb9ba61f6fd1406bc78dd62c50dc829bde4c167e6a7a1c3c0fa69747cb2bec684d58569cdf84adb43c3c8ec9617b61873eb37 SHA512 1a68587e6c34cc30e688b92af5cae49b7b52662fd97041b74cfa32d91d66ae3f2447dd6824e39822f8111ad11fd2d71cb6cf1f1d95ae6a67e822ab209f9a65c8 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.90.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.114.ebuild index 2e17df9a1303..2e17df9a1303 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.90.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.114.ebuild diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index cfe278aa6432..7aec1428e511 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -7,6 +7,7 @@ DIST nginx-1.19.5.tar.gz 1055590 BLAKE2B dc838848829553205886f1d538009ecccfd4b0d DIST nginx-1.19.6.tar.gz 1055982 BLAKE2B 6d818122b3bdf46b6c9ecb83a00d470b3db0f26f05140340c033d1d0851d679d077ce1853f8d0a1c0140bfdac2764e5702913e87149dccefda2c6f7bf8ac8845 SHA512 1249c56b124a8de71f5d722e53d599f3b0cb14dc0f95b1eb905a6a8019b2d33f8e76874de2a88d49c4c82ee4fa7aabd42e5044a0a110892c23b50f71cb632148 DIST nginx-1.19.7.tar.gz 1056631 BLAKE2B f7a62a2b7c1a8c91a01e54954323cddc7a948ab5b65f51594549b8b67e50ea954c4cd5b740f538472c6de7c4041b39b22a48beac37083900e6f0a015408316bc SHA512 660f03533581f350bbfe9a519fd0ee59c543c78be98aa5287df20a89653545b29fc98282548eab1741fb1d5c26da140166b6712ee06e498ba518019588f9b747 DIST nginx-1.19.8.tar.gz 1060155 BLAKE2B c540cfb86886ad60beefcaffa7c9ad4f79807bdff3fed9f6c2f23d38d46aaba4f0489ada289f14881f206de290a37b58934254e9690a707ac639204602530218 SHA512 da548dc459f7a921e2f6ea54f543496244e820acbdf3effc4db331717f69b710181fbfdac3be101cd7d1c39e3ca37a94f9a9c4017f11da843ed85a34acf26bc2 +DIST nginx-1.19.9.tar.gz 1060580 BLAKE2B 896f58de8051dcf76fc65b9e8263099e7d4c797832b5f9c354fe2440ff4a3155c0d9139a4022e4d828d17f11259be6853b264e22e43a986d249b5dc53a075d35 SHA512 a418aa22046f641afd95ee661c77c469d21c9957aa5ab74c4186526fcd18e0d701ee933a76ab143081b4b3f8815484074c2609aa257646218bf6b4b739b3cb88 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 DIST ngx_brotli-1.0.0rc.tar.gz 16207 BLAKE2B 450d0ea693bd98d4a1b615f2cdcaad41ccd28266f6d80beec7fe77fe750ab8c5d1bb55aabe15161b9b6d819d2b4d99a7774f2706f2f6fd084b52a7c7dddbc00c SHA512 05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d @@ -35,3 +36,4 @@ DIST njs-0.4.4.tar.gz 486870 BLAKE2B 9390bfe35249ea34b9edd4b7c2360a25c9ecb232e10 DIST njs-0.5.0.tar.gz 505568 BLAKE2B 5dc2a91bffa4eb2364d96e26def0959b111cc8bf88841f581e3c0d43fcb88ba1ea24b24339cb1f51b8290c08dd930dc18a274a7ab6a21ee4ba8b0e6c4f5a1ba0 SHA512 182a64ba519b1a1d29ac71ffe2c9ef8e5a6f9aaf3db9f327ac926114db73b339a424801b558068fc7ae06ae88a4dea0a601c749db4b6f2b579e427181e41d11b DIST njs-0.5.1.tar.gz 516345 BLAKE2B b861ff1e62eddeb8aabf6908253dba1393a32a04636a082dee979a52d320a7ecb12f961213652886a210ee9569460a3214d823cb5f7c3b025378b7cf6d64659f SHA512 bbc06e57a152a5dc5c71305a4bec80d6d3d6f886a82d6c39d82aa8f52add56029b7f38199f11789648539bcbba2a488dc6e64874fef0222479775708559f4da9 DIST njs-0.5.2.tar.gz 519331 BLAKE2B d2315ce563650a3985c1e40e3fcf17cdd69de5379f4213674db39bb2c7fb3f62df710e3bfccc0391e4bba2c19362f69d6574b4691e858c60af398c1131e3b79a SHA512 47ac82edd63059a38753371deafb5efe8e1c71f2533f1bf78e8ed56d6e7bfea801cb4a1213597bd73fc3e51263b394750efa29c5f1f3581c62f99c935fdfec99 +DIST njs-0.5.3.tar.gz 519938 BLAKE2B 1d06f8a20f6c37977e3b4b9afa0f136761a6998b85739a9853bb41d70ea6af42f49541035961fd0251eda2e10579f7bf983eaec2f9e19460138e53f44b9e6788 SHA512 b1d2e7498c37cc1df18e0f65866391637bf75d3d251fc7d7ad1ef5c76457697f49eaea088e1d157c94a6e779e9b8cc07b3f5aaac965666624506f517f6878c23 diff --git a/www-servers/nginx/nginx-1.19.9.ebuild b/www-servers/nginx/nginx-1.19.9.ebuild new file mode 100644 index 000000000000..951ed700dca2 --- /dev/null +++ b/www-servers/nginx/nginx-1.19.9.ebuild @@ -0,0 +1,1090 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Maintainer notes: +# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite +# - any http-module activates the main http-functionality and overrides USE=-http +# - keep the following requirements in mind before adding external modules: +# * alive upstream +# * sane packaging +# * builds cleanly +# * does not need a patch for nginx core +# - TODO: test the google-perftools module (included in vanilla tarball) + +# prevent perl-module from adding automagic perl DEPENDs +GENTOO_DEPEND_ON_PERL="no" + +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.3.1" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" +DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" + +# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2) +HTTP_BROTLI_MODULE_PV="1.0.0rc" +HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}" +HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz" +HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}" + +# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) +HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" +HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" + +# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) +HTTP_HEADERS_MORE_MODULE_PV="0.33" +HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.10" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + +# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) +HTTP_FANCYINDEX_MODULE_PV="0.4.4" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" + +# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.10.15" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" +HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" +LUA_COMPAT=( luajit ) + +# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) +HTTP_AUTH_PAM_MODULE_PV="1.5.2" +HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" +HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" +HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" + +# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) +HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04" +HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" +HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" +HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}" + +# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) +HTTP_METRICS_MODULE_PV="0.1.1" +HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" +HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" +HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" + +# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license) +HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.56" +HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" +HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" +HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" + +# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) +RTMP_MODULE_PV="1.2.1" +RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" +RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" +RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" + +# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) +HTTP_DAV_EXT_MODULE_PV="3.0.0" +HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" +HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" +HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" + +# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license) +HTTP_ECHO_MODULE_PV="0.62" +HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" +HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" +HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" + +# mod_security for nginx (https://modsecurity.org/, Apache-2.0) +# keep the MODULE_P here consistent with upstream to avoid tarball duplication +HTTP_SECURITY_MODULE_PV="2.9.3" +HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" +HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" +HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" + +# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) +HTTP_PUSH_STREAM_MODULE_PV="0.5.4" +HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" +HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" +HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" + +# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) +HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42" +HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" +HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" +HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42" + +# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2) +HTTP_MOGILEFS_MODULE_PV="1.0.4" +HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" +HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz" +HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" + +# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) +HTTP_MEMC_MODULE_PV="0.19" +HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" +HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" +HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" + +# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2) +HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c" +HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" +HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz" +HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" + +# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2) +GEOIP2_MODULE_PV="3.3" +GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" +GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz" +GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" + +# njs-module (https://github.com/nginx/njs, as-is) +NJS_MODULE_PV="0.5.3" +NJS_MODULE_P="njs-${NJS_MODULE_PV}" +NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" +NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" + +# We handle deps below ourselves +SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="https://nginx.org" +SRC_URI="https://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) + nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) + nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz ) + nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )" + +LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +# Package doesn't provide a real test suite +RESTRICT="test" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo grpc gzip limit_req limit_conn map memcached mirror + proxy referer rewrite scgi ssi split_clients upstream_hash + upstream_ip_hash upstream_keepalive upstream_least_conn + upstream_zone userid uwsgi" +NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip + gzip_static image_filter mp4 perl random_index realip secure_link + slice stub_status sub xslt" +NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients + upstream_hash upstream_least_conn upstream_zone" +NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread" +NGINX_MODULES_MAIL="imap pop3 smtp" +NGINX_MODULES_3RD=" + http_auth_ldap + http_auth_pam + http_brotli + http_cache_purge + http_dav_ext + http_echo + http_fancyindex + http_geoip2 + http_headers_more + http_javascript + http_lua + http_memc + http_metrics + http_mogilefs + http_naxsi + http_push_stream + http_security + http_slowfs_cache + http_sticky + http_upload_progress + http_upstream_check + http_vhost_traffic_status + stream_geoip2 + stream_javascript +" + +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" + +for mod in $NGINX_MODULES_STD; do + IUSE="${IUSE} +nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_OPT; do + IUSE="${IUSE} nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_STD; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_OPT; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_MAIL; do + IUSE="${IUSE} nginx_modules_mail_${mod}" +done + +for mod in $NGINX_MODULES_3RD; do + IUSE="${IUSE} nginx_modules_${mod}" +done + +# Add so we can warn users updating about config changes +# @TODO: jbergstroem: remove on next release series +IUSE="${IUSE} nginx_modules_http_spdy" + +CDEPEND=" + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http2? ( + !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http-cache? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_brotli? ( app-arch/brotli:= ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) + nginx_modules_http_gunzip? ( sys-libs/zlib ) + nginx_modules_http_gzip? ( sys-libs/zlib ) + nginx_modules_http_gzip_static? ( sys-libs/zlib ) + nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) + nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) + nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) + nginx_modules_http_secure_link? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( ${LUA_DEPS} ) + nginx_modules_http_auth_pam? ( sys-libs/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) + nginx_modules_http_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) + nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) + nginx_modules_stream_geoip? ( dev-libs/geoip ) + nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig ) + nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +REQUIRED_USE="pcre-jit? ( pcre ) + nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) + nginx_modules_http_grpc? ( http2 ) + nginx_modules_http_lua? ( + ${LUA_REQUIRED_USE} + nginx_modules_http_rewrite + ) + nginx_modules_http_naxsi? ( pcre ) + nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) + nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) + nginx_modules_http_security? ( pcre ) + nginx_modules_http_push_stream? ( ssl )" + +pkg_setup() { + NGINX_HOME="/var/lib/nginx" + NGINX_HOME_TMP="${NGINX_HOME}/tmp" + + ebegin "Creating nginx user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} + eend $? + + if use libatomic; then + ewarn "GCC 4.1+ features built-in atomic operations." + ewarn "Using libatomic_ops is only needed if using" + ewarn "a different compiler or a GCC prior to 4.1" + fi + + if [[ -n $NGINX_ADD_MODULES ]]; then + ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" + ewarn "This nginx installation is not supported!" + ewarn "Make sure you can reproduce the bug without those modules" + ewarn "_before_ reporting bugs." + fi + + if use !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi + + if use nginx_modules_http_mogilefs && use threads; then + eerror "mogilefs won't compile with threads support." + eerror "Please disable either flag and try again." + die "Can't compile mogilefs with threads support" + fi + + use nginx_modules_http_lua && lua-single_pkg_setup +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" + eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" + + if use nginx_modules_http_brotli; then + cd "${HTTP_BROTLI_MODULE_WD}" || die + eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch + cd "${S}" || die + fi + + if use nginx_modules_http_upstream_check; then + eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch + fi + + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + eautoreconf + + if use nginx_modules_http_lua; then + sed -i \ + -e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \ + configure || die + fi + + cd "${S}" || die + fi + + if use nginx_modules_http_upload_progress; then + cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die + eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch + cd "${S}" || die + fi + + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die + # We have config protection, don't rename etc files + sed -i 's:.default::' auto/install || die + # remove useless files + sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + + # don't install to /etc/nginx/ if not in use + local module + for module in fastcgi scgi uwsgi ; do + if ! use nginx_modules_http_${module}; then + sed -i -e "/${module}/d" auto/install || die + fi + done + + eapply_user +} + +src_configure() { + # mod_security needs to generate nginx/modsecurity/config before including it + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + ./configure \ + --enable-standalone-module \ + --disable-mlogc \ + --with-ssdeep=no \ + $(use_enable pcre-jit) \ + $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" + + cd "${S}" || die + fi + + local myconf=() http_enabled= mail_enabled= stream_enabled= + + use aio && myconf+=( --with-file-aio ) + use debug && myconf+=( --with-debug ) + use http2 && myconf+=( --with-http_v2_module ) + use libatomic && myconf+=( --with-libatomic ) + use pcre && myconf+=( --with-pcre ) + use pcre-jit && myconf+=( --with-pcre-jit ) + use threads && myconf+=( --with-threads ) + + # HTTP modules + for mod in $NGINX_MODULES_STD; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + else + myconf+=( --without-http_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_OPT; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + myconf+=( --with-http_${mod}_module ) + fi + done + + if use nginx_modules_http_fastcgi; then + myconf+=( --with-http_realip_module ) + fi + + # third-party modules + if use nginx_modules_http_upload_progress; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) + fi + + if use nginx_modules_http_headers_more; then + http_enabled=1 + myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) + fi + + if use nginx_modules_http_cache_purge; then + http_enabled=1 + myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) + fi + + if use nginx_modules_http_fancyindex; then + http_enabled=1 + myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + export LUAJIT_LIB=$(dirname $(lua_get_shared_lib)) + export LUAJIT_INC=$(lua_get_include_dir) + myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) + myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_pam; then + http_enabled=1 + myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) + fi + + if use nginx_modules_http_upstream_check; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) + fi + + if use nginx_modules_http_metrics; then + http_enabled=1 + myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) + fi + + if use nginx_modules_http_naxsi ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) + fi + + if use rtmp ; then + http_enabled=1 + myconf+=( --add-module=${RTMP_MODULE_WD} ) + fi + + if use nginx_modules_http_dav_ext ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) + fi + + if use nginx_modules_http_echo ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) + fi + + if use nginx_modules_http_security ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) + fi + + if use nginx_modules_http_push_stream ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) + fi + + if use nginx_modules_http_sticky ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) + fi + + if use nginx_modules_http_mogilefs ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) + fi + + if use nginx_modules_http_memc ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_ldap; then + http_enabled=1 + myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) + fi + + if use nginx_modules_http_vhost_traffic_status; then + http_enabled=1 + myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} ) + fi + + if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then + myconf+=( --add-module=${GEOIP2_MODULE_WD} ) + fi + + if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then + myconf+=( --add-module="${NJS_MODULE_WD}/nginx" ) + fi + + if use nginx_modules_http_brotli; then + http_enabled=1 + myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} ) + fi + + if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then + http_enabled=1 + fi + + if [ $http_enabled ]; then + use http-cache || myconf+=( --without-http-cache ) + use ssl && myconf+=( --with-http_ssl_module ) + else + myconf+=( --without-http --without-http-cache ) + fi + + # Stream modules + for mod in $NGINX_MODULES_STREAM_STD; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + else + myconf+=( --without-stream_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_STREAM_OPT; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + myconf+=( --with-stream_${mod}_module ) + fi + done + + if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then + stream_enabled=1 + fi + + if [ $stream_enabled ]; then + myconf+=( --with-stream ) + use ssl && myconf+=( --with-stream_ssl_module ) + fi + + # MAIL modules + for mod in $NGINX_MODULES_MAIL; do + if use nginx_modules_mail_${mod}; then + mail_enabled=1 + else + myconf+=( --without-mail_${mod}_module ) + fi + done + + if [ $mail_enabled ]; then + myconf+=( --with-mail ) + use ssl && myconf+=( --with-mail_ssl_module ) + fi + + # custom modules + for mod in $NGINX_ADD_MODULES; do + myconf+=( --add-module=${mod} ) + done + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + tc-export AR CC + + if ! use prefix; then + myconf+=( --user=${PN} ) + myconf+=( --group=${PN} ) + fi + + local WITHOUT_IPV6= + if ! use ipv6; then + WITHOUT_IPV6=" -DNGX_HAVE_INET6=0" + fi + + if [[ -n "${EXTRA_ECONF}" ]]; then + myconf+=( ${EXTRA_ECONF} ) + ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!" + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ + --pid-path="${EPREFIX}"/run/${PN}.pid \ + --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ + --with-cc-opt="-I${EROOT}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${EROOT}/usr/$(get_libdir)" \ + --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ + --with-compat \ + "${myconf[@]}" || die "configure failed" + + # A purely cosmetic change that makes nginx -V more readable. This can be + # good if people outside the gentoo community would troubleshoot and + # question the users setup. + sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die +} + +src_compile() { + use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" install + + cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die + + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx + + systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service + + doman man/nginx.8 + dodoc CHANGES* README + + # just keepdir. do not copy the default htdocs files (bug #449136) + keepdir /var/www/localhost + rm -rf "${ED}"/usr/html || die + + # set up a list of directories to keep + local keepdir_list="${NGINX_HOME_TMP}"/client + local module + for module in proxy fastcgi scgi uwsgi; do + use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" + done + + keepdir /var/log/nginx ${keepdir_list} + + # this solves a problem with SELinux where nginx doesn't see the directories + # as root and tries to create them as nginx + fperms 0750 "${NGINX_HOME_TMP}" + fowners ${PN}:0 "${NGINX_HOME_TMP}" + + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + # Don't create /run + rm -rf "${ED}"/run || die + + if use lua_single_target_luajit; then + pax-mark m "${ED}/usr/sbin/nginx" + fi + + if use nginx_modules_http_perl; then + cd "${S}"/objs/src/http/modules/perl/ || die + emake DESTDIR="${D}" INSTALLDIRS=vendor + perl_delete_localpod + cd "${S}" || die + fi + + if use nginx_modules_http_cache_purge; then + docinto ${HTTP_CACHE_PURGE_MODULE_P} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} + fi + + if use nginx_modules_http_fancyindex; then + docinto ${HTTP_FANCYINDEX_MODULE_P} + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_pam; then + docinto ${HTTP_AUTH_PAM_MODULE_P} + dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} + fi + + if use nginx_modules_http_upstream_check; then + docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} + dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} + fi + + if use nginx_modules_http_naxsi; then + insinto /etc/nginx + doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules + fi + + if use rtmp; then + docinto ${RTMP_MODULE_P} + dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} + fi + + if use nginx_modules_http_dav_ext; then + docinto ${HTTP_DAV_EXT_MODULE_P} + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_echo; then + docinto ${HTTP_ECHO_MODULE_P} + dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_security; then + docinto ${HTTP_SECURITY_MODULE_P} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt} + fi + + if use nginx_modules_http_push_stream; then + docinto ${HTTP_PUSH_STREAM_MODULE_P} + dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} + fi + + if use nginx_modules_http_sticky; then + docinto ${HTTP_STICKY_MODULE_P} + dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} + fi + + if use nginx_modules_http_memc; then + docinto ${HTTP_MEMC_MODULE_P} + dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_ldap; then + docinto ${HTTP_LDAP_MODULE_P} + dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf + fi +} + +pkg_postinst() { + if use ssl; then + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + fi + + if use nginx_modules_http_spdy; then + ewarn "" + ewarn "In nginx 1.9.5 the spdy module was superseded by http2." + ewarn "Update your configs and package.use accordingly." + fi + + if use nginx_modules_http_lua; then + ewarn "" + ewarn "While you can build lua 3rd party module against ${P}" + ewarn "the author warns that >=${PN}-1.11.11 is still not an" + ewarn "officially supported target yet. You are on your own." + ewarn "Expect runtime failures, memory leaks and other problems!" + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "" + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if ver_test ${_replacing_version} -ge 1.4.1-r2; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ver_test ${_replacing_version_branch} -lt 1.10; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ver_test ${_replacing_version_branch} -lt 1.10; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "This is a one-time change and will not happen on subsequent updates." + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX}"/var/log/nginx \ + "${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files in your server block(s)." + ewarn "" + ewarn "If this is causing any problems for you make sure that you are sourcing the" + ewarn "default parameters _before_ you set your own values." + ewarn "If you are relying on user-supplied proxy values you have to remove the" + ewarn "correlating lines from the file(s) mentioned above." + ewarn "" + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild index b815b67a8397..e5ffdf551e09 100644 --- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild @@ -33,7 +33,6 @@ CDEPEND=" >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( @@ -86,10 +85,9 @@ CDEPEND=" ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] " - DEPEND="${CDEPEND} - sys-devel/flex >=x11-base/xorg-proto-2018.4 + >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( @@ -98,13 +96,16 @@ DEPEND="${CDEPEND} www-client/w3m ) ) - )" - + ) +" RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " - +BDEPEND=" + sys-devel/flex + wayland? ( dev-util/wayland-scanner ) +" PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index b77e074e4801..7b4a9180cd77 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -34,7 +34,6 @@ CDEPEND=" >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( @@ -87,10 +86,9 @@ CDEPEND=" ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] " - DEPEND="${CDEPEND} - sys-devel/flex >=x11-base/xorg-proto-2018.4 + >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( @@ -99,13 +97,16 @@ DEPEND="${CDEPEND} www-client/w3m ) ) - )" - + ) +" RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " - +BDEPEND=" + sys-devel/flex + wayland? ( dev-util/wayland-scanner ) +" PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild index 4d6747696a47..1dd6a3468cda 100644 --- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild +++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-libs/glib-2.18:2" diff --git a/x11-libs/tslib/tslib-1.22.ebuild b/x11-libs/tslib/tslib-1.22.ebuild index 6b9f221644b7..47e35120b19a 100644 --- a/x11-libs/tslib/tslib-1.22.ebuild +++ b/x11-libs/tslib/tslib-1.22.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2 uinput? ( GPL-2+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="evdev sdl uinput" BDEPEND=" diff --git a/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch new file mode 100644 index 000000000000..b88f21cac82b --- /dev/null +++ b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/779406 + +commit e55f6880d6bb649b2f1bd55c31bd4ba6265ccae0 +Author: orbea <orbea@riseup.net> +Date: Tue Mar 30 11:54:33 2021 -0700 + + build: Fix undefined references for libm. + +diff --git a/Makefile.am b/Makefile.am +index 16d29ea..09a51bb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,4 +22,4 @@ libaurora_la_SOURCES = \ + ./src/config.h + + libaurora_la_LDFLAGS = -module -avoid-version -no-undefined +-libaurora_la_LIBADD = $(GTK_LIBS) ++libaurora_la_LIBADD = $(GTK_LIBS) $(LIBM) +diff --git a/configure.ac b/configure.ac +index b1c35e9..9b446c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,6 +20,9 @@ AC_ARG_ENABLE(animation, [ --enable-animation compile aurora with animati + + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0,,AC_MSG_ERROR([GTK+-2.10 is required to compile aurora])) + ++AC_CHECK_LIBM ++AC_SUBST([LIBM]) ++ + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + diff --git a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild index 2a8bfa1c6b8c..68deb8904145 100644 --- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild +++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild @@ -4,10 +4,10 @@ EAPI=7 MY_MAJ=$(ver_cut 1-2) - DESCRIPTION="Aurora GTK+ 2.x Theme Engine" HOMEPAGE="https://www.gnome-look.org/content/show.php?content=56438" SRC_URI="https://gnome-look.org/CONTENT/content-files/56438-aurora-${PV}.tar.bz2" +S="${WORKDIR}/aurora-${MY_MAJ}" LICENSE="GPL-2" SLOT="0" @@ -19,9 +19,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/aurora-${MY_MAJ}" - -PATCHES=( "${FILESDIR}"/${P}-glib-2.31.patch ) +PATCHES=( + "${FILESDIR}"/${P}-glib-2.31.patch + "${FILESDIR}"/${P}-slibtool-undefined-references.patch +) src_unpack() { unpack ${A} @@ -40,5 +41,5 @@ src_install() { doins -r ../Aurora/. # no static archives - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } |