From 8e16e058e709480115328fd9ee73b9819b9574a0 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Thu, 10 Dec 2020 20:53:05 +0000 Subject: Updating liguros repo --- app-doc/doxygen/Manifest | 1 + app-doc/doxygen/doxygen-1.8.17-r1.ebuild | 137 +++++++++++++ app-doc/doxygen/doxygen-1.8.20.ebuild | 135 +++++++++++++ app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch | 42 ++++ .../qemu/files/qemu-5.2.0-safe-stack.patch | 12 -- app-emulation/qemu/qemu-5.2.0.ebuild | 38 +--- app-emulation/qemu/qemu-9999.ebuild | 37 +--- app-shells/mksh/mksh-59.ebuild | 2 +- .../liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch | 28 +++ app-text/liblangtag/liblangtag-0.6.3.ebuild | 4 + dev-db/plr/metadata.xml | 22 +-- dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild | 2 +- dev-libs/gjs/gjs-1.66.1.ebuild | 2 +- dev-libs/libb64/Manifest | 1 + dev-libs/libb64/libb64-2.0.0.1.ebuild | 29 +++ .../liberasurecode/liberasurecode-1.6.2.ebuild | 2 +- dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild | 2 +- dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild | 6 +- dev-php/swoole/Manifest | 1 + dev-php/swoole/swoole-4.5.9.ebuild | 68 +++++++ dev-php/xhprof/Manifest | 2 +- dev-php/xhprof/xhprof-0.9.10.ebuild | 23 --- dev-php/xhprof/xhprof-2.2.3.ebuild | 18 ++ dev-python/cheetah/Manifest | 1 - dev-python/cheetah/cheetah-2.4.4-r1.ebuild | 45 ----- dev-python/cheetah/metadata.xml | 16 -- dev-python/couchdb-python/Manifest | 1 - .../couchdb-python/couchdb-python-1.1.ebuild | 42 ---- dev-python/couchdb-python/metadata.xml | 17 -- dev-python/cython/cython-0.29.21.ebuild | 1 + .../cython-0.29.21-spawn-multiprocessing.patch | 29 +++ dev-python/elasticsearch-curator/metadata.xml | 9 +- dev-python/elasticsearch-py/metadata.xml | 4 - dev-python/hypothesis/Manifest | 1 + dev-python/hypothesis/hypothesis-5.43.2.ebuild | 64 ++++++ dev-python/sentry-sdk/Manifest | 1 + dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild | 87 +++++++++ dev-python/typing/Manifest | 1 - dev-python/typing/metadata.xml | 13 -- dev-python/typing/typing-3.7.4.3.ebuild | 38 ---- .../dungeon-defenders-20130305-r1.ebuild | 68 +++++++ .../dungeon-defenders-20130305.ebuild | 101 ---------- games-rpg/dungeon-defenders/metadata.xml | 5 - games-rpg/twclone/Manifest | 1 - games-rpg/twclone/files/twclone-0.14-format.patch | 75 ------- games-rpg/twclone/metadata.xml | 19 -- games-rpg/twclone/twclone-0.14-r1.ebuild | 29 --- gnome-base/libbonobo/Manifest | 1 - gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild | 66 ------- gnome-base/libbonobo/metadata.xml | 9 - gnome-base/libgnome-keyring/Manifest | 1 - .../files/3.12.0-vala-0.42-compat.patch | 25 --- .../libgnome-keyring-3.12.0-r1.ebuild | 60 ------ gnome-base/libgnome-keyring/metadata.xml | 9 - gnome-base/orbit/Manifest | 1 - .../orbit/files/orbit-2.14.19-aix-func_data.patch | 99 ---------- .../orbit/files/orbit-2.14.19-automake-1.13.patch | 22 --- gnome-base/orbit/files/orbit-2.14.19-fPIC.patch | 46 ----- .../orbit-2.14.19-link_protocol_is_local.patch | 29 --- .../orbit/files/orbit-2.14.19-parallel-build.patch | 25 --- gnome-base/orbit/metadata.xml | 13 -- gnome-base/orbit/orbit-2.14.19-r5.ebuild | 102 ---------- media-libs/mesa/mesa-9999.ebuild | 17 +- .../raspberrypi-userland-bin-1.20201022.ebuild | 2 +- .../raspberrypi-userland-0_pre20201022.ebuild | 2 +- media-plugins/kodi-pvr-nextpvr/Manifest | 7 +- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild | 38 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild | 38 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild | 37 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild | 37 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild | 37 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild | 37 ---- .../kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild | 37 ++++ net-misc/curl/curl-7.74.0.ebuild | 2 +- net-proxy/haproxy/Manifest | 8 - net-proxy/haproxy/haproxy-1.8.26.ebuild | 169 ---------------- net-proxy/haproxy/haproxy-1.8.27-r1.ebuild | 169 ++++++++++++++++ net-proxy/haproxy/haproxy-1.8.27.ebuild | 169 ---------------- net-proxy/haproxy/haproxy-2.0.14-r1.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.0.14-r2.ebuild | 180 +++++++++++++++++ net-proxy/haproxy/haproxy-2.0.14.ebuild | 176 ----------------- net-proxy/haproxy/haproxy-2.0.17.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.0.18.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.0.19-r1.ebuild | 180 +++++++++++++++++ net-proxy/haproxy/haproxy-2.0.19.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.0.9999.ebuild | 2 +- net-proxy/haproxy/haproxy-2.1.10-r1.ebuild | 180 +++++++++++++++++ net-proxy/haproxy/haproxy-2.1.10.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.1.4-r1.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.1.4-r2.ebuild | 180 +++++++++++++++++ net-proxy/haproxy/haproxy-2.1.4.ebuild | 176 ----------------- net-proxy/haproxy/haproxy-2.1.8.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.1.9.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.1.9999.ebuild | 2 +- net-proxy/haproxy/haproxy-2.2.0.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.2.3.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.2.4.ebuild | 180 ----------------- net-proxy/haproxy/haproxy-2.2.5-r1.ebuild | 181 +++++++++++++++++ net-proxy/haproxy/haproxy-2.2.5.ebuild | 181 ----------------- net-proxy/haproxy/haproxy-2.2.6-r1.ebuild | 181 +++++++++++++++++ net-proxy/haproxy/haproxy-2.2.6.ebuild | 181 ----------------- net-proxy/haproxy/haproxy-2.2.9999.ebuild | 2 +- net-proxy/haproxy/haproxy-2.3.2-r1.ebuild | 178 +++++++++++++++++ net-proxy/haproxy/haproxy-2.3.2.ebuild | 178 ----------------- net-proxy/haproxy/haproxy-2.3.9999.ebuild | 2 +- profiles/package.mask/00-gentoo | 54 ++--- sci-chemistry/votca-csg/Manifest | 3 + sci-chemistry/votca-csg/votca-csg-1.6.3.ebuild | 92 +++++++++ sci-chemistry/votca-csgapps/Manifest | 1 + .../votca-csgapps/votca-csgapps-1.6.3.ebuild | 33 ++++ sci-chemistry/votca-xtp/Manifest | 1 + sci-chemistry/votca-xtp/votca-xtp-1.6.3.ebuild | 45 +++++ sci-geosciences/mapnik-world-boundaries/Manifest | 2 - .../mapnik-world-boundaries-20090514.ebuild | 29 --- .../mapnik-world-boundaries/metadata.xml | 9 - sci-libs/htslib/Manifest | 1 - sci-libs/htslib/htslib-1.9.ebuild | 45 ----- sci-libs/mkl-rt/Manifest | 1 - sci-libs/mkl-rt/metadata.xml | 30 --- sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild | 81 -------- sci-libs/votca-tools/Manifest | 1 + sci-libs/votca-tools/votca-tools-1.6.3.ebuild | 44 +++++ .../systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 2 +- .../raspberrypi-firmware-1.20201022.ebuild | 2 +- sys-cluster/nova/Manifest | 4 - sys-cluster/nova/nova-21.1.0.ebuild | 217 --------------------- sys-cluster/nova/nova-21.1.1.ebuild | 2 +- sys-cluster/nova/nova-22.0.0.ebuild | 213 -------------------- sys-cluster/spark-bin/spark-bin-2.4.3.ebuild | 4 +- sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild | 4 +- sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild | 4 +- .../raspberrypi-wifi-ucode-20190114.1_p9.ebuild | 2 +- sys-kernel/gentoo-kernel-bin/Manifest | 2 + .../gentoo-kernel-bin-5.4.82-r1.ebuild | 57 ++++++ .../gentoo-kernel-bin-5.9.13-r1.ebuild | 49 +++++ sys-libs/librtas/librtas-2.0.2-r1.ebuild | 2 +- www-client/firefox/files/distribution.ini | 42 ++++ www-client/firefox/firefox-84.0_rc1.ebuild | 1 + x11-libs/gtk+/gtk+-3.24.24-r1.ebuild | 2 +- x11-libs/gtk+/gtk+-3.24.24.ebuild | 2 +- x11-misc/synergy/synergy-1.9.1-r1.ebuild | 2 +- x11-wm/mutter/mutter-3.38.2.ebuild | 2 +- 142 files changed, 2625 insertions(+), 5198 deletions(-) create mode 100644 app-doc/doxygen/doxygen-1.8.17-r1.ebuild create mode 100644 app-doc/doxygen/doxygen-1.8.20.ebuild create mode 100644 app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch delete mode 100644 app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch create mode 100644 app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch create mode 100644 dev-libs/libb64/libb64-2.0.0.1.ebuild create mode 100644 dev-php/swoole/swoole-4.5.9.ebuild delete mode 100644 dev-php/xhprof/xhprof-0.9.10.ebuild create mode 100644 dev-php/xhprof/xhprof-2.2.3.ebuild delete mode 100644 dev-python/cheetah/Manifest delete mode 100644 dev-python/cheetah/cheetah-2.4.4-r1.ebuild delete mode 100644 dev-python/cheetah/metadata.xml delete mode 100644 dev-python/couchdb-python/Manifest delete mode 100644 dev-python/couchdb-python/couchdb-python-1.1.ebuild delete mode 100644 dev-python/couchdb-python/metadata.xml create mode 100644 dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch create mode 100644 dev-python/hypothesis/hypothesis-5.43.2.ebuild create mode 100644 dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild delete mode 100644 dev-python/typing/Manifest delete mode 100644 dev-python/typing/metadata.xml delete mode 100644 dev-python/typing/typing-3.7.4.3.ebuild create mode 100644 games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild delete mode 100644 games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild delete mode 100644 games-rpg/twclone/Manifest delete mode 100644 games-rpg/twclone/files/twclone-0.14-format.patch delete mode 100644 games-rpg/twclone/metadata.xml delete mode 100644 games-rpg/twclone/twclone-0.14-r1.ebuild delete mode 100644 gnome-base/libbonobo/Manifest delete mode 100644 gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild delete mode 100644 gnome-base/libbonobo/metadata.xml delete mode 100644 gnome-base/libgnome-keyring/Manifest delete mode 100644 gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch delete mode 100644 gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild delete mode 100644 gnome-base/libgnome-keyring/metadata.xml delete mode 100644 gnome-base/orbit/Manifest delete mode 100644 gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch delete mode 100644 gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch delete mode 100644 gnome-base/orbit/files/orbit-2.14.19-fPIC.patch delete mode 100644 gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch delete mode 100644 gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch delete mode 100644 gnome-base/orbit/metadata.xml delete mode 100644 gnome-base/orbit/orbit-2.14.19-r5.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild delete mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild create mode 100644 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild delete mode 100644 net-proxy/haproxy/haproxy-1.8.26.ebuild create mode 100644 net-proxy/haproxy/haproxy-1.8.27-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-1.8.27.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.0.14-r1.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.0.14-r2.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.0.14.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.0.17.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.0.18.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.0.19-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.0.19.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.1.10-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.1.10.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.1.4-r1.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.1.4-r2.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.1.4.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.1.8.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.1.9.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.2.0.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.2.3.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.2.4.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.2.5-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.2.5.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.2.6-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.2.6.ebuild create mode 100644 net-proxy/haproxy/haproxy-2.3.2-r1.ebuild delete mode 100644 net-proxy/haproxy/haproxy-2.3.2.ebuild create mode 100644 sci-chemistry/votca-csg/votca-csg-1.6.3.ebuild create mode 100644 sci-chemistry/votca-csgapps/votca-csgapps-1.6.3.ebuild create mode 100644 sci-chemistry/votca-xtp/votca-xtp-1.6.3.ebuild delete mode 100644 sci-geosciences/mapnik-world-boundaries/Manifest delete mode 100644 sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild delete mode 100644 sci-geosciences/mapnik-world-boundaries/metadata.xml delete mode 100644 sci-libs/htslib/htslib-1.9.ebuild delete mode 100644 sci-libs/mkl-rt/Manifest delete mode 100644 sci-libs/mkl-rt/metadata.xml delete mode 100644 sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild create mode 100644 sci-libs/votca-tools/votca-tools-1.6.3.ebuild delete mode 100644 sys-cluster/nova/nova-21.1.0.ebuild delete mode 100644 sys-cluster/nova/nova-22.0.0.ebuild create mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.82-r1.ebuild create mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.13-r1.ebuild create mode 100644 www-client/firefox/files/distribution.ini diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 9fcd0fe810f0..0f3605334495 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1 +1,2 @@ DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75 +DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild new file mode 100644 index 000000000000..109aaeccad41 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-utils eutils flag-o-matic llvm python-any-r1 +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" + SRC_URI="" +else + SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU" + +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( sys-devel/clang:= ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + doxysearch? ( dev-libs/xapian:= ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + sqlite? ( dev-db/sqlite:3 ) + " + +DEPEND="sys-devel/flex + sys-devel/bison + doc? ( ${PYTHON_DEPS} ) + ${RDEPEND}" + +# src_test() defaults to make -C testing but there is no such directory (bug #504448) +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 + "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 + "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" + "${FILESDIR}/${PN}-1.8.17-llvm10.patch" #730170 +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # Ensure we link to -liconv + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + local pro + for pro in */*.pro.in */*/*.pro.in; do + echo "unix:LIBS += -liconv" >> "${pro}" || die + done + fi + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + ewarn + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + ewarn + elog + elog "Continuing with -O2 instead ..." + elog + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + local mycmakeargs=( + -Duse_libclang=$(usex clang) + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex qt5) + -Duse_sqlite3=$(usex sqlite) + -DGIT_EXECUTABLE="false" + ) + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + cmake-utils_src_make -C "${BUILD_DIR}" docs + fi +} + +src_install() { + cmake-utils_src_install +} diff --git a/app-doc/doxygen/doxygen-1.8.20.ebuild b/app-doc/doxygen/doxygen-1.8.20.ebuild new file mode 100644 index 000000000000..48223ff9d997 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.8.20.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-utils eutils flag-o-matic llvm python-any-r1 +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" + SRC_URI="" +else + SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU" + +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( sys-devel/clang:= ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + doxysearch? ( dev-libs/xapian:= ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + sqlite? ( dev-db/sqlite:3 ) + " + +DEPEND="sys-devel/flex + sys-devel/bison + doc? ( ${PYTHON_DEPS} ) + ${RDEPEND}" + +# src_test() defaults to make -C testing but there is no such directory (bug #504448) +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 + "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # Ensure we link to -liconv + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + local pro + for pro in */*.pro.in */*/*.pro.in; do + echo "unix:LIBS += -liconv" >> "${pro}" || die + done + fi + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + ewarn + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + ewarn + elog + elog "Continuing with -O2 instead ..." + elog + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + local mycmakeargs=( + -Duse_libclang=$(usex clang) + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex qt5) + -Duse_sqlite3=$(usex sqlite) + -DGIT_EXECUTABLE="false" + ) + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + cmake-utils_src_make -C "${BUILD_DIR}" docs + fi +} + +src_install() { + cmake-utils_src_install +} diff --git a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch new file mode 100644 index 000000000000..2b2ca0ef733f --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch @@ -0,0 +1,42 @@ +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index ae52cab..04b9293 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -14,7 +14,7 @@ doxyapp.cpp + ) + + if (use_libclang) +- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) ++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) + endif() + + target_link_libraries(doxyapp +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 2387f1b..c880c3d 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -14,7 +14,7 @@ doxyparse.cpp + ) + + if (use_libclang) +- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) ++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) + endif() + + target_link_libraries(doxyparse +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3f4767c..d6891a6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -310,9 +310,9 @@ if (use_libclang) + endif() + include_directories(${LLVM_INCLUDE_DIRS}) + add_definitions(${LLVM_DEFINITIONS}) +- llvm_map_components_to_libnames(llvm_libs support core option) ++ llvm_map_components_to_libnames(llvm_libs support) + target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) +- set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) ++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) + endif() + + target_link_libraries(doxygen diff --git a/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch b/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch deleted file mode 100644 index 77ed254ab98e..000000000000 --- a/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch +++ /dev/null @@ -1,12 +0,0 @@ -If SafeStack fails to build it should be disabled, not enabled. ---- a/configure -+++ b/configure -@@ -4956,7 +4956,7 @@ if test "$safe_stack" = "no"; then - fi - else # "$safe_stack" = "" - # Set safe_stack to yes or no based on pre-existing flags -- if compile_prog "-Werror" ""; then -+ if ! compile_prog "-Werror" ""; then - safe_stack="no" - else - safe_stack="yes" diff --git a/app-emulation/qemu/qemu-5.2.0.ebuild b/app-emulation/qemu/qemu-5.2.0.ebuild index ff3eaeef3e26..516092e2e4d2 100644 --- a/app-emulation/qemu/qemu-5.2.0.ebuild +++ b/app-emulation/qemu/qemu-5.2.0.ebuild @@ -6,8 +6,6 @@ EAPI="7" PYTHON_COMPAT=( python3_{6,7,8,9,10} ) PYTHON_REQ_USE="ncurses,readline" -PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN" - FIRMWARE_ABI_VERSION="4.0.0-r50" inherit eutils linux-info toolchain-funcs multilib python-r1 \ @@ -225,7 +223,6 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-5.2.0-safe-stack.patch ) QA_PREBUILT=" @@ -233,10 +230,13 @@ QA_PREBUILT=" usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc64 usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf usr/share/qemu/palcode-clipper usr/share/qemu/s390-ccw.img usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" + usr/share/qemu/u-boot.e500 +" QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-x86_64 @@ -259,7 +259,8 @@ QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-armeb usr/bin/qemu-sparc32plus usr/bin/qemu-s390x - usr/bin/qemu-unicore32" + usr/bin/qemu-unicore32 +" DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the kernel module loaded before running kvm. The easiest way to ensure that the @@ -349,29 +350,6 @@ check_targets() { popd >/dev/null } -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - src_prepare() { check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user @@ -385,9 +363,6 @@ src_prepare() { # Verbose builds MAKEOPTS+=" V=1" - # Run after we've applied all patches. - handle_locales - # Remove bundled copy of libfdt rm -r dtc || die } @@ -440,6 +415,7 @@ qemu_src_configure() { $(use_enable debug debug-info) $(use_enable debug debug-tcg) $(use_enable doc docs) + $(use_enable nls gettext) $(use_enable plugins) $(use_enable xattr attr) ) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 0ac176578994..516092e2e4d2 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -6,8 +6,6 @@ EAPI="7" PYTHON_COMPAT=( python3_{6,7,8,9,10} ) PYTHON_REQ_USE="ncurses,readline" -PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN" - FIRMWARE_ABI_VERSION="4.0.0-r50" inherit eutils linux-info toolchain-funcs multilib python-r1 \ @@ -232,10 +230,13 @@ QA_PREBUILT=" usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc64 usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf usr/share/qemu/palcode-clipper usr/share/qemu/s390-ccw.img usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" + usr/share/qemu/u-boot.e500 +" QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-x86_64 @@ -258,7 +259,8 @@ QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-armeb usr/bin/qemu-sparc32plus usr/bin/qemu-s390x - usr/bin/qemu-unicore32" + usr/bin/qemu-unicore32 +" DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the kernel module loaded before running kvm. The easiest way to ensure that the @@ -348,29 +350,6 @@ check_targets() { popd >/dev/null } -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - src_prepare() { check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user @@ -384,9 +363,6 @@ src_prepare() { # Verbose builds MAKEOPTS+=" V=1" - # Run after we've applied all patches. - handle_locales - # Remove bundled copy of libfdt rm -r dtc || die } @@ -439,6 +415,7 @@ qemu_src_configure() { $(use_enable debug debug-info) $(use_enable debug debug-tcg) $(use_enable doc docs) + $(use_enable nls gettext) $(use_enable plugins) $(use_enable xattr attr) ) diff --git a/app-shells/mksh/mksh-59.ebuild b/app-shells/mksh/mksh-59.ebuild index 861fbab4336b..06c1df3129fb 100644 --- a/app-shells/mksh/mksh-59.ebuild +++ b/app-shells/mksh/mksh-59.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then ECVS_AUTH="ext" else SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="MirBSD Korn Shell" diff --git a/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch b/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch new file mode 100644 index 000000000000..86d7a651bbb9 --- /dev/null +++ b/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch @@ -0,0 +1,28 @@ +Fix build with gtk-doc-1.32 + +This bug was reported here: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939956 + +The issue is that gtk-doc-1.32 no longer generates empty tree_index +files. The recommendation is that liblangtag be modified to no longer +reference what used to be an empty tree_index, but is now a missing +file. The same bug report contained the patch implemented here, which +removes the reference to a now-missing tree_index file. + +The fix should already be provided in newer versions of liblangtag. + +diff --git a/docs/liblangtag-docs.sgml b/docs/liblangtag-docs.sgml +index 1234567..1234567 100644 +--- a/docs/liblangtag-docs.sgml ++++ b/docs/liblangtag-docs.sgml +@@ -58,10 +58,6 @@ + + + +- +- Object Hierarchy +- +- + + API Index + diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild index cbc05a8ccc1e..fd3c9a30603f 100644 --- a/app-text/liblangtag/liblangtag-0.6.3.ebuild +++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild @@ -31,6 +31,10 @@ DEPEND="${RDEPEND} # Upstream expect liblangtag to be installed when one runs tests... RESTRICT="test" +PATCHES=( + "${FILESDIR}/${P}-fix-for-gtk-doc-1.32.patch" +) + src_prepare() { default xdg_environment_reset diff --git a/dev-db/plr/metadata.xml b/dev-db/plr/metadata.xml index 4eded12f3fc6..40e14afb5ee3 100644 --- a/dev-db/plr/metadata.xml +++ b/dev-db/plr/metadata.xml @@ -1,21 +1,13 @@ - - - -An extension for postgresql databases to allow direct usage of dev-lang/R -in SQL queries and database functions - + + pgsql-bugs@gentoo.org + + + An extension for postgresql databases to allow direct usage of + dev-lang/R in SQL queries and database functions + gentoo-staging diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild index 9e541ab8e982..08caf6f45dd9 100644 --- a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild +++ b/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}" SLOT="0" LICENSE="BSD rpi-eeprom" -KEYWORDS="~arm ~arm64" +KEYWORDS="~arm arm64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND="sys-apps/help2man" diff --git a/dev-libs/gjs/gjs-1.66.1.ebuild b/dev-libs/gjs/gjs-1.66.1.ebuild index fcc5377cbee2..857e675b110c 100644 --- a/dev-libs/gjs/gjs-1.66.1.ebuild +++ b/dev-libs/gjs/gjs-1.66.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" -IUSE="+cairo examples gtk readline +sysprof test" +IUSE="+cairo examples gtk readline sysprof test" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" RESTRICT="!test? ( test )" diff --git a/dev-libs/libb64/Manifest b/dev-libs/libb64/Manifest index 0e3869afeccc..de017bb98a03 100644 --- a/dev-libs/libb64/Manifest +++ b/dev-libs/libb64/Manifest @@ -1 +1,2 @@ DIST libb64-1.2.1.zip 23316 BLAKE2B 1e3aa08679e363d61b7a0a77bfe909c0fc80411bf2c7b0f35e7a8a692a25585a37303ea0f010600c0e07e0419f016fe60f88851eebb26d044e7dbaf3d02726a0 SHA512 8b1e5c8086a38be82471b5f37393f3f236c923f4a2bb737209a297cbab32a9f0a5c4af4ac912c695f0f7d8ff9458d97ce0d01092fbacbfe7181e4fd816e2153d +DIST libb64-2.0.0.1.tar.gz 15766 BLAKE2B 45e3cab768cae39758d146cd84b72a7644592e55553be9c11ed1e83c3acbf4ed05cd00bbd59371b9e71cd53012149f25c371769afba7fbdaafdf561a297247c8 SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23 diff --git a/dev-libs/libb64/libb64-2.0.0.1.ebuild b/dev-libs/libb64/libb64-2.0.0.1.ebuild new file mode 100644 index 000000000000..9adbb345b334 --- /dev/null +++ b/dev-libs/libb64/libb64-2.0.0.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Fast Base64 encoding/decoding routines" +HOMEPAGE="https://github.com/libb64/libb64/" +SRC_URI=" + https://github.com/libb64/libb64/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-PD" +# static library, so always rebuild +SLOT="0/${PVR}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-arch/unzip" + +src_compile() { + # override -O3, -Werror non-sense + emake -C src CFLAGS="${CFLAGS} -I../include" +} + +src_install() { + dolib.a src/libb64.a + insinto /usr/include + doins -r include/b64 + einstalldocs +} diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild index 34a6b8d50a9a..04ffe4e54cdf 100644 --- a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild +++ b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="doc static-libs" RDEPEND="" diff --git a/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild index 19d783fb2bc5..dcae1156e881 100644 --- a/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild +++ b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Perl bindings for sci-libs/htslib" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild index 79ea5781e4d9..2ac07f3f2d20 100644 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild +++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_EXTRA_ECONF="" DOCS=( README.md ) -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 multilib @@ -21,7 +21,7 @@ LICENSE="PHP-3.01" SLOT="0" IUSE="" -DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]" +DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]" RDEPEND="${DEPEND}" src_test() { diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest index d7f433f861cf..64550949ad54 100644 --- a/dev-php/swoole/Manifest +++ b/dev-php/swoole/Manifest @@ -4,3 +4,4 @@ DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b5 DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7 DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106 +DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild new file mode 100644 index 000000000000..721b5a84f00b --- /dev/null +++ b/dev-php/swoole/swoole-4.5.9.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="swoole" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_SAPIS="cli" +PHP_EXT_NEEDED_USE="cli,sockets?" +DOCS=( README.md ) + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +HOMEPAGE="https://www.swoole.co.uk" +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine" +LICENSE="Apache-2.0" +SLOT="0" +# Tests can hang. Disable until this no longer happens +RESTRICT="test" + +DEPEND=" + app-arch/brotli:0= + dev-libs/libpcre + sys-libs/zlib:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + mysql? ( + php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) + php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) + php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) + php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) + ) +" + +RDEPEND="${DEPEND}" + +IUSE="debug http2 libressl mysql sockets ssl" + +src_configure() { + # JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory + local PHP_EXT_ECONF_ARGS=( + --enable-swoole + $(use_enable debug) + $(use_enable http2) + $(use_enable mysql mysqlnd) + $(use_enable ssl openssl) + $(use_with ssl openssl-dir "${EROOT}/usr") + $(use_enable sockets) + ) + + php-ext-source-r3_src_configure +} + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + [[ -f tests/template.phpt ]] && rm tests/template.phpt + SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test + done +} diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest index 28f5f886a5a8..9b12b022e21b 100644 --- a/dev-php/xhprof/Manifest +++ b/dev-php/xhprof/Manifest @@ -1,2 +1,2 @@ -DIST xhprof-0.9.10.tar.gz 850440 BLAKE2B f277c4e798c63337d7319ece9e5405fe2aa87677b146bd0a3c73079cda70b005b8a97647a4bfee66e8263eb413b60d685f617d1f8faefe3aff01c5eb5cbcd364 SHA512 f078c7d025d4712858f55a6a212f888cdb67f862c912639db4bd50b9d601e824c7a0bf9e0f9d1b04673230c7a04d9e00fff42f729055677db021ee47e7128088 DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3 +DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf diff --git a/dev-php/xhprof/xhprof-0.9.10.ebuild b/dev-php/xhprof/xhprof-0.9.10.ebuild deleted file mode 100644 index 340be6e1183e..000000000000 --- a/dev-php/xhprof/xhprof-0.9.10.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_PV="dab44f76da5c8a0d4f1339f7d2ea2bc42408e8e9" -PHP_EXT_S="${WORKDIR}/${PN}-${MY_PV}/extension" -PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3" - -inherit php-ext-pecl-r3 - -SRC_URI="https://github.com/phacility/xhprof/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" - -HOMEPAGE="https://pecl.php.net/package/xhprof" -DESCRIPTION="A Hierarchical Profiler for PHP" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -S="${WORKDIR}" diff --git a/dev-php/xhprof/xhprof-2.2.3.ebuild b/dev-php/xhprof/xhprof-2.2.3.ebuild new file mode 100644 index 000000000000..1d609078c8c4 --- /dev/null +++ b/dev-php/xhprof/xhprof-2.2.3.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_S="${S}/extension" +PHP_EXT_ECONF_ARGS="" +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://pecl.php.net/package/xhprof" +DESCRIPTION="A Hierarchical Profiler for PHP" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest deleted file mode 100644 index 5e957f6f425a..000000000000 --- a/dev-python/cheetah/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Cheetah-2.4.4.tar.gz 190989 BLAKE2B 567aee718199021c3de725376da37b2f28081cf8741d1af201f7e6e88e026f460c10f3502463d58285a1340e308c718f709d437185f99f22c11f76c586ba4a60 SHA512 11b8cbf7d71789d6ae83596b133ddbe0bf1ccf2bca4c59562e7cd1d9bb75fa9d3208c0021d7d77edafdb03fd399cf1a26c003267fbffb94f27bf4457b0f9234c diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild deleted file mode 100644 index 04fa79011eee..000000000000 --- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -MY_PN="Cheetah" -MY_P="${MY_PN}-${PV/_}" - -DESCRIPTION="Python-powered template engine and code generator" -HOMEPAGE="https://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.org/project/Cheetah/" -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -IUSE="" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -SLOT="0" - -RDEPEND="dev-python/markdown[${PYTHON_USEDEP}] - !dev-python/cheetah3" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGES README.markdown TODO ) -# Race in the test suite -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - # Disable broken tests. - sed \ - -e "/Unicode/d" \ - -e "s/if not sys.platform.startswith('java'):/if False:/" \ - -e "/results =/a\\ sys.exit(not results.wasSuccessful())" \ - -i cheetah/Tests/Test.py || die "sed failed" - - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" cheetah/Tests/Test.py || die "Testing failed with ${EPYTHON}" -} diff --git a/dev-python/cheetah/metadata.xml b/dev-python/cheetah/metadata.xml deleted file mode 100644 index 56fe8e4848eb..000000000000 --- a/dev-python/cheetah/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - python@gentoo.org - Python - - Cheetah is a Python-powered template engine and code generator. It can be used -as a standalone utility or it can be combined with other tools. Web developers -are its principle user group, but it has many potential uses and is also being -used to generate C++ game code, Java, SQL, form emails, and even Python code. - - Cheetah - - gentoo-staging - diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest deleted file mode 100644 index 27aee1778560..000000000000 --- a/dev-python/couchdb-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST CouchDB-1.1.tar.gz 60839 BLAKE2B d3fe1195083f0e0e36dfc25ca25d08e5f447ad34b8908bacedb43d81979ce7bf926100297422439103f8ef3a8bd398e408c19ad676461ad5908d79b92b4d9661 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild deleted file mode 100644 index c8ca15c61ab0..000000000000 --- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -MY_PN="CouchDB" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python library for working with CouchDB" -HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.org/project/CouchDB/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -S=${WORKDIR}/${MY_P} - -# Tests require connectivity to a couchdb server. -# Re-enable when the ebuild is capable of starting a local couchdb -# instance. -RESTRICT=test - -python_compile_all() { - use doc && esetup.py build_sphinx -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/couchdb-python/metadata.xml b/dev-python/couchdb-python/metadata.xml deleted file mode 100644 index 804b33b368e3..000000000000 --- a/dev-python/couchdb-python/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - djc@gentoo.org - Dirkjan Ochtman - - - python@gentoo.org - Python - - - CouchDB - djc/couchdb-python - - gentoo-staging - diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild index 3a5c85d7aad1..84d3ba8ac1eb 100644 --- a/dev-python/cython/cython-0.29.21.ebuild +++ b/dev-python/cython/cython-0.29.21.ebuild @@ -31,6 +31,7 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/cython-0.29.14-sphinx-update.patch" + "${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch" ) SITEFILE=50cython-gentoo.el diff --git a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch new file mode 100644 index 000000000000..0aa7212b9a34 --- /dev/null +++ b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch @@ -0,0 +1,29 @@ +Needed to prevent a loop while calling cythonize on macOS - or any platform +defaulting to the 'spawn' method, as Python 3.8 does on Darwin. + +https://github.com/cython/cython/pull/3263 +From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001 +From: Marcel Bargull +Date: Fri, 6 Dec 2019 18:21:19 +0100 +Subject: [PATCH] Disable parallel cythonization for "spawn" start method. + +--- + Cython/Build/Dependencies.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py +index 593e00a6ef..f9b9c15bc5 100644 +--- a/Cython/Build/Dependencies.py ++++ b/Cython/Build/Dependencies.py +@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()): + + if N <= 1: + nthreads = 0 ++ if nthreads: ++ import multiprocessing ++ if multiprocessing.get_start_method() == 'spawn': ++ print('Disabling parallel cythonization for "spawn" process start method.') ++ nthreads = 0 + if nthreads: + import multiprocessing + pool = multiprocessing.Pool( diff --git a/dev-python/elasticsearch-curator/metadata.xml b/dev-python/elasticsearch-curator/metadata.xml index 686a71bce1e3..138dfe02f23f 100644 --- a/dev-python/elasticsearch-curator/metadata.xml +++ b/dev-python/elasticsearch-curator/metadata.xml @@ -1,14 +1,7 @@ - - hydrapolic@gmail.com - Tomáš Mózes - - - proxy-maint@gentoo.org - Proxy Maintainers - + elasticsearch/curator diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml index e16873cd7f1a..be73373d3b63 100644 --- a/dev-python/elasticsearch-py/metadata.xml +++ b/dev-python/elasticsearch-py/metadata.xml @@ -1,10 +1,6 @@ - - hydrapolic@gmail.com - Tomáš Mózes - erkiferenc@gmail.com Ferenc Erki diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest index 713ffb212264..ed01c31dacef 100644 --- a/dev-python/hypothesis/Manifest +++ b/dev-python/hypothesis/Manifest @@ -5,3 +5,4 @@ DIST hypothesis-python-5.41.4.tar.gz 9098296 BLAKE2B ef471172039251129d03faea722 DIST hypothesis-python-5.41.5.tar.gz 9098660 BLAKE2B 6caa742d34a3a2aeb6c6fdec3f8772e5221e1d0b2becc1362b657d383387f2a1152756222cfe86ffbb3e23a53e395050a16325d74ec9e03822a5c0020505b38e SHA512 b220a48e5746bacc6fa257f79feed0dc2c0a9f66862aba74806fb1ac3d06f380620410c9c46c377c50e4fa7c3171d5b31ce2759e7a3e0e2abd0920b237242dd6 DIST hypothesis-python-5.43.0.tar.gz 9103047 BLAKE2B c9c8262fb32dfdb48b52ad11cd18f907d488802f1af04d7677e260abf24598afd5f89bf3f1a42c919460d5ea48b1d6979da5215ef9877260c601b133076bbd05 SHA512 129760a9c58f264e25c403fcacf9e1ab41267faee637856230341a91d6965a6c2fd05b9a8a12b6977377f8abc26ed7151384ad08195b03ddf62e8445b216eacf DIST hypothesis-python-5.43.1.tar.gz 9103292 BLAKE2B aa718b98c7a0e16322cbde38f0768e5ccf6716e2cd08aa97b5ed4d36c7ed9565e5ccba76443d74d253adff557918400ec384ee39c630523a31356c80dce15622 SHA512 428a7f1cfb379ebb3d3bea01727ad1633d2e591bea00de15d7967856af8b1aaa9371d278e51be9a0a902adaeff63215a2e87205309f058e371f6ad331737a11f +DIST hypothesis-python-5.43.2.tar.gz 9103806 BLAKE2B 7ef4bfdcd12782a3445d5094ab5111b305743c1c11afd33f3f615e6fd863192cff37c9df7b42052a83d55ee16d570adfb08f1e1c610697f2c2a3295cf09528fa SHA512 c348568f00ce66c6cb53398a7f9b471ffa686cb9c4a4180ac00ba0edae76404c0a7e182f5df8a3c0738b9379f79bfb4b89fdb94bfe3529313a9a3c243a2658ae diff --git a/dev-python/hypothesis/hypothesis-5.43.2.ebuild b/dev-python/hypothesis/hypothesis-5.43.2.ebuild new file mode 100644 index 000000000000..eb74be2fa846 --- /dev/null +++ b/dev-python/hypothesis/hypothesis-5.43.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +PYTHON_REQ_USE="threads(+),sqlite" + +inherit distutils-r1 eutils multiprocessing optfeature + +DESCRIPTION="A library for property based testing" +HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/" +SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz" +S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +IUSE="cli test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}] + cli? ( + $(python_gen_cond_dep ' + dev-python/black[${PYTHON_USEDEP}] + dev-python/click[${PYTHON_USEDEP}] + ' python3_{6..9}) + ) +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + >=dev-python/pytest-5.3.5[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + !! - - - - python@gentoo.org - Python - - - - typing - - gentoo-staging - diff --git a/dev-python/typing/typing-3.7.4.3.ebuild b/dev-python/typing/typing-3.7.4.3.ebuild deleted file mode 100644 index 157b8f9a2c6d..000000000000 --- a/dev-python/typing/typing-3.7.4.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Type Hints for Python" -HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -src_prepare() { - distutils-r1_src_prepare - - # broken on PyPy, unclear if CPython behavior is not a bug - # https://github.com/python/typing/issues/671 - sed -i -e 's:test_new_no_args:_&:' python2/test_typing.py || die -} - -python_test() { - if python_is_python3; then - cd "${S}"/src || die - else - cd "${S}"/python2 || die - fi - - "${EPYTHON}" test_typing.py -v || die "tests failed under ${EPYTHON}" -} diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild new file mode 100644 index 000000000000..e6bbd621a3e8 --- /dev/null +++ b/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit check-reqs desktop unpacker wrapper xdg + +TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}" +DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG" +HOMEPAGE="https://www.humblebundle.com/store/dungeon-defenders-collection" +SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="bindist fetch splitdebug" + +BDEPEND=" + app-arch/unzip +" +RDEPEND=" + media-libs/libsdl2[abi_x86_32,opengl,video] + media-libs/openal[abi_x86_32] + virtual/opengl[abi_x86_32] + x11-misc/xdg-utils +" + +DIR="/opt/${PN}" +QA_PREBUILT="${DIR#/}/*" + +CHECKREQS_DISK_BUILD="5916M" +S="${WORKDIR}/data" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " ${HOMEPAGE}" + einfo "and move it to your distfiles directory." +} + +src_unpack() { + unpack_zip ${A} +} + +src_prepare() { + default + + # https://bugzilla.icculus.org/show_bug.cgi?id=5894 + sed -i 's/LobbyLevel_Valentines2013\.udk/LobbyLevel.udk/' UDKGame/Config/DefaultDunDef.ini || die + + # Remove bundled binaries. + rm -v UDKGame/Binaries/{*.so*,xdg-open} || die +} + +src_install() { + # Move the data rather than copying. The game consumes over 5GB so a + # needless copy should really be avoided! + dodir "${DIR}" + mv -v Engine/ UDKGame/ "${ED}${DIR}" || die + + # Use system xdg-open script, location is hardcoded. + dosym ../../../../usr/bin/xdg-open "${DIR}"/UDKGame/Binaries/xdg-open + + make_wrapper ${PN} ./DungeonDefenders-x86 "${DIR}"/UDKGame/Binaries + newicon -s 48 DunDefIcon.png ${PN}.png + make_desktop_entry ${PN} "Dungeon Defenders" + + dodoc README-linux.txt +} diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild deleted file mode 100644 index 3a46935fd0bb..000000000000 --- a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: unbundle SDL-2 when it gets released - -EAPI=5 -inherit check-reqs eutils gnome2-utils unpacker games - -TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}" -MY_PN="DungeonDefenders" -DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG" -HOMEPAGE="https://dungeondefenders.com/" -SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="bundled-libs" -RESTRICT="bindist fetch splitdebug" - -MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${MYGAMEDIR#/}/UDKGame/Binaries/${MY_PN}-x86 - ${MYGAMEDIR#/}/UDKGame/Binaries/libSDL2-2.0.so.0" -CHECKREQS_DISK_BUILD="5916M" - -# linked against pulseaudio -# without SDL-2 only linkage: opengl, openal -DEPEND="app-arch/unzip" -RDEPEND=" - x11-misc/xdg-utils - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] - >=media-sound/pulseaudio-5.0[abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXScrnSaver[abi_x86_32(-)] - x11-libs/libXcursor[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXi[abi_x86_32(-)] - x11-libs/libXinerama[abi_x86_32(-)] - x11-libs/libXrandr[abi_x86_32(-)] - x11-libs/libXxf86vm[abi_x86_32(-)] - !bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )" - -S=${WORKDIR}/data - -pkg_nofetch() { - einfo "Please buy & download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to your DISTDIR directory." - einfo -} - -src_unpack() { - unpack_zip ${A} -} - -src_prepare() { - # https://bugzilla.icculus.org/show_bug.cgi?id=5894 - sed -i \ - -e 's/LobbyLevel_Valentines2013.udk/LobbyLevel.udk/' \ - UDKGame/Config/DefaultDunDef.ini || die - - # Remove the binaries that we're unbundling and unnecessary stuff - rm -v UDKGame/Binaries/xdg-open || die - if ! use bundled-libs ; then - einfo "Removing bundled libs..." - rm -v UDKGame/Binaries/libopenal.so.1 || die - fi -} - -src_install() { - # Move the data rather than copying. The game consumes over 5GB so - # a needless copy should really be avoided! - dodir "${MYGAMEDIR}" - mv -v Engine UDKGame "${D}${MYGAMEDIR}" || die - - # use system xdg-open script, location is hardcoded - dosym /usr/bin/xdg-open "${MYGAMEDIR}"/UDKGame/Binaries/xdg-open - - newicon -s 48 DunDefIcon.png ${PN}.png - make_desktop_entry "${PN}" "Dungeon Defenders" - games_make_wrapper ${PN} "./${MY_PN}-x86" "${MYGAMEDIR}/UDKGame/Binaries" - - dodoc README-linux.txt - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml index 63b92f0b4be3..d322aa139b4a 100644 --- a/games-rpg/dungeon-defenders/metadata.xml +++ b/games-rpg/dungeon-defenders/metadata.xml @@ -5,10 +5,5 @@ games@gentoo.org Gentoo Games Project - - - Use the upstream provided bundled libraries. - - gentoo-staging diff --git a/games-rpg/twclone/Manifest b/games-rpg/twclone/Manifest deleted file mode 100644 index 6cbe2a3ac1cd..000000000000 --- a/games-rpg/twclone/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST twclone-source-0.14.tar.gz 163065 BLAKE2B 58d5fb13c5d6dc6bb5f73d2f4da8eace8aad7625a464b45099bd21d9cd8c3d29b25714f73e505d895b7fd8815c0dd3227a289009b7298ebaf83b0ada58deff73 SHA512 66a63e2cc5fe82fb5a5b1f887c9eb3bf8b89044f7f7d489b67e5bb15a21426a5a0eb27b53ab59c05c784fc6fb7ffaadcfc5453fc55943959db859a053adb7843 diff --git a/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch deleted file mode 100644 index d9d1a1c52516..000000000000 --- a/games-rpg/twclone/files/twclone-0.14-format.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/bigbang.c 2015-10-27 09:21:51.172611109 +0100 -+++ b/bigbang.c 2015-10-27 09:25:41.117233447 +0100 -@@ -530,13 +530,11 @@ - planetfile = fopen ("./planets.data", "w"); - for (loop = 1; loop <= 299 - strlen(terraInfo); loop++) - strcat(terraInfo, " "); -- strcat(terraInfo, "\n"); -- fprintf (planetfile, terraInfo); -+ fprintf (planetfile, "%s\n", terraInfo); - sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector); - for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++) - strcat(ferrinfo, " "); -- strcat(ferrinfo, "\n"); -- fprintf(planetfile, ferrinfo); -+ fprintf(planetfile, "%s\n", ferrinfo); - randomPlanetInfo = malloc (sizeof (strNameLength)); - if (numRandomPlanets > 0) - { -@@ -552,8 +550,7 @@ - , c, tempint, randomname (randomPlanetInfo), randomnum(1,5)); - for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++) - strcat(ferrinfo, " "); -- strcat(ferrinfo, "\n"); -- fprintf(planetfile, ferrinfo); -+ fprintf(planetfile, "%s\n", ferrinfo); - - c++; - } -@@ -616,10 +613,9 @@ - fileline = strcat (fileline, ":"); - if (sectorlist[x]->nebulae != NULL) - fileline = strcat (fileline, sectorlist[x]->nebulae); -- fileline = strcat (fileline, ":\n"); - /* Later put in whitespace buffer for saving */ - /* Not needed until user created beacons put in */ -- fprintf (file, fileline); -+ fprintf (file, "%s:\n", fileline); - } - fclose (file); - free (fileline); -@@ -646,8 +642,7 @@ - len = (int) strlen (fileline); - for (y = 0; y <= 99 - len; y++) - strcat (fileline, " "); -- strcat (fileline, "\n"); -- fprintf (file, fileline); -+ fprintf (file, "%s\n", fileline); - } - fclose (file); - ---- a/config.c 2015-10-27 09:30:00.091283678 +0100 -+++ b/config.c 2015-10-27 09:30:25.068806593 +0100 -@@ -140,9 +140,8 @@ - - for (loop=0; loop < 199 - strlen(buffer); loop++) - strcat(buffer, " "); -- strcat(buffer, "\n"); - -- fprintf(configfile, buffer); -+ fprintf(configfile, "%s\n", buffer); - - fclose(configfile); - free(buffer); ---- a/planet.c 2015-10-27 09:31:44.867282757 +0100 -+++ b/planet.c 2015-10-27 09:32:17.083667674 +0100 -@@ -59,8 +59,7 @@ - addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE); - for (loop=0; loop< 399 - strlen(stufftosave); loop++) - strcat(stufftosave, " "); -- strcat(stufftosave, "\n"); -- fprintf(planetfile, stufftosave); -+ fprintf(planetfile, "%s\n", stufftosave); - } - } - fclose(planetfile); diff --git a/games-rpg/twclone/metadata.xml b/games-rpg/twclone/metadata.xml deleted file mode 100644 index b815445a1b1a..000000000000 --- a/games-rpg/twclone/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -How many of you remeber the BBS days back in the late 80's and early 90's? -Back when you would call in play games and go on with your life? Well I'm -trying to duplicate one of those old games. It was called Trade Wars -2002(Created by Martech Software). So I decided to make a game similar to it -that runs in Linux. - - - twclone - - gentoo-staging - diff --git a/games-rpg/twclone/twclone-0.14-r1.ebuild b/games-rpg/twclone/twclone-0.14-r1.ebuild deleted file mode 100644 index f2145115c10a..000000000000 --- a/games-rpg/twclone/twclone-0.14-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-source-${PV}" -DESCRIPTION="Clone of BBS Door game Trade Wars 2002" -HOMEPAGE="https://sourceforge.net/projects/twclone/" -SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-format.patch -) - -src_install() { - DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \ - default - cd "${D}/usr/bin" - for f in * ; do - mv {,${PN}-}${f} - done -} diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest deleted file mode 100644 index 5ad6f6b25821..000000000000 --- a/gnome-base/libbonobo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716 diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild deleted file mode 100644 index 58672cf1a28d..000000000000 --- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 - -DESCRIPTION="GNOME CORBA framework" -HOMEPAGE="https://developer.gnome.org/libbonobo/stable/" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="debug examples test" - -RDEPEND=" - >=dev-libs/glib-2.14:2 - >=gnome-base/orbit-2.14.0 - >=dev-libs/libxml2-2.4.20:2 - >=sys-apps/dbus-1.0.0 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/popt-1.5 - !gnome-base/bonobo-activation -" -DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/gtk-doc-am - virtual/yacc - sys-devel/flex - x11-apps/xrdb - virtual/pkgconfig - >=dev-util/intltool-0.35 -" - -# Tests are broken in several ways as reported in bug #288689 and upstream -# doesn't take care since libbonobo is deprecated. -RESTRICT="test" - -src_prepare() { - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die - - if ! use test; then - # don't waste time building tests, bug #226223 - sed 's/tests//' -i Makefile.am Makefile.in || die - fi - - if ! use examples; then - sed 's/samples//' -i Makefile.am Makefile.in || die - fi - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure $(use_enable debug bonobo-activation-debug) -} - -src_test() { - # Pass tests with FEATURES userpriv, see bug #288689 - unset ORBIT_SOCKETDIR - emake check -} diff --git a/gnome-base/libbonobo/metadata.xml b/gnome-base/libbonobo/metadata.xml deleted file mode 100644 index d074988aeedd..000000000000 --- a/gnome-base/libbonobo/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - gentoo-staging - diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest deleted file mode 100644 index 31c7a41f69e4..000000000000 --- a/gnome-base/libgnome-keyring/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd diff --git a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch deleted file mode 100644 index dd420c86732e..000000000000 --- a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 8 Jan 2019 12:19:36 +0100 -Subject: [PATCH] Fix vapi build with vala 0.42 - ---- - library/GnomeKeyring-1.0.metadata | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata -index 04662fb..d8451b9 100644 ---- a/library/GnomeKeyring-1.0.metadata -+++ b/library/GnomeKeyring-1.0.metadata -@@ -54,7 +54,7 @@ set_info skip=false - set_network_password skip=false - store_password skip=false - store_password_sync skip=false --unlock skip=false -+@unlock skip=false - - find_items*.callback type_arguments="GnomeKeyring.Found" - find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData" --- -2.18.1 - diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild deleted file mode 100644 index 7a5b74562aac..000000000000 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala multilib-minimal - -DESCRIPTION="Compatibility library for accessing secrets" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" - -LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 -SLOT="0" -IUSE="debug +introspection vala" -REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" - -# tests need python2 -RESTRICT="test" - -RDEPEND=" - >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] - >=sys-apps/dbus-1[${MULTILIB_USEDEP}] - >=gnome-base/gnome-keyring-3.1.92 - introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch - use vala && vala_src_prepare - gnome2_src_prepare - - # FIXME: Remove silly CFLAGS, report upstream - sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \ - -e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \ - -i configure.ac configure || die "sed failed" -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(usex debug --enable-debug=yes ' ') \ - $(multilib_native_use_enable vala) - - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/gnome-keyring/html docs/reference/gnome-keyring/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml deleted file mode 100644 index d074988aeedd..000000000000 --- a/gnome-base/libgnome-keyring/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - gentoo-staging - diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest deleted file mode 100644 index a3db461c9920..000000000000 --- a/gnome-base/orbit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch deleted file mode 100644 index b58fd00a10b8..000000000000 --- a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch +++ /dev/null @@ -1,99 +0,0 @@ -From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001 -From: Michael Haubenwallner -Date: Thu, 26 Jun 2014 12:45:18 +0200 -Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX - ---- - include/orbit/orb-core/allocators.h | 2 +- - src/idl-compiler/orbit-idl-utils.c | 14 +++++++------- - src/idl-compiler/orbit-idl2.h | 4 ++-- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h -index 0401a15..1861ca1 100644 ---- a/include/orbit/orb-core/allocators.h -+++ b/include/orbit/orb-core/allocators.h -@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer old, - Below, some magic values of the fnc ptr are defined. - **/ - typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem, -- gpointer func_data); -+ gpointer gfunc_data); - - #define ORBIT_MEMHOW_HOW(how) ((how) & 0x3) - #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2) -diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c -index 3bb0467..04fe4a2 100644 ---- a/src/idl-compiler/orbit-idl-utils.c -+++ b/src/idl-compiler/orbit-idl-utils.c -@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level) - - static void - IDL_tree_traverse_helper(IDL_tree p, GFunc f, -- gconstpointer func_data, -+ gconstpointer gfunc_data, - GHashTable *visited_nodes, - gboolean include_self) - { -@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f, - for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem; - curitem = IDL_LIST (curitem).next) { - IDL_tree_traverse_helper (IDL_get_parent_node -- (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE); -+ (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE); - } - - if (include_self) -- f(p, (gpointer)func_data); -+ f(p, (gpointer)gfunc_data); - } - - void - IDL_tree_traverse_parents_full (IDL_tree p, - GFunc f, -- gconstpointer func_data, -+ gconstpointer gfunc_data, - gboolean include_self) - { - GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal); -@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree p, - if (!p) - return; - -- IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self); -+ IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self); - - g_hash_table_destroy (visited_nodes); - } -@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree p, - void - IDL_tree_traverse_parents (IDL_tree p, - GFunc f, -- gconstpointer func_data) -+ gconstpointer gfunc_data) - { -- IDL_tree_traverse_parents_full (p, f, func_data, TRUE); -+ IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE); - } - - /* For use by below function */ -diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h -index b58f57f..670e072 100644 ---- a/src/idl-compiler/orbit-idl2.h -+++ b/src/idl-compiler/orbit-idl2.h -@@ -16,10 +16,10 @@ void orbit_idl_print_node (IDL_tree node, - int indent_level); - void IDL_tree_traverse_parents (IDL_tree p, - GFunc f, -- gconstpointer func_data); -+ gconstpointer gfunc_data); - void IDL_tree_traverse_parents_full (IDL_tree p, - GFunc f, -- gconstpointer func_data, -+ gconstpointer gfunc_data, - gboolean include_self); - gboolean orbit_cbe_type_contains_complex (IDL_tree ts); - void orbit_idl_check_oneway_op (IDL_tree op); --- -1.8.3.2 - diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch deleted file mode 100644 index fcfeefba08cb..000000000000 --- a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch +++ /dev/null @@ -1,22 +0,0 @@ - test/everything/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am -index 32beb36..1eef7ac 100644 ---- a/test/everything/Makefile.am -+++ b/test/everything/Makefile.am -@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src) - - IDL_FLAGS= --showcpperrors --add-imodule - IDL_FILES= everything.idl --include $(top_srcdir)/Makefile.shared -+include ../../Makefile.shared - - BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c - CLEANFILES = ${BUILT_SOURCES} iorfile - --TESTS = $(srcdir)/test.sh -+TESTS = test.sh - - EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) - diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch deleted file mode 100644 index 394919f98568..000000000000 --- a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 3 Mar 2013 13:29:24 -0500 -Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC - -Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161 ---- - configure.in | 9 +++++++++ - src/services/name/Makefile.am | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/configure.in b/configure.in -index 0879051..38b7b8b 100644 ---- a/configure.in -+++ b/configure.in -@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then - AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) - fi - -+AC_ARG_ENABLE([libname-server-pic], -+ [AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])]) -+if test x$enable_libname_server_pic = xyes; then -+ LIBNAME_SERVER_PIC=$lt_prog_compiler_pic -+else -+ LIBNAME_SERVER_PIC= -+fi -+AC_SUBST(LIBNAME_SERVER_PIC) -+ - AC_MSG_CHECKING(which idl compiler to use) - IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" - AC_ARG_WITH(idl-compiler, -diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am -index 7212557..21b7365 100644 ---- a/src/services/name/Makefile.am -+++ b/src/services/name/Makefile.am -@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS) - libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \ - name-support.c name-support.h - libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h -+libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC) - - orbit_name_server_2_SOURCES = boot.c - orbit_name_server_2_LDFLAGS = $(FLAGS) --- -1.8.1.5 - diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch deleted file mode 100644 index 2344935f46d2..000000000000 --- a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 12 Feb 2013 00:27:41 -0500 -Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some - ipv6-enabled machines - -Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one, -by setting hints.ai_family before calling getaddrinfo(). - -https://bugzilla.gnome.org/show_bug.cgi?id=693636 ---- - linc2/src/linc-protocols.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c -index e6895f4..22a77aa 100644 ---- a/linc2/src/linc-protocols.c -+++ b/linc2/src/linc-protocols.c -@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, - memset(&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_CANONNAME; -+ hints.ai_family = proto->family; - - if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) { - if (!warned++) --- -1.8.1.2 - diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch deleted file mode 100644 index 113b90465bae..000000000000 --- a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001 -From: Michael Haubenwallner -Date: Thu, 26 Jun 2014 12:37:59 +0200 -Subject: [PATCH 2/2] bug#732274: fix parallel build failure - ---- - src/services/name/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am -index deda1ed..8cf868e 100644 ---- a/src/services/name/Makefile.am -+++ b/src/services/name/Makefile.am -@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h - - orbit_name_server_2_SOURCES = boot.c - orbit_name_server_2_LDFLAGS = $(FLAGS) --orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h -+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a - orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS) - - $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h --- -1.8.3.2 - diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml deleted file mode 100644 index ae40a42e5ca4..000000000000 --- a/gnome-base/orbit/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - Force libname-server-2 to be built as PIC; needed on - hardened systems - - gentoo-staging - diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild deleted file mode 100644 index 989d5d6b26e2..000000000000 --- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="ORBit2" -GNOME_TARBALL_SUFFIX="bz2" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 toolchain-funcs autotools multilib-minimal - -DESCRIPTION="ORBit2 is a high-performance CORBA ORB" -HOMEPAGE="https://projects.gnome.org/ORBit2/" - -LICENSE="GPL-2 LGPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="pic static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( debug )" - -RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}] - >=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig -" - -DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h ) - -MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config ) - -src_prepare() { - # Fix wrong process kill, bug #268142 - sed "s:killall lt-timeout-server:killall timeout-server:" \ - -i test/timeout.sh || die "sed 1 failed" - - # Do not mess with CFLAGS - sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed" - - if ! use test; then - sed -i -e 's/test //' Makefile.am || die - fi - - # Drop failing test, bug #331709 - sed -i -e 's/test-mem //' test/Makefile.am || die - - # Fix link_protocol_is_local() for ipv4 on machines with ipv6 - # https://bugzilla.gnome.org/show_bug.cgi?id=693636 - epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch" - - # Build libname-server-2.a with -fPIC on hardened, bug #312161 - epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch" - - epatch "${FILESDIR}"/${P}-automake-1.13.patch - epatch "${FILESDIR}"/${P}-parallel-build.patch #273031 - epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094 - - eautoreconf - gnome2_src_prepare - - # we have to copy sources, there is something that causes tests - # to segfault when libs are out-of-source built. - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=() - - # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain - # files to be not found by autotools when compiling ORBit. See bug #58540 - # for more information. Please don't remove -- 8/18/06 - unset IDL_DIR - - # We need to use the hosts IDL compiler if cross-compiling, bug #262741 - if tc-is-cross-compiler; then - # check that host version is present and executable - [[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first" - myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2") - fi - gnome2_src_configure \ - $(use_enable pic libname-server-pic) \ - $(use_enable static-libs static) \ - "${myconf[@]}" -} - -multilib_src_compile() { - # Parallel compilation fails, bug #635094 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_test() { - # can fail in parallel, see bug #235994 - emake -j1 check -} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index dc473fa2c625..acc41980b625 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -43,6 +43,7 @@ REQUIRED_USE=" d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) + osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) @@ -316,6 +317,10 @@ pkg_pretend() { if ! use llvm; then use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi } python_check_deps() { @@ -346,6 +351,8 @@ multilib_src_configure() { local emesonargs=() if use classic; then + dri_driver_enable !gallium swrast + # Intel code dri_driver_enable video_cards_i915 i915 dri_driver_enable video_cards_i965 i965 @@ -437,6 +444,7 @@ multilib_src_configure() { gallium_enable -- kmsro fi + gallium_enable -- swrast gallium_enable video_cards_lima lima gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -481,14 +489,6 @@ multilib_src_configure() { vulkan_enable video_cards_v3d broadcom fi - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - driver_list() { local drivers="$(sort -u <<< "${1// /$'\n'}")" echo "${drivers//$'\n'/,}" @@ -503,6 +503,7 @@ multilib_src_configure() { $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) + $(meson_use osmesa) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false) diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild index dedbb39c6c92..4e3aec4c4fc6 100644 --- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild +++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}/firmware-${PV}" LICENSE="BSD GPL-2 raspberrypi-videocore-bin" SLOT="0" -KEYWORDS="-* ~arm ~arm64" +KEYWORDS="-* ~arm arm64" IUSE="+hardfp examples" RDEPEND="!media-libs/raspberrypi-userland" diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild index 788e267aecc7..7f27f6655647 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild @@ -17,7 +17,7 @@ else # * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00" SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="arm ~arm64" + KEYWORDS="arm arm64" S="${WORKDIR}/userland-${GIT_COMMIT}" fi diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest index 92815c0b41ec..14ea36b8bac4 100644 --- a/media-plugins/kodi-pvr-nextpvr/Manifest +++ b/media-plugins/kodi-pvr-nextpvr/Manifest @@ -1,6 +1 @@ -DIST kodi-pvr-nextpvr-7.0.0.tar.gz 145031 BLAKE2B 01d8583d74111dfcb59a139987dc30cc900a41742ea28d4a0fcec11864cb6fc505dd200cf7b61c9dc3d7338ac500d014cc6a312ed8b26be6387604a7969aa9d1 SHA512 b7ede2d9f2a384816c48c19078583aa996f8d08671842444abc93a02e7d3cea9669deb67c26429aa68d3875b6644c29f467bc925768a336916b6b6a7d0894cc9 -DIST kodi-pvr-nextpvr-7.0.2.tar.gz 146987 BLAKE2B 751e08334f29f447b6abd665c782cee9ddc7a1b40a6600296a68d131827feecac3c71622aa1fc61c30d6aafa799b82f7197528c2fdd764a8a66f263493bca2a7 SHA512 8e3d0f127379263b55e565a5eafc062a265a354e23f3c184093e4f6a3ffbccddddf0acddb89321165f7c7242c6c55d22b2a033e4d52bb5cd9e48baef91d15a08 -DIST kodi-pvr-nextpvr-7.1.0.tar.gz 145632 BLAKE2B 048e006df0817390037d79c3c1f4286c8309630c21931842f52b152c389e356fb7297799fcb1eba04a11029ae55e2c88d637acfa933279f9b3b7488fc823256c SHA512 1d4fa70b1ad4988b9b7b6cf04b992c5bf5f6c7ea469dcb4c745e90b6b09d2de52ec1ec785c30dcb7cdf1703aef9fbedc2ad2b43d1bcc7c7480daef4b1fc50e26 -DIST kodi-pvr-nextpvr-7.1.1.tar.gz 147599 BLAKE2B 0091182e313d9ca052f08cf9615dfaca51e1354d54f58685e23a767cc8ada532c531ff67f198f74f84d5252b61f2bc1a2c06d8ffe92ff771730a2a54c7841c3d SHA512 7a387c9d42e3044c99125292da7d399bfd138d5126904daa5acb3612b46e54adb1ba890d8a90dc20af8cf9b9dbc152531fdbaa8f38d4f7faf208176379542752 -DIST kodi-pvr-nextpvr-8.0.0.tar.gz 147610 BLAKE2B 22928f16d9b9b2af7d5226137a0768e321ed2490b9f06046a232a9b906b98690b5f96aac32e5843e0163ac8836250fdbef535b06ee93792f6752719ece7d54ec SHA512 66f92a6b9239729017cc87dc75842e545b5bed711298231366238d0c56e4154944819a4607bd1e1bfc49721a41ca0644721304c9fb037a6cab034ae51dde3349 -DIST kodi-pvr-nextpvr-8.0.1.tar.gz 147804 BLAKE2B ae1489eb5b8c72a635dd59c94f9aa45626cd49fad1bc897fde0c8868009bc9f3b5d43eafef2ce378060a1061848b7d798ce015f4d156a11b10cb89e109ab5d85 SHA512 91d0a6d8f3c21d55e11e116b4bca4832f17e06a2ab7b45963739109575a33e037cf73258aae3ec26ab1b3746c0c5777800ef3d266c170859ea393423ad031a35 +DIST kodi-pvr-nextpvr-8.0.2.tar.gz 148511 BLAKE2B 058464e3144216dd0b36bdaf7f124933b5fed3e5cd4672b79b6226cf727bc9ec7434e63855484069d364e34e97da0c1a62cd234b3b15411dcac7fff43cc83617 SHA512 951cce79233a0606fb12669f52ba7fe24381cfc9d56213dcfed5a928ab41ec974d919713a530ef5d465a31f5d7da175594c28790a55cfc9e144473903d79c49b diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild deleted file mode 100644 index 75598935558f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - =dev-libs/libplatform-2* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild deleted file mode 100644 index 75598935558f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - =dev-libs/libplatform-2* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild deleted file mode 100644 index 46d49f2ab86f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild deleted file mode 100644 index 46d49f2ab86f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild deleted file mode 100644 index 46d49f2ab86f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild deleted file mode 100644 index 46d49f2ab86f..000000000000 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's NextPVR client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - dev-libs/tinyxml2 - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild new file mode 100644 index 000000000000..46d49f2ab86f --- /dev/null +++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake kodi-addon + +DESCRIPTION="Kodi's NextPVR client addon" +HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr" +SRC_URI="" + +case ${PV} in +9999) + SRC_URI="" + EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git" + inherit git-r3 + ;; +*) + CODENAME="Matrix" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}" + ;; +esac + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=" + =media-tv/kodi-19* + dev-libs/tinyxml2 + " + +RDEPEND=" + ${DEPEND} + " diff --git a/net-misc/curl/curl-7.74.0.ebuild b/net-misc/curl/curl-7.74.0.ebuild index 0431772f4a6e..d89d5d9531c4 100644 --- a/net-misc/curl/curl-7.74.0.ebuild +++ b/net-misc/curl/curl-7.74.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index d0e81d1e3ce6..4c981b67d3f9 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,16 +1,8 @@ -DIST haproxy-1.8.26.tar.gz 2205531 BLAKE2B 87aaeb3df6668752ec9242bda86b9b28339ad6926ee3ad16c606239693daa0d957271a76e270bf7d2d64102024121d4e9c1458da0f2e1d9bb8188856c0f68949 SHA512 a88f1fab0c234140e949ca12a87a09d7be1e0888bf2022a19c971727af08e579e3e6318d87411772915df6d73880710e6afdab842b622b6c0fa02020fa5c9425 DIST haproxy-1.8.27.tar.gz 2209243 BLAKE2B 31d83f41fd5e8f77ec28a7c168661c7e8a24b51890cbc8336fd45668b031fca87a3533c9f78ee18302394e54e58b89786300a32506dadf0d7275c84e62b0f395 SHA512 d8b36787ea75cb3a8332b1b95fc154d6e83a52ffd91548d1d0bacab62a069d3c05e859e2e40ddb65c1a37d0a30cc6a29a07c8260ce69413a3e80c83b4143dd8a DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993 -DIST haproxy-2.0.17.tar.gz 2676783 BLAKE2B ee17afdf3b34bc28fe810746709ef5cb07cbcc3d7508ab13349f67b59584dfd53d6f2f926615b87095b6f130560a529c480957d62e2943bc0936e1b905896fa9 SHA512 edcd061534ef9a6d7eab9692dccbb22fb7a3bf145cbf555646763c0fd72f7f13d41482744072286327a48951397a11822f1708b26be24b7bc5a327f516ca8816 -DIST haproxy-2.0.18.tar.gz 2679168 BLAKE2B dbc591223f640524bc898b5c2261c4092ddee0b245fcf96ea0ccccab45fdbdadb2880b870ced6141b6325ad5bb7765951d15b0325d3343bea7e90a138db0c68b SHA512 67245c375541b6004667831aaecb38e59429363f45f24fd0c4c36a28fa59dc24d66fe54b093e6b52d6029b6de8b3c86cda19e15f5f438119669bca9d70d4c0a3 DIST haproxy-2.0.19.tar.gz 2682426 BLAKE2B 6e14842bfcc23167414e2f4e222708bc2d08947b0c420b758b5eaf35a5145c1d013b376a2e84df77802277fe8cc2fd5a14ed9cab3232a74590ec76813fa06952 SHA512 6484c14e7296f4600a1b7a2123809097cac563767dc79c1cbcd29d5fc0e580926b4701d3d095fe146c1de334e5ec50502d2f97fcdd0b711889711e806720fa2f DIST haproxy-2.1.10.tar.gz 2721955 BLAKE2B b7fb27aac039cc52a35afc2710c83200727fb8fad570980ed92e68ec4e0be002d4c0e792ce2636b6470a81cd5b6c1e80be9ea53490034d67a173522801cd7315 SHA512 923db1b5374e5026304f593d939e905c72a9850dd7199f655ec250ce9e81bf8b712895d7eafaf5f248885d138b31d3dda679fb92bd8a9536ed681f2a09acded6 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 -DIST haproxy-2.1.8.tar.gz 2715203 BLAKE2B fdf0896c8ee7a10268f422058f5a75c2b245da1bffed765dc618f24d18c95704724022f229b82e8df0cf2220dd3b9aa295825a7a6087009123841bead071974f SHA512 6aaf1822e88189344dadc0ab64ccba3268a913a8676a375039cbe5447d5f54957668b23f1314bf68f97c195400f5817a08dd898318368075f73c1a2cca366a78 -DIST haproxy-2.1.9.tar.gz 2720185 BLAKE2B bdc93093f0bd7b7652376dfb65f5ea373c6420e53c0180ee07c644fe26bcf3c4fb2724624ce5f68504ca89b9c82f52de47a7da42e88e7ee3dc72b9780fab9d69 SHA512 acd0a4f49f67ceba4474223fab098b3f65897f9863bc91bc84af3f78945ad925cf12b2a261ccc4839f0b059557537899879a3929f05c6bb42b025bdb444f345a -DIST haproxy-2.2.0.tar.gz 2866916 BLAKE2B 176234efefee72beb1b46e7e8bb2455edc4135323b834a73870e30ca7a439b24cbb62568cb2aacd9d6b4d5c2234ebe7524de119a3ac2ec1c1f701de03a174933 SHA512 25cff09acba29ba36f045d45f894d26a13eea3e71c3e1f868446e739eed1fcfee8fc4af8da2914eef7ecbfe266a498f931cc6ec6c3e73b8874c140618269f480 -DIST haproxy-2.2.3.tar.gz 2872195 BLAKE2B 266375aeca17ea0053956d3fd8a4077da70e308501042b67433722f0ed2efbc85438d8cd7a6d7c7a3184349ff6cf6ed5ae90d05a150b6fda1077400f0769d75a SHA512 db99a5069537b6a3f161ad0a32ed884e81e27ed471d7c5f74b0655580c3eb1248376c5b252a9b998bead4fc5c05f28fda9e2280b8b05447bc5bc2d3c8fb55825 -DIST haproxy-2.2.4.tar.gz 2874180 BLAKE2B c53da911f09a5b35ae97709691754aceed09b01dffa27ee69368d26f552c1b87d149477ad8ab0410564e5ef1d520c91e069b36a9f3a5588a8cf9feb3139f9181 SHA512 762b51fdb9609654155ea2feebeb640bdd817481f633f012d767e1481bf888b90790455f0305ea9bbd0aec8363561d183bd510029f1bcce95102328ffbaf8afd DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca DIST haproxy-2.2.6.tar.gz 2890554 BLAKE2B c1a8f2611f373a80d3a246e5daac9ce7f69cbb7c7104057e9afbcb83b373ed97a5ae8d35d0152f4739b112693b312cd3535ef9b3c6c22b3e92f5ec6fbd5321ae SHA512 b9afa4a4112dccaf192fce07b1cdbb1547060d998801595147a41674042741b62852f65a65aa9b2d033db8808697fd3a522494097710a19071fbb0c604544de5 DIST haproxy-2.3.2.tar.gz 2903983 BLAKE2B f4acc499e9210f1f520d1cc0913511986c1ecc74d5b9cc492e398cbeb29824d28c6983646d21a6c1eaf1f04010815778e582d1de464d39cd2660c63d5aa2b043 SHA512 ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e714f976052122788c917593d5e665d3a60d687a3ff63579331fdc5816414a8b75c7c8573e0b286ed5 diff --git a/net-proxy/haproxy/haproxy-1.8.26.ebuild b/net-proxy/haproxy/haproxy-1.8.26.ebuild deleted file mode 100644 index 38dbb9fa7899..000000000000 --- a/net-proxy/haproxy/haproxy-1.8.26.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit 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} " - - 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=linux2628 - USE_GETADDRINFO=1 - USE_TFO=1 - ) - - # 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 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS}" 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 examples/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins examples/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-proxy/haproxy/haproxy-1.8.27-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild new file mode 100644 index 000000000000..8e761181c1c2 --- /dev/null +++ b/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2020 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="https://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 ~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 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} " + + 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=linux2628 + USE_GETADDRINFO=1 + USE_TFO=1 + ) + + # 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 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} + emake -C contrib/systemd SBINDIR=/usr/sbin + + if use tools ; then + for contrib in ${CONTRIBS[@]} ; do + emake -C contrib/${contrib} \ + CFLAGS="${CFLAGS}" 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 examples/seamless_reload.txt + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins examples/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-proxy/haproxy/haproxy-1.8.27.ebuild b/net-proxy/haproxy/haproxy-1.8.27.ebuild deleted file mode 100644 index 38dbb9fa7899..000000000000 --- a/net-proxy/haproxy/haproxy-1.8.27.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit 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} " - - 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=linux2628 - USE_GETADDRINFO=1 - USE_TFO=1 - ) - - # 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 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS}" 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 examples/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins examples/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-proxy/haproxy/haproxy-2.0.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild deleted file mode 100644 index d2bc8cefa323..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.0.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild new file mode 100644 index 000000000000..8315ce195ca3 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2020 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="https://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 ~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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.0.14.ebuild b/net-proxy/haproxy/haproxy-2.0.14.ebuild deleted file mode 100644 index f0fc2f618fe2..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.14.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit user 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="https://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 ~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" -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}" - -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} " - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - 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}" ${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-proxy/haproxy/haproxy-2.0.17.ebuild b/net-proxy/haproxy/haproxy-2.0.17.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.17.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.0.18.ebuild b/net-proxy/haproxy/haproxy-2.0.18.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.18.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.0.19-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild new file mode 100644 index 000000000000..3e58a8395c2a --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2020 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="https://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 ~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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.0.19.ebuild b/net-proxy/haproxy/haproxy-2.0.19.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.19.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild index c8b2a35cb104..f4e348135849 100644 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +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 ) diff --git a/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild new file mode 100644 index 000000000000..3e58a8395c2a --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2020 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="https://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 ~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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.1.10.ebuild b/net-proxy/haproxy/haproxy-2.1.10.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.1.10.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.1.4-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild deleted file mode 100644 index d2bc8cefa323..000000000000 --- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.1.4-r2.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild new file mode 100644 index 000000000000..8315ce195ca3 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2020 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="https://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 ~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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.1.4.ebuild b/net-proxy/haproxy/haproxy-2.1.4.ebuild deleted file mode 100644 index f0fc2f618fe2..000000000000 --- a/net-proxy/haproxy/haproxy-2.1.4.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit user 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="https://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 ~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" -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}" - -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} " - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - 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}" ${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-proxy/haproxy/haproxy-2.1.8.ebuild b/net-proxy/haproxy/haproxy-2.1.8.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.1.8.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.1.9.ebuild b/net-proxy/haproxy/haproxy-2.1.9.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.1.9.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.1.9999.ebuild index 98b834168056..3e58a8395c2a 100644 --- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +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 ) diff --git a/net-proxy/haproxy/haproxy-2.2.0.ebuild b/net-proxy/haproxy/haproxy-2.2.0.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.0.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.2.3.ebuild b/net-proxy/haproxy/haproxy-2.2.3.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.3.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.2.4.ebuild b/net-proxy/haproxy/haproxy-2.2.4.ebuild deleted file mode 100644 index 98b834168056..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.4.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.2.5-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild new file mode 100644 index 000000000000..89be20bd2485 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2020 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="https://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 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}" + +PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) +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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.2.5.ebuild b/net-proxy/haproxy/haproxy-2.2.5.ebuild deleted file mode 100644 index 802caf5f9413..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.5.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2020 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="https://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 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" -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}" - -PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.2.6-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild new file mode 100644 index 000000000000..e4208e8619bc --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2020 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="https://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 ~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}" + +PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) +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} " + + 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) ) + + # For now, until the strict-aliasing breakage will be fixed + append-cflags -fno-strict-aliasing + + # 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-proxy/haproxy/haproxy-2.2.6.ebuild b/net-proxy/haproxy/haproxy-2.2.6.ebuild deleted file mode 100644 index 3ea3fd524dc0..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.6.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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}" - -PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) -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} " - - 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) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # 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-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild index 98b834168056..3e58a8395c2a 100644 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +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 ) diff --git a/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild new file mode 100644 index 000000000000..0e35d77e2704 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2020 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="https://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 ~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}" + +PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) +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} " + + 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-proxy/haproxy/haproxy-2.3.2.ebuild b/net-proxy/haproxy/haproxy-2.3.2.ebuild deleted file mode 100644 index 21bcf5f49666..000000000000 --- a/net-proxy/haproxy/haproxy-2.3.2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2020 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="https://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 ~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" -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}" - -PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) -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} " - - 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-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild index 98b834168056..3e58a8395c2a 100644 --- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +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 ) diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo index 78bd1093c510..a6a220f603b2 100644 --- a/profiles/package.mask/00-gentoo +++ b/profiles/package.mask/00-gentoo @@ -32,6 +32,19 @@ #--- END OF EXAMPLES --- +# Michał Górny (2020-12-10) +# Synergy 2.0 was a beta branch, and it should have never been marked +# stable. It never reached feature parity with 1.x, and upstream +# eventually abandoned it. The users are asked to 'downgrade' to 1.x +# that is actively maintained. The buggy 2.0.0 version will be removed +# in 30 days. +>=x11-misc/synergy-2 + +# Sergei Trofimovich (2020-12-10) +# Masked for testing. Builtd failures around locales +# and safe-stack detection +>=app-emulation/qemu-5.2.0 + # Michał Górny (2020-12-10) # Stuck on LLVM 9. Superseded by dev-util/cvise that features better # parallelization and more acive development. @@ -414,17 +427,6 @@ media-plugins/kodi-game-libretro-bnes (2020-11-09) -# Python 2 backport. Last revdep masked. -# Removal in 30 days. Bug #753725. -dev-python/typing - -# Michał Górny (2020-11-09) -# Dead Python 2 package. Replaced by dev-python/cheetah3. The last -# mongodb versions needing it are masked now. -# Removal in 30 days. Bug #753722. -dev-python/cheetah - # Alexys Jacob (2020-11-09) # Mask dev-db/mongodb versions which do not support python3 so we # can move forward in cleaning python2 from tree. Bug #708954. @@ -432,17 +434,6 @@ dev-python/cheetah # supported by upstream. See: https://jira.mongodb.org/browse/SERVER-52687 (2020-11-09) -# sci-libs/mkl-rt is now subsumed by the updated sci-libs/mkl package -# which also provides development header files and pkgconfig files -# Removal in 30 days. Bug #747310. -sci-libs/mkl-rt - -# Dirkjan Ochtman (2020-11-05) -# Incorrect DISTUTILS_USE_SETUPTOOLS value, dead upstream. -# Removal in 30 days. Bug #748063 -dev-python/couchdb-python - # Alfredo Tupone (2020-11-05) # will be upgraded after new lua release www-apps/liquid_feedback_frontend @@ -472,25 +463,6 @@ kde-apps/kde-meta:5 # emerge --noreplace kde-plasma/plasma-meta kde-apps/kdecore-meta kde-apps/kdebase-meta:5 -# Michał Górny (2020-10-26) -# This packages makes little sense without sci-geosciences/mapnik. -# It has not been updated in 11 years, so it has been useless anyway. -# Removal in 14 days. Bug #559060. -sci-geosciences/mapnik-world-boundaries - -# Michał Górny (2020-10-24) -# Last release in 2004, next release 'Soon(tm)'. Fails to build -# due to horrible code hacks. -# Removal in 30 days. Bug #638088. -games-rpg/twclone - -# Michał Górny (2020-10-24) -# Deprecated GNOME2 era libraries with no reverse dependencies left. -# Removal in 30 days. Bug #751004. -gnome-base/libbonobo -gnome-base/libgnome-keyring -gnome-base/orbit - # Thomas Deutschmann (2018-12-10) # Marek Szuba (2020-10-13) # Ulrich Müller (2020-11-06) diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest index 5fe0107261a3..2b1a53b094a9 100644 --- a/sci-chemistry/votca-csg/Manifest +++ b/sci-chemistry/votca-csg/Manifest @@ -4,6 +4,7 @@ DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 2ea75cf08dc3005bd08ebe85113d95743fe85 DIST votca-csg-1.5.tar.gz 429164 BLAKE2B da04bd9ce8e879e9a961006256e03d160fa49fe77aa2f1eff0986b338296b04137bb087ecfabb7f2fc855b0ccd83dc4ddddfd65c43303bf5f2eef0519d27b0ec SHA512 c5a77ded3c9b2582494bea55b464689d566d4155713af823dccc6999f98438444d51fae3948144f82c2aaf3914eee740fe21e8828af689d37ab0b5ffea0605fa DIST votca-csg-1.6.1.tar.gz 474044 BLAKE2B 36ededfffe7af5b87b2a031f69afbb9cc727af9454466163312e48c23719f6fe3cb727de96c419ae6e7d4901576013bd76f84d8e7e394cc65df4d83bd1ce30bb SHA512 b8f0f1bf2ca57ee9e2050b4a76e1d725ccb0908314886415f36d4e4554953b4e1c93f7c05502afb77f9b7b5ef3059ebbf7f223b965ba72ae45736798fa2e6ad9 DIST votca-csg-1.6.2.tar.gz 522982 BLAKE2B e0376e04e7baabaa45cab2cc87ff3d7574a35a4a50d87763bb42232eb6f110904b9fb5cdee0a8f2b4057a441a8ca5e276a8d44e14ec3609301832c2ed18cfd94 SHA512 e1d88cc9d18718f323355736afaf309940234001abb39414dd4990f1ff231ef3e8f71d51c78929c422c296b96f304fa17f6c9671071148ff1446bdc1eb442708 +DIST votca-csg-1.6.3.tar.gz 523225 BLAKE2B 4edb53515957f86f272c0bfbef2d72086432665d97fec4bda6011aaf732a5878c2d85e23d15ac24e5051ae3d11328799b5a0d76cf5c13a1202e11be10fe16b0b SHA512 7804d17f5c79ab6420653e1f1007539edb8c22dab47b0a9c776d726c9ac955ae2e3740bcfa171d9a347b074692be81499329a54e9dcfa53a173a7be082739525 DIST votca-csg-1.6.tar.gz 464175 BLAKE2B 1871c7edc4b4e848a06049a7c687e906f166312777bdbf5c65be8efe8d5032582fdca9dc7eca453b7013901f409326b0583c79731c68fa2b4e6366f021958b0b SHA512 76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe DIST votca-csg-1.6_rc1.tar.gz 479265 BLAKE2B c4ba3c81eefd375eea6f8c0b1cd60f9cc80898fb7e8e811ecc286f06d94bd4316edfca277649ec3f7f8b751b2f2928ca2dfe61cc3b1c3060a324ea783c62003f SHA512 6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936 DIST votca-csg-manual-1.4.1.pdf 1282641 BLAKE2B 370b7c8997649555fd2360b999cf381c340a74c3747afda23d0e9d346367cc6d14d4e9a0e9ac82184945427d30050dd623dd1b6d8218c6ff3d2f17331987aaae SHA512 e89f41af05eaeb9ea499e8625cc98e2632ec647ec2d8c9c9052dcd4d2935d082b29b51495514e3e06e73ce42b8cda7017fc523a013569378e2bc86bf88ad32d4 @@ -12,6 +13,7 @@ DIST votca-csg-manual-1.5.1.pdf 1263719 BLAKE2B 29e2ce27215787a1121e45ec1e88ce7c DIST votca-csg-manual-1.5.pdf 1273566 BLAKE2B edfa2adb942d968cf79499e89342b7aaab64edfbfb6e02f76a66201df0920a58acc17bf4e2e4846d104519df163223c27f283cc5798ec7b64d9317a7728ff8c4 SHA512 da298ab0c27000ccf7fb5793c4252c4e17a969709db2649a5acb56af6208b954312c46a2ea8399cdb879b699e72a0ded0b2fe1bcd26431c6625f36b09c0267a5 DIST votca-csg-manual-1.6.1.pdf 1248350 BLAKE2B d4433974e38785fb968bd357ed2914515b2a22a78d6417597265bb1420b5af8b7b9849533a5faba571bcf635eff8385b244b2252bf7a20d3adb9318cd7115b03 SHA512 d627a9c7a71b8ac5e8d6ca109f0ea56978706b0dd1408aaf10b75b4b52f40b6150063248477ca2b5922f603e8d582ddd4dec3de73b3991db5fbb7bf204d347a3 DIST votca-csg-manual-1.6.2.pdf 1241907 BLAKE2B 9d51682099081cb8301eed10e7bb4f3afea89561626da5f3b361939d8d9b4ed15bb49392074bc19c530d413f4913afbf4ce612ee62e0e4d22c30f856a2019cbb SHA512 a85094bfa9ae2fcef52f42af162eb1a94ed30de9d7785aac03d7591177f6982dd315874566ce2671df508a3139ce8816c6becf0e0c1d0bfb9b675063810eb3e7 +DIST votca-csg-manual-1.6.3.pdf 1242192 BLAKE2B 18097cd949b1c874b41b9e0df0ae3815027a5d7fe3d7a3b236ae2aacb269106265e9467a4d78dfefd6f51bcd514727d88500e43d759df0d23f76644833d4b2f7 SHA512 a631670100dd1f26f2fa815b714dc51c7551f2d92d2072af210778cc380bfdcbc70d01c0a47b88b0ea351d73a5fd334db1da8463d21c933d7af3d7af3b10ccc2 DIST votca-csg-manual-1.6.pdf 1248178 BLAKE2B 5213d55787041db81fe8563febbf130db6aed9233e569039b66d69cfb173131353d45bef824640ee7b0a3fed7821ede4d5a6ce6ffc14d1548499317afdc0248a SHA512 e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca DIST votca-csg-manual-1.6_rc1.pdf 1248403 BLAKE2B b702eff4a36d27d592147f115f4e9080cbf580b6401141a14865395f0cb927c35f60035f92724e71e5edadbbe3e317f93989eb6f2e0a0e7b9f685e56851546d2 SHA512 2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb DIST votca-csg-tutorials-1.4.1.tar.gz 6339417 BLAKE2B e9acf8e421f6fce4d97be2d51fb559979c6fd3e6b042525cedf32cadeab1dddc5b1aaf80bbbfd387da3bce71672759c2e84d317c789f616dc71834c72a581fff SHA512 896ec9d6b2537a06301046a74c1957708eb96d9854b3ec855fe3457208c142f6fb26a03e323a2644862a1efd0030fcceb1189f73655b984462f0f7127a02de90 @@ -20,5 +22,6 @@ DIST votca-csg-tutorials-1.5.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01 DIST votca-csg-tutorials-1.5.tar.gz 5947774 BLAKE2B d497f1e9282c4cacc070d09d901ad8f5d3042ab3a279aa4d1c3bcd3184dc22231d1f2a75ba0ffe245e6f6300fb740e562b24c8039594ec01307491a6068b55f6 SHA512 00447380fa887178ad02cc4e1425a04fc2fd2babdd4790d387fcd4aa2734dc14dacf4b4444d420937aa0a5b53e90741b44f9a4bca31bdcdae10fbfb8323e9848 DIST votca-csg-tutorials-1.6.1.tar.gz 5945945 BLAKE2B 18ea7e406acf70e37049b1f8676551d96b20825fba25bb9c1e674b0f94f5ee41bd74ce77619880dfb2e2f1f8fb0b40de9ce8a5e9e9d8470639af057376a19632 SHA512 82d60fcea4859e1caa6138147848427dbdb1ddcf4e0713b6f2d50cd624ceacdbce1ceb8e98fb85d079d8d9de02f501ec8c9236243fe75761e44486f27207249b DIST votca-csg-tutorials-1.6.2.tar.gz 5945110 BLAKE2B 2871c89c763c8624deb877f90da10cd2021ec5b10a0d8473c4523b70a179247ad2e809aa5b0aab7c36a324d929b55f3b2070822914043382424b87fbf34ef05b SHA512 40f377a824f6c10be759adf3e1b87dbc5392b00e4a377ba04d998f96aa9b7ceb986c2e5cfac16ea3047f08d2d76deb7e9f3aadfba794f58b8f131861f7a7ff04 +DIST votca-csg-tutorials-1.6.3.tar.gz 5944550 BLAKE2B ab84819cd567f60d05fe4368b077541fe4804dc91040354b99a37aa23831af26047b87d2b987a8eb20c4c588fd4fc099302493ce77b4df70f436fc372ec25a4a SHA512 a05b56272b293b5ec7ea5d413f4d34e023ac3f2fe018548891be71ba925181c05ea758b73a0264ee76626582084e7e9f8972dba66ceed31642d3f35796354b99 DIST votca-csg-tutorials-1.6.tar.gz 5946764 BLAKE2B 018bd00c86c0a85baf35afd2ea4206c96dee8f948dcbf331b53e6f685b69bf2c909731b15ba3261c86cee9e1960ec5cfa7b2ee0c6dcfabbbbc110789840184ad SHA512 36d3a66c19d230f2002170851345da7063aeef1f29841945b8a182f73922617823815dde5d7289fb0f80e771ac03780adacdf95af4814235edbf69a4772b3696 DIST votca-csg-tutorials-1.6_rc1.tar.gz 5946622 BLAKE2B 7bf0c7083ca7b148d16f7b77b9f785c11b16a8124a5435522e8c065859f4c2ae560c622f04021918b2683c9955d5a1b674c84fad179319f5fedb86616bbe24e7 SHA512 1c89f95944f8277a995d9d6d7dacfae2ae1be54a9a7b19c53d3464a4bdf5da0556e862033ba0a5f442b1ee5bd79bafd478655856fe266f4285c98e14512ce259 diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.3.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.3.ebuild new file mode 100644 index 000000000000..ecfe51472e81 --- /dev/null +++ b/sci-chemistry/votca-csg/votca-csg-1.6.3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit bash-completion-r1 cmake multilib + +IUSE="doc examples extras +gromacs hdf5" +PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )" +if [ "${PV}" != "9999" ]; then + SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://github.com/${PN/-//}-manual/releases/download/v${PV}/${PN}-manual-${PV}.pdf ) + examples? ( https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + S="${WORKDIR}/${P#votca-}" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + KEYWORDS="" + PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )" +fi + +DESCRIPTION="Votca coarse-graining engine" +HOMEPAGE="https://www.votca.org" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + ~sci-libs/votca-tools-${PV} + >=dev-cpp/eigen-3.3 + gromacs? ( sci-chemistry/gromacs:= ) + hdf5? ( sci-libs/hdf5 ) + dev-lang/perl + app-shells/bash:*" + +DEPEND="${RDEPEND} + >=app-text/txt2tags-2.5 + virtual/pkgconfig" + +DOCS=( README.md NOTICE CHANGELOG.md ) + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + if use examples; then + EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git" + EGIT_BRANCH="master" + EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\ + git-r3_src_unpack + fi + fi +} + +src_configure() { + mycmakeargs=( + -DWITH_GMX=$(usex gromacs) + -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5') + -DWITH_RC_FILES=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call + for i in "${ED}"/usr/bin/csg_*; do + [[ ${i} = *csg_call ]] && continue + bashcomp_alias csg_call "${i##*/}" + done + if use doc; then + [[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" + fi + if use examples; then + insinto "/usr/share/doc/${PF}/tutorials" + docompress -x "/usr/share/doc/${PF}/tutorials" + rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake* + doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/* + fi +} + +pkg_postinst() { + einfo + einfo "Please read and cite:" + einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). " + einfo "https://dx.doi.org/10.1021/ct900369w" + einfo +} diff --git a/sci-chemistry/votca-csgapps/Manifest b/sci-chemistry/votca-csgapps/Manifest index 21b594b448a5..ba12ae2fc2aa 100644 --- a/sci-chemistry/votca-csgapps/Manifest +++ b/sci-chemistry/votca-csgapps/Manifest @@ -4,5 +4,6 @@ DIST votca-csgapps-1.5.1.tar.gz 26006 BLAKE2B 8651978c15087fc7332fe229cfc33d8c42 DIST votca-csgapps-1.5.tar.gz 25975 BLAKE2B 185e759d658c6f763da2d26770766ec8ee05017b4c6a67e13915de04fbf2ecf268f2f800c5e18ef0f38c615340b0db163e886dc98a9395a69359f94dc8773f60 SHA512 20dda9d07ef2f33c9decff2766ece8f24cf2562993b4dfb7dd637d84325b835a6ecd30d34c5cfb9c428dbf72c2b5dfe9fd49d266182704b981db151c3c4ea2e4 DIST votca-csgapps-1.6.1.tar.gz 20128 BLAKE2B 509f684b84e7ebb718fbcf5b48adc732dc8c6b9f6478269e243dda3c980a5d91a46208863ac6227a07d90f6e2ea4e5cf2b50a7b34b6dbe2567d9a95ede4ee1de SHA512 06e396c20990f7bb22ae8c888a36585b40a61280aa53a521c01128bbaadc1f449f85d4f41380ee3ce290defb64eca285be7dde1cd888f4cb69805695511a5b90 DIST votca-csgapps-1.6.2.tar.gz 19549 BLAKE2B 8aad4ff143a2073b4d17a4af0766898882ed011be4de814b6dca3cb4c1776fbee925fb4fef4ba1fd20d3aa3097440caeaab7fddb68b35322b5123868e7e2fbea SHA512 f88f8ea41773b846ed7b3b910ad81c58a6dc1aabea5ae8ead030709c095e229b29443213854d358b4fa6518d8373b9a2acab741be2bbc33fec22d8f267f6cfe3 +DIST votca-csgapps-1.6.3.tar.gz 19588 BLAKE2B 2de9490325832cbd0611cc97c7fff9594d1bff281da22ea8f7e5f054361d50dfc38145a627042ef24e91ba9c37de62b6f9efcdd8bd170ee6c0190802fdbce57e SHA512 02215966ef9ea57089e9694cf0a1560f7a62e25dacbce80fea848e9d3d54a26be6174e6b4fe24ba7a6a13b675c0bdb5f407a7c30fc58a6b9c4bd826eb522f0b8 DIST votca-csgapps-1.6.tar.gz 20130 BLAKE2B 0c34fba42a70f756043aae89f51b94cc0a9c9a85680ed78c56b4c05f834d94c74aff59e4adf6155e5fab81d057da58ec420d843532af57beeaa6e81f82432d92 SHA512 5a85abaf6b09a225604f33f2e0cfb774525159e9bce89efd7ebfc0c9c37342e472503ff51c3065be2a4b87e95671f55164c630477f404f94b0510a83e262352f DIST votca-csgapps-1.6_rc1.tar.gz 20138 BLAKE2B 9374911f761fd78f01721e8e10f3b9c14f2ba894735735e4d09f5e29eb1d1b69f4fa081699d7a93abfad2ebe55d6439edbb6db547618e6d2cfbaf7bbc8a79ca8 SHA512 153bd6e537175c9908739c60ce80830ebf57c0686f11b21fc541995cb5355d4a3f7f7ee7d1707bb85f5fc859bf260a3a167450175ffe8feb92044e8018be996b diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.3.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.3.ebuild new file mode 100644 index 000000000000..c10ab938281e --- /dev/null +++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit cmake + +if [ "${PV}" != "9999" ]; then + SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + S="${WORKDIR}/${P#votca-}" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + KEYWORDS="" +fi + +DESCRIPTION="Extra applications for votca-csg" +HOMEPAGE="https://www.votca.org" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-cpp/eigen-3.3 + ~sci-chemistry/${PN%apps}-${PV}" + +DEPEND="${RDEPEND}" + +DOCS=( README.md ) diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest index 255335e1387c..af3c7ca11cc9 100644 --- a/sci-chemistry/votca-xtp/Manifest +++ b/sci-chemistry/votca-xtp/Manifest @@ -4,6 +4,7 @@ DIST votca-xtp-1.5.1.tar.gz 14634849 BLAKE2B 84ee9fc531a530ba276a6fd3eccc78dd25c DIST votca-xtp-1.5.tar.gz 14637712 BLAKE2B af04de706f0d100968928459a03b6a94a94a211b3f5bd056d123756d40760fb0ada70add429ed5b86e211dbdd3b91aa4cf12e51a260638766d04158e7b5a1201 SHA512 693f34004749edfbabcd0a19dc23b3de3c09858c7c0dfe1e420b92632397971e3687489c1074a489d4d2fd337ddc5749c419869db104c65736e7c01bf12cd140 DIST votca-xtp-1.6.1.tar.gz 1405246 BLAKE2B b32db1e50ebfd79683ea2bf990293d9dfcf7703f3d95467a3fac5f98ec98e9bf1d29bab079e8f328fab8998144af186e7f47e99d9312763f7d73a1ae364ce58a SHA512 8b1bb235e70c239d0c57ceac65cd384841ea136d61f28bc72cbe2cfb47f9d776d42e06180acd1d8da93d0a0586e0bc3884ed82830d0f31c498ce225ca79a45aa DIST votca-xtp-1.6.2.tar.gz 1405868 BLAKE2B 4e5700cec41ede632b97904259040aef2b79f9698547bf508584e49ff5cb16ab627c31732136de67bed3f70af9bf890a25bf511e8d9278821107760fc29441b7 SHA512 64610239ef5b902daa4ff475b4fea194912ef2a50e24214fcecf7d63336208a642c5ae5f02b0f21d04a78acaef224ba9a29b06b9380dbd6a43553e704efc54fe +DIST votca-xtp-1.6.3.tar.gz 1405361 BLAKE2B 35b73f754f6485c96624e75db7583559601e286d1a782259266f7a4e210ab21615d8ba6d308975483428091bf58a55b8fc96327543c17f8b5786744560cdf239 SHA512 2de786a10a3776b6a6e187cd1c42b173cb912b1169b6283ccd245fac9b2f03a94235b2ff8a372dee83e33f6669211b1f79573b099ad9775971ece79a88ac990c DIST votca-xtp-1.6.tar.gz 1404955 BLAKE2B 1599281ea1cd6b5a93b1d91f69a793af7bb9cd2fbf70157e5d40a5bfc72f973f3d97338f92157c2c482ad041f8afda298282b1f83dda66d0bb189bdc07bb5a23 SHA512 cb99c31fe7f1af53b8ccf50cc9cc304ed5c5b5d1a165e1a72a456c0bbf5ac8bb9263c9eff829acc74be348192afbf80fd4d80a2c20d1dd5d7f909b1b50368670 DIST votca-xtp-1.6_rc1.tar.gz 13586771 BLAKE2B d5b72a7389b77df0570eac0021870bba3fa66a89b3a2df1e08632b1c1827884d101ef8d972762dae35e44e53e7a9fe9278d3204eec09c35d091ab3427b055be4 SHA512 0b54eddcf944967b1d41f75f4887eba9edc3be18b94d319e93e795a24f58a2877d7f60afd806290eacb41d329d1b1206ebaab83874d6be2d5b026f06dbc19dfd DIST votca-xtp-manual-1.4.1.pdf 1066873 BLAKE2B 8cbd4b55b013794a19a8b5867b929b8e2d9084e6780d777b2a2bbaea23006f4f4ec5b26bd4a07c59e1c6726f23471eb1756b668636e0c4e656a0807e64197586 SHA512 fdf1147f24785524f5e96020fcd29c32bbeef520eebf6afba32b59d7e777d586c452919478d2734c3f021e558b1147b945cdbc0833402be2b16e5af3a8e37f5f diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.3.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.6.3.ebuild new file mode 100644 index 000000000000..5615bbcf64e4 --- /dev/null +++ b/sci-chemistry/votca-xtp/votca-xtp-1.6.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit bash-completion-r1 cmake multilib + +IUSE="" +if [ "${PV}" != "9999" ]; then + SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + S="${WORKDIR}/${P#votca-}" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + KEYWORDS="" +fi + +DESCRIPTION="Votca excitation and charge properties module" +HOMEPAGE="https://www.votca.org" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + ~sci-libs/votca-tools-${PV} + >=dev-cpp/eigen-3.3 + sci-libs/hdf5[cxx] + ~sci-chemistry/votca-csg-${PV} + sci-libs/libxc" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( README.md NOTICE CHANGELOG.md ) + +pkg_postinst() { + einfo + einfo "Please read and cite:" + einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)" + einfo "https://doi.org/10.1021/acs.jctc.8b00617" + einfo +} diff --git a/sci-geosciences/mapnik-world-boundaries/Manifest b/sci-geosciences/mapnik-world-boundaries/Manifest deleted file mode 100644 index 300821a14a1a..000000000000 --- a/sci-geosciences/mapnik-world-boundaries/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST processed_p-20090514.zip 255429573 BLAKE2B c0dc970f03a92ea2071d9a4edcfeb060e3bc972a681f2a153fd512ddd2a4f4605ccd9125a9a7584d83f35560245f7fee6e58ec153ab51b899c75b4e9cc5837e7 SHA512 8a6c35def519b8c3652bfa6d63b62b1c3e2acbfc833a62157443c171e495f8698912ccbd36a4def590329937ad4b9f4c4595a016013df8209cbc7c5b3e19b2c4 -DIST world_boundaries-spherical-20090331.tgz 52857349 BLAKE2B 9a968a5682607980010eb3eb8080ab1a9e94c4581e3bd201b572f793249b322d01ee4224e090cfb118474e396e7c9aab8900a6119506a29757d57ed04d7e547f SHA512 2d83049688b52987ffa26afb25a340dd1f68f22fe8fbf8e5ca10a798e34cde9c6e4508c44edf86cd46f7ab3d154b123cbbd6084f8b7087c5fbb4c6a14b9cc69d diff --git a/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild b/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild deleted file mode 100644 index e68b87be369c..000000000000 --- a/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.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 - -DESCRIPTION="Mapnik World Boundaries" -HOMEPAGE="https://www.openstreetmap.org/" -SRC_URI="mirror://gentoo/world_boundaries-spherical-20090331.tgz - mirror://gentoo/processed_p-20090514.zip" - -LICENSE="CC-BY-SA-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" - -src_prepare() { - default - mv coastlines/* world_boundaries/ -} - -src_install() { - insinto /usr/share/mapnik - doins -r world_boundaries -} diff --git a/sci-geosciences/mapnik-world-boundaries/metadata.xml b/sci-geosciences/mapnik-world-boundaries/metadata.xml deleted file mode 100644 index 15925ba63ade..000000000000 --- a/sci-geosciences/mapnik-world-boundaries/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - sci-geosciences@gentoo.org - Gentoo Geosciences Project - - gentoo-staging - diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest index e89bbbd83014..3aac577a0cfd 100644 --- a/sci-libs/htslib/Manifest +++ b/sci-libs/htslib/Manifest @@ -1,2 +1 @@ DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075 -DIST htslib-1.9.tar.bz2 1178859 BLAKE2B a0229313d3572717101f4f23d39fa124f3bb38d8b2e65055f4f801dbb5f1549df95115e8beadd8fa024171b3ff8a874d20087bf71819c36700666f168dbe41ab SHA512 ddb0e2d970e4c2c27e203b064898f95cb7c187cd497c02fc7b4312dcea25669d0b6063d537687521e7a065f6daefa1ae897add2df4981037a187b499d08fdef7 diff --git a/sci-libs/htslib/htslib-1.9.ebuild b/sci-libs/htslib/htslib-1.9.ebuild deleted file mode 100644 index 956cbd063c48..000000000000 --- a/sci-libs/htslib/htslib-1.9.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="C library for high-throughput sequencing data formats" -HOMEPAGE="https://www.htslib.org/" -SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2" - -SLOT="0/2" -LICENSE="MIT" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="+bzip2 curl +lzma static-libs" - -RDEPEND=" - bzip2? ( app-arch/bzip2:= ) - curl? ( net-misc/curl ) - lzma? ( app-arch/xz-utils:= )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - # upstream injects LDFLAGS into the .pc file, - # which is a big nono for QA - sed 's/private_LIBS=$LDFLAGS/private_LIBS=""/g' -i configure || die -} - -src_configure() { - econf \ - --disable-gcs \ - --disable-plugins \ - --disable-s3 \ - $(use_enable bzip2 bz2) \ - $(use_enable curl libcurl) \ - $(use_enable lzma) -} - -src_install() { - default - - if ! use static-libs; then - find "${D}" -name '*.a' -delete || die - fi -} diff --git a/sci-libs/mkl-rt/Manifest b/sci-libs/mkl-rt/Manifest deleted file mode 100644 index ee38f0cec318..000000000000 --- a/sci-libs/mkl-rt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mkl-rt-2019.4.243.tar.bz2 213996111 BLAKE2B 04c04cd521d73b9c51341f60e69f41e3093403dcace370f2379db2cbceadcd3d64f6c06b25f8ffcbec31edbf0f0a46a9e454450e7f282cf91436093e770ea207 SHA512 a1f33806de2e1437cd3c1de088cbf117a5a3c41cf5f0003f680385d51c793d745229ec8fbd6587f03acfd25b7973912fdffbc0cf1f2360063edf2f4b0df0aa9d diff --git a/sci-libs/mkl-rt/metadata.xml b/sci-libs/mkl-rt/metadata.xml deleted file mode 100644 index 54d2e31157e5..000000000000 --- a/sci-libs/mkl-rt/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - https://software.intel.com/en-us/mkl - - - - Mo Zhou - lumin@debian.org - - - sci@gentoo.org - Gentoo Science Project - - - - Intel® Math Kernel Library (Intel® MKL) optimizes code with minimal - effort for future generations of Intel® processors. It is compatible - with your choice of compilers, languages, operating systems, and - linking and threading models. - - - - Enable runtime library switching by eselect and ld.so. - - - gentoo-staging - diff --git a/sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild b/sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild deleted file mode 100644 index c90926300316..000000000000 --- a/sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils - -DESCRIPTION="Intel Math Kernel Library (Runtime)" -HOMEPAGE="https://software.intel.com/en-us/mkl" -SRC_URI="https://repo.continuum.io/pkgs/main/linux-64/mkl-2019.4-243.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="ISSL" # https://software.intel.com/en-us/mkl/license-faq -SLOT="0" -KEYWORDS="~amd64" -IUSE="eselect-ldso" - -# MKL uses Intel/LLVM OpenMP by default. -# One can change the threadding layer to "gnu" or "tbb" through the MKL_THREADING_LAYER env var. -RDEPEND=" -eselect-ldso? ( !app-eselect/eselect-cblas - >=app-eselect/eselect-blas-0.2 ) -sys-libs/libomp" - -DEPEND="" - -S=${WORKDIR} - -src_install() { - insinto /usr/$(get_libdir)/ - doins lib/*.so - - if use eselect-ldso; then - dodir /usr/$(get_libdir)/blas/mkl-rt - dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl-rt/libblas.so - dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl-rt/libblas.so.3 - dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl-rt/libcblas.so - dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl-rt/libcblas.so.3 - dosym ../../libomp.so usr/$(get_libdir)/blas/mkl-rt/libiomp5.so - dodir /usr/$(get_libdir)/lapack/mkl-rt - dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl-rt/liblapack.so - dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl-rt/liblapack.so.3 - dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl-rt/liblapacke.so - dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl-rt/liblapacke.so.3 - dosym ../../libomp.so usr/$(get_libdir)/lapack/mkl-rt/libiomp5.so - fi -} - -pkg_postinst() { - use eselect-ldso || return - local libdir=$(get_libdir) me="mkl-rt" - - # check blas - eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} - local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) - if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then - eselect blas set ${libdir} ${me} - elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." - else - elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." - elog "To use blas [${me}] implementation, you have to issue (as root):" - elog "\t eselect blas set ${libdir} ${me}" - fi - - # check lapack - eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} - local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) - if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then - eselect lapack set ${libdir} ${me} - elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]." - else - elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]." - elog "To use lapack [${me}] implementation, you have to issue (as root):" - elog "\t eselect lapack set ${libdir} ${me}" - fi -} - -pkg_postrm() { - if use eselect-ldso; then - eselect blas validate - eselect lapack validate - fi -} diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest index ca10e4b96e8a..63e70fa584a8 100644 --- a/sci-libs/votca-tools/Manifest +++ b/sci-libs/votca-tools/Manifest @@ -4,5 +4,6 @@ DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaacc DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0 DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc +DIST votca-tools-1.6.3.tar.gz 109937 BLAKE2B 4cc6a0f061c3455ff326eada36c5b66e31aedbc6aac297db42a128940c17d81dbd41e47c7c9af012ab5b24a7fe9f12575bf3563fd566d62492d1c79f1887db02 SHA512 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed diff --git a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild new file mode 100644 index 000000000000..d9d3d01cd6d3 --- /dev/null +++ b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit cmake eutils multilib + +if [ "${PV}" != "9999" ]; then + SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + S="${WORKDIR}/${P#votca-}" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + KEYWORDS="" +fi + +DESCRIPTION="Votca tools library" +HOMEPAGE="https://www.votca.org" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:= + dev-libs/expat + >=dev-cpp/eigen-3.3 + sci-libs/fftw:3.0" + +DEPEND="${RDEPEND} + >=app-text/txt2tags-2.5 + virtual/pkgconfig" + +DOCS=( NOTICE ) + +src_configure() { + mycmakeargs=( + -DWITH_RC_FILES=OFF + ) + cmake_src_configure +} diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild index 8070579dcf43..9c424d2704ec 100644 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild @@ -199,7 +199,7 @@ add_service() { elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" mkdir -p "${EROOT}/etc/runlevels/${runlevel}" - ln -snf "${EROOT}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" } pkg_postinst() { diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild index 7fe926ad7820..7102d367161f 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" == 9999 ]]; then EGIT_CLONE_TYPE="shallow" else SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="-* ~arm ~arm64" + KEYWORDS="-* ~arm arm64" S="${WORKDIR}/firmware-${PV}" fi diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest index d0c8578df849..ee1598dff455 100644 --- a/sys-cluster/nova/Manifest +++ b/sys-cluster/nova/Manifest @@ -1,10 +1,6 @@ -DIST nova-21.1.0.tar.gz 9213435 BLAKE2B e84bc5131c4bd5ca50ab2783b8b6c606eac0abdaf622fb9a32b9c86fb91ac569f92459da199b4d4bbf679710e593f7ce5539c7f85f89446a463064a108b58d3b SHA512 abb6db64bf25806a9037df1b54bb5874e0599654b8cabafbb6ac659358124a5aa62668117e0a529677e1997d7d89b4265fbb9de4613f28d00d71bdfc4e94c471 DIST nova-21.1.1.tar.gz 9300545 BLAKE2B 757e7da69a10da73f7786e71e81ffc126304f8bff65910d3cb7ee8bf8fddc70490451b8173ac1a26e0b256e6cf54f4292617481c5fc7394e727ad2da20ed4607 SHA512 c44f0ca3b689cf3a3f364654bbdc8d4a425c702506be2d4e2d00002baf3395b5212807f1cc696488602d642c3565a7a84a407357d3621028c39e844c2ac4c466 -DIST nova-22.0.0.tar.gz 9168828 BLAKE2B 6ae28abd6e14a50c7d28564bcd7df0ab5681c5a89b4b561a68231d14f92faca4d394b2669b0f60292bc0a00589e36663f6529059a26fd6a5e3991066abda0070 SHA512 4b6b889550f839711462dba8b541977e35aecc062a3f86414b94338666807d31b330084ac3f6ebf889b8ef3f4fddec324d6af6fadeea76edd96baa48c00df7f7 DIST nova-22.0.1.tar.gz 9254552 BLAKE2B b676ef872a9c14331860cd907a74c30f41dfb64908af9ac9e93bbc966a43daf1b3ef74d8a9e80e6f50ac25713a65a0082a02ecb276731ea3ea704dad210d6e7e SHA512 002b4fac8807b0a993e281fe6438b3e1db5cba31f12b2570c3bfd7cc495a5334668db4cc75a66f11186a8f0409f84e47e9e8b38220a1b3af762e543481ab0b7c DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970 -DIST nova.conf.sample-21.1.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d DIST nova.conf.sample-21.1.1 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d -DIST nova.conf.sample-22.0.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970 DIST nova.conf.sample-22.0.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970 diff --git a/sys-cluster/nova/nova-21.1.0.ebuild b/sys-cluster/nova/nova-21.1.0.ebuild deleted file mode 100644 index 5b5c3f8d1e65..000000000000 --- a/sys-cluster/nova/nova-21.1.0.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 eutils linux-info multilib - -DESCRIPTION="Cloud computing fabric controller" -HOMEPAGE="https://launchpad.net/nova" - -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}" - EGIT_REPO_URI="https://github.com/openstack/nova.git" - EGIT_BRANCH="stable/ussuri" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite" -REQUIRED_USE=" - !compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" - -CDEPEND=" - >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - compute-only? ( - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] - >=dev-python/jinja-2.10[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.7[${PYTHON_USEDEP}] - >=dev-python/webob-1.8.2[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}] - !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/websockify-0.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}] - >=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-4.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-3.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}] - >=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}] - >=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}] - >=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}] - >=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}] - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] - >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}] - >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}] - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] - >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}] - >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}] - >=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}] - >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - >=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}] - dev-python/libvirt-python[${PYTHON_USEDEP}] - app-emulation/libvirt[iscsi?] - app-emulation/spice-html5 - novncproxy? ( www-apps/novnc ) - sys-apps/iproute2 - openvswitch? ( net-misc/openvswitch ) - rabbitmq? ( net-misc/rabbitmq-server ) - memcached? ( - net-misc/memcached - >=dev-python/python-memcached-1.58 - ) - sys-fs/sysfsutils - sys-fs/multipath-tools - net-misc/bridge-utils - compute? ( - app-cdr/cdrtools - sys-fs/dosfstools - app-emulation/qemu - ) - iscsi? ( - sys-fs/lsscsi - >=sys-block/open-iscsi-2.0.873-r1 - ) - acct-user/nova - acct-group/nova" - -#PATCHES=( -# "${FILESDIR}/filename" -#) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ - NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ - ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - - if use !compute-only; then - for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do - newinitd "${FILESDIR}/nova.initd" "nova-${svc}" - done - fi - use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" - - diropts -m 0750 -o nova -g qemu - dodir /var/log/nova /var/lib/nova/instances - diropts -m 0750 -o nova -g nova - - insinto /etc/nova - insopts -m 0640 -o nova -g nova - newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" - doins "${FILESDIR}/nova-compute.conf" - doins "${S}/etc/nova/"* - # rootwrap filters - insopts -m 0644 - insinto /etc/nova/rootwrap.d - doins "etc/nova/rootwrap.d/compute.filters" - - # add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0600 -o root -g root - doins "${FILESDIR}/nova-sudoers" - - if use iscsi ; then - # Install udev rules for handle iscsi disk with right links under /dev - udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules - - insinto /etc/nova/ - doins "${FILESDIR}/scsi-openscsi-link.sh" - fi - rm -r "${ED}/usr/etc" -} - -pkg_postinst() { - if use iscsi ; then - elog "iscsid needs to be running if you want cinder to connect" - fi -} diff --git a/sys-cluster/nova/nova-21.1.1.ebuild b/sys-cluster/nova/nova-21.1.1.ebuild index 5eae03721699..5b5c3f8d1e65 100644 --- a/sys-cluster/nova/nova-21.1.1.ebuild +++ b/sys-cluster/nova/nova-21.1.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then else SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV} https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/sys-cluster/nova/nova-22.0.0.ebuild b/sys-cluster/nova/nova-22.0.0.ebuild deleted file mode 100644 index 6303e12b1f5a..000000000000 --- a/sys-cluster/nova/nova-22.0.0.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 eutils linux-info multilib - -DESCRIPTION="Cloud computing fabric controller" -HOMEPAGE="https://launchpad.net/nova" - -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}" - EGIT_REPO_URI="https://github.com/openstack/nova.git" - EGIT_BRANCH="stable/victoria" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite" -REQUIRED_USE=" - !compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" - -CDEPEND=" - >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - compute-only? ( - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] - ) - >=dev-python/decorator-4.1.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] - >=dev-python/jinja-2.10[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] - >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.7[${PYTHON_USEDEP}] - >=dev-python/webob-1.8.2[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.23.0[${PYTHON_USEDEP}] - >=dev-python/six-1.11.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/websockify-0.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}] - >=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}] - >=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}] - >=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}] - >=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}] - >=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}] - >=dev-python/os-win-4.2.0[${PYTHON_USEDEP}] - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] - >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}] - >=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}] - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] - >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}] - >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}] - >=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}] - >=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - >=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] - dev-python/libvirt-python[${PYTHON_USEDEP}] - app-emulation/libvirt[iscsi?] - app-emulation/spice-html5 - novncproxy? ( www-apps/novnc ) - sys-apps/iproute2 - openvswitch? ( net-misc/openvswitch ) - rabbitmq? ( net-misc/rabbitmq-server ) - memcached? ( - net-misc/memcached - >=dev-python/python-memcached-1.58 - ) - sys-fs/sysfsutils - sys-fs/multipath-tools - net-misc/bridge-utils - compute? ( - app-cdr/cdrtools - sys-fs/dosfstools - app-emulation/qemu - ) - iscsi? ( - sys-fs/lsscsi - >=sys-block/open-iscsi-2.0.873-r1 - ) - acct-user/nova - acct-group/nova" - -#PATCHES=( -#) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ - NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ - ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - - if use !compute-only; then - for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do - newinitd "${FILESDIR}/nova.initd" "nova-${svc}" - done - fi - use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" - - diropts -m 0750 -o nova -g qemu - dodir /var/log/nova /var/lib/nova/instances - diropts -m 0750 -o nova -g nova - - insinto /etc/nova - insopts -m 0640 -o nova -g nova - newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" - doins "${FILESDIR}/nova-compute.conf" - doins "${S}/etc/nova/"* - # rootwrap filters - insopts -m 0644 - insinto /etc/nova/rootwrap.d - doins "etc/nova/rootwrap.d/compute.filters" - - # add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0600 -o root -g root - doins "${FILESDIR}/nova-sudoers" - - if use iscsi ; then - # Install udev rules for handle iscsi disk with right links under /dev - udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules - - insinto /etc/nova/ - doins "${FILESDIR}/scsi-openscsi-link.sh" - fi - rm -r "${ED}/usr/etc" -} - -pkg_postinst() { - if use iscsi ; then - elog "iscsid needs to be running if you want cinder to connect" - fi -} diff --git a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild index 99aa5cd404a1..68debb5ec8f3 100644 --- a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild +++ b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild @@ -43,6 +43,7 @@ src_install() { local SPARK_SCRIPTS=( bin/beeline + bin/find-spark-home bin/load-spark-env.sh bin/pyspark bin/spark-class @@ -53,9 +54,6 @@ src_install() { local s for s in "${SPARK_SCRIPTS[@]}"; do - ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..." - sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}" - eend $? dobin "${s}" done diff --git a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild index 99aa5cd404a1..68debb5ec8f3 100644 --- a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild +++ b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild @@ -43,6 +43,7 @@ src_install() { local SPARK_SCRIPTS=( bin/beeline + bin/find-spark-home bin/load-spark-env.sh bin/pyspark bin/spark-class @@ -53,9 +54,6 @@ src_install() { local s for s in "${SPARK_SCRIPTS[@]}"; do - ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..." - sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}" - eend $? dobin "${s}" done diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild index aa75467add18..9c34936b7ea9 100644 --- a/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild +++ b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild @@ -32,6 +32,7 @@ src_install() { local SPARK_SCRIPTS=( bin/beeline + bin/find-spark-home bin/load-spark-env.sh bin/pyspark bin/spark-class @@ -42,9 +43,6 @@ src_install() { local s for s in "${SPARK_SCRIPTS[@]}"; do - ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..." - sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}" - eend $? dobin "${s}" done diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild index 38d2b40eea18..1e30e037e8fa 100644 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild +++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="Broadcom" SLOT="0" -KEYWORDS="~arm ~arm64" +KEYWORDS="~arm arm64" RDEPEND="!sys-kernel/linux-firmware[-savedconfig]" diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 767d9099d0af..6fd044e9ea9b 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -20,6 +20,7 @@ DIST gentoo-kernel-5.4.81-1.amd64.xpak 61059891 BLAKE2B 2a8aa181e46886f7a9faa3c9 DIST gentoo-kernel-5.4.81-1.arm64.xpak 56277584 BLAKE2B 2443569a47d8d53652c0b400610e6a43947be7225fad4fd2de2e4a6fd1fd2b0cbfae15ebbf4df7e595caf2f4e6cef014d9ba7dc5e5a325a635866672fd44e2a0 SHA512 0468af376f36c1b3d7351c8242a4d08c46ce11189e33c059e2892b7cd8f126ad42a8256c056bb5db0f600c24a212651f512bec6b46531eaa0b5fd35093f8080b DIST gentoo-kernel-5.4.81-1.x86.xpak 52879835 BLAKE2B bb93d0cd2280d7c7981e2330a405f00e7ef3aa906d6b52be8a03b0a7a71b9af3fb8bcd5af16adec36a198dc2d7f950759c800154afe14e3c29e8c276e0d3b013 SHA512 359fe6ec58b85f1cbb9780368582c332e2095f96b0363c04bc613cbe4f7fdbe3606e18571072b260ada8422d22088d0e50400975030c780581c56038d398b818 DIST gentoo-kernel-5.4.82-1.amd64.xpak 61041603 BLAKE2B 8f9c2b745b070ca48d207ee02f5d30b166a5e4742fe667425972c4b29c5471ae90e7a6d327f3f4917c1aedd755a0c81b346fb90c7889c4f925db87d62f82d0df SHA512 4c78769ce35eb9e172d8ba8ba170d5e5684c0dcb32f041ff031e658a8a53d7819c856a2315832dd8ee6088afe14bd471f8c60a95593581e7746ed276e219ba49 +DIST gentoo-kernel-5.4.82-1.arm64.xpak 56304051 BLAKE2B ec9ec9c44f21405e1b5b8d179532b80f9d9d823ba36a9bb6c3bcd87e66b2515cd3844eef53b18ab106131f0ea46b1840b897aa6e6c77c5e532f4c3868c59237a SHA512 18cf7caadae3c6567110525cd7f96e7bc7f5911a04c1904cf4e3ddfb400afe97f44970cdb7ef43dfda4aaf2b728563385dd717486149b3cc4185597b98bb9c03 DIST gentoo-kernel-5.4.82-1.x86.xpak 52869397 BLAKE2B 1c3cac750bbc617e354aa5be8f4da4cea4511c0825b10b8e2d153ade7e4c658c7f538ed01e3754ea5eed8ace127bec0c4d7c82890d7da8341229792e6a1a630e SHA512 2a779603b843f2e4e757f80bba6ddd31a878f13ddb2b174f87f4a2ae3784fbca05be36994a29377674996a627b3f878fd6d50dd98a648ba0e6b45d039fe62f70 DIST gentoo-kernel-5.9.10-1.amd64.xpak 62950591 BLAKE2B 032e27aaaf9f622ce16b3ee699752215fe7485052bebdafddf2155aed370b6316be07eb009da3e207a9b12f8c7865c70c7466451b205cc4b4f374c731a815fd5 SHA512 7f504e2f15319d60f464a4e45edee9503316a100eec8a6258e27ec7a00a4d2a5cbf9ead4e77ae5342ea05778572fc8ecda94c63b425b99b6ac3a5f183e377bbb DIST gentoo-kernel-5.9.10-1.arm64.xpak 60852046 BLAKE2B da0ee409eb47ae9bf570a08640bd060894974f5f09fb348b3d43c525f7d006f982a447ff9b17bc22969de929b05a316ee72668d40a20d8c3b8e2084588898416 SHA512 3ae82b223c97903a9c25abcad4a9f1f9e4ede68caf796833d9aa0c0cb23898c5b62e4023b8d3a00ff91cdd1f1ee8e82d51e9198454bf87ea16fed9c99147e202 @@ -31,6 +32,7 @@ DIST gentoo-kernel-5.9.12-1.amd64.xpak 62965041 BLAKE2B d9172f6bbf71a577aa54db97 DIST gentoo-kernel-5.9.12-1.arm64.xpak 60921892 BLAKE2B df1d0724b371d5363d92d94220825fbed4e549c8bec26ede850f08dda059af660ef7996ceed5c4fd6ca84563fe3d54919793603c4745442a9bf3ea37f54d1543 SHA512 b97b5cc504bf47424190d491057921ad3a9feb080b8b362fe0625213f814f20287410960e06f16b67f2c310923a791d072f3b0cc2acd8ef771914113c66f20be DIST gentoo-kernel-5.9.12-1.x86.xpak 56011322 BLAKE2B b306e3b8d78130ef846faf27b6d994a9c7f7c1791b16c65f24cb351ef50adbd7324384aa4ce25f0504ace16f103c3a55c0d8a2b058b31a6538a20c5d0a385a85 SHA512 3b1ff4bddb116f069ed1f186a8ab4519ff9a0a075e81232ffea293da8a5e1b7c74a2103be3901d25fe161a2566a919c24377c76567dc3b9ed92cb4046293a831 DIST gentoo-kernel-5.9.13-1.amd64.xpak 62956495 BLAKE2B ded936faf3c8e2a0c8cf2a5cecd4ba6ec41ea67ab15ab0000a2adc145875f35bdd47019b091a3c6a9c4d0f71edfc2056b00198203c09d443289373e1e2fe073a SHA512 4b8ed47f7eed494b173d2d3e83635805dbb0795030379b8f7ecd1034cba08b17c238f1dfe2137fed692a29f32aa50e6d991de97c592ece8506b4942728092cdf +DIST gentoo-kernel-5.9.13-1.arm64.xpak 61119858 BLAKE2B 037e7ebbffb7ff2d143b3a6d1cbd95baf0dfe5b91430e2e7c92b7235123fde79f77326d519780e7a7e1d385e831f3088694fbb04cf36762b6735d4f5c010a453 SHA512 b50a1e5171b36479d0c2756ab819322d68f51df3222daa39e2362172cc4d622d5a9cafef2f2ab41bcb89dd533cf27ecd1eda6ce4783084ce4ab75777d5604279 DIST gentoo-kernel-5.9.13-1.x86.xpak 56040088 BLAKE2B 436e6527da0120f6fa1829bdef7a20903c9bcce6113105831311d1fb0a62bc959866da6b1624063edadd509ce4d1cc88cdff03111a018ddec0038d960ab0435c SHA512 f9c3c24078fa8325488e69e74e39f1b7a46a8dc606e656029e706c4e0b7d5ad9c8ef9c318df9764d61fde429d37956002b4481f2c9207699f0804cd7d9a5cb3e DIST gentoo-kernel-5.9.8-1.amd64.xpak 63386669 BLAKE2B 6ebe70d1085d0ea33361ab398d076ba5bb3cd21aab1769d8a106978d7b320b993878fd32a59800997a5832483a19b3bce2e396b09ed25c0f34d5786ae9b7f90d SHA512 61f4d150f8fb5cca735e09ca8021ae972d953b0297dc52d9d623d1ee3f3d4a3e5cd7f98d39f785e279891373c9719166a5dad624ea16a9300c7c3fa7b0777aaf DIST gentoo-kernel-5.9.8-1.arm64.xpak 61440507 BLAKE2B 4704fa85533e68763346f3b4ccd462473424404c1e8f0302a69300e48ccc265857c2911aa36b11b38a0fc908d5ba681c4d35038f5cee473172b83ab331075cff SHA512 0df3f58142b0015457de82134b4c3535f8826f6108ef8aa32e2097cc5294fab35a76135fd4a4fdaed50e2b52be149833bd3e9137546f5beca90c7861f3c0c579 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.82-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.82-r1.ebuild new file mode 100644 index 000000000000..2378adc3f352 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.82-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-install + +MY_P=${P/-bin/}-1 +DESCRIPTION="Pre-built Linux kernel with genpatches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.amd64.xpak + ) + arm64? ( + https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.arm64.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.x86.xpak + )" +S=${WORKDIR} + +LICENSE="GPL-2" +KEYWORDS="~arm64" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" + +QA_PREBUILT='*' + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_test() { + kernel-install_test "${PV}" \ + "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \ + "lib/modules/${PV}" +} + +src_install() { + mv * "${ED}" || die +} diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.13-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.13-r1.ebuild new file mode 100644 index 000000000000..ad9181bc4960 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.13-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-install + +MY_P=${P/-bin/}-1 +DESCRIPTION="Pre-built Linux kernel with genpatches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + arm64? ( + https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.arm64.xpak + )" +S=${WORKDIR} + +LICENSE="GPL-2" +KEYWORDS="~arm64" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" + +QA_PREBUILT='*' + +pkg_pretend() { + ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_test() { + kernel-install_test "${PV}" \ + "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \ + "lib/modules/${PV}" +} + +src_install() { + mv * "${ED}" || die +} diff --git a/sys-libs/librtas/librtas-2.0.2-r1.ebuild b/sys-libs/librtas/librtas-2.0.2-r1.ebuild index 5ea804f00159..ec20aa395889 100644 --- a/sys-libs/librtas/librtas-2.0.2-r1.ebuild +++ b/sys-libs/librtas/librtas-2.0.2-r1.ebuild @@ -23,6 +23,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install docdir=/usr/share/doc/${PF} + emake DESTDIR="${D}" install docdir="${EPREFIX}"/usr/share/doc/${PF} find "${D}" -name '*.la' -delete || die } diff --git a/www-client/firefox/files/distribution.ini b/www-client/firefox/files/distribution.ini new file mode 100644 index 000000000000..680512e3da32 --- /dev/null +++ b/www-client/firefox/files/distribution.ini @@ -0,0 +1,42 @@ +[Global] +id=gentoo +version=1.0 +about=Mozilla Firefox for Gentoo +about.de=Mozilla Firefox für Gentoo + +[Preferences] +app.distributor="gentoo" +app.distributor.channel="gentoo" +startup.homepage_welcome_url="https://www.gentoo.org/" + +[BookmarksToolbar] +item.1.type=default +item.2.title=Gentoo's Bugzilla +item.2.link=https://bugs.gentoo.org/ +item.3.title=Gentoo Forums +item.3.link=https://forums.gentoo.org/ +item.4.title=Gentoo Packages +item.4.link=https://packages.gentoo.org/ +item.5.title=Planet Gentoo +item.5.link=https://planet.gentoo.org/ +item.6.title=Gentoo Wiki +item.6.link=https://wiki.gentoo.org/ + +[BookmarksMenu] +item.1.title=Gentoo +item.1.type=folder +item.1.folderId=1 + +[BookmarksFolder-1] +item.1.title=Gentoo Linux +item.1.link=https://www.gentoo.org/ +item.2.title=Gentoo's Bugzilla +item.2.link=https://bugs.gentoo.org/ +item.3.title=Gentoo Forums +item.3.link=https://forums.gentoo.org/ +item.4.title=Gentoo Packages +item.4.link=https://packages.gentoo.org/ +item.5.title=Planet Gentoo +item.5.link=https://planet.gentoo.org/ +item.6.title=Gentoo Wiki +item.6.link=https://wiki.gentoo.org/ diff --git a/www-client/firefox/firefox-84.0_rc1.ebuild b/www-client/firefox/firefox-84.0_rc1.ebuild index 5109871e529f..b1a5705bd3f0 100644 --- a/www-client/firefox/firefox-84.0_rc1.ebuild +++ b/www-client/firefox/firefox-84.0_rc1.ebuild @@ -883,6 +883,7 @@ src_install() { # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" + newins "${FILESDIR}"/distribution.ini distribution.ini newins "${FILESDIR}"/disable-auto-update.policy.json policies.json # Install system-wide preferences diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild index e4f339007985..161a79cacb81 100644 --- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection +sysprof test vim-syntax wayland +X xinerama" +IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X ) diff --git a/x11-libs/gtk+/gtk+-3.24.24.ebuild b/x11-libs/gtk+/gtk+-3.24.24.ebuild index bb71f7877e63..4a70f48ff70e 100644 --- a/x11-libs/gtk+/gtk+-3.24.24.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.24.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection +sysprof test vim-syntax wayland +X xinerama" +IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X ) diff --git a/x11-misc/synergy/synergy-1.9.1-r1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild index 017f0601c9a4..e44e659f7187 100644 --- a/x11-misc/synergy/synergy-1.9.1-r1.ebuild +++ b/x11-misc/synergy/synergy-1.9.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="libressl qt5 test" RESTRICT="!test? ( test )" diff --git a/x11-wm/mutter/mutter-3.38.2.ebuild b/x11-wm/mutter/mutter-3.38.2.ebuild index de7a8a883a14..9c81a28880df 100644 --- a/x11-wm/mutter/mutter-3.38.2.ebuild +++ b/x11-wm/mutter/mutter-3.38.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" LICENSE="GPL-2+" SLOT="0/7" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot -IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland" +IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" wayland? ( ^^ ( elogind systemd ) udev ) -- cgit v1.3.1