[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/wammu/

[Sebastian Pipping]

commit:     8324389e263b89ca2961377be72cc377a9308425
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 20:05:23 2016 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 20:11:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8324389e

app-mobilephone/wammu: Adjust gammu dependency (#775)

Changelog of gammu 1.34.0 says:
"Removed deprecated Python modules gammu.Data and gammu.Worker".

Package-Manager: portage-2.2.27

 .../{wammu-0.36-r1.ebuild => wammu-0.35-r1.ebuild} | 28 ++++++++++++----------
 app-mobilephone/wammu/wammu-0.36-r1.ebuild         |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app-mobilephone/wammu/wammu-0.36-r1.ebuild b/app-mobilephone/wammu/wammu-0.35-r1.ebuild
similarity index 72%
copy from app-mobilephone/wammu/wammu-0.36-r1.ebuild
copy to app-mobilephone/wammu/wammu-0.35-r1.ebuild
index 4c84990..b8d262e 100644
--- a/app-mobilephone/wammu/wammu-0.36-r1.ebuild
+++ b/app-mobilephone/wammu/wammu-0.35-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="3"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_DEPEND="2"
 
-inherit distutils-r1
+inherit distutils
 
 DESCRIPTION="Front-end for gammu to access mobile phones easily"
 HOMEPAGE="http://www.wammu.eu/"
@@ -17,9 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth gnome"
 
-RDEPEND=">=app-mobilephone/gammu-1.25.0[python]
-	>=dev-python/wxpython-2.8[${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}]
+RDEPEND=">=app-mobilephone/gammu-1.25.0[python] <app-mobilephone/gammu-1.34.0[python]
+	>=dev-python/wxpython-2.8
+	bluetooth? ( dev-python/pybluez
 		gnome? ( net-wireless/gnome-bluetooth )
 	)"
 DEPEND="${RDEPEND}"
@@ -29,8 +29,10 @@ DEPEND="${RDEPEND}"
 MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv zh_CN zh_TW"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
-# Required to source locale content out of the box
-DISTUTILS_IN_SOURCE_BUILD=1
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_prepare() {
 	local lang support_linguas=no
@@ -49,16 +51,16 @@ src_prepare() {
 		done
 	fi
 
-	distutils-r1_src_prepare
+	python_convert_shebangs -r 2 .
 }
 
 src_compile() {
 	# SKIPWXCHECK: else 'import wx' results in
 	# Xlib: connection to ":0.0" refused by server
-	SKIPWXCHECK=yes distutils-r1_src_compile
+	SKIPWXCHECK=yes distutils_src_compile
 }
 
 src_install() {
-	local DOCS="AUTHORS FAQ"
-	SKIPWXCHECK=yes distutils-r1_src_install
+	DOCS="AUTHORS FAQ"
+	SKIPWXCHECK=yes distutils_src_install
 }

diff --git a/app-mobilephone/wammu/wammu-0.36-r1.ebuild b/app-mobilephone/wammu/wammu-0.36-r1.ebuild
index 4c84990..5b974e6 100644
--- a/app-mobilephone/wammu/wammu-0.36-r1.ebuild
+++ b/app-mobilephone/wammu/wammu-0.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth gnome"
 
-RDEPEND=">=app-mobilephone/gammu-1.25.0[python]
+RDEPEND=">=app-mobilephone/gammu-1.25.0[python] <app-mobilephone/gammu-1.34.0[python]
 	>=dev-python/wxpython-2.8[${PYTHON_USEDEP}]
 	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}]
 		gnome? ( net-wireless/gnome-bluetooth )