x11-misc/redshift: Fix USE=-gtk (bug #427156)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 165 insertions, 7 deletions

diff --git a/x11-misc/redshift/ChangeLog b/x11-misc/redshift/ChangeLog
index 2efeefd46366..ba4539df59ce 100644
--- a/x11-misc/redshift/ChangeLog
+++ b/x11-misc/redshift/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/redshift
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.13 2012/01/28 14:50:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.14 2012/07/20 22:28:52 sping Exp $
+
+*redshift-1.7-r1 (20 Jul 2012)
+
+  20 Jul 2012; Sebastian Pipping <sping@gentoo.org> +redshift-1.7-r1.ebuild,
+  +files/redshift-1.7-make-conditionals.patch:
+  No longer install .svg files for USE=-gtk (bug #427156)
+  The patch has been written with upstream in mind.
 
   28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> redshift-1.7.ebuild:
   x86 stable wrt bug #398905
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index a4c56273c511..6f136861374f 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.6-bonoboiidfix.patch 1504 RMD160 e8c6d10541d2fa6f996b9e31bbe133aeed0dcdfb SHA1 595f613b2afef44b57ddb63f0ad435ae10312511 SHA256 1e58e4e9ae99e44aee8de9bbbd5efef3e93471a609b1aa26cd99d3af6ae180b9
+AUX redshift-1.7-make-conditionals.patch 2248 RMD160 89d2f1a0aba27272e34ae3fe1ac99c4efe1dbb9e SHA1 4dee39a25c8d34e9552e9f82ab4741bf6081fb03 SHA256 5d18ba80a1719a9c2f215911785698056ca67a90d2e34d2a1fb0c5ab9aa21717
 DIST redshift-1.4.1.tar.bz2 238462 RMD160 dfee63f794734c36bf4d99b25b91256077754165 SHA1 58692ffe03dcbe3c3d732c2d1314313a26b86db0 SHA256 49325ecd61263519c2bac51e7239d87b22bcfd550ad43d3e60282b6230d29cf7
 DIST redshift-1.6.tar.bz2 266881 RMD160 d2a921afbf1b4c0f8df9cb192b3938bb4f5c4211 SHA1 c79cadab1f36c478be9e0160e4832ae8256d5615 SHA256 9107451dee3c71c6ea146cb5409390814bf85b56ea495fb576c28f6e31fc863c
 DIST redshift-1.7.tar.bz2 269820 RMD160 c2ba1bc43e8bd5448a22c0ab25ff2b781321929b SHA1 cca3b83afef1687b533337649af1285116918590 SHA256 9bfa3c3d4a9ce6ea06a5e6235ab4e8215a456c08d6e7451c0389456a37d010c8
 EBUILD redshift-1.4.1.ebuild 1552 RMD160 0ff857293d07506946835645690e61920d7f73c4 SHA1 a6731b4e7368fdce8b9d691d5964874f9eb0167e SHA256 974eaca8e4c0c05c52c752354b0a5c3760d024f2ad0c24bd58e8877f5b0fe84c
 EBUILD redshift-1.6-r1.ebuild 1582 RMD160 7bb76f04bd46171055ccb79b190b0d151fa64685 SHA1 2c40e26dc4de16a51c263bbd83ab1504ad92e0e6 SHA256 a39bae96f5c1e970af05f7fbb7da8481250219b40d3ff10b7e5e63013141ee12
+EBUILD redshift-1.7-r1.ebuild 1623 RMD160 e8caee069fefdc0d1a0260c84580602ce7ca7c90 SHA1 a2847ca8aefcd6a1b83d05afec1e05ccf54f76b6 SHA256 44b683d19da1d9e7c535839809221014aa761e86108a9a78000bb50697561314
 EBUILD redshift-1.7.ebuild 1548 RMD160 8f18310750b11305aa4b8a5570c66f4dab026be3 SHA1 e55e959477ca46369ad8f3e33a11aa0f73f14666 SHA256 12f67d86e30365cf31fc51d47068ea4b671f318240737102fab1adbaa8ac24d2
-MISC ChangeLog 2157 RMD160 153dba38cb1381cf7bd3d38066e55fc11df904cb SHA1 ab41dee1f26728f159b2dd6e58e1d25ebdea198d SHA256 b56502de4e90ab5c16808ebcf37118f1e459ede5e9d8c1e81dd8216342bfcff9
+MISC ChangeLog 2419 RMD160 93e936a71242304121af44f6367b9eef828b09da SHA1 c63d4601ff2a2618fc8e683133d83e604c8989e0 SHA256 f21d979f33238b2e99016eec6021326aa526bf7ac588bf9d3d736c9eaf3ba7d7
 MISC metadata.xml 315 RMD160 38d1516141e868a656b85bd326730f2593233a4a SHA1 21408caf23dcf6370ae880c56e565a41e7d6c9c8 SHA256 cff6dc284808e8fe098b715c8282fea04029907709482cdbe497fb0cea4f1811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk8kC0kACgkQuUQtlDBCeQJ/PACeI9VgLqI2/0qZCZfITcYfSMDD
-S5sAn1bNn3NLzSJ6usqtQPBPb/CtchnL
-=1ZeP
+iEYEARECAAYFAlAJ25UACgkQsAvGakAaFgA49gCePRWm0s3Jl2RpUz/awIlo8inf
+KL8AoMde4IfhLT1PgxIdnnhD0Xk2Wlrt
+=QHqI
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch b/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch
new file mode 100644
index 000000000000..03d150c4d80e
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch
@@ -0,0 +1,72 @@
+--- 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/redshift-1.7-r1.ebuild b/x11-misc/redshift/redshift-1.7-r1.ebuild
new file mode 100644
index 000000000000..edfe807cb841
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.7-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.7-r1.ebuild,v 1.1 2012/07/20 22:28:52 sping Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="gtk? 2:2.6"
+
+inherit autotools eutils 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="geoclue gnome gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	geoclue? ( app-misc/geoclue )
+	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
+
+	epatch "${FILESDIR}"/${P}-make-conditionals.patch
+	eautoreconf
+}
+
+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}
+}