diff options
58 files changed, 151 insertions, 140 deletions
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild index 8188a88c1b52..5d25296fe157 100644 --- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild +++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +inherit autotools edos2unix flag-o-matic multilib-minimal toolchain-funcs FAM_PV="${PV/_p*/}" DEBIAN_PATCH="${PV#*_p}" @@ -13,6 +14,7 @@ SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz " +S="${WORKDIR}"/${PN}-${FAM_PV} LICENSE="GPL-2 LGPL-2.1" SLOT="0" @@ -28,7 +30,7 @@ RDEPEND=" ${DEPEND} " DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README ) -S=${WORKDIR}/${PN}-${FAM_PV} + PATCHES=( "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch "${FILESDIR}"/${PN}-${FAM_PV}-bindresvport.patch #729120 diff --git a/app-admin/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20200113-r1.ebuild index 1223ab1823d1..0d7d5d920584 100644 --- a/app-admin/metalog/metalog-20200113-r1.ebuild +++ b/app-admin/metalog/metalog-20200113-r1.ebuild @@ -14,7 +14,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 IUSE="unicode" RDEPEND=">=dev-libs/libpcre-3.4" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/autoconf-archive virtual/pkgconfig" diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild index 9aa6eaea2be1..5302219832b5 100644 --- a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild +++ b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild @@ -1,8 +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 gnome2-utils +inherit desktop gnome2-utils DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing" HOMEPAGE="http://www.xcdroast.org/" diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild index 4bd398081e52..5344bb6d677e 100644 --- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild +++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,7 +28,8 @@ RDEPEND="${PYTHON_DEPS} boost? ( dev-libs/boost ) lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild index 986a3e9bb94e..6bd7a06a0091 100644 --- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild +++ b/app-i18n/pyzy/pyzy-0.1.0-r3.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" @@ -24,7 +24,8 @@ RDEPEND="dev-db/sqlite:3 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc:= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" ${PYTHON_DEPS} sys-devel/autoconf-archive doc? ( app-doc/doxygen )" diff --git a/dev-ml/octavius/octavius-1.2.2.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild index 8cd4f8364783..750e6cbda7f1 100644 --- a/dev-ml/octavius/octavius-1.2.2.ebuild +++ b/dev-ml/octavius/octavius-1.2.2.ebuild @@ -13,6 +13,3 @@ LICENSE="ISC" SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt" - -RDEPEND="" -DEPEND="${DEPEND}" diff --git a/dev-perl/Acme-Damn/Acme-Damn-0.80.0-r1.ebuild b/dev-perl/Acme-Damn/Acme-Damn-0.80.0-r2.ebuild index 4f8655ad3eaf..1934164f0bb7 100644 --- a/dev-perl/Acme-Damn/Acme-Damn-0.80.0-r1.ebuild +++ b/dev-perl/Acme-Damn/Acme-Damn-0.80.0-r2.ebuild @@ -15,7 +15,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND="" -BEPEND="${RDEPEND} +BDEPEND="${RDEPEND} virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception diff --git a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0.ebuild b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r1.ebuild index 57be297def39..417129317015 100644 --- a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0.ebuild +++ b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r1.ebuild @@ -14,8 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="" -DEPEND="${DEPEND} - app-antivirus/clamav +RDEPEND="app-antivirus/clamav" +DEPEND=" + ${RDEPEND} virtual/perl-ExtUtils-MakeMaker " diff --git a/dev-python/lmfit/lmfit-1.0.1.ebuild b/dev-python/lmfit/lmfit-1.0.1-r1.ebuild index a62b5b1c5688..e3d9bc9fd9c6 100644 --- a/dev-python/lmfit/lmfit-1.0.1.ebuild +++ b/dev-python/lmfit/lmfit-1.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,6 @@ BDEPEND=" >=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}] >=dev-python/scipy-1.2[${PYTHON_USEDEP}] " -RDEPEND="${DEPEND}" +RDEPEND="${BDEPEND}" distutils_enable_tests pytest diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild index 722cecd0b2a8..ae416f7ef84b 100644 --- a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild +++ b/dev-util/pycharm-community/pycharm-community-2020.1.1.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild index 09b8a54087c3..f524f07d6ec5 100644 --- a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild +++ b/dev-util/pycharm-community/pycharm-community-2020.1.3.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild index 722cecd0b2a8..ae416f7ef84b 100644 --- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild +++ b/dev-util/pycharm-community/pycharm-community-2020.1.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild index 4448e547cef7..e4fe870ae5c6 100644 --- a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild +++ b/dev-util/pycharm-community/pycharm-community-2020.3.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild index 035932264b04..03e39e824852 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild index 39a685c8d78c..9eaa204428ba 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild index 035932264b04..03e39e824852 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild index c3b7f577705a..0d9e280fe197 100644 --- a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild +++ b/dev-util/pycharm-professional/pycharm-professional-2020.3.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 -inherit gnome2-utils readme.gentoo-r1 xdg +inherit desktop gnome2-utils readme.gentoo-r1 xdg DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" HOMEPAGE="http://www.jetbrains.com/pycharm/" diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 0c7ca0cf045a..5d18befe55b9 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -389,7 +389,8 @@ epatch() { case ${EAPI:-0} in 0|1|2|3|4|5) -# @VARIABLE: EPATCH_USER_SOURCE +# @ECLASS_VARIABLE: EPATCH_USER_SOURCE +# @USER_VARIABLE # @DESCRIPTION: # Location for user patches, see the epatch_user function. # Should be set by the user. Don't set this in ebuilds. diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index c616e4a3f455..93eac1a4c4aa 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: scons-utils.eclass @@ -73,6 +73,7 @@ # set in src_configure(). # @ECLASS-VARIABLE: SCONSOPTS +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # The default set of options to pass to scons. Similar to MAKEOPTS, @@ -80,6 +81,7 @@ # up MAKEOPTS instead. # @ECLASS-VARIABLE: EXTRA_ESCONS +# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # The additional parameters to pass to SCons whenever escons() is used. diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index f22460881ef4..5218706a1ab7 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: waf-utils.eclass @@ -24,6 +24,7 @@ case ${EAPI:-0} in esac # @ECLASS-VARIABLE: WAF_VERBOSE +# @USER_VARIABLE # @DESCRIPTION: # Set to OFF to disable verbose messages during compilation # this is _not_ meant to be set in ebuilds diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild index 0153c5d051ac..6e1e3a824afa 100644 --- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild +++ b/games-arcade/openmortal/openmortal-0.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND="media-libs/libsdl[video] >=media-libs/freetype-2.4.0:2 dev-lang/perl " -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { diff --git a/games-kids/memonix/memonix-1.6-r1.ebuild b/games-kids/memonix/memonix-1.6-r1.ebuild index cd3307ffbefe..f21368cfc488 100644 --- a/games-kids/memonix/memonix-1.6-r1.ebuild +++ b/games-kids/memonix/memonix-1.6-r1.ebuild @@ -3,16 +3,16 @@ EAPI=7 -inherit cmake desktop +inherit cmake desktop wrapper DESCRIPTION="Brain teasers, puzzle and memory games for kid's in one pack" HOMEPAGE="https://www.viewizard.com/memonix/" SRC_URI="http://www.viewizard.com/download/${PN}_${PV}_src.tar.bz2" +S="${WORKDIR}/MemonixSourceCode" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" media-libs/libsdl:0[sound,opengl,video,X] @@ -21,8 +21,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/MemonixSourceCode" - src_install() { exeinto /usr/"$(get_libdir)" doexe ../${P}_build/Memonix diff --git a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild index 45e32d2039b7..4319ff1db634 100644 --- a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild +++ b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit gnome2-utils +inherit desktop gnome2-utils DESCRIPTION="D&D character generator" HOMEPAGE="http://pcgen.sourceforge.net/" diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild index ac6267f86cb6..4b05d8e37e66 100644 --- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild +++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake desktop xdg +inherit cmake desktop wrapper xdg DESCRIPTION="Free 2D Zelda fangame" HOMEPAGE="https://www.solarus-games.org/" @@ -14,14 +14,13 @@ S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="mirror" RDEPEND=" >=games-engines/solarus-1.3.0 <games-engines/solarus-1.4.0 " -DEPEND="app-arch/zip" +BDEPEND="app-arch/zip" DOCS=( ChangeLog readme.txt ) diff --git a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild index b8e0195e4681..ea879c3b692d 100644 --- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild +++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake desktop xdg +inherit cmake desktop wrapper xdg DESCRIPTION="Free 2D Zelda fangame parody" HOMEPAGE="https://www.solarus-games.org/" @@ -14,14 +14,13 @@ S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="mirror bindist" RDEPEND=" >=games-engines/solarus-1.3.1-r1 <games-engines/solarus-1.4.0 " -DEPEND="app-arch/zip" +BDEPEND="app-arch/zip" DOCS=( ChangeLog readme.txt ) diff --git a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild index 1466c52f896d..d82d02f9b103 100644 --- a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild +++ b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild @@ -15,7 +15,7 @@ LICENSE="GPL-2 galaxyhack" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=" +DEPEND=" >=dev-libs/boost-1.34:= media-libs/libsdl[video] media-libs/sdl-image[png] diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild index c560bf69948e..da31ffb6d75b 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild @@ -53,12 +53,12 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} app-text/iso-codes - sys-devel/autoconf-archive x11-base/xorg-proto " BDEPEND=" dev-util/glib-utils >=dev-util/intltool-0.40.1 + sys-devel/autoconf-archive >=sys-devel/gettext-0.17 virtual/pkgconfig " diff --git a/gnome-extra/cjs/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild index aebbde30dd1f..bbdc3a6ffabe 100644 --- a/gnome-extra/cjs/cjs-4.6.0.ebuild +++ b/gnome-extra/cjs/cjs-4.6.0.ebuild @@ -24,10 +24,10 @@ RDEPEND=" gtk? ( x11-libs/gtk+:3 ) " DEPEND="${RDEPEND} - sys-devel/autoconf-archive test? ( sys-apps/dbus ) " BDEPEND=" + sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig " diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild index 1c6172411ec8..0360af62aaac 100644 --- a/media-libs/gmmlib/gmmlib-20.2.2.ebuild +++ b/media-libs/gmmlib/gmmlib-20.2.2.ebuild @@ -31,8 +31,6 @@ IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch ) diff --git a/media-libs/gmmlib/gmmlib-20.2.5.ebuild b/media-libs/gmmlib/gmmlib-20.2.5.ebuild index 5dae8781fc44..c2ccec30beac 100644 --- a/media-libs/gmmlib/gmmlib-20.2.5.ebuild +++ b/media-libs/gmmlib/gmmlib-20.2.5.ebuild @@ -31,8 +31,6 @@ IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch ) diff --git a/media-libs/gmmlib/gmmlib-20.3.2.ebuild b/media-libs/gmmlib/gmmlib-20.3.2.ebuild index 5dae8781fc44..c2ccec30beac 100644 --- a/media-libs/gmmlib/gmmlib-20.3.2.ebuild +++ b/media-libs/gmmlib/gmmlib-20.3.2.ebuild @@ -31,8 +31,6 @@ IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch ) diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild index daef825f99e2..cd84eca98c8b 100644 --- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild +++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild @@ -31,8 +31,6 @@ IUSE="test +custom-cflags" RESTRICT="!test? ( test )" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 4e796e2186d3..eec88a3a2181 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -31,8 +31,6 @@ IUSE="test +custom-cflags" RESTRICT="!test? ( test )" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild index 0ea671150776..18a3a1f47777 100644 --- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild +++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-li IUSE="doc static-libs" RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen )" RESTRICT="test" diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild index 7d6d36b78e95..f534f3a6d5b5 100644 --- a/media-video/vdr/vdr-2.2.0-r6.ebuild +++ b/media-video/vdr/vdr-2.2.0-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic l10n toolchain-funcs # Switches supported by extensions-patch EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild b/media-video/vdr/vdr-2.4.1-r3.ebuild index 2d62740dffe0..3655c860fee0 100644 --- a/media-video/vdr/vdr-2.4.1-r3.ebuild +++ b/media-video/vdr/vdr-2.4.1-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic multilib toolchain-funcs +inherit flag-o-matic l10n toolchain-funcs DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" HOMEPAGE="http://www.tvdr.de/" diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild index d7ea137b4c6a..aac5f13f30e4 100644 --- a/media-video/vdr/vdr-2.4.6-r1.ebuild +++ b/media-video/vdr/vdr-2.4.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic multilib toolchain-funcs +inherit flag-o-matic l10n toolchain-funcs DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" HOMEPAGE="http://www.tvdr.de/" diff --git a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild index aee64ac9fa4c..31aecde1b0f5 100644 --- a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild +++ b/net-dialup/pppconfig/pppconfig-2.3.21.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=5 -inherit eutils +inherit l10n DESCRIPTION="A text menu based utility for configuring ppp" HOMEPAGE="https://packages.qa.debian.org/p/pppconfig.html" diff --git a/net-im/kouchat/kouchat-1.1.0.ebuild b/net-im/kouchat/kouchat-1.1.0.ebuild index 3c7522dc9b9c..b719616ecc03 100644 --- a/net-im/kouchat/kouchat-1.1.0.ebuild +++ b/net-im/kouchat/kouchat-1.1.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 JAVA_PKG_IUSE="" -inherit eutils java-pkg-2 java-ant-2 +inherit desktop java-pkg-2 java-ant-2 DESCRIPTION="KouChat is a simple serverless chat client for local area networks" HOMEPAGE="https://kouchat.googlecode.com/" diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild index ff1a742535fa..a0dd2594c166 100644 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild +++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -29,7 +29,7 @@ RDEPEND="ssl? ( !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) tools? ( app-text/xmlto )" DOCS=( AUTHORS README.md THANKS TODO ) diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild index 67c1b6331100..ea546bdea493 100644 --- a/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild +++ b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild @@ -1,8 +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 versionator + +inherit versionator wrapper MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)" @@ -10,30 +11,29 @@ DESCRIPTION="Client for NoMachine remote servers" HOMEPAGE="https://www.nomachine.com" SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )" +S="${WORKDIR}"/NX/etc/NX/player/packages + LICENSE="nomachine" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" RESTRICT="strip" -DEPEND="" -RDEPEND="dev-libs/glib:2 - dev-libs/openssl:0" - -S=${WORKDIR}/NX/etc/NX/player/packages +RDEPEND=" + dev-libs/glib:2 + dev-libs/openssl:0 +" QA_PREBUILT="*" -src_install() -{ +src_install() { local NXROOT=/opt/NX -# dodir /etc/NX/localhost -# echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg + #dodir /etc/NX/localhost + #echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg dodir /opt - tar xozf nxclient.tar.gz -C "${D}"/opt - tar xozf nxplayer.tar.gz -C "${D}"/opt + tar xozf nxclient.tar.gz -C "${ED}"/opt + tar xozf nxplayer.tar.gz -C "${ED}"/opt make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin } diff --git a/net-p2p/fms/fms-0.3.82.ebuild b/net-p2p/fms/fms-0.3.82.ebuild index 574d26fb3ac5..e01b2b22cd0b 100644 --- a/net-p2p/fms/fms-0.3.82.ebuild +++ b/net-p2p/fms/fms-0.3.82.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" -inherit eutils cmake-utils user +inherit edos2unix cmake-utils user DESCRIPTION="A spam-resistant message board application for Freenet" #FMS oly has a homepage within freenet, so the closest is a wiki linking to it diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild index e0ec40538bc0..8b1a4a31ab81 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild @@ -3,8 +3,7 @@ EAPI=7 -# eutils: strip-linguas -inherit eutils toolchain-funcs +inherit l10n toolchain-funcs IUSE="nls dbus ssl +gtk" diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild index 1f67e6eb580f..ed940b40c224 100644 --- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild +++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs +inherit autotools multilib toolchain-funcs MY_PV="$(ver_rs 1- '')" SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken" diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild index 6c1206f26eb4..565d211983c3 100644 --- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild +++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools +inherit autotools multilib MY_PV="$(ver_rs 1- '')" SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken" diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild index d07405c37e08..593677d31290 100644 --- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild +++ b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild @@ -25,14 +25,16 @@ LICENSE="GPL-3 LGPL-3" SLOT="0" IUSE="" -BDEPEND=" +RDEPEND=" dev-python/six[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/numkit[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} test? ( >=dev-python/pandas-0.17[${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" distutils_enable_tests pytest diff --git a/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild b/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild index b4a2a037987e..82feebc5aff7 100644 --- a/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild +++ b/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ RDEPEND=" sci-libs/hdf5:= rpc? ( sci-chemistry/molequeue ) " -DEPEND="${DEPEND} +DEPEND="${RDEPEND} dev-cpp/eigen:3 test? ( dev-qt/qttest:5 ) " diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild index cae8a6436b4f..00bc08d3f4cb 100644 --- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild +++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.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=5 @@ -23,7 +23,7 @@ RDEPEND=" virtual/freedesktop-icon-theme net-wireless/bluez " -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig sys-devel/gettext " diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2-r1.ebuild index 57d46a51a3f2..80b313603db7 100644 --- a/sci-libs/numkit/numkit-1.1.2.ebuild +++ b/sci-libs/numkit/numkit-1.1.2-r1.ebuild @@ -19,4 +19,4 @@ BDEPEND=" dev-python/six[${PYTHON_USEDEP}] >=dev-python/numpy-1.9[${PYTHON_USEDEP}] >=dev-python/scipy-1.0[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" +RDEPEND="${BDEPEND}" diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild index 739ce56d681c..f182d5168c48 100644 --- a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild +++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ RDEPEND=" sys-libs/readline:0= || ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu ) fox? ( x11-libs/fox:1.6 )" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig doc? ( dev-python/sphinx[latex] )" diff --git a/sci-misc/boinc/boinc-7.14.2.ebuild b/sci-misc/boinc/boinc-7.14.2.ebuild index 51e1970735b3..4159f0107c21 100644 --- a/sci-misc/boinc/boinc-7.14.2.ebuild +++ b/sci-misc/boinc/boinc-7.14.2.ebuild @@ -5,7 +5,7 @@ EAPI=6 WX_GTK_VER=3.0-gtk3 -inherit autotools gnome2-utils linux-info systemd user wxwidgets +inherit autotools desktop gnome2-utils linux-info systemd user wxwidgets DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="https://boinc.ssl.berkeley.edu/" diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild index c47d056ff117..cf696e8c6bc7 100644 --- a/sci-misc/boinc/boinc-9999.ebuild +++ b/sci-misc/boinc/boinc-9999.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +MY_PV=$(ver_cut 1-2) WX_GTK_VER=3.0-gtk3 -inherit autotools gnome2-utils linux-info systemd user wxwidgets +inherit autotools desktop linux-info systemd wxwidgets xdg-utils DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="https://boinc.ssl.berkeley.edu/" @@ -15,13 +16,12 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/BOINC/${PN}.git" inherit git-r3 else - MY_PV="7.14" SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}" fi -LICENSE="LGPL-2.1" +LICENSE="LGPL-3" SLOT="0" IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl" @@ -30,6 +30,8 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) " # libcurl must not be using an ssl backend boinc does not support. # If the libcurl ssl backend changes, boinc should be recompiled. COMMON_DEPEND=" + acct-group/boinc + acct-user/boinc >=app-misc/ca-certificates-20080809 cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 @@ -43,8 +45,13 @@ COMMON_DEPEND=" media-libs/freeglut virtual/jpeg:0= x11-libs/gtk+:3 + x11-libs/libICE >=x11-libs/libnotify-0.7 + x11-libs/libSM + x11-libs/libXi + x11-libs/libXmu x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit] + virtual/jpeg ) " DEPEND="${RDEPEND} @@ -59,7 +66,9 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 - "${FILESDIR}"/fix_webview.patch + "${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch + # bug #732024 + "${FILESDIR}"/${PN}-${MY_PV}-remove-usr_lib.patch ) pkg_setup() { @@ -86,16 +95,28 @@ pkg_setup() { } src_prepare() { + # bug #732024 + if test "x$(get_libdir)" = "xlib64"; then + sed -i -e 's,/:/lib:/usr/lib:,:/lib64:/usr/lib64:,g' m4/sah_check_lib.m4 || die + fi + default # prevent bad changes in compile flags, bug 286701 sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" eautoreconf + + use X && setup-wxwidgets + + # bug #732024 + if test "x$(get_libdir)" = "xlib64"; then + sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die + fi } src_configure() { - use X && setup-wxwidgets unicode + LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) -L${EPREFIX}/$(get_libdir) ${LDFLAGS}" \ econf --disable-server \ --enable-client \ --enable-dynamic-client-linkage \ @@ -122,12 +143,12 @@ src_install() { make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}" # Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910 - mv "${ED%/}"/usr/share/applications/boincmgr{-${PN},}.desktop || \ + mv "${ED}"/usr/share/applications/boincmgr{-${PN},}.desktop || \ die "Failed to rename desktop file" fi # cleanup cruft - rm -rf "${ED%/}"/etc || die "rm failed" + rm -r "${ED}"/etc || die "rm failed" find "${D}" -name '*.la' -delete || die "Removing .la files failed" sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die @@ -135,20 +156,11 @@ src_install() { newconfd "${FILESDIR}"/${PN}.conf ${PN} } -pkg_preinst() { - gnome2_icon_savelist - - enewgroup ${PN} - # note this works only for first install so we have to - # elog user about the need of being in video group - local groups="${PN}" - groups+=",video" - enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}" -} - pkg_postinst() { - if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then - gnome2_icon_cache_update + if use X; then + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update fi elog @@ -185,7 +197,9 @@ pkg_postinst() { } pkg_postrm() { - if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then - gnome2_icon_cache_update + if use X; then + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update fi } diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild index 1ef336f2ab40..a60bb434ef8b 100644 --- a/sci-physics/espresso/espresso-4.1.3.ebuild +++ b/sci-physics/espresso/espresso-4.1.3.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake python-single-r1 savedconfig +inherit cmake cuda python-single-r1 savedconfig DESCRIPTION="Extensible Simulation Package for Research on Soft matter" HOMEPAGE="http://espressomd.org" diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild index 1ef336f2ab40..a60bb434ef8b 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake python-single-r1 savedconfig +inherit cmake cuda python-single-r1 savedconfig DESCRIPTION="Extensible Simulation Package for Research on Soft matter" HOMEPAGE="http://espressomd.org" diff --git a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild b/sys-libs/libapparmor/libapparmor-2.13.4.ebuild index a854860ab42f..e87d5f295ebc 100644 --- a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild +++ b/sys-libs/libapparmor/libapparmor-2.13.4.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 @@ -24,7 +24,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/autoconf-archive sys-devel/bison sys-devel/flex diff --git a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild index 72eb80e6c283..a3bba356f5d0 100644 --- a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild +++ b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/autoconf-archive sys-devel/bison sys-devel/flex diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild index 9d528d3562a1..65eb3d388ace 100644 --- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild +++ b/sys-libs/libapparmor/libapparmor-3.0.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 @@ -25,7 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/autoconf-archive sys-devel/bison sys-devel/flex diff --git a/x11-plugins/guifications/guifications-2.16.ebuild b/x11-plugins/guifications/guifications-2.16.ebuild index f6ac6a1017d6..0c8a39b85b1b 100644 --- a/x11-plugins/guifications/guifications-2.16.ebuild +++ b/x11-plugins/guifications/guifications-2.16.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 @@ -20,7 +20,7 @@ IUSE="debug nls" RDEPEND="net-im/pidgin[gtk] x11-libs/gtk+:2" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" src_configure() { |