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
commit24aa90a063d327197298ee0246e25caed97e7089 (patch)
tree20431611a08e7a7362a83d5cc2f7a969ed3f2cf1 /app-mobilephone
parentUse Python 2 (bug #311537). (diff)
downloadhistorical-24aa90a063d327197298ee0246e25caed97e7089.tar.gz
historical-24aa90a063d327197298ee0246e25caed97e7089.tar.bz2
historical-24aa90a063d327197298ee0246e25caed97e7089.zip
Use Python 2 (bug #311661).
Package-Manager: portage-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/Manifest4
-rw-r--r--app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild29
3 files changed, 26 insertions, 15 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/Manifest b/app-mobilephone/bitpim/Manifest
index c95c158dec3e..b86ecac6d4bf 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -3,6 +3,6 @@ AUX bitpim-1.0.6-gcc43.patch 836 RMD160 aaac3af0d3bebeab2d062a2cab18585f3607caf3
AUX bitpim-1.0.6-gentoo.patch 3342 RMD160 c819de9c04f0e450e761145278db66f2ce4621de SHA1 ebc1e1ee0be32333edb4cabfd671de69420562b2 SHA256 4b0e0d59da000a0450a1e7fc0124e8cdf58f1b7caebc193c0a4dbc3719ba55e3
AUX maketarball 916 RMD160 9b8c3bbf63f14d8270c70ca72a61ebe7f82519d8 SHA1 7e17e9dc31281a227967816bf986e744164ac1c5 SHA256 74e267ea8ca9d5375f52b5c47515a46bfea43d04ec309f4c4ff794c7cc20c800
DIST bitpim-1.0.6.tar.bz2 4595216 RMD160 8b532bc412a6953196ea184f8a55911747b33943 SHA1 6975f456f80e5b4ff3173cf1893ef9f9af71b280 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d
-EBUILD bitpim-1.0.6-r1.ebuild 3493 RMD160 198e14c1f88f88fe1c65672d67c9262259272ba2 SHA1 f93a174a898b8e86b26ece60728e1435e80d9520 SHA256 4a21d3e8e88ce154077e4971373502fa63ee3532e36ca5ca4adb2c0478b15b3e
-MISC ChangeLog 6557 RMD160 cbe7177aa0b87a159af261e14567cc7fd11b9df3 SHA1 482e84729a571c6d91c8a510c28c241857787de6 SHA256 54133b3c0f313882685c1844b15687d3b970587e45bd4e11423ebb28ea33d97b
+EBUILD bitpim-1.0.6-r1.ebuild 3557 RMD160 82374b22709da299cf6dbc71557b084a8a02aaef SHA1 f53a0da4d8f6d57ead8ae44dfef59f80918d8edf SHA256 c56d22f9d51d83733c58647ce15c52a7864817570697ee5eb2f99d9072ae4a77
+MISC ChangeLog 6687 RMD160 d379fa6580f9c740ad5b16094d3c283f1f9098cb SHA1 e78c6b95dd5127450261e2646148ea7f2cc9f845 SHA256 92fb57fbe40d1530fa288c7a48ccf36ec361bf8749e22f47578d7eba7b2ede63
MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
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"