summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-12 14:47:41 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-12 14:47:41 +0000
commit1d71583045a1d52e9aa7f54e36799bef88008ee5 (patch)
tree0b1fc68071a522e86e09353d5deae320c9d5795b /app-mobilephone
parentUse Python 2 (bug #311537). (diff)
downloadgentoo-2-1d71583045a1d52e9aa7f54e36799bef88008ee5.tar.gz
gentoo-2-1d71583045a1d52e9aa7f54e36799bef88008ee5.tar.bz2
gentoo-2-1d71583045a1d52e9aa7f54e36799bef88008ee5.zip
Use Python 2 (bug #311661).
(Portage version: 2.2.0_alpha14_p1/cvs/Linux x86_64)
Diffstat (limited to 'app-mobilephone')
-rw-r--r--app-mobilephone/bitpim/ChangeLog8
-rw-r--r--app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild29
2 files changed, 24 insertions, 13 deletions
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index 80331cc5cb8d..b3a82c8ab923 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-mobilephone/bitpim
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.31 2010/06/08 16:23:41 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.32 2011/01/12 14:47:41 arfrever Exp $
+
+ 12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ bitpim-1.0.6-r1.ebuild:
+ Use Python 2 (bug #311661).
08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
bitpim-1.0.6-r1.ebuild:
diff --git a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild b/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
index 3c043f734183..9c8b5247c1e1 100644
--- a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
+++ b/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.4 2010/06/08 16:23:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.5 2011/01/12 14:47:41 arfrever Exp $
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
-inherit eutils distutils fdo-mime multilib
+inherit distutils eutils fdo-mime multilib
DESCRIPTION="Program to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
HOMEPAGE="http://www.bitpim.org/"
@@ -17,19 +18,25 @@ KEYWORDS="~amd64 ~x86"
#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="crypt evo usb"
-COMMON_DEPEND="=dev-python/wxpython-2.8*
- dev-python/python-dsv
+COMMON_DEPEND="dev-python/apsw
dev-python/pyserial
- dev-python/apsw
- crypt? ( >=dev-python/paramiko-1.7.1
- dev-python/pycrypto )
+ dev-python/python-dsv
+ dev-python/wxpython:2.8
+ crypt? (
+ >=dev-python/paramiko-1.7.1
+ dev-python/pycrypto
+ )
usb? ( dev-libs/libusb:0 )"
DEPEND="${COMMON_DEPEND}
usb? ( dev-lang/swig )"
RDEPEND="${COMMON_DEPEND}
- media-video/ffmpeg
media-libs/netpbm
- >=dev-lang/python-2.5"
+ media-video/ffmpeg"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
src_prepare() {
epatch "${FILESDIR}/${P}-gentoo.patch"