Added some QA fixes and updated to latest upstream release

(Portage version: 2.1.4.1)

6 files changed, 292 insertions, 10 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/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