gentoo resync : 20.03.2021

4 files changed, 11 insertions, 62 deletions

diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 739d3b9b6a6c..bc2e40ef9d53 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,5 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1-r1.ebuild 1011 BLAKE2B 1cfbf2c337e02f78bcd8d0960d68fd00bd54af6d128b290417782f956d3b77a5b400f66a8caea5b814cdeff3a3ad204ac3ba3deefbb310481fb5d5a309a8dfe9 SHA512 998126f36b97b042eaffaa68c6d05a2983bfd5f31c48a5ae03621ed41583cbd6fe467aa569cc15c45fa029a7254c7f5b934a504d8bcabf29cdaec2ee6fc12cd9
-EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
-EBUILD nitrogen-99999.ebuild 951 BLAKE2B 593d5517c0a3cfdd367dbe884302708c9d63ad83b7c0cabceda61d2ec4a5fcc15f5aad86163bcb51e71a6603cd3630214826fcf9af66aac42fbc630d323c3f70 SHA512 dfb30c112a5bbf409ad322dc084ae9d0c6ec15e001b19c21735d1d416486528c7d7a47f1a767fd49e514789ee20e0e8f0acc3157495150a2eacd11647fd98acd
+EBUILD nitrogen-1.6.1-r1.ebuild 1019 BLAKE2B 8e65f90322651059c274b1eca6aff664f5f4dc587935726c00ddd97aed0ce6c43da437958dc137b4a4bb65ce128e46884a15e7dede426de2c8b9309bd9ec00dc SHA512 25177bb8eb9bb2de237e7e6cd42162215ee4811b6fa2215053d7cd7cbe893125e501fcaded779036a7d1a40985959fb084d9ff2fc0e1a3633f0c09b3b8ec8018
+EBUILD nitrogen-99999.ebuild 948 BLAKE2B 168dbbb5637c1f431f2445b60d418c9349c0113f8cccab5059f58d57f4e259876336730c7d7dd4cee0e347abb164c8e9456f0fa861a4114bb702c198bb67e4d3 SHA512 22b99582b6a06275f88539dd0bebabddb704bd3ba6ef12ebb0921e03a23505f4c514e57620089270f904817e41c6d3584b7ae3fa749b82ea1f00bc04d470b4de
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index 68f5dd2023f7..420044457248 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.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=6
+
 inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
@@ -10,9 +11,10 @@ SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=gnome-base/librsvg-2.20:2
@@ -21,7 +23,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )
 "
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
deleted file mode 100644
index aee77e158ce4..000000000000
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic xdg-utils
-
-DESCRIPTION="A background browser and setter for X"
-HOMEPAGE="http://projects.l3ib.org/nitrogen/"
-SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls xinerama"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-2.10:2.4
-	>=gnome-base/librsvg-2.20:2
-	>=x11-libs/gtk+-2.10:2
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/nitrogen/nitrogen-99999.ebuild b/x11-misc/nitrogen/nitrogen-99999.ebuild
index dec80fb27a1d..ce8061fea451 100644
--- a/x11-misc/nitrogen/nitrogen-99999.ebuild
+++ b/x11-misc/nitrogen/nitrogen-99999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2019 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 git-r3 xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
 HOMEPAGE="https://github.com/l3ib/nitrogen"
 EGIT_REPO_URI="https://github.com/l3ib/${PN}"
 
-IUSE="nls xinerama"
-KEYWORDS=""
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="nls xinerama"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=gnome-base/librsvg-2.20:2
 	>=x11-libs/gtk+-2.10:2
 	xinerama? ( x11-libs/libXinerama )
 "
-BDEPEND="
+DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )
 "