diff options
144 files changed, 852 insertions, 726 deletions
diff --git a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild index b0e001e4a6a0..6b6c7c7a905a 100644 --- a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild +++ b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit autotools eutils epatch user +inherit autotools epatch user DESCRIPTION="A speech server that allows screen readers to interact with festival lite" HOMEPAGE="http://eflite.sourceforge.net" diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild index c458fcee9dcd..8509d2d383e6 100644 --- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild +++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild @@ -1,41 +1,43 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="braille translator from the National Federation of the Blind" +DESCRIPTION="Braille translator from the National Federation of the Blind" HOMEPAGE="http://www.nfb.org/nfbtrans" SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND=" >=app-arch/unzip-5.50-r2" -RDEPEND="" - -S=${WORKDIR} +BDEPEND=" >=app-arch/unzip-5.50-r2" PATCHES=( -"${FILESDIR}"/${P}-gentoo-fix.patch -"${FILESDIR}"/${P}-getline-fix.patch -"${FILESDIR}"/${P}-respect-ldflags.patch + "${FILESDIR}"/${P}-gentoo-fix.patch + "${FILESDIR}"/${P}-getline-fix.patch + "${FILESDIR}"/${P}-respect-ldflags.patch ) src_prepare() { mv MAKEFILE Makefile || die mv SPANISH.ZIP spanish.zip || die - emake lowercase + default + + emake lowercase } src_compile() { - emake CC=$(tc-getCC) \ + emake \ + CC="$(tc-getCC)" \ LIBS= \ - CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all + CFLAGS="${CFLAGS} -DLINUX" \ + LDFLAGS="${LDFLAGS}" \ + all } src_install() { diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild index 3d3a5c02977f..b85ce3b6ab6a 100644 --- a/app-admin/ccze/ccze-0.2.1-r4.ebuild +++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit fixheadtails autotools eutils toolchain-funcs +inherit autotools fixheadtails toolchain-funcs DESCRIPTION="A flexible and fast logfile colorizer" HOMEPAGE="https://github.com/madhouse/ccze/releases" SRC_URI="mirror://gentoo/${P}.tar.gz" -RESTRICT="test" - LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ppc x86" -IUSE="" + +RESTRICT="test" DEPEND="dev-libs/libpcre sys-libs/ncurses:0=" - RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ ) diff --git a/app-admin/keepass/keepass-2.46.ebuild b/app-admin/keepass/keepass-2.46.ebuild index a42724fe8584..550a4da96f43 100644 --- a/app-admin/keepass/keepass-2.46.ebuild +++ b/app-admin/keepass/keepass-2.46.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop eutils xdg-utils +inherit desktop optfeature wrapper xdg-utils MY_PN="KeePass" DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" HOMEPAGE="https://keepass.info/" SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="aot" -COMMON_DEPEND="dev-lang/mono" -DEPEND="${COMMON_DEPEND} - app-arch/unzip -" -RDEPEND="${COMMON_DEPEND} +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} dev-dotnet/libgdiplus[cairo] " -S="${WORKDIR}" PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" ) # bug #687052 @@ -101,10 +100,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - if ! has_version x11-misc/xdotool ; then - elog "Optional dependencies:" - elog " x11-misc/xdotool (enables autotype/autofill)" - fi + optfeature "enables autotype/autofill" x11-misc/xdotool elog "Some systems may experience issues with copy and paste operations." elog "If you encounter this, please install x11-misc/xsel." diff --git a/app-admin/keepass/keepass-2.47.ebuild b/app-admin/keepass/keepass-2.47.ebuild index af7035cf7b4b..850250d93e2c 100644 --- a/app-admin/keepass/keepass-2.47.ebuild +++ b/app-admin/keepass/keepass-2.47.ebuild @@ -3,27 +3,26 @@ EAPI=7 -inherit desktop eutils xdg-utils +inherit desktop optfeature wrapper xdg-utils MY_PN="KeePass" DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" HOMEPAGE="https://keepass.info/" SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="aot" -COMMON_DEPEND="dev-lang/mono" -DEPEND="${COMMON_DEPEND} - app-arch/unzip -" -RDEPEND="${COMMON_DEPEND} +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} dev-dotnet/libgdiplus[cairo] " -S="${WORKDIR}" PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" ) # bug #687052 @@ -101,10 +100,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - if ! has_version x11-misc/xdotool ; then - elog "Optional dependencies:" - elog " x11-misc/xdotool (enables autotype/autofill)" - fi + optfeature "enables autotype/autofill" x11-misc/xdotool elog "Some systems may experience issues with copy and paste operations." elog "If you encounter this, please install x11-misc/xsel." diff --git a/app-admin/lnav/lnav-0.8.5.ebuild b/app-admin/lnav/lnav-0.8.5.ebuild index 8a803a78428e..d981f24a9e9f 100644 --- a/app-admin/lnav/lnav-0.8.5.ebuild +++ b/app-admin/lnav/lnav-0.8.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs autotools +inherit autotools DESCRIPTION="A curses-based tool for viewing and analyzing log files" HOMEPAGE="https://lnav.org" diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild index 64c7de8adaed..73758b4838f4 100644 --- a/app-admin/lnav/lnav-0.9.0.ebuild +++ b/app-admin/lnav/lnav-0.9.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs autotools +inherit autotools DESCRIPTION="A curses-based tool for viewing and analyzing log files" HOMEPAGE="https://lnav.org" diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild index 1cfad2788449..1e48d5125737 100644 --- a/app-admin/socklog/socklog-2.1.0.ebuild +++ b/app-admin/socklog/socklog-2.1.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs flag-o-matic +inherit flag-o-matic toolchain-funcs -DESCRIPTION="small secure replacement for syslogd with automatic log rotation" +DESCRIPTION="Small secure replacement for syslogd with automatic log rotation" HOMEPAGE="http://smarden.org/socklog/" SRC_URI="http://smarden.org/socklog/${P}.tar.gz" diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild index a4978b8144ad..cdc308efa9f9 100644 --- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild +++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="Files which haven't been accessed are removed from specified directories" HOMEPAGE="https://pagure.io/tmpwatch" @@ -14,8 +14,14 @@ SLOT="0" KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" IUSE="selinux" -RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )" -DEPEND="" +# psmisc for fuser +DEPEND=" + !kernel_Darwin? ( sys-process/psmisc ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-tmpreaper ) +" PATCHES=( "${FILESDIR}/${P}-boottime.patch" diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild index 41ea0cc71d54..db6b19a2144a 100644 --- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild +++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic +inherit autotools flag-o-matic DESCRIPTION="Open Source File Integrity Checker and IDS" HOMEPAGE="http://www.tripwire.org/" @@ -71,7 +71,7 @@ pkg_postinst() { elog "script provided by the app-admin/mktwpol package. This package is" elog "installed for you by the \"tools\" USE flag (which is enabled by" elog "default." -else + else elog "Maintenance of tripwire policy files as packages are added" elog "and deleted from your system can be automated by the mktwpol.sh" elog "script provided by the app-admin/mktwpol package. This package" diff --git a/app-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild index 760fe40c131c..c8096088021a 100644 --- a/app-admin/usbview/usbview-2.0.ebuild +++ b/app-admin/usbview/usbview-2.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils linux-info +EAPI=7 + +inherit desktop linux-info DESCRIPTION="Display the topology of devices on the USB bus" HOMEPAGE="http://www.kroah.com/linux-usb/" @@ -17,10 +18,8 @@ RDEPEND=" x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS ChangeLog README TODO ) diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch index 070e9c019d26..89e0698c3e45 100644 --- a/app-admin/watchfolder/files/0.3.3-64bit.patch +++ b/app-admin/watchfolder/files/0.3.3-64bit.patch @@ -1,5 +1,5 @@ ---- a/watchd.c 2006-02-23 12:33:32.000000000 -0500 -+++ b/watchd.c 2006-02-23 12:45:30.000000000 -0500 +--- a/watchd.c ++++ b/watchd.c @@ -176,7 +176,7 @@ // free(p2tmp); diff --git a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch index 175e8ed29ec3..9ccfa76c0934 100644 --- a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch +++ b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch @@ -1,5 +1,5 @@ ---- a/watchd.c 2009-02-27 23:46:42.000000000 +0000 -+++ b/watchd.c 2009-02-27 23:50:22.000000000 +0000 +--- a/watchd.c ++++ b/watchd.c @@ -671,7 +671,7 @@ { if (folder->flags&FL_LOG_FILE) diff --git a/app-admin/watchfolder/files/0.3.3-implicit-decl.patch b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch new file mode 100644 index 000000000000..1b8e72d72bf8 --- /dev/null +++ b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch @@ -0,0 +1,40 @@ +--- a/chain.c ++++ b/chain.c +@@ -21,7 +21,7 @@ Author : Peter Turczak <p_turczak@wiwa.de> + #include "chain.h" + #include <stdio.h> + #include <stdlib.h> +- ++#include <string.h> + + struct element* newchain() + { +--- a/filedb.c ++++ b/filedb.c +@@ -1,5 +1,7 @@ + #include <sys/types.h> + #include <sys/stat.h> ++#include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include "chain.h" + #include "filedb.h" +--- a/inifile.c ++++ b/inifile.c +@@ -1,5 +1,6 @@ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include "inifile.h" + + /* +--- a/watchd.c ++++ b/watchd.c +@@ -25,6 +25,7 @@ Syntax : watchd + #include <sys/types.h> + #include <sys/timeb.h> + #include <sys/stat.h> ++#include <sys/time.h> + #include <sys/wait.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild index d6fc7c4146b5..1622add191e4 100644 --- a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild +++ b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="watches directories and processes files" +DESCRIPTION="Watches directories and processes files" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.gz" +S="${WORKDIR}/${P/folder/d}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~ppc ~x86" -S="${WORKDIR}/${P/folder/d}" - PATCHES=( # patch to remove warnings on 64 bit systems "${FILESDIR}"/${PV}-64bit.patch # and a gcc 4.3.3 / fortify_sources fix "${FILESDIR}"/${PV}-fortify-sources.patch + # various implicit declarations + "${FILESDIR}"/${PV}-implicit-decl.patch ) src_prepare() { default + sed -i \ -e '/-c -o/s:OPT:CFLAGS:' \ -e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \ diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild index b172fd0d2204..04f9402991c5 100644 --- a/app-arch/makeself/makeself-2.2.0-r2.ebuild +++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit unpacker eutils +inherit unpacker -DESCRIPTION="shell script that generates a self-extractible tar.gz" +DESCRIPTION="Shell script that generates a self-extractible tar.gz" HOMEPAGE="http://www.megastep.org/makeself/" SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" @@ -15,8 +16,6 @@ KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux" RDEPEND="sys-apps/gentoo-functions" -S="${WORKDIR}/${PN}-release-${PV}" - PATCHES=( "${FILESDIR}/${P}-help-header.patch" ) src_install() { diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild index 6124ae9ca95d..5d5cae52801e 100644 --- a/app-arch/mt-st/mt-st-1.3.ebuild +++ b/app-arch/mt-st/mt-st-1.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="control magnetic tape drive operation" +DESCRIPTION="Control magnetic tape drive operation" HOMEPAGE="https://github.com/iustin/mt-st" SRC_URI="https://github.com/iustin/mt-st/releases/download/${P}/${P}.tar.gz" @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" } src_install() { diff --git a/app-arch/mt-st/mt-st-1.4.ebuild b/app-arch/mt-st/mt-st-1.4.ebuild index 8677862cdc02..b63ab7081319 100644 --- a/app-arch/mt-st/mt-st-1.4.ebuild +++ b/app-arch/mt-st/mt-st-1.4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="control magnetic tape drive operation" diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild index 6201e07af279..4588f304d124 100644 --- a/app-arch/mt-st/mt-st-9999.ebuild +++ b/app-arch/mt-st/mt-st-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit git-r3 toolchain-funcs DESCRIPTION="control magnetic tape drive operation" @@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/iustin/mt-st" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" src_configure() { tc-export CC diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild index 527828394d33..224e6c596e42 100644 --- a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild +++ b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch DESCRIPTION="A daily backup system similar to Plan9's dumpfs" HOMEPAGE="http://0xcc.net/pdumpfs/" diff --git a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild index bd12c7b9d6fd..9b91aa577c3c 100644 --- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild +++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -inherit eutils unpacker +inherit desktop unpacker DESCRIPTION="Secure free online backup, storage, and sharing system" HOMEPAGE="https://spideroak.com" @@ -46,47 +46,50 @@ src_prepare() { # Set RPATH for preserve-libs handling (bug #400979). cd "${S}/opt/SpiderOakONE/lib" || die local x - for x in `find` ; do + for x in $(find) ; do # Use \x7fELF header to separate ELF executables and libraries [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue patchelf --set-rpath '$ORIGIN' "${x}" || \ die "patchelf failed on ${x}" done - #Remove the libraries that break compatibility in modern systems - #SpiderOak will use the system libs instead - rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" - rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" - rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" - rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" + # Remove the libraries that break compatibility in modern systems + # SpiderOak will use the system libs instead + rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" || die + rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" || die + rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" || die + rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" || die eapply_user } src_install() { - #install the wrapper script + # Install the wrapper script exeinto /usr/bin doexe usr/bin/SpiderOakONE # inotify_dir_watcher needs to be marked executable, bug #453266 #chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher - #install the executable + # Install the executable exeinto /opt/SpiderOakONE/lib doexe opt/SpiderOakONE/lib/SpiderOakONE doexe opt/SpiderOakONE/lib/inotify_dir_watcher - rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} + rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} || die - #install the prebundled libraries + # Install the prebundled libraries insinto /opt/SpiderOakONE doins -r opt/SpiderOakONE/lib - #install the config files - use dbus || rm -rf etc/dbus-1 + # Install the config files + if ! use dbus; then + rm -rf etc/dbus-1 || die + fi + insinto / doins -r etc - #install the manpage + # Install the manpage doman usr/share/man/man1/SpiderOakONE.1.gz if use X; then diff --git a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild index b4cb99ed03b9..933f3f579edf 100644 --- a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild +++ b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils flag-o-matic +EAPI=7 + +inherit autotools desktop flag-o-matic DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI" HOMEPAGE="http://www.coyotegulch.com/products/acovea/" @@ -18,8 +19,8 @@ RDEPEND=">=app-benchmarks/acovea-5 DEPEND="${RDEPEND}" src_prepare() { - use unicode && epatch "${FILESDIR}"/${P}-unicode.patch - epatch "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch + use unicode && eapply "${FILESDIR}"/${P}-unicode.patch + eapply "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch append-cxxflags -std=c++11 eautoreconf } diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild index c2e8656b7af9..def6449b2579 100644 --- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild +++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic qmake-utils toolchain-funcs + +inherit qmake-utils toolchain-funcs COMMIT="5023138d7c35c4667c938b853e5ea89737334e92" DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux" @@ -22,7 +23,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" -BDEPEND="" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/i7z-0.27.2-ncurses.patch diff --git a/app-benchmarks/libc-bench/libc-bench-20110206.ebuild b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild index 72efbc992efa..75f49f8d8689 100644 --- a/app-benchmarks/libc-bench/libc-bench-20110206.ebuild +++ b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Time and memory-efficiency tests of various C/POSIX standard library functions" HOMEPAGE="http://www.etalabs.net/libc-bench.html http://git.musl-libc.org/cgit/libc-bench/" @@ -12,15 +12,15 @@ SRC_URI="http://www.etalabs.net/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -src_prepare() { - epatch "${FILESDIR}"/respect-flags.patch -} +PATCHES=( + "${FILESDIR}"/respect-flags.patch +) src_configure() { tc-export CC - CFLAGS+=" ${CPPFLAGS}" + + append-cflags "${CPPFLAGS}" } src_install() { diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild index 4370360dc7ad..e0adb201c246 100644 --- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild +++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils +inherit desktop DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs" HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/" SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz" +S="${WORKDIR}"/tkdvd LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND=" app-cdr/cdrtools @@ -21,8 +21,6 @@ RDEPEND=" dev-lang/tk:0 " -S=${WORKDIR}/tkdvd - src_compile() { :; } src_install() { diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml index 8f61a344a5c9..52527f677660 100644 --- a/app-crypt/ccid/metadata.xml +++ b/app-crypt/ccid/metadata.xml @@ -9,4 +9,7 @@ <flag name="kobil-midentity">Build and install Kobil_mIDentity_switch tool</flag> <flag name="twinserial">Enable twinserial reader</flag> </use> + <upstream> + <remote-id type="github">LudovicRousseau/CCID</remote-id> + </upstream> </pkgmetadata> diff --git a/app-crypt/gorilla/files/gorilla-script-destdir.patch b/app-crypt/gorilla/files/gorilla-script-destdir.patch index e18fcd80e3ec..55ac63ede7a7 100644 --- a/app-crypt/gorilla/files/gorilla-script-destdir.patch +++ b/app-crypt/gorilla/files/gorilla-script-destdir.patch @@ -1,5 +1,5 @@ ---- gorilla-1.4/gorilla.in 2006-07-14 13:29:33.000000000 -0400 -+++ gorilla-1.4/gorilla.in.new 2006-07-14 13:33:01.000000000 -0400 +--- a/gorilla.in ++++ b/gorilla.in @@ -1,10 +1,13 @@ #! /bin/sh # the next line restarts using wish \ diff --git a/app-crypt/gorilla/gorilla-1.4-r1.ebuild b/app-crypt/gorilla/gorilla-1.4-r1.ebuild index 2348ecc65614..fdb790d0430d 100644 --- a/app-crypt/gorilla/gorilla-1.4-r1.ebuild +++ b/app-crypt/gorilla/gorilla-1.4-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 DESCRIPTION="Password Safe in secure way with GUI interface" HOMEPAGE="https://github.com/zdia/gorilla/wiki" @@ -12,22 +10,23 @@ SRC_URI="https://github.com/zdia/gorilla/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" DEPEND=" >=dev-lang/tcl-8.4.19:0 >=dev-lang/tk-8.4.19:0 dev-tcltk/iwidgets - dev-tcltk/bwidget" -RDEPEND=${DEPEND} + dev-tcltk/bwidget +" +RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-script-destdir.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-script-destdir.patch +) src_configure() { ./configure || die "econf failed" } + src_compile() { :; } src_install() { diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild index f4e3c0857bdd..c2c6fe168bcb 100644 --- a/app-crypt/libmd/libmd-1.0.3.ebuild +++ b/app-crypt/libmd/libmd-1.0.3.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit multilib - DESCRIPTION="Message Digest functions from BSD systems" HOMEPAGE="https://www.hadrons.org/software/libmd/" SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz" diff --git a/app-crypt/libmd/libmd-9999.ebuild b/app-crypt/libmd/libmd-9999.ebuild index b7ba4f0339ba..7ce508a893c1 100644 --- a/app-crypt/libmd/libmd-9999.ebuild +++ b/app-crypt/libmd/libmd-9999.ebuild @@ -14,6 +14,8 @@ SLOT="0" src_prepare() { default + + eautoreconf } src_configure() { diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild index a886a2157412..fc4bbfa9a2f1 100644 --- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild +++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild @@ -64,5 +64,5 @@ src_install() { cd "${S}/tools" || die BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install dobin "${S}/tools/tpm2_ptool" - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild index 26e5fd720d81..8cdb913f1e7f 100644 --- a/app-misc/gentoo/gentoo-0.20.7.ebuild +++ b/app-misc/gentoo/gentoo-0.20.7.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils + +inherit autotools desktop DESCRIPTION="Graphical file manager for Unix-like systems, using GTK+" HOMEPAGE="https://sourceforge.net/projects/gentoo/" diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r4.ebuild index 5255af99c271..c4a446040f4f 100644 --- a/app-misc/razertool/razertool-0.0.7-r4.ebuild +++ b/app-misc/razertool/razertool-0.0.7-r4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils + +inherit autotools desktop DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse" HOMEPAGE="http://razertool.sourceforge.net/" diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild index 281e6b0e895a..b33c8c3e2032 100644 --- a/app-shells/mksh/mksh-59c.ebuild +++ b/app-shells/mksh/mksh-59c.ebuild @@ -6,11 +6,11 @@ EAPI=7 inherit toolchain-funcs if [[ ${PV} == *9999 ]] ; then - inherit cvs ECVS_SERVER="anoncvs.mirbsd.org:/cvs" ECVS_MODULE="mksh" ECVS_USER="_anoncvs" ECVS_AUTH="ext" + inherit cvs 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" diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index d1e1e13e083f..04b333bd6995 100644 --- a/app-shells/mksh/mksh-9999.ebuild +++ b/app-shells/mksh/mksh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ EAPI=7 inherit toolchain-funcs if [[ ${PV} == *9999 ]] ; then - inherit cvs ECVS_SERVER="anoncvs.mirbsd.org:/cvs" ECVS_MODULE="mksh" ECVS_USER="_anoncvs" ECVS_AUTH="ext" + inherit cvs 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" diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild index c2318824efe3..c9cdbf0e1e8c 100644 --- a/app-text/ding/ding-1.8.1.ebuild +++ b/app-text/ding/ding-1.8.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit desktop DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)" HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/" @@ -12,7 +12,6 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" RDEPEND=">=dev-lang/tk-8.3" diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild index 8f9c4893199b..488950ddc494 100644 --- a/app-text/htmlc/htmlc-2.40.0.ebuild +++ b/app-text/htmlc/htmlc-2.40.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # Override version: 2.4.0 > 2.21.0 so we name it 2.40.0 MY_P="${P/0[.]/.}" @@ -9,6 +9,7 @@ MY_P="${P/0[.]/.}" DESCRIPTION="HTML template files expander" HOMEPAGE="http://htmlc.inria.fr/" SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" LICENSE="htmlc" SLOT="0" @@ -20,11 +21,9 @@ IUSE="+ocamlopt" DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - src_configure() { ./configure \ - --install-root-dir "${ED}usr" \ + --install-root-dir "${ED}/usr" \ || die } @@ -42,6 +41,7 @@ src_install() { else emake installbyt fi + emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman dodoc README Announce* CHANGES } diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild index b10f6905b522..38f7c831c39b 100644 --- a/app-text/htmlc/htmlc-2.60.0.ebuild +++ b/app-text/htmlc/htmlc-2.60.0.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 # Override version: 2.4.0 > 2.21.0 so we name it 2.40.0 MY_P="${P/0[.]/.}" @@ -11,6 +9,7 @@ MY_P="${P/0[.]/.}" DESCRIPTION="HTML template files expander" HOMEPAGE="http://htmlc.inria.fr/" SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz" +S="${WORKDIR}/${MY_P}" LICENSE="htmlc" SLOT="0" @@ -22,15 +21,13 @@ IUSE="+ocamlopt" DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/werror.patch" -} +PATCHES=( + "${FILESDIR}"/werror.patch +) src_configure() { ./configure \ - --install-root-dir "${ED}usr" \ + --install-root-dir "${ED}/usr" \ || die } @@ -48,6 +45,7 @@ src_install() { else emake installbyt fi + emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman dodoc README Announce* CHANGES } diff --git a/app-text/xmlto/xmlto-0.0.28-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild index 21e100a54846..fcc8c8274dcd 100644 --- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild +++ b/app-text/xmlto/xmlto-0.0.28-r3.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils + +inherit epatch DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats" HOMEPAGE="https://pagure.io/xmlto" diff --git a/dev-games/aseprite/aseprite-1.1.6.ebuild b/dev-games/aseprite/aseprite-1.1.6.ebuild index e95b1dcdefed..aab455bf61f3 100644 --- a/dev-games/aseprite/aseprite-1.1.6.ebuild +++ b/dev-games/aseprite/aseprite-1.1.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils eutils flag-o-matic +inherit cmake-utils desktop flag-o-matic DESCRIPTION="Animated sprite editor & pixel art tool" HOMEPAGE="https://www.aseprite.org" @@ -55,6 +55,7 @@ src_prepare() { if use debug ; then sed -i '/-DNDEBUG/d' CMakeLists.txt || die fi + # Fix shebang in thumbnailer sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die } diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild index df56d538b824..50550ea6c716 100644 --- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild +++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit autotools eutils +inherit autotools DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic" HOMEPAGE="http://jerasure.org" @@ -30,5 +30,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild index 4bd39b49d822..9b095c166782 100644 --- a/dev-libs/libev/libev-4.33.ebuild +++ b/dev-libs/libev/libev-4.33.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools eutils multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="A high-performance event loop/event model with lots of feature" HOMEPAGE="http://software.schmorp.de/pkg/libev.html" @@ -36,7 +36,8 @@ multilib_src_configure() { multilib_src_install_all() { if ! use static-libs; then - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die fi + einstalldocs } diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4-r1.ebuild index 928ed1b2bfa5..4ff0ef02da9f 100644 --- a/dev-libs/liblist/liblist-2.4.ebuild +++ b/dev-libs/liblist/liblist-2.4-r1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools - DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks" HOMEPAGE="http://ohnopub.net/liblist" SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2" @@ -14,13 +12,13 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" IUSE="doc examples" -RDEPEND=" +BDEPEND=" doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base - )" -DEPEND="${RDEPEND}" + ) +" src_configure() { econf \ @@ -42,7 +40,7 @@ src_install() { docompress -x /usr/share/doc/${PF}/{list.0,paper.dvi,examples} # no static archives - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild index 40141bb55b71..e353d9ccc9be 100644 --- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild +++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild @@ -2,11 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib toolchain-funcs + +inherit toolchain-funcs DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="https://www.infradead.org/~tgr/libnl/" SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz" + LICENSE="LGPL-2.1" SLOT="1.1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" @@ -14,6 +16,7 @@ IUSE="doc static-libs" DEPEND="doc? ( app-doc/doxygen )" DOCS=( ChangeLog ) + PATCHES=( "${FILESDIR}"/${PN}-1.1-vlan-header.patch "${FILESDIR}"/${PN}-1.1-flags.patch @@ -34,14 +37,14 @@ src_prepare() { sed -i lib/Makefile -e '/OUT_AR/d' || die fi - rm -f lib/libnl.a + rm -f lib/libnl.a || die } src_compile() { - emake AR=$(tc-getAR) + emake AR="$(tc-getAR)" if use doc ; then - cd "${S}/doc" + cd "${S}/doc" || die emake gendoc fi } @@ -50,7 +53,8 @@ src_install() { default if use doc ; then - cd "${S}/doc" + cd "${S}/doc" || die + docinto html dodoc -r html/* fi diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild index 30fa4a923c0f..14a4835802c4 100644 --- a/dev-libs/libnl/libnl-1.1.9999.ebuild +++ b/dev-libs/libnl/libnl-1.1.9999.ebuild @@ -2,18 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 multilib toolchain-funcs + +inherit git-r3 toolchain-funcs DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="https://www.infradead.org/~tgr/libnl/" EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable" + LICENSE="LGPL-2.1" SLOT="1.1" -KEYWORDS="" IUSE="doc static-libs" -DEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-doc/doxygen )" + DOCS=( ChangeLog ) + PATCHES=( "${FILESDIR}"/${PN}-1.1-vlan-header.patch "${FILESDIR}"/${PN}-1.1-flags.patch @@ -30,18 +33,18 @@ src_prepare() { -e 's|-g ||g' \ Makefile.opts.in || die - if ! use static-libs; then + if ! use static-libs ; then sed -i lib/Makefile -e '/OUT_AR/d' || die fi - rm -f lib/libnl.a + rm -f lib/libnl.a || die } src_compile() { - emake AR=$(tc-getAR) + emake AR="$(tc-getAR)" if use doc ; then - cd "${S}/doc" + cd "${S}/doc" || die emake gendoc fi } @@ -50,7 +53,7 @@ src_install() { default if use doc ; then - cd "${S}/doc" + cd "${S}/doc" || die docinto html dodoc -r html/* fi diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild index aeb14abc754e..984497bbf061 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic -DESCRIPTION="library for building efficient parsers, written in C" +DESCRIPTION="Library for building efficient parsers, written in C" HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" @@ -15,9 +15,10 @@ KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" IUSE="iconv test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" >=dev-util/netsurf-buildsystem-1.7-r1 - test? ( dev-lang/perl )" + test? ( dev-lang/perl ) +" DOCS=( README docs/Todo ) diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild index 0345f7b9ea63..d851e35b45c7 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild @@ -15,9 +15,10 @@ KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="iconv test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" >=dev-util/netsurf-buildsystem-1.7-r1 - test? ( dev-lang/perl )" + test? ( dev-lang/perl ) +" DOCS=( README docs/Todo ) diff --git a/dev-libs/libserialport/libserialport-0.1.1.ebuild b/dev-libs/libserialport/libserialport-0.1.1.ebuild index 36916226487d..b6824186f222 100644 --- a/dev-libs/libserialport/libserialport-0.1.1.ebuild +++ b/dev-libs/libserialport/libserialport-0.1.1.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" - -inherit eutils ltprune +EAPI=7 if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools + inherit autotools git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" KEYWORDS="amd64 x86" @@ -20,13 +18,12 @@ LICENSE="LGPL-3" SLOT="0" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf - eapply_user } src_configure() { @@ -35,5 +32,6 @@ src_configure() { src_install() { default - prune_libtool_files + + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/dev-libs/libserialport/libserialport-9999.ebuild b/dev-libs/libserialport/libserialport-9999.ebuild index cb6bd9f168a1..13181d0099a0 100644 --- a/dev-libs/libserialport/libserialport-9999.ebuild +++ b/dev-libs/libserialport/libserialport-9999.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" - -inherit eutils ltprune +EAPI=7 if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools + inherit autotools git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -20,13 +18,12 @@ LICENSE="LGPL-3" SLOT="0" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf - eapply_user } src_configure() { @@ -35,5 +32,6 @@ src_configure() { src_install() { default - prune_libtool_files + + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild index 70c4d4906352..0dd7f7bf3a2d 100644 --- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild +++ b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools multilib-minimal libtool +inherit autotools multilib-minimal DESCRIPTION="ASN.1 library" HOMEPAGE="https://www.gnu.org/software/libtasn1/" diff --git a/dev-libs/libvformat/files/libvformat-nodoc.patch b/dev-libs/libvformat/files/libvformat-nodoc.patch index e9dd55ce25ef..cba04e1e569d 100644 --- a/dev-libs/libvformat/files/libvformat-nodoc.patch +++ b/dev-libs/libvformat/files/libvformat-nodoc.patch @@ -1,5 +1,5 @@ ---- Makefile.am.orig 2005-08-12 13:36:39.000000000 +0200 -+++ Makefile.am 2005-08-12 13:36:57.000000000 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src vformat test doc +SUBDIRS = src vformat diff --git a/dev-libs/libvformat/libvformat-1.13-r2.ebuild b/dev-libs/libvformat/libvformat-1.13-r2.ebuild index 22f1d04278fc..323b1ec0b2de 100644 --- a/dev-libs/libvformat/libvformat-1.13-r2.ebuild +++ b/dev-libs/libvformat/libvformat-1.13-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools ltprune +EAPI=7 + +inherit autotools DESCRIPTION="Library to read and write vcard files" HOMEPAGE="https://sourceforge.net/projects/vformat/" @@ -10,29 +11,30 @@ SRC_URI=" mirror://debian/pool/main/libv/${PN}/${PN}_${PV}.orig.tar.gz mirror://debian/pool/main/libv/${PN}/${PN}_${PV}-10.debian.tar.gz " +S="${WORKDIR}/${P}.orig" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="static-libs" - -S="${WORKDIR}/${P}.orig" src_prepare() { - epatch \ + eapply \ "${WORKDIR}"/debian/patches/*.patch \ "${FILESDIR}"/${PN}-nodoc.patch \ "${FILESDIR}"/${P}-has_unistd.patch \ "${FILESDIR}"/${P}-str.patch + default + eautoreconf } src_configure() { - econf $(use_enable static-libs static) + econf --disable-static } src_install() { default - use static-libs || prune_libtool_files + + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild index 025e69060d40..8c306a31e412 100644 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild +++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Small library to access XDG Base Directories Specification paths" HOMEPAGE="https://github.com/devnev/libxdg-basedir" SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris" -IUSE="doc static-libs" +IUSE="doc" -RDEPEND="" -DEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-doc/doxygen )" -S="${WORKDIR}/${PN}-${P}" +PATCHES=( + "${FILESDIR}"/${P}-buffer-overflow.patch +) src_prepare() { - epatch "${FILESDIR}/${P}-buffer-overflow.patch" + default eautoreconf } src_configure() { econf \ - $(use_enable static-libs static) \ + --disable-static \ $(use_enable doc doxygen-html) } @@ -42,8 +45,9 @@ src_install() { emake DESTDIR="${D}" install if use doc; then - dohtml -r doc/html/* + docinto html + dodoc -r doc/html/* fi - find "${D}" -type f -name '*.la' -delete + find "${ED}" -type f -name '*.la' -delete } diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild index 51f16d208994..5db6df61122e 100644 --- a/dev-libs/libxls/libxls-1.6.2.ebuild +++ b/dev-libs/libxls/libxls-1.6.2.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit eutils - DESCRIPTION="A library which can read Excel (xls) files" HOMEPAGE="https://github.com/libxls/libxls" SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz" @@ -12,16 +10,13 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/8" # libxlsreader.so.8 KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" -DEPEND="" BDEPEND=" app-arch/unzip virtual/pkgconfig " -RESTRICT=test # test driver is missing +RESTRICT="test" # test driver is missing PATCHES=( "${FILESDIR}"/${PN}-1.4.0-asprintf.patch @@ -35,5 +30,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild index 9db3902e430f..90fa9a8308a8 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="xml" -inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal +inherit autotools flag-o-matic prefix python-r1 multilib-minimal DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" @@ -102,8 +102,8 @@ src_prepare() { # Please do not remove, as else we get references to PORTAGE_TMPDIR # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize -# epunt_cxx # if we don't eautoreconf + #elibtoolize + #epunt_cxx # if we don't eautoreconf eautoreconf } diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild index fb80191e40eb..4107e6d0d0ad 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="xml" -inherit autotools libtool flag-o-matic python-r1 prefix multilib-minimal +inherit autotools flag-o-matic prefix python-r1 multilib-minimal # Note: Please bump in sync with dev-libs/libxslt XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild index 350eede2cb08..254c2b32d9d2 100644 --- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit libtool multilib-minimal toolchain-funcs +inherit libtool multilib-minimal # Note: Please bump this in sync with dev-libs/libxml2. DESCRIPTION="XSLT libraries and tools" @@ -13,7 +13,6 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - IUSE="crypt debug examples static-libs elibc_Darwin" BDEPEND=">=virtual/pkgconfig-1" diff --git a/dev-libs/log4sh/log4sh-1.4.2.ebuild b/dev-libs/log4sh/log4sh-1.4.2.ebuild index bb98dc57cf64..09caddd99216 100644 --- a/dev-libs/log4sh/log4sh-1.4.2.ebuild +++ b/dev-libs/log4sh/log4sh-1.4.2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 DESCRIPTION="A flexible logging framework for shell scripts" HOMEPAGE="https://sourceforge.net/projects/log4sh" @@ -22,8 +20,7 @@ src_compile() { src_test() { # testsuite needs USER variable - export USER="$(whoami)" - make test || die "make test failed" + USER="$(whoami)" emake test } src_install() { @@ -31,7 +28,9 @@ src_install() { doins build/log4sh dodoc doc/*.txt - dohtml doc/*.{html,css} + + docinto html + dodoc doc/*.{html,css} if use examples; then docinto examples @@ -41,7 +40,7 @@ src_install() { } pkg_postinst() { - elog "To use log4sh, have your script source /usr/lib/log4sh/log4sh" + elog "To use log4sh, have your script source ${EPREFIX}/usr/lib/log4sh/log4sh" elog "If you want to use remote logging, you should install package," elog "that provides netcat binary (for example - net-analyzer/netcat)" } diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild index 7c7351aab1b8..62b158098d87 100644 --- a/dev-libs/maloc/maloc-1.5-r1.ebuild +++ b/dev-libs/maloc/maloc-1.5-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" SLOT="0" LICENSE="GPL-2" -IUSE="doc mpi static-libs" +IUSE="doc mpi" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" BDEPEND=" @@ -48,6 +48,7 @@ src_configure() { myeconfargs+=( --disable-triplet + --disable-static $(use_enable mpi) ) diff --git a/dev-libs/mathjax/mathjax-2.7.0.ebuild b/dev-libs/mathjax/mathjax-2.7.0.ebuild index d2f69ad8e4c0..b61ec426b028 100644 --- a/dev-libs/mathjax/mathjax-2.7.0.ebuild +++ b/dev-libs/mathjax/mathjax-2.7.0.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils vcs-clean +inherit vcs-clean DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath" HOMEPAGE="https://www.mathjax.org/" SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/MathJax-${PV} LICENSE="Apache-2.0" SLOT="0" @@ -16,8 +17,6 @@ IUSE="doc examples" RESTRICT="binchecks strip" -S=${WORKDIR}/MathJax-${PV} - make_webconf() { # web server config file - should we really do this? cat > $1 <<-EOF diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild index d2f69ad8e4c0..b61ec426b028 100644 --- a/dev-libs/mathjax/mathjax-2.7.4.ebuild +++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils vcs-clean +inherit vcs-clean DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath" HOMEPAGE="https://www.mathjax.org/" SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/MathJax-${PV} LICENSE="Apache-2.0" SLOT="0" @@ -16,8 +17,6 @@ IUSE="doc examples" RESTRICT="binchecks strip" -S=${WORKDIR}/MathJax-${PV} - make_webconf() { # web server config file - should we really do this? cat > $1 <<-EOF diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild index 6e9b1f771e0e..c30baaa60e5e 100644 --- a/dev-libs/mathjax/mathjax-2.7.7.ebuild +++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,6 +8,7 @@ inherit vcs-clean DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath" HOMEPAGE="https://www.mathjax.org/" SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/MathJax-${PV} LICENSE="Apache-2.0" SLOT="0" @@ -18,8 +19,6 @@ RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )" RESTRICT="binchecks strip" -S=${WORKDIR}/MathJax-${PV} - make_webconf() { # web server config file - should we really do this? cat > $1 <<-EOF diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild index b97a1597e36b..e79a8d71fd52 100644 --- a/dev-libs/popt/popt-1.16-r2.ebuild +++ b/dev-libs/popt/popt-1.16-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils multilib-minimal libtool ltprune + +inherit epatch multilib-minimal libtool ltprune DESCRIPTION="Parse Options - Command line parser" HOMEPAGE="http://rpm5.org/" @@ -23,7 +24,7 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE=${S} \ + ECONF_SOURCE="${S}" \ econf \ $(use_enable static-libs static) \ $(use_enable nls) diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild index c10902006d52..40d8c55b0881 100644 --- a/dev-libs/popt/popt-1.18.ebuild +++ b/dev-libs/popt/popt-1.18.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit multilib-minimal libtool DESCRIPTION="Parse Options - Command line parser" diff --git a/dev-libs/simdjson/simdjson-0.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild index ed7b3f9d6f58..40e114a8f658 100644 --- a/dev-libs/simdjson/simdjson-0.7.1.ebuild +++ b/dev-libs/simdjson/simdjson-0.7.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs cmake +inherit cmake DESCRIPTION="SIMD accelerated C++ JSON library" HOMEPAGE=" diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild index b97cc2e514e7..8dd574e4361f 100644 --- a/dev-libs/simdjson/simdjson-0.8.2.ebuild +++ b/dev-libs/simdjson/simdjson-0.8.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs cmake +inherit cmake DESCRIPTION="SIMD accelerated C++ JSON library" HOMEPAGE=" diff --git a/dev-libs/simdjson/simdjson-0.9.2.ebuild b/dev-libs/simdjson/simdjson-0.9.2.ebuild index b13f61e541de..4e993cb17707 100644 --- a/dev-libs/simdjson/simdjson-0.9.2.ebuild +++ b/dev-libs/simdjson/simdjson-0.9.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs cmake +inherit cmake DESCRIPTION="SIMD accelerated C++ JSON library" HOMEPAGE=" diff --git a/dev-libs/squareball/squareball-0.2.0.ebuild b/dev-libs/squareball/squareball-0.2.0.ebuild index aeb29384561f..f66cb329826c 100644 --- a/dev-libs/squareball/squareball-0.2.0.ebuild +++ b/dev-libs/squareball/squareball-0.2.0.ebuild @@ -1,22 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git" - inherit git-r3 autotools + inherit autotools git-r3 fi -inherit eutils ltprune - DESCRIPTION="A general-purpose library for C99" HOMEPAGE="https://github.com/rafaelmartins/squareball" - -SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else +if ! [[ ${PV} = *9999* ]]; then + SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -25,14 +20,11 @@ SLOT="0" IUSE="doc test static-libs" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND=" +BDEPEND=" virtual/pkgconfig - test? ( - dev-util/cmocka ) - doc? ( - app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" +DEPEND="test? ( dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf @@ -55,5 +47,6 @@ src_compile() { src_install() { use doc && HTML_DOCS=( doc/build/html/* ) default - prune_libtool_files --all + + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/squareball/squareball-9999.ebuild b/dev-libs/squareball/squareball-9999.ebuild index aeb29384561f..28dcbab67e2f 100644 --- a/dev-libs/squareball/squareball-9999.ebuild +++ b/dev-libs/squareball/squareball-9999.ebuild @@ -1,22 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git" - inherit git-r3 autotools + inherit autotools git-r3 fi -inherit eutils ltprune - DESCRIPTION="A general-purpose library for C99" HOMEPAGE="https://github.com/rafaelmartins/squareball" - -SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -25,14 +20,11 @@ SLOT="0" IUSE="doc test static-libs" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND=" +BDEPEND=" virtual/pkgconfig - test? ( - dev-util/cmocka ) - doc? ( - app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" +DEPEND="test? ( dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf @@ -55,5 +47,6 @@ src_compile() { src_install() { use doc && HTML_DOCS=( doc/build/html/* ) default - prune_libtool_files --all + + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/uulib/files/uulib-0.5.20-shared.patch b/dev-libs/uulib/files/uulib-0.5.20-shared.patch index 3a7f6582ef4e..fade48fb5932 100644 --- a/dev-libs/uulib/files/uulib-0.5.20-shared.patch +++ b/dev-libs/uulib/files/uulib-0.5.20-shared.patch @@ -2,10 +2,8 @@ Source: PDL Linux https://raw.githubusercontent.com/pld-linux/uudeview/master/uudeview-shared.patch https://github.com/pld-linux/uudeview - -diff -ruN uudeview-0.5.20.orig/uulib/Makefile.in uudeview-0.5.20/uulib/Makefile.in ---- uudeview-0.5.20.orig/uulib/Makefile.in 2002-03-11 10:15:46.000000000 +0100 -+++ uudeview-0.5.20/uulib/Makefile.in 2014-10-11 20:20:04.280175737 +0200 +--- a/Makefile.in ++++ b/Makefile.in @@ -40,9 +40,13 @@ VDEF = -DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\" # diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild index 96c0207408d5..18563655e646 100644 --- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild +++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild @@ -1,25 +1,46 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit autotools toolchain-funcs MY_P=uudeview-${PV} DESCRIPTION="Library that supports Base64 (MIME), uuencode, xxencode and binhex coding" HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/" SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P}/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" -S=${WORKDIR}/${MY_P}/${PN} +BDEPEND="sys-devel/libtool" + +PATCHES=( + "${FILESDIR}"/${P}-shared.patch +) src_prepare() { - epatch "${FILESDIR}/${P}-shared.patch" + default + sed -i 's:\<ar\>:$(AR):' Makefile.in || die + # Fix Darwin and other platforms with a non-GNU default libtool + sed -i 's/libtool/$(LIBTOOL)/' Makefile.in || die +} + +src_configure() { tc-export AR CC RANLIB + econf +} + +src_compile() { + if use prefix ; then + LIBTOOL=glibtool + else + LIBTOOL=libtool + fi + + LIBTOOL="${LIBTOOL}" emake } diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild index 81718c3911fd..92b6d26f5962 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild @@ -17,7 +17,7 @@ PHP_EXT_OPTIONAL_USE="php" USE_RUBY="ruby24 ruby25 ruby26" RUBY_OPTIONAL="yes" -inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs +inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng DESCRIPTION="SWIG and JNI bindings for Xapian" HOMEPAGE="https://www.xapian.org/" @@ -311,7 +311,7 @@ src_install() { java-pkg_dojar java/built/xapian.jar # TODO: make the build system not install this... java-pkg_doso java/.libs/libxapian_jni.so - rm -rf "${D}var" || die "could not remove java cruft!" + rm -rf "${ED}/var" || die "could not remove java cruft!" fi if use lua; then @@ -334,8 +334,8 @@ src_install() { fi # For some USE combinations this directory is not created - if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then - mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die + if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then + mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die fi dodoc AUTHORS HACKING NEWS TODO README diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild index 7289983d3f51..6fb5b4472847 100644 --- a/dev-libs/xapian/xapian-1.2.25.ebuild +++ b/dev-libs/xapian/xapian-1.2.25.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit eutils multilib-minimal +inherit multilib-minimal MY_P="${PN}-core-${PV}" @@ -42,7 +42,7 @@ multilib_src_configure() { myconf="${myconf} --enable-backend-flint --enable-backend-remote" - ECONF_SOURCE=${S} econf $myconf + ECONF_SOURCE=${S} econf ${myconf} } MULTILIB_WRAPPED_HEADERS=( @@ -61,11 +61,11 @@ multilib_src_install() { } multilib_src_install_all() { - use doc || rm -rf "${ED}usr/share/doc/xapian-core-${PV}" + use doc || rm -rf "${ED%/}/usr/share/doc/xapian-core-${PV}" dodoc AUTHORS HACKING PLATFORMS README NEWS - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -type f -delete || die } multilib_src_test() { diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild index d2e1c0ec8fc4..d78cc9126d08 100644 --- a/dev-libs/xapian/xapian-1.4.17.ebuild +++ b/dev-libs/xapian/xapian-1.4.17.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib-minimal +inherit multilib-minimal MY_P="${PN}-core-${PV}" @@ -41,7 +41,7 @@ multilib_src_configure() { myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - ECONF_SOURCE=${S} econf $myconf + ECONF_SOURCE=${S} econf ${myconf} } MULTILIB_WRAPPED_HEADERS=( @@ -65,10 +65,10 @@ multilib_src_install() { multilib_src_install_all() { if use doc; then - rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die + rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die fi dodoc AUTHORS HACKING PLATFORMS README NEWS - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -type f -delete || die } diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild index af91a3119e61..6a4927607af9 100644 --- a/dev-libs/xapian/xapian-1.4.18.ebuild +++ b/dev-libs/xapian/xapian-1.4.18.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib-minimal +inherit multilib-minimal MY_P="${PN}-core-${PV}" @@ -41,7 +41,7 @@ multilib_src_configure() { myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - ECONF_SOURCE=${S} econf $myconf + ECONF_SOURCE=${S} econf ${myconf} } MULTILIB_WRAPPED_HEADERS=( @@ -65,10 +65,10 @@ multilib_src_install() { multilib_src_install_all() { if use doc; then - rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die + rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die fi dodoc AUTHORS HACKING PLATFORMS README NEWS - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -type f -delete || die } diff --git a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch index a0aedfe05105..dd78635e013e 100644 --- a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch +++ b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch @@ -1,5 +1,5 @@ ---- yaz-3.0.47/configure.ac.orig 2009-07-08 04:58:43.000000000 -0700 -+++ yaz-3.0.47/configure.ac 2009-07-31 01:46:21.764545198 -0700 +--- a/configure.ac ++++ b/configure.ac @@ -367,14 +367,14 @@ dnl diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild index fa044ba4bf87..847579e85f6b 100644 --- a/dev-libs/yaz/yaz-3.0.53.ebuild +++ b/dev-libs/yaz/yaz-3.0.53.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools +EAPI=7 + +inherit autotools DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers" HOMEPAGE="http://www.indexdata.dk/yaz" @@ -11,22 +12,34 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86" -IUSE="debug icu libressl tcpd ziffy" +IUSE="debug icu gnutls tcpd ziffy" -RDEPEND="dev-libs/libxml2 +RDEPEND=" + dev-libs/libxml2 dev-libs/libxslt - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + sys-libs/readline:= + sys-libs/ncurses:= + virtual/libintl + !gnutls? ( dev-libs/openssl:0= ) + gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) - ziffy? ( net-libs/libpcap )" -DEPEND="${RDEPEND} - virtual/pkgconfig + ziffy? ( net-libs/libpcap ) +" +DEPEND="${RDEPEND}" +BDEPEND=" dev-lang/tcl:0 - >=sys-devel/libtool-2" + sys-devel/bison + >=sys-devel/libtool-2 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch + default AT_M4DIR="m4" eautoreconf } @@ -35,22 +48,19 @@ src_configure() { --enable-static \ --enable-shared \ $(use_enable debug memdebug) \ + $(use_with gnutls) \ $(use_enable icu) \ $(use_enable tcpd tcpd /usr) } -src_compile() { - emake -} - src_install() { local docdir="/usr/share/doc/${PF}" - emake DESTDIR="${D}" docdir="${docdir}" install + emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install - dodir ${docdir}/html - mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs" - mv -f "${D}"/usr/share/doc/${PN}/common "${D}"/${docdir}/html/ || die "Failed to move HTML docs" - rm -rf "${D}"/usr/share/doc/${PN} + dodir "${docdir}"/html + mv -f "${ED}"/${docdir}/*.{html,png} "${ED}"/${docdir}/html/ || die "Failed to move HTML docs" + mv -f "${ED}"/usr/share/doc/${PN}/common "${ED}"/${docdir}/html/ || die "Failed to move HTML docs" + rm -rf "${ED}"/usr/share/doc/${PN} || die dodoc ChangeLog NEWS README } diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch index 13dd91ea2ca5..3c0e07b9dc4a 100644 --- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch +++ b/dev-libs/zthread/files/zthread-2.3.2-clang.patch @@ -2,9 +2,8 @@ fix compile when using clang as $CC: Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased) -diff -r 2a43e83684d5 src/foreign/zthread/include/zthread/Guard.h ---- a/include/zthread/Guard.h Sat Aug 10 11:31:46 2013 +0200 -+++ b/include/zthread/Guard.h Sun Aug 18 09:46:43 2013 +0200 +--- a/include/zthread/Guard.h ++++ b/include/zthread/Guard.h @@ -108,7 +108,7 @@ } diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff index 94b42eedfbf3..b8f68f59dd2a 100644 --- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff +++ b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff @@ -1,5 +1,5 @@ ---- a/include/zthread/Guard.h 2008-07-22 14:46:28.000000000 +0200 -+++ b/include/zthread/Guard.h 2008-07-22 14:51:41.000000000 +0200 +--- a/include/zthread/Guard.h ++++ b/include/zthread/Guard.h @@ -491,7 +491,7 @@ try { @@ -9,8 +9,8 @@ LockingPolicy::destroyScope(*this); } catch (...) { /* ignore */ } ---- a/src/MutexImpl.h 2008-07-22 14:54:40.000000000 +0200 -+++ b/src/MutexImpl.h 2008-07-22 15:03:30.000000000 +0200 +--- a/src/MutexImpl.h ++++ b/src/MutexImpl.h @@ -153,7 +153,7 @@ _owner = self; diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild index 02af2643693a..9d7decd68746 100644 --- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild +++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils ltprune +inherit autotools MY_P="ZThread-${PV}" DESCRIPTION="platform-independent multi-threading and synchronization library for C++" HOMEPAGE="http://zthread.sourceforge.net/" SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86" -IUSE="debug doc kernel_linux static-libs" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" +IUSE="debug doc kernel_linux" -S="${WORKDIR}/${MY_P}" +BDEPEND="doc? ( app-doc/doxygen )" PATCHES=( "${FILESDIR}"/${P}-no-fpermissive-r1.diff @@ -34,7 +32,8 @@ src_prepare() { rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778 + # bug #467778 + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die AT_M4DIR="share" eautoreconf } @@ -43,7 +42,7 @@ src_configure() { econf \ $(use_enable debug) \ $(use_enable kernel_linux atomic-linux) \ - $(use_enable static-libs static) + --disable-static } src_compile() { @@ -62,5 +61,5 @@ src_install() { use doc && dodoc -r doc/html - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild index fd324bf579fd..0ff2fea7c727 100644 --- a/dev-ml/batteries/batteries-2.7.0.ebuild +++ b/dev-ml/batteries/batteries-2.7.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit oasis eutils +inherit oasis DESCRIPTION="The community-maintained foundation library for your OCaml projects" HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/" diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild index 234cd57645b7..22c0e7d10f18 100644 --- a/dev-ml/calendar/calendar-2.04.ebuild +++ b/dev-ml/calendar/calendar-2.04.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib DESCRIPTION="An Ocaml library to handle dates and time" HOMEPAGE="http://forge.ocamlcore.org/projects/calendar/" @@ -29,5 +29,9 @@ src_test() { src_install() { findlib_src_install dodoc README CHANGES - use doc && dohtml -r doc + + if use doc ; then + docinto html + dodoc -r doc + fi } diff --git a/dev-python/sarge/sarge-0.1.5.ebuild b/dev-python/sarge/sarge-0.1.5.ebuild index 91ce0166cea0..c0a010b0eae8 100644 --- a/dev-python/sarge/sarge-0.1.5.ebuild +++ b/dev-python/sarge/sarge-0.1.5.ebuild @@ -2,21 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8} ) inherit distutils-r1 MY_PN="${PN}" MY_P="${MY_PN}-${PV}.post0" -S=${WORKDIR}/$MY_P DESCRIPTION="wrapper for subprocess which provides command pipeline functionality" HOMEPAGE="https://sarge.readthedocs.org/" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND="" -BDEPEND="" diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild index 73b3b5ec1c13..c46c7fc05135 100644 --- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild +++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild @@ -9,7 +9,6 @@ inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg if [[ "${PV}" = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth" - PROPERTIES="live" else # dxx-rebirth-0.61.0_pre20190720.ebuild #MY_COMMIT='a17792c89fd49dd12fdf5981670dd7f64b42850f' diff --git a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild index 425230e43c69..577047969630 100644 --- a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild +++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild @@ -9,7 +9,6 @@ inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg if [[ "${PV}" = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth" - PROPERTIES="live" else MY_COMMIT='' S="${WORKDIR}/${PN}-${MY_COMMIT}" diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild index cccd2e4ca023..e18b20946951 100644 --- a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +CMAKE_MAKEFILE_GENERATOR=emake inherit cmake xdg-utils DESCRIPTION="An open-source full-featured 2D animation creation software" @@ -48,7 +49,6 @@ DEPEND=" " CMAKE_USE_DIR="${S}"/toonz/sources -CMAKE_MAKEFILE_GENERATOR=emake src_configure() { local mycmakeargs=( diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild index 9f6cb8de54bc..e93f63190e46 100644 --- a/media-gfx/slic3r/slic3r-9999.ebuild +++ b/media-gfx/slic3r/slic3r-9999.ebuild @@ -7,17 +7,17 @@ inherit desktop git-r3 perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org" -SRC_URI="" EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git" +S="${WORKDIR}/slic3r-${PV}" LICENSE="AGPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="" IUSE="+gui test" RESTRICT="!test? ( test )" # check Build.PL for dependencies -RDEPEND="!=dev-lang/perl-5.16* +RDEPEND=" + !=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib @@ -53,7 +53,8 @@ RDEPEND="!=dev-lang/perl-5.16* >=virtual/perl-Socket-2.16.0 x11-libs/libXmu )" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-libs/clipper dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 @@ -63,10 +64,12 @@ DEPEND="${RDEPEND} >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 - test? ( virtual/perl-Test-Harness - virtual/perl-Test-Simple )" + test? ( + virtual/perl-Test-Harness + virtual/perl-Test-Simple + ) +" -S="${WORKDIR}/slic3r-${PV}" PERL_S="${S}/xs" PATCHES=( diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild index 587e006037fd..dda461774e57 100644 --- a/media-libs/libao/libao-1.2.2-r1.ebuild +++ b/media-libs/libao/libao-1.2.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools libtool multilib multilib-minimal +inherit autotools multilib multilib-minimal DESCRIPTION="The Audio Output library" HOMEPAGE="https://www.xiph.org/ao/" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="alsa nas mmap pulseaudio static-libs" +IUSE="alsa nas mmap pulseaudio" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) @@ -38,11 +38,11 @@ multilib_src_configure() { local myeconfargs=( --disable-arts --disable-esd + --disable-static $(use_enable alsa alsa) $(use_enable mmap alsa-mmap) $(use_enable nas) $(use_enable pulseaudio pulse) - $(use_enable static-libs static) ) ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } @@ -53,5 +53,6 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS CHANGES README TODO + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die } diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild index 8067dd910028..16cfcb99acd7 100644 --- a/media-libs/libmypaint/libmypaint-1.6.1.ebuild +++ b/media-libs/libmypaint/libmypaint-1.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools python-any-r1 toolchain-funcs +inherit python-any-r1 toolchain-funcs MY_PV=${PV/_beta/-beta.} MY_P=${PN}-${MY_PV} @@ -44,6 +44,7 @@ RDEPEND=" src_configure() { tc-ld-disable-gold # bug 589266 + econf \ --disable-debug \ --disable-docs \ @@ -57,5 +58,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild index 69cfd9504e43..d946b6c8fe4a 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild @@ -2,25 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools multilib-minimal MY_P="${P/sdl-/SDL_}" DESCRIPTION="Graphics drawing primitives library for SDL" HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="ZLIB" SLOT="0/16" # libSDL_gfx.so.16 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="doc cpu_flags_x86_mmx static-libs" +IUSE="doc cpu_flags_x86_mmx" RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog README ) -S="${WORKDIR}/${MY_P}" - src_prepare() { default sed -i -e 's/-O //' configure.in || die @@ -31,7 +31,7 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable static-libs static) + --disable-static } #multilib_src_install() { @@ -40,9 +40,11 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs + if use doc ; then docinto html dodoc -r Docs/* fi + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild index 373fb1ac374f..92ec91ed3eaf 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild @@ -2,25 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit autotools multilib-minimal MY_P="${P/sdl-/SDL_}" DESCRIPTION="Graphics drawing primitives library for SDL" HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="doc cpu_flags_x86_mmx static-libs" +IUSE="doc cpu_flags_x86_mmx" RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog README ) -S="${WORKDIR}/${MY_P}" - src_prepare() { default sed -i -e 's/-O //' configure.in || die @@ -31,7 +31,7 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable static-libs static) + --disable-static } #multilib_src_install() { @@ -40,9 +40,11 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs + if use doc ; then docinto html dodoc -r Docs/* fi + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die } diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild index 494a39f77f5a..7208220ba2c4 100644 --- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild +++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild @@ -2,27 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit autotools multilib-minimal MY_P="${P/sdl2-/SDL2_}" DESCRIPTION="Graphics drawing primitives library for SDL2" HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="ZLIB" SLOT="0" KEYWORDS="amd64 ~ppc64 x86" -IUSE="doc cpu_flags_x86_mmx static-libs" +IUSE="doc cpu_flags_x86_mmx" DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog README ) -S=${WORKDIR}/${MY_P} - PATCHES=( - "${FILESDIR}/${PN}-1.0.4-slibtool.patch" + "${FILESDIR}"/${PN}-1.0.4-slibtool.patch ) src_prepare() { @@ -37,16 +37,19 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable static-libs static) + --disable-static ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install_all() { einstalldocs + if use doc ; then docinto html dodoc -r Docs/html/* fi + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die } diff --git a/media-radio/cqrlog/cqrlog-2.4.0.ebuild b/media-radio/cqrlog/cqrlog-2.4.0.ebuild index ac99b49b32f1..f1bd0065b1e1 100644 --- a/media-radio/cqrlog/cqrlog-2.4.0.ebuild +++ b/media-radio/cqrlog/cqrlog-2.4.0.ebuild @@ -8,24 +8,26 @@ inherit optfeature DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database" HOMEPAGE="https://www.cqrlog.com/ https://github.com/ok2cqr/cqrlog" SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-lang/lazarus-1.8.0 - >=dev-lang/fpc-3.0.2" -RDEPEND="${DEPEND} - virtual/mysql[server] +DEPEND=" + >=dev-lang/lazarus-1.8.0 + >=dev-lang/fpc-3.0.2 +" +RDEPEND=" + ${DEPEND} dev-libs/atk dev-libs/glib + virtual/mysql[server] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 - x11-libs/pango" + x11-libs/pango +" PATCHES=( "${FILESDIR}/${P}-makefile.patch" diff --git a/media-sound/cmusfm/cmusfm-0.3.3.ebuild b/media-sound/cmusfm/cmusfm-0.3.3.ebuild index 3a2f2d2e87bf..83f80380a2a0 100644 --- a/media-sound/cmusfm/cmusfm-0.3.3.ebuild +++ b/media-sound/cmusfm/cmusfm-0.3.3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools readme.gentoo-r1 DESCRIPTION="Last.fm scrobbler for cmus music player" @@ -13,18 +14,23 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="libnotify" -CDEPEND="net-misc/curl +DEPEND=" + net-misc/curl dev-libs/openssl:0= - libnotify? ( >=x11-libs/libnotify-0.7 )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - media-sound/cmus" + libnotify? ( >=x11-libs/libnotify-0.7 ) +" +RDEPEND=" + ${DEPEND} + media-sound/cmus +" +BDEPEND="virtual/pkgconfig" + +DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time." src_prepare() { default + eautoreconf - DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time." } src_configure() { diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild index 89b0d4b0da7e..6837e519f3ca 100644 --- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild +++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar" HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/" @@ -15,9 +14,9 @@ KEYWORDS="amd64 x86" RDEPEND=">=media-libs/libpng-1.2" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch -} +PATCHES=( + "${FILESDIR}"/${P}-libpng15.patch +) src_install() { dobin bwbar diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 56fb924c673c..7eaa4fd5b529 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Simple ncurses bandwidth monitor" HOMEPAGE="http://bwmon.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" SLOT="0" LICENSE="GPL-2 public-domain" KEYWORDS="amd64 ~hppa ppc sparc x86" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-typo-fix.patch \ - "${FILESDIR}"/${P}-overflow.patch \ +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-typo-fix.patch + "${FILESDIR}"/${P}-overflow.patch "${FILESDIR}"/${P}-tinfo.patch -} +) src_compile() { emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild index 252806110764..e5c251413259 100644 --- a/net-analyzer/cnet/cnet-3.3.4.ebuild +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Network simulation tool" HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" @@ -18,13 +19,10 @@ RDEPEND=" dev-libs/elfutils x11-libs/libX11 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" + +DOCS=( 1st.README ) -DOCS=( - 1st.README -) PATCHES=( "${FILESDIR}"/${PN}-3.3.4-gentoo.patch "${FILESDIR}"/${PN}-3.3.1-tcl.patch diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild index 0c94c1940d9e..a3d959ea9cbe 100644 --- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild +++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild @@ -1,22 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="netcat clone extended with twofish encryption" HOMEPAGE="http://cryptcat.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar" +S="${WORKDIR}"/unix LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -S=${WORKDIR}/unix +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-misc.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-misc.patch + default tc-export CC CXX } diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch index 17ec33489c89..0b9c62b597f0 100644 --- a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch +++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch @@ -1,5 +1,5 @@ ---- a/unix/Makefile -+++ b/unix/Makefile +--- a/Makefile ++++ b/Makefile @@ -10,16 +10,14 @@ # debugging # DFLAGS = -DTEST -DDEBUG diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild index f846b315d95e..b7647756faa3 100644 --- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild +++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor" HOMEPAGE="https://www.mavetju.org/unix/general.php" @@ -12,20 +13,19 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 arm ~mips x86" +# for pod2man +BDEPEND="dev-lang/perl" RDEPEND="net-libs/libpcap" -DEPEND=" - ${RDEPEND} - dev-lang/perl -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-debian.patch - epatch "${FILESDIR}"/${P}-endianness.patch -} +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-endianness.patch +) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild index e286126f8a0c..9134806f0c99 100644 --- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools fcaps toolchain-funcs + +inherit autotools fcaps DESCRIPTION="Watches network traffic and displays media from TCP streams observed" HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild index 528e269b5891..6a3ea8056e36 100644 --- a/net-analyzer/egressor/egressor-1.0-r2.ebuild +++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild @@ -1,30 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="tool for checking router configuration" HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/" SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz" +S="${WORKDIR}" LICENSE="egressor" SLOT="0" KEYWORDS="amd64 ppc x86" -DEPEND="<net-libs/libnet-1.1 - >=net-libs/libnet-1.0.2a-r3" -RDEPEND="net-libs/libpcap +DEPEND=" + <net-libs/libnet-1.1 + >=net-libs/libnet-1.0.2a-r3 +" +RDEPEND=" + net-libs/libpcap dev-perl/Net-RawIP - dev-lang/perl" - -S=${WORKDIR} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-libnet-1.0.patch \ - "${FILESDIR}"/${PV}-flags.patch -} + dev-lang/perl +" +PATCHES=( + "${FILESDIR}"/${PV}-libnet-1.0.patch + "${FILESDIR}"/${PV}-flags.patch +) src_compile() { tc-export CC diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 2653de68f200..b0b8ace9d97b 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs PATCH_VER="1.0" MY_P=nc${PV} diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch index eb8c09b84695..eb89d34f3e8b 100644 --- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch +++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -1,6 +1,6 @@ # Copyright Seblu 2015 ---- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 -+++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +--- a/src/netlib.c ++++ b/src/netlib.c @@ -3997,11 +3997,7 @@ } } diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index ac656a889e76..6a56ebb79e3c 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic user +EAPI=7 + +inherit flag-o-matic user DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" @@ -13,7 +14,13 @@ LICENSE="netperf" SLOT="0" IUSE="demo sctp" -DEPEND=">=sys-apps/sed-4" +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch +) pkg_setup() { enewuser netperf @@ -21,13 +28,6 @@ pkg_setup() { } src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch \ - "${FILESDIR}"/${PN}-2.7.0-space.patch \ - "${FILESDIR}"/${PN}-2.7.0-inline.patch - # Fixing paths in scripts sed -i \ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ @@ -39,7 +39,7 @@ src_prepare() { doc/examples/udp_stream_script \ || die - eapply_user + default } src_configure() { @@ -57,10 +57,10 @@ src_configure() { src_install() { default - # move netserver into sbin as we had it before 2.4 was released with its + # Move netserver into sbin as we had it before 2.4 was released with its # autoconf goodness dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die + mv "${ED}"/usr/{bin,sbin}/netserver || die # init.d / conf.d newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf @@ -73,6 +73,6 @@ src_install() { # documentation and example scripts dodoc AUTHORS ChangeLog NEWS README Release_Notes dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die } diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml index 74c2baebb4ec..0c2c61169992 100644 --- a/net-analyzer/netselect/metadata.xml +++ b/net-analyzer/netselect/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">apenwarr/netselect</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild index 11fd0ab2cae5..34aafe6fa113 100644 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs + +inherit toolchain-funcs DESCRIPTION="Ultrafast implementation of ping" HOMEPAGE="http://apenwarr.ca/netselect/" diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild index 5f48909bca01..4ce4485f5c7f 100644 --- a/net-analyzer/nmap/nmap-7.80-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -inherit autotools desktop flag-o-matic lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild index 8b08d910d677..ab9ed8c0ddbe 100644 --- a/net-analyzer/nmap/nmap-7.91-r1.ebuild +++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -inherit autotools flag-o-matic lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild index 09c622523f36..587628f57224 100644 --- a/net-analyzer/nmap/nmap-7.91-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -inherit autotools flag-o-matic lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 782f91bf13e1..0b9f3ddf3650 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs +inherit autotools git-r3 lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild index f502164771a3..4203113e8853 100644 --- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild +++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="tool to test TCP and UDP throughput" +inherit toolchain-funcs + +DESCRIPTION="Tool to test TCP and UDP throughput" HOMEPAGE="http://www.leo.org/~elmar/nttcp/" SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz" -LICENSE="public-domain" +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~mips ~ppc x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch -} +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_compile() { emake \ diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index 298a47420fd0..7a6f5c184609 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="The OpenBSD network swiss army knife" HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" diff --git a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild index 38568044a9f1..c3266ee8f631 100644 --- a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild +++ b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A network monitoring tool with bandwidth tracking" HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/" @@ -12,18 +13,21 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" net-libs/libpcap >=sys-libs/ncurses-5.3-r1 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-smtp_line.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - epatch "${FILESDIR}"/${P}-smtp_line.patch + default + eautoreconf } diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild index 29e14b375300..362756f86a4d 100644 --- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild +++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild @@ -1,29 +1,51 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Automated port scan detector and response tool" # Seems like CISCO took the site down? HOMEPAGE="https://sourceforge.net/projects/sentrytools/" SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz" +S="${WORKDIR}"/${PN}_beta SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x64-macos" +IUSE="kernel_Darwin kernel_linux kernel_FreeBSD kernel_SunOS" -S="${WORKDIR}"/${PN}_beta +RDEPEND="kernel_Darwin? ( app-shells/tcsh )" -src_prepare() { - epatch "${FILESDIR}"/${P}-conf.patch - epatch "${FILESDIR}"/${P}-config.h.patch - epatch "${FILESDIR}"/${P}-gcc.patch - epatch "${FILESDIR}"/${P}-ignore.csh.patch -} +PATCHES=( + "${FILESDIR}"/${P}-conf.patch + "${FILESDIR}"/${P}-config.h.patch + "${FILESDIR}"/${P}-gcc.patch + "${FILESDIR}"/${P}-ignore.csh.patch +) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" linux + local target + + if use kernel_Darwin ; then + target="osx" + elif use kernel_linux ; then + target="linux" + elif use kernel_FreeBSD ; then + target="freebsd" + elif use kernel_SunOS ; then + target="solaris" + fi + + if [[ -z "${target}" ]] ; then + elog "Using 'generic' target for your platform" + target="generic" + else + elog "Using '${target}' (detected) target for your platform" + fi + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" "${target}" } src_install() { diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild index b7c18a9d4cd0..7fb4b5b2a9d4 100644 --- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild +++ b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils savedconfig toolchain-funcs user +EAPI=7 -DESCRIPTION="a port scan detection tool" +inherit savedconfig toolchain-funcs user + +DESCRIPTION="A port scan detection tool" SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz" HOMEPAGE="http://www.openwall.com/scanlogd/" @@ -20,8 +21,12 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default restore_config params.h tc-export CC } diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml index 2c2a7923cfc8..60756e3c4e9f 100644 --- a/net-analyzer/scli/metadata.xml +++ b/net-analyzer/scli/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">schoenw/scli</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild index 4c5d34c145d1..87ae7040083b 100644 --- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild +++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Squid logfile analyzer and traffic grapher" HOMEPAGE="http://squid-graph.sourceforge.net/" -LICENSE="GPL-2" SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz" +S="${WORKDIR}"/${PN} +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="dev-perl/GD[png]" -S=${WORKDIR}/${PN} - src_install() { dobin apacheconv generate.cgi squid-graph timeconv dodoc README diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch index 3dd72203c309..0efa4d0817ec 100644 --- a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch +++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch @@ -1,5 +1,5 @@ ---- a/src/squidsites.c -+++ b/src/squidsites.c +--- a/squidsites.c ++++ b/squidsites.c @@ -286,7 +286,7 @@ static
void print_help()
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild index 01f56bf30cc3..c165a7e043dd 100644 --- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild +++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites" -LICENSE="GPL-2" HOMEPAGE="http://www.stefanopassiglia.com/misc.htm" SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz" +S="${WORKDIR}/src" + +LICENSE="GPL-2" SLOT="1" KEYWORDS="amd64 ppc x86" -S="${WORKDIR}/src" +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_prepare() { + default + # Respect CFLAGS sed -i Makefile \ -e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \ || die - epatch "${FILESDIR}"/${P}-format-security.patch } src_compile() { diff --git a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild index ddd41125cefe..fa4f81fe21ab 100644 --- a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild +++ b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs +inherit autotools DESCRIPTION="An SSLv3/TLS network protocol analyzer" HOMEPAGE="https://github.com/adulau/ssldump/" diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild index 92a3a89625bf..0cade5bca7fd 100644 --- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.6.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/sslscan/sslscan-2.0.8.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild index 5093e3ee48ab..d7a03ebe0b4d 100644 --- a/net-analyzer/sslscan/sslscan-2.0.8.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.8.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1j" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/sslscan/sslscan-2.0.9.ebuild b/net-analyzer/sslscan/sslscan-2.0.9.ebuild index 5e25d50fb227..01672701213e 100644 --- a/net-analyzer/sslscan/sslscan-2.0.9.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.9.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild index a9dc609c45f5..09a3d41b512c 100644 --- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild +++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild @@ -1,18 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Tool for testing multicast connectivity" HOMEPAGE="http://www.venaas.no/multicast/ssmping/" -LICENSE="public-domain" SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz" + +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 x86" +PATCHES=( + "${FILESDIR}"/${PN}-0.9-build.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9-build.patch + default tc-export CC } diff --git a/net-analyzer/symon/symon-2.88.ebuild b/net-analyzer/symon/symon-2.88.ebuild index 0250b6eec39b..521fcb00eb67 100644 --- a/net-analyzer/symon/symon-2.88.ebuild +++ b/net-analyzer/symon/symon-2.88.ebuild @@ -1,31 +1,27 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils perl-module toolchain-funcs +EAPI=7 + +inherit perl-module toolchain-funcs DESCRIPTION="Performance and information monitoring tool" HOMEPAGE="https://wpd.home.xs4all.nl/symon/" SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="perl +symon symux" -REQUIRED_USE=" - || ( perl symon symux ) -" +REQUIRED_USE="|| ( perl symon symux )" +BDEPEND="sys-devel/pmake" RDEPEND=" perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) " -DEPEND=" - ${RDEPEND} - sys-devel/pmake -" - -S=${WORKDIR}/${PN} +DEPEND="${RDEPEND}" # Deletes the directory passed as an argument from the internal pmake # variable SUBDIR. @@ -84,7 +80,6 @@ src_install() { doman symux/symux.8 dosbin symux/symux - dodir /usr/share/symon insinto /usr/share/symon doins symux/c_smrrds.sh fperms a+x /usr/share/symon/c_smrrds.sh diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild index e988b2260bdb..eca9e30b0bd3 100644 --- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild +++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild @@ -1,36 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic + +inherit autotools MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)" DESCRIPTION="Extract and concatenate portions of pcap files" HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" -LICENSE="BSD" -SLOT="0" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz " +S="${WORKDIR}"/${MY_P/_/-} + +LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~ppc x86" -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} -" -S=${WORKDIR}/${MY_P/_/-} +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" src_prepare() { - eapply \ - "${WORKDIR}"/debian/patches/[0-]* \ - "${FILESDIR}"/${PN}-1.2a_p3-exit.patch - eapply_user + eapply "${WORKDIR}"/debian/patches/[0-]* + eapply "${FILESDIR}"/${PN}-1.2a_p3-exit.patch + + default + sed -i -e 's|ifndef lint|if 0|g' *.c || die - eautoconf + + mv configure.{in,ac} || die + eautoreconf } src_install() { diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild index 235ac5dff8d2..30fbb10604a6 100644 --- a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild +++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Passive per-connection tcp bandwidth monitor" HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/" @@ -12,17 +13,23 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-libs/libpcap sys-libs/ncurses " -RDEPEND=" - ${DEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default + sed -i src/Makefile.am -e 's| -Werror||g' || die + + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 709ad3a89a3e..6187c9661381 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,35 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils +EAPI=7 + +inherit toolchain-funcs MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc sparc x86" +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch +) + src_prepare() { + default + sed -i apps/unix/{client,server}/Makefile \ -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ || die - epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch" - cp -f os-dep/unix/* . - cp -f engine/* . + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die } src_compile() { emake -C apps/unix/client \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" emake -C apps/unix/server \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" } diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild index 41fc4c911c96..f90cd8e94cd7 100644 --- a/net-im/pidgin/pidgin-2.14.1.ebuild +++ b/net-im/pidgin/pidgin-2.14.1.ebuild @@ -247,7 +247,7 @@ src_install() { if use gtk ; then # Fix tray paths for e16 (x11-wm/enlightenment) and other - # implementations that are not complient with new hicolor theme yet, #323355 + # implementations that are not compliant with new hicolor theme yet, #323355 local pixmapdir for d in 16 22 32 48; do pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions diff --git a/net-im/pidgin/pidgin-2.14.2.ebuild b/net-im/pidgin/pidgin-2.14.2.ebuild index 6a72b74271cd..4f3358fca714 100644 --- a/net-im/pidgin/pidgin-2.14.2.ebuild +++ b/net-im/pidgin/pidgin-2.14.2.ebuild @@ -247,7 +247,7 @@ src_install() { if use gtk ; then # Fix tray paths for e16 (x11-wm/enlightenment) and other - # implementations that are not complient with new hicolor theme yet, #323355 + # implementations that are not compliant with new hicolor theme yet, #323355 local d f pixmapdir for d in 16 22 32 48 ; do pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions" diff --git a/net-libs/libtelnet/libtelnet-0.23.ebuild b/net-libs/libtelnet/libtelnet-0.23.ebuild index f497242059f6..9577f3cce082 100644 --- a/net-libs/libtelnet/libtelnet-0.23.ebuild +++ b/net-libs/libtelnet/libtelnet-0.23.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools -DESCRIPTION="Simple RFC-complient TELNET implementation as a C library" +DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild index 44e62916c511..9edf0466d6a4 100644 --- a/net-libs/libtelnet/libtelnet-9999.ebuild +++ b/net-libs/libtelnet/libtelnet-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ else KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="Simple RFC-complient TELNET implementation as a C library" +DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" LICENSE="public-domain" diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild index f5949b52f56c..a71c6727a327 100644 --- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild +++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit qmail webapp autotools +WEBAPP_MANUAL_SLOT="yes" +inherit autotools qmail webapp MY_P=${P/_rc/-rc} @@ -13,18 +14,18 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -WEBAPP_MANUAL_SLOT="yes" KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86" IUSE="maildrop" # the RESTRICT is because the vpopmail lib directory is locked down # and non-root can't access them. RESTRICT="userpriv" -RDEPEND="virtual/qmail - >=net-mail/vpopmail-5.4.33 +RDEPEND=" net-mail/autorespond + >=net-mail/vpopmail-5.4.33 + virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 )" -DEPEND=${RDEPEND} +DEPEND="${RDEPEND}" S="${WORKDIR}"/${MY_P} diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild index d9d1f9e65e60..44bbe713db84 100644 --- a/net-print/cups-filters/cups-filters-1.28.3.ebuild +++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" LICENSE="MIT GPL-2" SLOT="0" -IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" +IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" RESTRICT="!test? ( test )" @@ -81,13 +81,13 @@ src_configure() { --with-pdftops=pdftops --with-rcdir=no --without-php + --disable-static $(use_enable dbus) $(use_enable foomatic) $(use_enable ldap) $(use_enable pclm) $(use_enable pdf mutool) $(use_enable postscript ghostscript) - $(use_enable static-libs static) $(use_enable zeroconf avahi) $(use_with jpeg) $(use_with png) @@ -100,21 +100,25 @@ src_compile() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_configure perl-module_src_compile - popd > /dev/null + popd > /dev/null || die fi } +src_test() { + emake check +} + src_install() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_install perl_delete_localpod - popd > /dev/null + popd > /dev/null || die fi if use postscript; then @@ -136,10 +140,6 @@ src_install() { systemd_dounit "${S}/utils/cups-browsed.service" } -src_test() { - emake check -} - pkg_postinst() { if ! use foomatic ; then ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." diff --git a/net-print/cups-filters/cups-filters-1.28.7.ebuild b/net-print/cups-filters/cups-filters-1.28.7.ebuild index 37b780aabfce..44bbe713db84 100644 --- a/net-print/cups-filters/cups-filters-1.28.7.ebuild +++ b/net-print/cups-filters/cups-filters-1.28.7.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" LICENSE="MIT GPL-2" SLOT="0" -IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" +IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" RESTRICT="!test? ( test )" @@ -81,13 +81,13 @@ src_configure() { --with-pdftops=pdftops --with-rcdir=no --without-php + --disable-static $(use_enable dbus) $(use_enable foomatic) $(use_enable ldap) $(use_enable pclm) $(use_enable pdf mutool) $(use_enable postscript ghostscript) - $(use_enable static-libs static) $(use_enable zeroconf avahi) $(use_with jpeg) $(use_with png) @@ -100,21 +100,25 @@ src_compile() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_configure perl-module_src_compile - popd > /dev/null + popd > /dev/null || die fi } +src_test() { + emake check +} + src_install() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_install perl_delete_localpod - popd > /dev/null + popd > /dev/null || die fi if use postscript; then @@ -136,10 +140,6 @@ src_install() { systemd_dounit "${S}/utils/cups-browsed.service" } -src_test() { - emake check -} - pkg_postinst() { if ! use foomatic ; then ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild index 90abc670cca8..ddd2623dced4 100644 --- a/net-print/cups-filters/cups-filters-9999.ebuild +++ b/net-print/cups-filters/cups-filters-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" LICENSE="MIT GPL-2" SLOT="0" -IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" +IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" RESTRICT="!test? ( test )" @@ -79,13 +79,13 @@ src_configure() { --with-pdftops=pdftops --with-rcdir=no --without-php + --disable-static $(use_enable dbus) $(use_enable foomatic) $(use_enable ldap) $(use_enable pclm) $(use_enable pdf mutool) $(use_enable postscript ghostscript) - $(use_enable static-libs static) $(use_enable zeroconf avahi) $(use_with jpeg) $(use_with png) @@ -98,21 +98,25 @@ src_compile() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_configure perl-module_src_compile - popd > /dev/null + popd > /dev/null || die fi } +src_test() { + emake check +} + src_install() { default if use perl; then - pushd "${S}/scripting/perl" > /dev/null + pushd "${S}/scripting/perl" > /dev/null || die perl-module_src_install perl_delete_localpod - popd > /dev/null + popd > /dev/null || die fi if use postscript; then @@ -134,10 +138,6 @@ src_install() { systemd_dounit "${S}/utils/cups-browsed.service" } -src_test() { - emake check -} - pkg_postinst() { if ! use foomatic ; then ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." diff --git a/sci-astronomy/pal/pal-0.9.7.ebuild b/sci-astronomy/pal/pal-0.9.7.ebuild index fd11ad2b6641..bae29575c7b1 100644 --- a/sci-astronomy/pal/pal-0.9.7.ebuild +++ b/sci-astronomy/pal/pal-0.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,7 +25,7 @@ src_configure() { src_install() { default - # remove cruft from non-fhs complient + # remove cruft from non-fhs compliant rm -r "${ED}"usr/share/pal || die rm -r "${ED}"usr/{docs,manifests,news} || die use static-libs || prune_libtool_files --all diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild index 1f8e88f9076b..5c9e0a601819 100644 --- a/sys-apps/fakeroot/fakeroot-1.22.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.23.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild index c0f5629f8051..8ff11f2bd082 100644 --- a/sys-apps/fakeroot/fakeroot-1.23.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.24.ebuild b/sys-apps/fakeroot/fakeroot-1.24.ebuild index 1145abde6854..c0433bfb258d 100644 --- a/sys-apps/fakeroot/fakeroot-1.24.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild index 7e3cc26ba97b..7262b803969b 100644 --- a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild +++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils ltprune - DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data" HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -12,14 +10,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -IUSE="examples +glade static-libs test" +IUSE="examples +glade test" RESTRICT="!test? ( test )" RDEPEND="x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango glade? ( gnome-base/libglade )" -DEPEND=${RDEPEND} +DEPEND="${RDEPEND}" src_prepare() { default @@ -37,7 +35,7 @@ src_configure() { econf \ $(use_enable glade libglade) \ --disable-glade \ - $(use_enable static-libs static) \ + --disable-static \ $(use_enable test gtktest) \ --enable-libtool-lock } @@ -45,9 +43,10 @@ src_configure() { src_install() { default - prune_libtool_files + find "${ED}" -type f -name '*.la' -delete || die dodoc AUTHORS ChangeLog README TODO + if use examples; then docinto examples dodoc "${S}"/examples/* |