x11-misc/redshift: Migrate to python-r1 (bug #440180)

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

3 files changed, 33 insertions, 36 deletions

diff --git a/x11-misc/redshift/ChangeLog b/x11-misc/redshift/ChangeLog
index 4828d6bed30b..291c9e1d1dc7 100644
--- a/x11-misc/redshift/ChangeLog
+++ b/x11-misc/redshift/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2012/08/16 20:40:38 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.19 2013/02/17 22:38:57 sping Exp $
+
+  17 Feb 2013; Sebastian Pipping <sping@gentoo.org> redshift-1.7-r1.ebuild:
+  Migrate to python-r1 (bug #440180). Thanks for the initial patch to Michał
+  Górny
 
   16 Aug 2012; Julian Ospald <hasufell@gentoo.org> redshift-1.7-r1.ebuild:
   fix build for -gtk wrt #431646
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 37853aea26c1..6c98fbdaf1b3 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -8,18 +8,14 @@ DIST redshift-1.6.tar.bz2 266881 SHA256 9107451dee3c71c6ea146cb5409390814bf85b56
 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 2000 SHA256 ccfd24210ca6468dbe19177a24da1fe6853917611ff9cddd503bd7ae3ec7266c SHA512 f2d2daf3165f143f82c8610867d7af1ef996a3812b4ca172f213faa297be0c8b84ff34c9582d6b5818a2d5d04e07d0e1545db223e1fa30d18ec4b5aa782e7ba0 WHIRLPOOL e60bb099a94bd9adb29da73f12aab4a4429645f415a3e397324bffa501df21c25a7a135f5e269eefad02f33a6f30dc0508f942936d6aeff849eace6119f9e28b
+EBUILD redshift-1.7-r1.ebuild 1716 SHA256 0194abb81ea9d2b18c1b0cf49c717e0b6aa3151b5e583dbc3bec5cdce78ccbfd SHA512 77f14ed167bee63cb8971d8c230782b1aad729777d241351cf8750eea82d17ecdb7139e1c037818bc95c452d69b96ebfd6b311265b155374612dedf799725176 WHIRLPOOL 656dc373027af72dbc79a22258e081e5374c6bc5e01096d787e853268a869b35d732e89469bd0b0084b3f58fb1ebe97a0858a31a1f5048cdd156f038c79790ff
 EBUILD redshift-1.7.ebuild 1548 SHA256 12f67d86e30365cf31fc51d47068ea4b671f318240737102fab1adbaa8ac24d2 SHA512 dc0ff44022c6941020b5a5b35697aefd023bd84ebe162c6e5233e380bb6271e4ecdada7fb17cb38c539db23d9ebb45fe857ad1e56bec1aa72e99ee473fa92480 WHIRLPOOL 24ebb988437df04292b616b0017ea546cb93d146a1ef2038626e89b5237abda810e2f5c9d7214e813e2da7c53d11271630c66aceac1320c3690a7ffafb5d470e
-MISC ChangeLog 2993 SHA256 bdf8a73a61de5cade4236baef88543ed64394dbfe0f3459aac301146ad260486 SHA512 8dd0345a8b663320018d4b2aa6df5c27737a47dfcfed7627d2af593c3368e37b5260fd6aff13c73e346644b2706d08c9f24809ef98018742aea8e78c2c0d36bb WHIRLPOOL d5fcb52a6c6c33b9381bbbea23dd62f76bb088009f8638cedf2d7ee01d025f1efc966042c6bcbbe5da6d589ab48083201474a27c0d54f8ab9f799764ea3ab390
+MISC ChangeLog 3154 SHA256 67c1e8fac053d61869df01912c24bc5fc376eefb8085a0b2c8a18938d17c8d5f SHA512 a0926b8c5214302758de963ec6239d0d79c3cb0407ff723e4f26d04ab7a903921d3eb1771b178f01cae85582b15c2cc74f8956910f34554b1b5711d9772f2767 WHIRLPOOL 6674c776c7c677a93ad9c43fb22a7e0d0ebbd3fe80ff169f1226998837809ba8b332d5878c022afbbfaeeebe9d5f054c08c999737940b7a811f05b4159e4d478
 MISC metadata.xml 315 SHA256 cff6dc284808e8fe098b715c8282fea04029907709482cdbe497fb0cea4f1811 SHA512 1f324af52eec95af3922617facbef22407438f043058c1528f7291de45262588c470c05b03184472980243b37917e36949b1b225f14549a53f8b08c2cd00e81d WHIRLPOOL 0cb6414cbffc09fca999210bd1b77b1aab543edfa8b2e2433514d928c6289842fc986442ce0f6b2dc3da4733e932ffd3b44cf309df587d8f48dc586e60b92ca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLVmpAAoJEFpvPKfnPDWz1t0IAJe/D2xrUbjE3EsmKvLC0Avm
-0fKi3uhGV/bk+Epo3vXOPAFWjoMIuROd/qK0eFF+MIIlhtMhO/Q2WfO/IPeEtA7t
-pLO0EDHj70lLF6zQIqkZgvxon4duglO21zzKSdTHQtaFpBqBdLekIHrGTsvjfPxD
-cf43HWBcjYyCmu9S3HVi2xKFY5vDKogTPIUkOa3y2c/+i71sKu7fmle/nnWe2FiT
-a2eAL1pKehSny4xBaO7Ph0INA71ud8JU+iU72VzqqILguKqvZ/MA4QagmTbYm307
-YY3T9p8YWCyeOII6EjFhUWzzZUJSN1QafUmEVZU/mEkMgDGR6HGQZZR9S7wuIH8=
-=qgWl
+iEYEAREIAAYFAlEhXBkACgkQsAvGakAaFgDavACgiwoFeOFMaxeDS2WWasQ0VZXn
+LkAAnRsdbQQE6r++RX9DApNgVtxsFyWJ
+=PCD+
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/redshift/redshift-1.7-r1.ebuild b/x11-misc/redshift/redshift-1.7-r1.ebuild
index f3bd2103af66..832d6c8edd41 100644
--- a/x11-misc/redshift/redshift-1.7-r1.ebuild
+++ b/x11-misc/redshift/redshift-1.7-r1.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/08/16 20:40:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.7-r1.ebuild,v 1.6 2013/02/17 22:38:57 sping Exp $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-PYTHON_DEPEND="gtk? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit autotools eutils gnome2-utils python
+inherit autotools eutils gnome2-utils python-r1
 
 DESCRIPTION="A screen color temperature adjusting software"
 HOMEPAGE="http://jonls.dk/redshift/"
@@ -24,20 +21,23 @@ COMMON_DEPEND=">=x11-libs/libX11-1.4
 	x11-libs/libxcb
 	geoclue? ( app-misc/geoclue )
 	gnome? ( dev-libs/glib:2
-		>=gnome-base/gconf-2 )"
+		>=gnome-base/gconf-2 )
+	gtk? ( ${PYTHON_DEPS} )"
 RDEPEND="${COMMON_DEPEND}
-	gtk? ( >=dev-python/pygtk-2
-		dev-python/pyxdg )"
+	gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	>py-compile
 	epatch "${FILESDIR}"/${P}-make-conditionals.patch
+	epatch_user
 	eautoreconf
 }
 
 src_configure() {
+	python_export_best
+
 	econf \
 		--disable-silent-rules \
 		$(use_enable nls) \
@@ -50,20 +50,17 @@ src_configure() {
 		--disable-ubuntu
 }
 
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/gtk-redshift install
+}
+
 src_install() {
 	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}
-		emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" -C src/gtk-redshift install
-	}
-
-	if use gtk ; then
-		rm -R "${D}"/usr/$(get_libdir)/python* || die
-		python_execute_function per_abi_install
-		python_generate_wrapper_scripts -f "${D}"/usr/bin/gtk-redshift
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/gtk-redshift
 	fi
 }
 
@@ -72,9 +69,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	use gtk && { gnome2_icon_cache_update; python_mod_optimize gtk_${PN}; }
+	use gtk && gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	use gtk && { gnome2_icon_cache_update; python_mod_cleanup gtk_${PN}; }
+	use gtk && gnome2_icon_cache_update
 }