commit: 4bdfaeea151f6e7c4e16f4c148bcb26aae11fe15 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Sun Sep 13 18:54:16 2015 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sun Sep 13 18:55:43 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdfaeea
x11-misc/redshift: Remove old Package-Manager: portage-2.2.20.1 x11-misc/redshift/Manifest | 2 - x11-misc/redshift/files/1.6-bonoboiidfix.patch | 43 ------------ .../files/redshift-1.7-make-conditionals.patch | 72 ------------------- x11-misc/redshift/files/redshift-1.9-toggle.patch | 37 ---------- x11-misc/redshift/redshift-1.7-r1.ebuild | 77 --------------------- x11-misc/redshift/redshift-1.7.ebuild | 74 -------------------- x11-misc/redshift/redshift-1.9.1-r1.ebuild | 79 --------------------- x11-misc/redshift/redshift-1.9.1-r2.ebuild | 80 ---------------------- x11-misc/redshift/redshift-1.9.1.ebuild | 76 -------------------- 9 files changed, 540 deletions(-) diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest index bc88f98..f4580aa 100644 --- a/x11-misc/redshift/Manifest +++ b/x11-misc/redshift/Manifest @@ -1,3 +1 @@ DIST redshift-1.10.tar.gz 519595 SHA256 f7a1ca1eccf662995737e14f894c2b15193923fbbe378d151e346a8013644f16 SHA512 0fd3867d883268279b6297a0eec1bcdc20022a893b935fd4767fbfc0797ad044777af4cf1efcfec7a1f362306ae88869f73b20c91b29844e9e201881c5b56260 WHIRLPOOL 3aa705a5afedb4ebb7fcab98afec0d69ea5c8c7cd280eee72fc2aff260df85d00b0af722ce6fc1e3e04d000e30d37eb2ddca8b82d6a25e9d587f4e0d98bfc626 -DIST redshift-1.7.tar.bz2 269820 SHA256 9bfa3c3d4a9ce6ea06a5e6235ab4e8215a456c08d6e7451c0389456a37d010c8 SHA512 522b29c2a96d56d8497f93b8a72f295a3a4bbbaef32c514b6975da9a6d046bc0c97318458e8dad000ae18bef98a8fae0d1c2249f3be6860985a4e5ae0b1bb559 WHIRLPOOL 78c1e4a121b93889f6ebbfe86962c5b830a4b7169d0a8c33883e00405dfc5d51409a59b788618a8be740720c50ef17a230fbcf408d5ece858b73286eec336c27 -DIST redshift-1.9.1.tar.gz 163257 SHA256 31636a76c3544cd1efd3cd43f443d97b63f9d27c4bcc90619897cf489ea74766 SHA512 7d0d037a6415efd5b82e4d617fdc826bb67259358bb4c00153a121712ae3ea260e975860bb02b8cdc789d9593fd420fae6cf5319cf0bad29202ba2ff83f9efff WHIRLPOOL 926123312d64e3f974e253b7226fade48233fdccd6ba6494dac00ef0b26ceaf021be8f35c446851bd59e20e66ea1fcc65c2aa087f193d3960328540b31def2ea diff --git a/x11-misc/redshift/files/1.6-bonoboiidfix.patch b/x11-misc/redshift/files/1.6-bonoboiidfix.patch deleted file mode 100644 index b4f6c4d..0000000 --- a/x11-misc/redshift/files/1.6-bonoboiidfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Handle newer versions of gnome-panel gconf schema. - In newer versions of gnome-panel (>2.30), the gconf identifier - name for bonobo_iid was renamed to applet_iid, this caused - redshift to be unable to locate the Clock Applet. This patch - attempts to use the legacy behaviour, and on failure to - retrieve the value uses the newer identifer. -Author: Miloš Komarčević <kmi...@gmail.com> -Bug: https://launchpad.net/bugs/706353 -Bug-Ubuntu: https://launchpad.net/bugs/706353 -Bug-Fedora: https://bugzilla.redhat.com/661145 -Bug-Gentoo: https://bugs.gentoo.org/365481 - ---- a/src/location-gnome-clock.c -+++ b/src/location-gnome-clock.c -@@ -104,11 +104,28 @@ - char *bonobo_iid = gconf_client_get_string(client, key, - &error); - -+ /* Try both gnome-panel 2.30.x and earlier bonobo_iid key and -+ newer applet_iid. */ - if (!error && bonobo_iid != NULL && - !strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) { - clock_applet_count += 1; - current_city = find_current_city(client, id); - } -+ else { -+ g_free(key); -+ key = g_strdup_printf("/apps/panel/applets/%s" -+ "/applet_iid", id); -+ char *applet_iid = gconf_client_get_string(client, key, -+ &error); -+ -+ if (!error && applet_iid != NULL && -+ !strcmp(applet_iid, "ClockAppletFactory::ClockApplet")) { -+ clock_applet_count += 1; -+ current_city = find_current_city(client, id); -+ } -+ -+ g_free(applet_iid); -+ } - - g_free(bonobo_iid); - g_free(key); diff --git a/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch b/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch deleted file mode 100644 index 03d150c..0000000 --- a/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- Makefile.am 2012-07-20 22:52:27.013475104 +0200 -+++ Makefile.am 2012-07-20 23:54:22.807021292 +0200 -@@ -2,43 +2,51 @@ - SUBDIRS = src po - ACLOCAL_AMFLAGS = -I m4 - -+_HICOLOR_FILES = \ -+ data/icons/hicolor/scalable/apps/redshift.svg \ -+ data/icons/hicolor/scalable/apps/redshift-status-on.svg \ -+ data/icons/hicolor/scalable/apps/redshift-status-off.svg -+ -+_UBUNTU_MONO_DARK_FILES = \ -+ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \ -+ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg -+ -+_UBUNTU_MONO_LIGHT_FILES = \ -+ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \ -+ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg -+ -+_DESKTOP_FILES = \ -+ data/applications/gtk-redshift.desktop -+ - # Icons -+if ENABLE_GUI - hicolor_icondir = @datadir@/icons/hicolor/scalable/apps --hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \ -- data/icons/hicolor/scalable/apps/redshift-status-on.svg \ -- data/icons/hicolor/scalable/apps/redshift-status-off.svg -+hicolor_icon_DATA = $(_HICOLOR_FILES) - - if ENABLE_UBUNTU - ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps --ubuntu_mono_dark_icon_DATA = \ -- data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \ -- data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg -+ubuntu_mono_dark_icon_DATA = $(_UBUNTU_MONO_DARK_FILES) - - ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps --ubuntu_mono_light_icon_DATA = \ -- data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \ -- data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg -+ubuntu_mono_light_icon_DATA = $(_UBUNTU_MONO_LIGHT_FILES) -+endif - endif - - - # Desktop file - if ENABLE_GUI - desktopdir = @datadir@/applications --desktop_DATA = data/applications/gtk-redshift.desktop -+desktop_DATA = $(_DESKTOP_FILES) - endif - - # man page - dist_man1_MANS = redshift.1 - - EXTRA_DIST = \ -- $(hicolor_icon_DATA) \ -- $(desktop_DATA) -- --if ENABLE_UBUNTU --EXTRA_DIST += \ -- $(ubuntu_mono_dark_icon_DATA) \ -- $(ubuntu_mono_light_icon_DATA) --endif -+ $(_HICOLOR_FILES) \ -+ $(_UBUNTU_MONO_DARK_FILES) \ -+ $(_UBUNTU_MONO_LIGHT_FILES) \ -+ $(_DESKTOP_FILES) - - # Update PO translations - .PHONY: update-po diff --git a/x11-misc/redshift/files/redshift-1.9-toggle.patch b/x11-misc/redshift/files/redshift-1.9-toggle.patch deleted file mode 100644 index b28a11b..0000000 --- a/x11-misc/redshift/files/redshift-1.9-toggle.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9426e9fba038a3b5076ed92dbe538451de8725f2 Mon Sep 17 00:00:00 2001 -From: Jon Lund Steffensen <jon...@gmail.com> -Date: Fri, 11 Apr 2014 00:26:57 +0200 -Subject: [PATCH] redshift-gtk: Fix crash when toggling state using the status - icon - ---- - src/redshift-gtk/statusicon.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py -index 5685f08..08f28ef 100644 ---- a/src/redshift-gtk/statusicon.py -+++ b/src/redshift-gtk/statusicon.py -@@ -79,7 +79,7 @@ def __init__(self, args=[]): - - # Add toggle action - self.toggle_item = Gtk.CheckMenuItem.new_with_label(_('Enabled')) -- self.toggle_item.connect('activate', self.toggle_cb) -+ self.toggle_item.connect('activate', self.toggle_item_cb) - self.status_menu.append(self.toggle_item) - - # Add suspend menu -@@ -215,6 +215,10 @@ def popup_menu_cb(self, widget, button, time, data=None): - self.status_icon, button, time) - - def toggle_cb(self, widget, data=None): -+ self.remove_suspend_timer() -+ self.child_toggle_status() -+ -+ def toggle_item_cb(self, widget, data=None): - # Only toggle if a change from current state was requested - if self.is_enabled() != widget.get_active(): - self.remove_suspend_timer() --- -1.9.1 - diff --git a/x11-misc/redshift/redshift-1.7-r1.ebuild b/x11-misc/redshift/redshift-1.7-r1.ebuild deleted file mode 100644 index ef2e755..0000000 --- a/x11-misc/redshift/redshift-1.7-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils gnome2-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="http://jonls.dk/redshift/"; -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="geoclue gnome gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - geoclue? ( app-misc/geoclue:0 ) - gnome? ( dev-libs/glib:2 - >=gnome-base/gconf-2 ) - gtk? ( ${PYTHON_DEPS} )" -RDEPEND="${COMMON_DEPEND} - gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-make-conditionals.patch - epatch_user - eautoreconf -} - -src_configure() { - python_export_best - - econf \ - --disable-silent-rules \ - $(use_enable nls) \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - $(use_enable gnome gnome-clock) \ - $(use_enable geoclue) \ - $(use_enable gtk gui) \ - --disable-ubuntu -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \ - -C src/gtk-redshift install -} - -src_install() { - default - - if use gtk; then - python_foreach_impl _impl_specific_src_install - python_replicate_script "${D}"/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.7.ebuild b/x11-misc/redshift/redshift-1.7.ebuild deleted file mode 100644 index bca0726..0000000 --- a/x11-misc/redshift/redshift-1.7.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="gtk? 2:2.6" - -inherit eutils gnome2-utils python - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="http://jonls.dk/redshift/"; -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="geoclue gnome gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - geoclue? ( app-misc/geoclue:0 ) - gnome? ( dev-libs/glib:2 - >=gnome-base/gconf-2 )" -RDEPEND="${COMMON_DEPEND} - gtk? ( >=dev-python/pygtk-2 - dev-python/pyxdg )" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext )" - -pkg_setup() { - use gtk && python_set_active_version 2 -} - -src_prepare() { - if use gtk; then - >py-compile - python_convert_shebangs 2 src/gtk-redshift/gtk-redshift - fi -} - -src_configure() { - local myconf - use gtk || myconf="--disable-gui" - - econf \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-randr \ - --enable-vidmode \ - $(use_enable gnome gnome-clock) \ - $(use_enable geoclue) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS NEWS README -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - use gtk && python_mod_optimize gtk_${PN} -} - -pkg_postrm() { - gnome2_icon_cache_update - use gtk && python_mod_cleanup gtk_${PN} -} diff --git a/x11-misc/redshift/redshift-1.9.1-r1.ebuild b/x11-misc/redshift/redshift-1.9.1-r1.ebuild deleted file mode 100644 index f792a71..0000000 --- a/x11-misc/redshift/redshift-1.9.1-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{3_3,3_4} ) - -inherit 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 ~x86" -IUSE="appindicator geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - geoclue? ( app-misc/geoclue: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} - nls? ( sys-devel/gettext ) - appindicator? ( dev-libs/libappindicator ) -" - -src_prepare() { - epatch_user - eautoreconf -} - -src_configure() { - python_export_best - - econf \ - --disable-silent-rules \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - $(use_enable geoclue) \ - $(use_enable gtk gui) \ - --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.9.1-r2.ebuild b/x11-misc/redshift/redshift-1.9.1-r2.ebuild deleted file mode 100644 index 735ea07..0000000 --- a/x11-misc/redshift/redshift-1.9.1-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{3_3,3_4} ) - -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 ~x86" -IUSE="appindicator geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - geoclue? ( app-misc/geoclue: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} - nls? ( sys-devel/gettext ) - appindicator? ( dev-libs/libappindicator ) -" - -src_prepare() { - epatch_user - eautoreconf -} - -src_configure() { - python_export_best - - econf \ - --disable-silent-rules \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - $(use_enable geoclue) \ - $(use_enable gtk gui) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --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.9.1.ebuild b/x11-misc/redshift/redshift-1.9.1.ebuild deleted file mode 100644 index 0155570..0000000 --- a/x11-misc/redshift/redshift-1.9.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{3_3,3_4} ) - -inherit 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 ~x86" -IUSE="geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) - gtk? ( ${PYTHON_DEPS} )" -RDEPEND="${COMMON_DEPEND} - gtk? ( dev-python/pygobject[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch_user - eautoreconf -} - -src_configure() { - python_export_best - - econf \ - --disable-silent-rules \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - $(use_enable geoclue) \ - $(use_enable gtk gui) \ - --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 -}
