[patch] Diff between ebuilds

0001-Convert-cups-to-python-single-r1.patch (text/plain), 2.20 KB, created by Michał Górny on 2013-07-25 14:11:32 UTC

From 50f7ba6226bf8dc9e74c408b87fc6ddb80e9f3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Thu, 25 Jul 2013 16:09:50 +0200
Subject: [PATCH] Convert cups to python-single-r1.

---
 .../cups/{cups-1.6.3-r1.ebuild => cups-1.6.3-r2.ebuild} | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
 copy gx86/net-print/cups/{cups-1.6.3-r1.ebuild => cups-1.6.3-r2.ebuild} (96%)

diff --git a/gx86/net-print/cups/cups-1.6.3-r1.ebuild b/gx86/net-print/cups/cups-1.6.3-r2.ebuild
similarity index 96%
copy from gx86/net-print/cups/cups-1.6.3-r1.ebuild
copy to gx86/net-print/cups/cups-1.6.3-r2.ebuild
index 340ae9c..8cef89c 100644
--- a/gx86/net-print/cups/cups-1.6.3-r1.ebuild
+++ b/gx86/net-print/cups/cups-1.6.3-r2.ebuild
@@ -4,9 +4,10 @@
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
 
 MY_P=${P/_beta/b}
 MY_PV=${PV/_beta/b}
@@ -49,6 +50,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
@@ -74,7 +76,8 @@ PDEPEND="
 	filters? ( net-print/foomatic-filters )
 "
 
-REQUIRED_USE="gnutls? ( ssl )"
+REQUIRED_USE="gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # upstream includes an interactive test which is a nono for gentoo
 RESTRICT="test"
@@ -95,11 +98,7 @@ pkg_setup() {
 	enewuser lp -1 -1 -1 lp
 	enewgroup lpadmin 106
 
-	# python 3 is no-go
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 
 	if use kernel_linux; then
 		linux-info_pkg_setup
@@ -185,7 +184,7 @@ src_configure() {
 		$(use_with java) \
 		--without-perl \
 		--without-php \
-		$(use_with python) \
+		$(use_with python python "${PYTHON}") \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
 		--with-systemdsystemunitdir="$(systemd_get_unitdir)" \
-- 
1.8.3.2