support multiple python abis, force build output verbose, bump to eapi=4, minor changes

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

4 files changed, 86 insertions, 40 deletions

diff --git a/x11-misc/redshift/ChangeLog b/x11-misc/redshift/ChangeLog
index ba4539df59ce..5e2e76358ac9 100644
--- a/x11-misc/redshift/ChangeLog
+++ b/x11-misc/redshift/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2012/07/20 22:28:52 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.15 2012/07/21 19:13:55 hasufell Exp $
+
+  21 Jul 2012; Julian Ospald <hasufell@gentoo.org> redshift-1.7-r1.ebuild,
+  +files/redshift-1.7-python-abi.patch:
+  support multiple python abis, force build output verbose, bump to eapi=4,
+  minor changes
 
 *redshift-1.7-r1 (20 Jul 2012)
 
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 6f136861374f..50093bfc0ac0 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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 2419 RMD160 93e936a71242304121af44f6367b9eef828b09da SHA1 c63d4601ff2a2618fc8e683133d83e604c8989e0 SHA256 f21d979f33238b2e99016eec6021326aa526bf7ac588bf9d3d736c9eaf3ba7d7
-MISC metadata.xml 315 RMD160 38d1516141e868a656b85bd326730f2593233a4a SHA1 21408caf23dcf6370ae880c56e565a41e7d6c9c8 SHA256 cff6dc284808e8fe098b715c8282fea04029907709482cdbe497fb0cea4f1811
+AUX 1.6-bonoboiidfix.patch 1504 SHA256 1e58e4e9ae99e44aee8de9bbbd5efef3e93471a609b1aa26cd99d3af6ae180b9 SHA512 5723efb760f8435f7ca3118308d6d3e6e7b7109a3bfec27d127590aaae465fd90cb446c4a5008886ad7da8561222e268fbe21fc0591ce9dad049e36c06170f9c WHIRLPOOL c69a5370c4c9e52ec7f77ccd423bc7a7b1b6c1287a76624b151db91482674578f9a9908aa0c1a7661acf23a93c577d2b7477578a47d7149c993edeac59240c8c
+AUX redshift-1.7-make-conditionals.patch 2248 SHA256 5d18ba80a1719a9c2f215911785698056ca67a90d2e34d2a1fb0c5ab9aa21717 SHA512 2e927b1a2d874de444aba7098a3ab402247c101b0a12b52b3a504a493b9bae5ed10c49bf2db59cedeade7b4d1f7b5cf9a06cfe398f360ffac7538f1d8f8f0446 WHIRLPOOL 1b98ce658eb06ec6ff3088152c295a701d5dc2807a2efea8de220e584a4b366f7c7f078dd4ff94a7ea8b98ca2ad1c9b1df61f90bdae40ba5debddfb9fa88c01d
+AUX redshift-1.7-python-abi.patch 702 SHA256 efd71f92d8eb759a64861d4ff522d379faea6fe0424b286483053ae3403baa0d SHA512 1902d60a70bfe541d7a3f55a12c076804ed514bf2b11b679de2f33e8f243794613bef3a73b207803795dafce8df543e17138102c308b4125b4cad00f138ff3f7 WHIRLPOOL fc433be6491d0a75ef8867e27635dab562fde90aac3d9ba02c5eb04472e3803e0e8fed0b1feef713d8cbbd45577000f0cc7082fe27d388fe638dfdfe344df41a
+DIST redshift-1.4.1.tar.bz2 238462 SHA256 49325ecd61263519c2bac51e7239d87b22bcfd550ad43d3e60282b6230d29cf7
+DIST redshift-1.6.tar.bz2 266881 SHA256 9107451dee3c71c6ea146cb5409390814bf85b56ea495fb576c28f6e31fc863c
+DIST redshift-1.7.tar.bz2 269820 SHA256 9bfa3c3d4a9ce6ea06a5e6235ab4e8215a456c08d6e7451c0389456a37d010c8 SHA512 522b29c2a96d56d8497f93b8a72f295a3a4bbbaef32c514b6975da9a6d046bc0c97318458e8dad000ae18bef98a8fae0d1c2249f3be6860985a4e5ae0b1bb559 WHIRLPOOL 78c1e4a121b93889f6ebbfe86962c5b830a4b7169d0a8c33883e00405dfc5d51409a59b788618a8be740720c50ef17a230fbcf408d5ece858b73286eec336c27
+EBUILD redshift-1.4.1.ebuild 1552 SHA256 974eaca8e4c0c05c52c752354b0a5c3760d024f2ad0c24bd58e8877f5b0fe84c SHA512 89d905114372286971cc9a39a64ef266020575b59b4e02616d0276e7addd14adf1e4c9f3f39a689ea97475ebff1f0800a112afb47db73a1f027dbe5821e002f3 WHIRLPOOL e4ec6e97a7fa1ed34c9f656860c7126aa61c0c54f9a0742b00bd7dd01a047fa6bf9086252186f9a1fc4befd25d37c40eccdc3b14c4f8c7cdd298135866c01bd5
+EBUILD redshift-1.6-r1.ebuild 1582 SHA256 a39bae96f5c1e970af05f7fbb7da8481250219b40d3ff10b7e5e63013141ee12 SHA512 9b1c9045fecd47fa5d4c90e535933a76243de979b2eae6351f542ce5b3d5fb1eabe386609d336ec3023f98dd73c2baeda0c11245591016283ccce89b4597b37a WHIRLPOOL d547dc6f6d973df97f9d086b05828feded096c4c938beb32c36887505eecbd2b9ca81c038ccfc5fa3b1bf1f549c57165025b2d0a2fa548db478f9d58a60fd41e
+EBUILD redshift-1.7-r1.ebuild 2052 SHA256 849f81ee185e38d2672827fc66c5950b7ec719479db1157202d6b5b66daa62fe SHA512 86ac86f2b104f7fe035015d85130629e0e14228cbb4eaa1927a287933aaaa724e02102d23c960b95ef1666f84842528088a863facbb43b8162a323076642ad99 WHIRLPOOL 2a366658c6598d4753b26256abb6c88e45fb9132689ab7072a19161c8a4e1008524be810a3947c88cdf55fc870d24dedf890652b5ae0fe7fad0d7477580c4834
+EBUILD redshift-1.7.ebuild 1548 SHA256 12f67d86e30365cf31fc51d47068ea4b671f318240737102fab1adbaa8ac24d2 SHA512 dc0ff44022c6941020b5a5b35697aefd023bd84ebe162c6e5233e380bb6271e4ecdada7fb17cb38c539db23d9ebb45fe857ad1e56bec1aa72e99ee473fa92480 WHIRLPOOL 24ebb988437df04292b616b0017ea546cb93d146a1ef2038626e89b5237abda810e2f5c9d7214e813e2da7c53d11271630c66aceac1320c3690a7ffafb5d470e
+MISC ChangeLog 2630 SHA256 92a7007ebb87fa029c5c1d27eda738c7c6b2e7baa441bbf61af3fb79ca8afc6d SHA512 20628db311bfd0a56270962c4eba7953bac633cf35d56edbc5acab2b7abf4ff9a07de64b2dba05b4f6fcd5c894431414f864cf8522881aaac050606d8c887355 WHIRLPOOL aed903ccaf62bd9aad2a2a1acb54f2679b5c22bb2e92cd6ce43e96c0eb0e9cb9b2af0f08b7e4318a2600246e0f51c338f6f76b4a288f952eb13763eec624f13f
+MISC metadata.xml 315 SHA256 cff6dc284808e8fe098b715c8282fea04029907709482cdbe497fb0cea4f1811 SHA512 1f324af52eec95af3922617facbef22407438f043058c1528f7291de45262588c470c05b03184472980243b37917e36949b1b225f14549a53f8b08c2cd00e81d WHIRLPOOL 0cb6414cbffc09fca999210bd1b77b1aab543edfa8b2e2433514d928c6289842fc986442ce0f6b2dc3da4733e932ffd3b44cf309df587d8f48dc586e60b92ca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAJ25UACgkQsAvGakAaFgA49gCePRWm0s3Jl2RpUz/awIlo8inf
-KL8AoMde4IfhLT1PgxIdnnhD0Xk2Wlrt
-=QHqI
+iQEcBAEBCAAGBQJQCv6FAAoJEFpvPKfnPDWzWX0H/AknSgZKMyzUZQG+moHU0yPa
+z44CoKKGzFkDb6YtXArPILTC1UjXLfesxx/iPCrESSITGfdV4D/E1CO5NWgilOt3
+LmZ6B3BIiw+Xweqcw8NknH3X5OIgqRPuVdVJ8KCNY5duhjoMCTBdBsDUBJEfvCuN
+7wMpdtOOFdP+hMl2TbqzuM+LHhUNbWqB0c35usuFeWZu2JHXu//Dws9L4/2qFpA7
+22WzjSLoSOC2nNy/PjEXQfIXUmnCA5OpHxjp94XCtZZWnaa5ZYwV8SN7oIiibUL8
+uZyecEe9qqE6KoEwA5FuXYG1+ANVlVQ1Dw5ZyBrjwhWZVQfnGZw3s0MXuhDi1UM=
+=xyVQ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/redshift/files/redshift-1.7-python-abi.patch b/x11-misc/redshift/files/redshift-1.7-python-abi.patch
new file mode 100644
index 000000000000..34ed52faccbf
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.7-python-abi.patch
@@ -0,0 +1,30 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Jul 20 17:59:51 UTC 2012
+Subject: gentoo-specific patch to support multiple python abis
+
+--- src/gtk-redshift/Makefile.am
++++ src/gtk-redshift/Makefile.am
+@@ -1,21 +1,9 @@
+ 
+-if ENABLE_GUI
+-gtk_redshift_PYTHON = \
+-	__init__.py \
+-	utils.py \
+-	statusicon.py
+-nodist_gtk_redshift_PYTHON = \
+-	defs.py
+ gtk_redshiftdir = $(pythondir)/gtk_redshift
+ 
+ dist_bin_SCRIPTS = gtk-redshift
+-endif
+-
+-EXTRA_DIST = defs.py.in
+-CLEANFILES = defs.py
+-
+ 
+ # Local python definitions
+-defs.py: defs.py.in
++all-local: defs.py.in
+ 	sed -e "s|\@bindir\@|$(bindir)|g" \
+-		-e "s|\@localedir\@|$(localedir)|g" $< > $@
++		-e "s|\@localedir\@|$(localedir)|g" $< > defs.py
diff --git a/x11-misc/redshift/redshift-1.7-r1.ebuild b/x11-misc/redshift/redshift-1.7-r1.ebuild
index edfe807cb841..e2ff0c07dbd5 100644
--- a/x11-misc/redshift/redshift-1.7-r1.ebuild
+++ b/x11-misc/redshift/redshift-1.7-r1.ebuild
@@ -1,10 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.7-r1.ebuild,v 1.2 2012/07/21 19:13:55 hasufell Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="gtk? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"
 
 inherit autotools eutils gnome2-utils python
 
@@ -29,49 +31,53 @@ RDEPEND="${COMMON_DEPEND}
 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
+	>py-compile
+	epatch "${FILESDIR}"/${P}-python-abi.patch \
+		"${FILESDIR}"/${P}-make-conditionals.patch
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
-	use gtk || myconf="--disable-gui"
-
 	econf \
-		--disable-dependency-tracking \
+		--disable-silent-rules \
 		$(use_enable nls) \
 		--enable-randr \
 		--enable-vidmode \
+		--disable-wingdi \
 		$(use_enable gnome gnome-clock) \
 		$(use_enable geoclue) \
-		${myconf}
+		$(use_enable gtk gui) \
+		--disable-ubuntu
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
+	default
+
+	# handle multiple python abi support
+	per_abi_install() {
+		cp "${D}"/usr/bin/gtk-redshift "${D}"/usr/bin/gtk-redshift-${PYTHON_ABI} || die
+		python_convert_shebangs ${PYTHON_ABI} "${D}"/usr/bin/gtk-redshift-${PYTHON_ABI}
+
+		insinto "$(python_get_sitedir)"/gtk_redshift
+		doins src/gtk-redshift/{__init__,defs,statusicon,utils}.py
+	}
+
+	if use gtk ; then
+		python_execute_function per_abi_install
+		rm "${D}"/usr/bin/gtk-redshift || die
+		python_generate_wrapper_scripts "${D}"/usr/bin/gtk-redshift
+	fi
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	use gtk && gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	use gtk && python_mod_optimize gtk_${PN}
+	use gtk && { gnome2_icon_cache_update; python_mod_optimize gtk_${PN}; }
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	use gtk && python_mod_cleanup gtk_${PN}
+	use gtk && { gnome2_icon_cache_update; python_mod_cleanup gtk_${PN}; }
 }