Apply patch for >gnome-2.30 wrt bug 365481 by Anton Bolshakov <anton.bugs@gmail.com>. Drop old.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 70 insertions, 79 deletions

diff --git a/x11-misc/redshift/ChangeLog b/x11-misc/redshift/ChangeLog
index 2d8c7552ea65..2b66bd5f8e71 100644
--- a/x11-misc/redshift/ChangeLog
+++ b/x11-misc/redshift/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/redshift
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.7 2011/02/21 17:26:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.8 2011/05/04 06:33:06 xarthisius Exp $
+
+*redshift-1.6-r1 (04 May 2011)
+
+  04 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/1.6-bonoboiidfix.patch, -redshift-1.5.ebuild, -redshift-1.6.ebuild,
+  +redshift-1.6-r1.ebuild:
+  Apply patch for >gnome-2.30 wrt bug 365481 by Anton Bolshakov
+  <anton.bugs@gmail.com>. Drop old.
 
 *redshift-1.6 (21 Feb 2011)
 
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index ad57a3e353fe..e26a17c2dccc 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.6-bonoboiidfix.patch 1504 RMD160 e8c6d10541d2fa6f996b9e31bbe133aeed0dcdfb SHA1 595f613b2afef44b57ddb63f0ad435ae10312511 SHA256 1e58e4e9ae99e44aee8de9bbbd5efef3e93471a609b1aa26cd99d3af6ae180b9
 DIST redshift-1.4.1.tar.bz2 238462 RMD160 dfee63f794734c36bf4d99b25b91256077754165 SHA1 58692ffe03dcbe3c3d732c2d1314313a26b86db0 SHA256 49325ecd61263519c2bac51e7239d87b22bcfd550ad43d3e60282b6230d29cf7
-DIST redshift-1.5.tar.bz2 243312 RMD160 58af2271357f05008446020ee8638a7670cec248 SHA1 8096e5ec46023137df244407bd903712ce3626a5 SHA256 6dd1f68450442c6ebe859a4eb80c4558a8a00087766bd1fd00624896d78ab471
 DIST redshift-1.6.tar.bz2 266881 RMD160 d2a921afbf1b4c0f8df9cb192b3938bb4f5c4211 SHA1 c79cadab1f36c478be9e0160e4832ae8256d5615 SHA256 9107451dee3c71c6ea146cb5409390814bf85b56ea495fb576c28f6e31fc863c
 EBUILD redshift-1.4.1.ebuild 1552 RMD160 0ff857293d07506946835645690e61920d7f73c4 SHA1 a6731b4e7368fdce8b9d691d5964874f9eb0167e SHA256 974eaca8e4c0c05c52c752354b0a5c3760d024f2ad0c24bd58e8877f5b0fe84c
-EBUILD redshift-1.5.ebuild 1568 RMD160 8c867e0ff0f6a5ded35755c233b093690a4ebb36 SHA1 69984fc068447b90e896b0910c0ec0f890b60882 SHA256 a539c3bc2ccc7da7fc158f4a0f9ab802ad97ae5ccddf12b05d8a7544bd021cd9
-EBUILD redshift-1.6.ebuild 1524 RMD160 28db7f81bdfdaf2a47c18b5cfd61f5316549cdfb SHA1 565135ec9dc081e9bbb29170872a6a2448f945c8 SHA256 b2b1964768958a5dbce3af7fc138198030fe1f98e6a6de4415c171be72177296
-MISC ChangeLog 1179 RMD160 ee342efd0d882def3c5f200e434ad8aaaa85b30d SHA1 4bddc7e8f557ecade05bdce061a31856685365bf SHA256 c8aacbc6475f42a3d13293118f8a24b7a481ae61d47a766363caad47c19e9fea
+EBUILD redshift-1.6-r1.ebuild 1582 RMD160 7bb76f04bd46171055ccb79b190b0d151fa64685 SHA1 2c40e26dc4de16a51c263bbd83ab1504ad92e0e6 SHA256 a39bae96f5c1e970af05f7fbb7da8481250219b40d3ff10b7e5e63013141ee12
+MISC ChangeLog 1471 RMD160 b512f3d4174a217b8a2c01c189c2c7b09bc69baf SHA1 f63f256ea376acead6b127b9600ea151816eab09 SHA256 7925f37da6cf04da9ba47e1a0589aae15a4ada6b1cb9edd75b0eef67cdd9a610
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk3A8ywACgkQIiMqcbOVdxRcPgP/SbYiJ+lvXxe788yjLapaX/ZC
+rZiei3RipWvIGKFSgRTahlBIblV4yP0+PSogRfJQiY6GkTo4/Dk/ewhlXmXs6uHf
+vJlOIQz4B8TSHT2MEvANjyViyUTLWHjil6UM0q+eJ4A1Rd1BazKgrWKy8fm2sEHF
+Npb5z6HslAjdacAZTQc=
+=Cel9
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/redshift/files/1.6-bonoboiidfix.patch b/x11-misc/redshift/files/1.6-bonoboiidfix.patch
new file mode 100644
index 000000000000..b4f6c4de2749
--- /dev/null
+++ b/x11-misc/redshift/files/1.6-bonoboiidfix.patch
@@ -0,0 +1,43 @@
+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ć <kmilos@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/redshift-1.5.ebuild b/x11-misc/redshift/redshift-1.5.ebuild
deleted file mode 100644
index 4f045e609f6c..000000000000
--- a/x11-misc/redshift/redshift-1.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.5.ebuild,v 1.3 2010/09/21 07:46:06 scarabeus Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="gtk? 2:2.6"
-
-inherit gnome2-utils python
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome gtk nls"
-
-COMMON_DEPEND="|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	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
-		ln -nfs $(type -P true) py-compile || die
-		python_convert_shebangs 2 src/gtk-redshift/gtk-redshift
-	fi
-}
-
-src_configure() {
-	local myconf
-	use gtk || myconf="--enable-gui=none"
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-randr \
-		--enable-vidmode \
-		$(use_enable gnome gnome-clock) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog 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.6.ebuild b/x11-misc/redshift/redshift-1.6-r1.ebuild
index ad4b87c4c725..725f2fe650a4 100644
--- a/x11-misc/redshift/redshift-1.6.ebuild
+++ b/x11-misc/redshift/redshift-1.6-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.6.ebuild,v 1.1 2011/02/21 17:26:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.6-r1.ebuild,v 1.1 2011/05/04 06:33:06 xarthisius Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="gtk? 2:2.6"
 
-inherit gnome2-utils python
+inherit eutils gnome2-utils python
 
 DESCRIPTION="A screen color temperature adjusting software"
 HOMEPAGE="http://jonls.dk/redshift/"
@@ -38,6 +38,7 @@ src_prepare() {
 		ln -s $(type -P true) py-compile || die
 		python_convert_shebangs 2 src/gtk-redshift/gtk-redshift
 	fi
+	epatch "${FILESDIR}"/${PV}-bonoboiidfix.patch
 }
 
 src_configure() {