7 files changed, 299 insertions, 13 deletions
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index 15025508ff47..0f8cad81a899 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-mobilephone/bitpim
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.22 2007/10/03 05:01:05 dirtyepic Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.23 2008/02/09 22:06:07 nerdboy Exp $
+
+*bitpim-1.0.5 (09 Feb 2008)
+
+  09 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/bitpim-1.0.5-ffmpeg_quality.patch,
+  +files/bitpim-1.0.5-gentoo.patch, +bitpim-1.0.5.ebuild:
+  Updated to latest development release to go with latest wxPython; will
+  probably also add the official stable 1.0.0 release, which still works
+  with slightly older deps (the new one may have better exception support).
+  Needs some python deps updated for ppc arches.
 
   03 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> bitpim-0.9.10.ebuild,
   bitpim-0.9.13.ebuild:
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index 4dd98b2f1fdc..b85cebc45a9f 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -1,8 +1,12 @@
 AUX bitpim-0.9.10-gentoo.patch 2550 RMD160 6f49b7f2ed7a636b27051c751139bab4f291eb3e SHA1 8c6349b37a5b310ae9e68467cb33871b9818bf2a SHA256 9f1373b2da022dfd388cd73e194e96d8c017025d5e9561cc29c4bfbd411a6052
 AUX bitpim-0.9.13-gentoo.patch 3366 RMD160 ed617365a38f4aaa583a8c3b6e4e3a12c0520168 SHA1 3a5b428fbf66671266d44c6a1e603cd2b398b10d SHA256 eaa5b6bd96cfc68e73c2d2f030c28696f55598f8aaa73492db1b54c145513cd5
+AUX bitpim-1.0.5-ffmpeg_quality.patch 697 RMD160 de30fce5943333ccfe3a013eca308ec196d68445 SHA1 e6d44e04ed34859904a89235263dd21f20db0e9c SHA256 4af3689f5eef2608f34e44c30b53c59507672375cd67e276268a8e8b5fc0f1cf
+AUX bitpim-1.0.5-gentoo.patch 3024 RMD160 28c49c3623279667fbddc32a499a28b28199a443 SHA1 e99066f60ed3980739d8cce30aac2ff716e55d97 SHA256 30031bed2470e5f9bf0782fddc9363e5d95da086053df37e49e9cdbfd96d3c00
 DIST bitpim-0.9.10.tar.bz2 4028416 RMD160 a6693ebc6a5859af4138ee7c019912f395d6b1d6 SHA1 836553a20abbc0dd44fac737bb4930e3f9e4b98b SHA256 b792e8f83a936a628177837ba4dacb6cdd48de1f56bf0f1a9925f876c5dcad34
 DIST bitpim-0.9.13.tar.bz2 4212639 RMD160 e2a3159ed8b53ac44a07b69e2533ec90b2bb3529 SHA1 c2b014c569ce8d7743bb50afa5e75168f195798b SHA256 f43b88049d9f57a6ea51d72c2009f7b079b555aaa7b5e6b5b8b1681af6acca62
-EBUILD bitpim-0.9.10.ebuild 4366 RMD160 c37f423263a3681949f40c688b8caee840186f70 SHA1 b218174897391404f5809185873ca30ce41547f3 SHA256 e7bd2a17739e8612ad138859d377125dd704338ad919d1166444c37807de84d9
-EBUILD bitpim-0.9.13.ebuild 4373 RMD160 ac3147d58b04d3f47848be407f7bbe01de0241d2 SHA1 5a4c98e7a2548e64692ed1f979f9c4169d64d22b SHA256 b35573cf3aa3204f4d5f8daa16fba1e453b827016a6fe7d07bf01e425d1aaab8
-MISC ChangeLog 4611 RMD160 126ed53ffba86661d07531516d3bcf6120079625 SHA1 eff4ae7578929721eee440a46fd1b6872f0fa748 SHA256 42f2c8928fd459d52087c07bdc42e9bd6d7609d30abf6404d4583d98aa70e86f
+DIST bitpim-1.0.5.tar.bz2 4526097 RMD160 5d078ebd419a729c8c15ce287529fbacd0386ed4 SHA1 abd3d6a2606c2a0fbc4b9fdf2ab21b246b21bb14 SHA256 f880ddfde79cb8bcf9d56b5c937af2c1548f11eaf00a5a690b14de18e1369826
+EBUILD bitpim-0.9.10.ebuild 4337 RMD160 c6af1ef555e55851d5c42636d7d61d2a7c554dda SHA1 da6ce44e0e1e80b17bd0a19f4ce911904ce983e2 SHA256 f4738339a8350b3a1c58556f3c82e09ac98e9d3c9a8fd29c61a6a5a9b807bfde
+EBUILD bitpim-0.9.13.ebuild 4344 RMD160 8672a2275776057a555481aef028fb63b0c6e867 SHA1 fd64bdfc78cf91efe924cbdc80f24191597e3518 SHA256 5eae823d7d5252c489d19d1bf395f8b36c23bc4a428895b04b64538096cf9ddb
+EBUILD bitpim-1.0.5.ebuild 4718 RMD160 494628e580d6856539bcf71e0f4bcafd0db34462 SHA1 3c9a9470fc243041ecdffe996f25a7a4b9261202 SHA256 5f9d8da0acf6f79fcb953dfff69cea03f640c2370a7d04a68f3981f7ad08e9ff
+MISC ChangeLog 5061 RMD160 543a8bf872cc8a79a3835b5116faeb929c9e6fd6 SHA1 471ae842c130dd906bf762669357c2f11b4361fc SHA256 673c0602b6419fda47c9a7c7dcd4e794f76b8251ddc6550e8c9dcc4d4a421c2c
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
diff --git a/app-mobilephone/bitpim/bitpim-0.9.10.ebuild b/app-mobilephone/bitpim/bitpim-0.9.10.ebuild
index 8e3f8d1975c7..405f0ecb7da9 100644
--- a/app-mobilephone/bitpim/bitpim-0.9.10.ebuild
+++ b/app-mobilephone/bitpim/bitpim-0.9.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.10.ebuild,v 1.4 2007/10/03 05:01:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.10.ebuild,v 1.5 2008/02/09 22:06:07 nerdboy Exp $
 
 inherit distutils multilib
 
-DESCRIPTION="This program allows you to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
+DESCRIPTION="Program to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
 HOMEPAGE="http://www.bitpim.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
@@ -74,7 +74,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}"
 
 	# Install files into right place
 	#
diff --git a/app-mobilephone/bitpim/bitpim-0.9.13.ebuild b/app-mobilephone/bitpim/bitpim-0.9.13.ebuild
index 507bb9e89a26..0698ae2f9985 100644
--- a/app-mobilephone/bitpim/bitpim-0.9.13.ebuild
+++ b/app-mobilephone/bitpim/bitpim-0.9.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.13.ebuild,v 1.5 2007/10/03 05:01:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.13.ebuild,v 1.6 2008/02/09 22:06:07 nerdboy Exp $
 
 inherit distutils multilib
 
-DESCRIPTION="This program allows you to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
+DESCRIPTION="Program to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
 HOMEPAGE="http://www.bitpim.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
@@ -74,7 +74,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}"
 
 	# Install files into right place
 	#
diff --git a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
new file mode 100644
index 000000000000..8023f055b72c
--- /dev/null
+++ b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.5.ebuild,v 1.1 2008/02/09 22:06:07 nerdboy Exp $
+
+inherit distutils 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/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# this needs fixing
+#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="crypt evo sqlite usb"
+
+DEPEND="=dev-python/wxpython-2.8.7.1*
+	>=dev-python/python-dsv-1.4.0
+	>=dev-python/pyserial-2.2
+	sqlite? ( >=dev-db/sqlite-3.3.10
+		>=dev-python/apsw-3.3.13.1 )
+	crypt? ( >=dev-python/paramiko-1.7.1
+		>=dev-python/pycrypto-2.0.1 )
+	usb? ( >=dev-lang/swig-1.3.21 >=dev-libs/libusb-0.1.10a )"
+
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+	media-libs/netpbm
+	>=dev-lang/python-2.5"
+
+#For Gentoo devs only: uncomment this line when you want to make the tarball
+#then COMMENT IT BACK!
+#pkg_setup() { maketarball; } 
+maketarball() { #For building the tarball. To be used only by ebuild maintainers
+	local x svnrev
+	svnrev=$(svn log -q --limit 1 https://${PN}.svn.sourceforge.net/svnroot/${PN}/releases/${PV} | sed -r '/^[^r]/d;s/^r([0-9]+) .*$/\1/')
+	[ $? = 0 ] || return 1
+
+	#Fetch the source (only those directories that are needed)
+	cd "${DISTDIR}" && mkdir -p ${P} || return 1
+	for x in resources packaging src ; do
+		svn export https://${PN}.svn.sourceforge.net/svnroot/${PN}/releases/${PV}/${x} ${P}/${x} || return 1
+	done
+
+	#Remove unneeded stuff
+	rm ${P}/resources/*.chm ${P}/src/package.py
+
+	#Freeze version and set vendor name to Gentoo
+	sed -i -e 's/\(^__FROZEN__="[$]Id: \).*\( $"\)/\1'${svnrev}'\2/' \
+		-e 's/^vendor=".*"/vendor="Gentoo"/' \
+		${P}/src/version.py || return 1
+
+	#Make the tarball
+	tar -cjf ${P}.tar.bz2 ${P}
+	rm -r ${P}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch" || die "gentoo patch failed"
+	epatch "${FILESDIR}/${P}-ffmpeg_quality.patch" || die "ffmpeg patch failed"
+	sed -i "s/python2.3/${python}/" "${S}/src/native/usb/build.sh"
+}
+
+src_compile() {
+	# USB stuff
+	if use usb; then
+	    cd "${S}/src/native/usb"
+	    sh ./build.sh || die "compilation of native/usb failed"
+	fi
+
+	# strings
+	cd "${S}/src/native/strings"
+	${python} setup.py build || die "compilation of native/strings failed"
+
+	# bmp2avi
+	cd "${S}/src/native/av/bmp2avi"
+	PLATFORM=linux make || die "compilation of native/bmp2avi failed"
+}
+
+src_install() {
+
+	# Install files into right place
+	#
+	# BitPim is a self-contained app, so jamming it into 
+	# Python's site-packages might not be worthwhile.  We'll
+	# Put it in its own home, and add the PYTHONPATH in the 
+	# wrapper executables below.
+	distutils_python_version
+	local RLOC=/usr/$(get_libdir)/${P}
+
+	# Main Python source
+	insinto ${RLOC}
+	doins src/*.py
+
+	# Phone specifics
+	insinto ${RLOC}/phones
+	doins src/phones/*.py
+
+	# Native products
+	insinto ${RLOC}/native
+	doins src/native/*.py
+	insinto ${RLOC}/native/qtopiadesktop
+	doins src/native/qtopiadesktop/*.py
+	insinto ${RLOC}/native/outlook
+	doins src/native/outlook/*.py
+	insinto ${RLOC}/native/egroupware
+	doins src/native/egroupware/*.py
+	if use evo ; then
+		insinto ${RLOC}/native/evolution
+		doins src/native/evolution/*.py
+	fi
+
+	# strings
+	cd "${S}/src/native/strings"
+	${python} setup.py install --root="${D}" --no-compile "$@" \
+	    || die "install of native/strings failed"
+
+	cd "${S}"
+	insinto $RLOC/native/strings
+	doins src/native/strings/__init__.py src/native/strings/jarowpy.py
+
+	# usb
+	if use usb; then
+		insinto ${RLOC}/native/usb
+		doins src/native/usb/*.py
+		doins src/native/usb/*.so
+	fi
+
+	# Helpers and resources
+	dobin src/native/av/bmp2avi/bmp2avi
+	insinto ${RLOC}/resources
+	doins resources/*
+
+	# Bitfling
+	if use crypt; then
+		FLINGDIR="${RLOC}/bitfling"
+		insinto $FLINGDIR
+		cd "${S}/src/bitfling"
+		doins *.py
+		cd "${S}"
+	fi
+
+	# Creating scripts
+	echo '#!/bin/sh' > "${T}/bitpim"
+	echo "exec ${python} ${RLOC}/bp.py \"\$@\"" >> "${T}/bitpim"
+	dobin "${T}/bitpim"
+	if use crypt; then
+		echo '#!/bin/sh' > "${T}/bitfling"
+		echo "exec ${python} ${RLOC}/bp.py \"\$@\" bitfling" >> "${T}/bitfling"
+		dobin "${T}/bitfling"
+	fi
+
+	# Desktop file
+	insinto /usr/share/applications
+	sed -i -e "s|%%INSTALLBINDIR%%|/usr/bin|" -e "s|%%INSTALLLIBDIR%%|${RLOC}|" \
+		packaging/bitpim.desktop
+	doins packaging/bitpim.desktop
+}
+
+pkg_postinst() {
+	# Optimize in installed directory
+	python_mod_optimize "${ROOT}usr/$(get_libdir)/${P}"
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup "${ROOT}usr/$(get_libdir)/${P}"
+	fdo-mime_desktop_database_update
+}
diff --git a/app-mobilephone/bitpim/files/bitpim-1.0.5-ffmpeg_quality.patch b/app-mobilephone/bitpim/files/bitpim-1.0.5-ffmpeg_quality.patch
new file mode 100644
index 000000000000..d3077eeb95ad
--- /dev/null
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.5-ffmpeg_quality.patch
@@ -0,0 +1,11 @@
+--- src/conversions.py.orig	2007-06-12 19:07:59.000000000 -0700
++++ src/conversions.py	2007-06-12 19:09:12.000000000 -0700
+@@ -240,7 +240,7 @@
+     mp3file=common.gettempfilename("mp3")
+     try:
+         try:
+-            run(ffmpeg, "-i", shortfilename(inputfilename), "-hq", "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file))
++            run(ffmpeg, "-i", shortfilename(inputfilename), "-sameq", "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file))
+         except common.CommandExecutionFailed, e:
+             # we get this exception on bad parameters, or any other
+             # issue so we assume bad parameters for the moment.
diff --git a/app-mobilephone/bitpim/files/bitpim-1.0.5-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-1.0.5-gentoo.patch
new file mode 100644
index 000000000000..38edcf78c11d
--- /dev/null
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.5-gentoo.patch
@@ -0,0 +1,90 @@
+diff -ur src.orig/common.py src/common.py
+--- src.orig/common.py	2007-05-03 14:42:01.000000000 -0700
++++ src/common.py	2007-06-09 19:22:00.000000000 -0700
+@@ -860,7 +860,7 @@
+         # windows running from exe, return as is
+         return os.path.abspath(os.path.dirname(sys.executable))
+     # running from src, up one
+-    return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]
++    return os.path.abspath(os.path.dirname(sys.argv[0]))
+ 
+ if sys.platform=='win32':
+     # From Tim Golden's Win32 How Do I ...?
+diff -ur src.orig/conversions.py src/conversions.py
+--- src.orig/conversions.py	2007-05-03 14:42:01.000000000 -0700
++++ src/conversions.py	2007-06-09 19:22:00.000000000 -0700
+@@ -20,11 +20,11 @@
+ 
+ class ConversionFailed(Exception): pass
+ 
+-helperdir=os.path.join(common.get_main_dir(), "helpers")
++helperdir="/usr/bin"
+ 
+ osext={'win32': '.exe',
+        'darwin': '.mbin',
+-       'linux2': '.lbin'} \
++       'linux2': ''} \
+        [sys.platform]
+ 
+ # This shortname crap is needed because Windows programs (including ffmpeg)
+@@ -128,14 +128,14 @@
+     p=sys.path[0]
+     if os.path.isfile(p):
+         p=os.path.dirname(p)
+-    helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))
++    helpersdirectory="/usr/bin"
+     print "Helper Directory: "+helpersdirectory
+     if sys.platform=='win32':
+         osext=".exe"
+     if sys.platform=='darwin':
+         osext=".mbin"
+     if sys.platform=='linux2':
+-        osext=".lbin"
++        osext=""
+         
+     pngtopnmbin=gethelperbinary('pngtopnm')
+     ppmquantbin=gethelperbinary('ppmquant')
+diff -ur src.orig/importexport.py src/importexport.py
+--- src.orig/importexport.py	2007-04-02 18:07:57.000000000 -0700
++++ src/importexport.py	2007-06-09 19:22:00.000000000 -0700
+@@ -21,7 +21,7 @@
+ import wx.html
+ 
+ # Others
+-from thirdparty import DSV
++import DSV
+ 
+ # My modules
+ import common
+diff -ur src.orig/native/av/bmp2avi/Makefile src/native/av/bmp2avi/Makefile
+--- src.orig/native/av/bmp2avi/Makefile	2006-05-05 00:10:08.000000000 -0700
++++ src/native/av/bmp2avi/Makefile	2007-06-09 19:22:00.000000000 -0700
+@@ -13,6 +13,6 @@
+ 
+ SRC=avi_file.cxx bmp_file.cxx b2a.cxx
+ 
+-bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC)
++bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC)
+ 	$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)
+ 
+diff -ur src.orig/native/usb/build.sh src/native/usb/build.sh
+--- src.orig/native/usb/build.sh	2007-06-09 19:21:30.000000000 -0700
++++ src/native/usb/build.sh	2007-06-09 19:22:00.000000000 -0700
+@@ -4,4 +4,4 @@
+ swig -python -I/usr/include libusb.i
+ 
+ gcc -fPIC -Wall -fno-strict-aliasing -O2 -g  -shared  -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb 
+-strip _libusb.so
++#strip _libusb.so
+diff -ur src.orig/phones/com_samsung.py src/phones/com_samsung.py
+--- src.orig/phones/com_samsung.py	2007-01-09 14:28:37.000000000 -0800
++++ src/phones/com_samsung.py	2007-06-09 19:22:00.000000000 -0700
+@@ -16,7 +16,7 @@
+ import time
+ 
+ # site-packages
+-from thirdparty import DSV
++import DSV
+ 
+ # BitPim modules
+ import bpcalendar