gentoo resync : 15.12.2019

4 files changed, 5 insertions, 177 deletions

diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index bae0c7d316ab..8c6024cbedf8 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,3 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.12-r1.ebuild 1942 BLAKE2B 1fa6db5f74d95241f8660e8a70cfcf7e2b1c1ec999b3f31dcb8c5bb3249bba03776d658fac3ddabfef883a1bda0af321fed01fd7643ed17cfc2325fc6783f03f SHA512 b44ceb94269c892838fff899fba525cf5fe561fec39977ef3c84a95a781074f516fa3f49b49898052b3aa38641bb4a31c4dcd9f7ca55a4dd701873c9a9d91d1f
-EBUILD redshift-1.12-r2.ebuild 1944 BLAKE2B f8cdd23da354c73fe549924029e08dce3044ed3f1b2a53fb5f3f98d244b4f5f0b6dac45f7df146a87e6945e88195ac0f718a2428a5b0fb28d82401b31be4ee73 SHA512 53c4ca2fea3a7ceefb2dfbf95dfa1f2a3d242c6fd8e98e003b5e7cc9557b3b59550bb1297beb8ad234b5373fd244acb1d9e0127ab33d3699714b600007f5e650
-EBUILD redshift-1.12.ebuild 1925 BLAKE2B 4009bb9d76c2088d519e70046a8695d046009d8c38d7c10f88c7fb8ea61d2aa74b67c2a59e279a80935a3e5fdf22d2e927e08f43f344f1257eeb07ddf0744728 SHA512 4e0456eaf95571ca8b58faf8db6e81290fe6eb6463f0a78260e190da16374aa6ae3f16fb1a0307961133433db2a39a2152bcb08367ae5e3302fcd7e678b80ded
+EBUILD redshift-1.12-r3.ebuild 1979 BLAKE2B c8477ee501a0f20c4eaa47a493b1dd9d57479cbbfbe138da5b4130267cfe35b08ed15f3b043e6c7ee706d9632dd5eda6ac343756d731e5b12e3e8fe9f88ee181 SHA512 75925f7e15c02cb83c9d2861e3d696699c4ac64350332eb650e1a801c99b84df4dc126303daf6f16e7ad9b369a200a892d2c06f582cc144cddd54114a3d2a349
 MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.12-r1.ebuild b/x11-misc/redshift/redshift-1.12-r1.ebuild
deleted file mode 100644
index e53725fb2471..000000000000
--- a/x11-misc/redshift/redshift-1.12-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit systemd autotools eutils gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="ayatana geoclue gtk nls"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	ayatana? ( dev-libs/libappindicator:3[introspection] )
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		--disable-silent-rules \
-		$(use_enable nls) \
-		--enable-drm \
-		--enable-randr \
-		--enable-vidmode \
-		--disable-wingdi \
-		\
-		--disable-corelocation \
-		$(use_enable geoclue geoclue2) \
-		\
-		$(use_enable gtk gui) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
-		--disable-quartz \
-		--disable-ubuntu
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/redshift-gtk install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/redshift-gtk
-		dosym redshift-gtk /usr/bin/gtk-redshift
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/redshift/redshift-1.12-r2.ebuild b/x11-misc/redshift/redshift-1.12-r3.ebuild
index 7ce1fd9516b9..b0a34731e938 100644
--- a/x11-misc/redshift/redshift-1.12-r2.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="ayatana geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
@@ -53,7 +53,7 @@ src_configure() {
 		\
 		$(use_enable gtk gui) \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
+		--enable-apparmor \
 		--disable-quartz \
 		--disable-ubuntu
 }
@@ -70,6 +70,8 @@ src_install() {
 		python_foreach_impl _impl_specific_src_install
 		python_replicate_script "${D}"/usr/bin/redshift-gtk
 		dosym redshift-gtk /usr/bin/gtk-redshift
+
+		python_foreach_impl python_optimize
 	fi
 }
 
diff --git a/x11-misc/redshift/redshift-1.12.ebuild b/x11-misc/redshift/redshift-1.12.ebuild
deleted file mode 100644
index 8f866b931797..000000000000
--- a/x11-misc/redshift/redshift-1.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit systemd autotools eutils gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ayatana geoclue gtk nls"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-	ayatana? ( dev-libs/libappindicator:3 )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		--disable-silent-rules \
-		$(use_enable nls) \
-		--enable-drm \
-		--enable-randr \
-		--enable-vidmode \
-		--disable-wingdi \
-		\
-		--disable-corelocation \
-		$(use_enable geoclue geoclue2) \
-		\
-		$(use_enable gtk gui) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
-		--disable-quartz \
-		--disable-ubuntu
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/redshift-gtk install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/redshift-gtk
-		dosym redshift-gtk /usr/bin/gtk-redshift
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}