Remove obsolete version. Fix improper processing of the command line arguments (#154078).

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

6 files changed, 18 insertions, 416 deletions

diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index c85df3c8a4a1..4b34ccfdab5f 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bitpim-0.9.00-gentoo.patch 2100 RMD160 73955641a7bed463f3235264817a2e8449bb1622 SHA1 01ffd8dc58f257671f14b7211176aaa42bae2590 SHA256 6ac750e08ddc7e3404d98f6a8aff9aac3dedd6347d8a2d0a4b718fd11922165f
-MD5 697098050c09fa34e19f9683cfb0036a files/bitpim-0.9.00-gentoo.patch 2100
-RMD160 73955641a7bed463f3235264817a2e8449bb1622 files/bitpim-0.9.00-gentoo.patch 2100
-SHA256 6ac750e08ddc7e3404d98f6a8aff9aac3dedd6347d8a2d0a4b718fd11922165f files/bitpim-0.9.00-gentoo.patch 2100
-AUX bitpim-0.9.07-gentoo.patch 2550 RMD160 b5bcbdfc5970a71e7e410f68601f724bd167b75b SHA1 0bc28e20eb16eda35e3459507c23e2b5d30c3fbf SHA256 a72121131198f9cdc9ba0d2e8139751cc9fcd243a366c574ed82cf4755a4d752
-MD5 8696025ed77226a1a1c2ef4d73e2613d files/bitpim-0.9.07-gentoo.patch 2550
-RMD160 b5bcbdfc5970a71e7e410f68601f724bd167b75b files/bitpim-0.9.07-gentoo.patch 2550
-SHA256 a72121131198f9cdc9ba0d2e8139751cc9fcd243a366c574ed82cf4755a4d752 files/bitpim-0.9.07-gentoo.patch 2550
-DIST bitpim-0.9.00.tar.bz2 3795414 RMD160 757797ebe7a595e30fc64321675aeb0cd797bcf7 SHA1 859b5eba870be06745b98eae0580aa60c7e50dbf SHA256 b5452e2ac7397f44b0c9db7a20f766aa4d7dc417ba16a5fa3bd3c0b7ae8fff9f
+AUX bitpim-0.9.07-gentoo.patch 3157 RMD160 ac5cc213338dec920d066791b6f2d874e582adbe SHA1 4bd41b5e5f6db0daf0fbb55bf6b3453257f0b26c SHA256 57757f41e6dfaa51b8fcdc657ad33c1236adc595c28cd2e8bc16022cf51fb520
+MD5 00fe82c9e7c2843b3919e23fcbb92e57 files/bitpim-0.9.07-gentoo.patch 3157
+RMD160 ac5cc213338dec920d066791b6f2d874e582adbe files/bitpim-0.9.07-gentoo.patch 3157
+SHA256 57757f41e6dfaa51b8fcdc657ad33c1236adc595c28cd2e8bc16022cf51fb520 files/bitpim-0.9.07-gentoo.patch 3157
 DIST bitpim-0.9.07.tar.bz2 3833224 RMD160 fcee72015ada5623185e145f8b1703e29409c7fd SHA1 3fbbafb9353e3685be2969f667fb28ca06165740 SHA256 159faac3ebb0685a30207b592c631b53ad83843a6a8103d5dca9d95a78e5f0df
-EBUILD bitpim-0.9.00.ebuild 4310 RMD160 5488ab91fd3b900ef9aaf642dbec74b982f06f74 SHA1 d180f90d6f5f5a683c42136a01666d0eede7a18b SHA256 85cc3e0f1216574bbb8a6ea1d86e0168303edf795105f76fbeb0b4271be8cff8
-MD5 3c79ccadaaca5ce60588510678bff12e bitpim-0.9.00.ebuild 4310
-RMD160 5488ab91fd3b900ef9aaf642dbec74b982f06f74 bitpim-0.9.00.ebuild 4310
-SHA256 85cc3e0f1216574bbb8a6ea1d86e0168303edf795105f76fbeb0b4271be8cff8 bitpim-0.9.00.ebuild 4310
-EBUILD bitpim-0.9.07.ebuild 4310 RMD160 45cd9e3c369216410f0a9c69a009788c4065c4a7 SHA1 0a8987e50b28d064d936361ac06d69d14fb3191f SHA256 40696054dbc668c4c67e6d24d812b8da8a7f05e39c3b52b0ada6736ca67758f8
-MD5 2b62ffe282f98b7dfc6e922dacf05acb bitpim-0.9.07.ebuild 4310
-RMD160 45cd9e3c369216410f0a9c69a009788c4065c4a7 bitpim-0.9.07.ebuild 4310
-SHA256 40696054dbc668c4c67e6d24d812b8da8a7f05e39c3b52b0ada6736ca67758f8 bitpim-0.9.07.ebuild 4310
-MISC ChangeLog 3112 RMD160 87c8713c7fc2e6cac0751c8c3b1416ae2ec4d417 SHA1 deb4850ce3d7c4447dfca0d3a5791f143deddf5e SHA256 5f981e071d0d2788a766b150b53d4bb4997ec5cca2948b88e03898ae0e1d1216
-MD5 f1d23e19b655e4935abab74a2501a38a ChangeLog 3112
-RMD160 87c8713c7fc2e6cac0751c8c3b1416ae2ec4d417 ChangeLog 3112
-SHA256 5f981e071d0d2788a766b150b53d4bb4997ec5cca2948b88e03898ae0e1d1216 ChangeLog 3112
+EBUILD bitpim-0.9.07-r1.ebuild 4329 RMD160 b72f2742892f0ab1afc73724c26a7e0d66a223d8 SHA1 dbb33438970d28d368504726eee4bc9e176037e9 SHA256 cf5c129bbbbaac83f68c563b9d140b832866a405412dfe89bb506b5791227d18
+MD5 823b88b84e20be16db640a3986f83ba2 bitpim-0.9.07-r1.ebuild 4329
+RMD160 b72f2742892f0ab1afc73724c26a7e0d66a223d8 bitpim-0.9.07-r1.ebuild 4329
+SHA256 cf5c129bbbbaac83f68c563b9d140b832866a405412dfe89bb506b5791227d18 bitpim-0.9.07-r1.ebuild 4329
+MISC ChangeLog 3432 RMD160 b5274ff49c32aa3fc78e9cd99b3326a792956364 SHA1 30dafd90e4d20d8cca82906cf118b2a6ab28191c SHA256 54008a11a21760bae6380bc0fae66ebd28f495b8d2e387ad4150b8d6d5efabf1
+MD5 2c399f79856e964409f371d865ca0dc7 ChangeLog 3432
+RMD160 b5274ff49c32aa3fc78e9cd99b3326a792956364 ChangeLog 3432
+SHA256 54008a11a21760bae6380bc0fae66ebd28f495b8d2e387ad4150b8d6d5efabf1 ChangeLog 3432
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
 MD5 b05575cd16c40945a62bcfee6f1fce07 metadata.xml 493
 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e metadata.xml 493
 SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2 metadata.xml 493
-MD5 2ed4f7495ea97bcd40459836b54082ef files/digest-bitpim-0.9.00 247
-RMD160 5187f3cfe6d6041d19d59112a0ebb09b2c322cf4 files/digest-bitpim-0.9.00 247
-SHA256 3bc9b7f00b6e03145e7ca4bbdfe905057020708cabdf7716e99ee9cc10ed30f2 files/digest-bitpim-0.9.00 247
-MD5 087513d43c2cea84aebf1a95184562e1 files/digest-bitpim-0.9.07 247
-RMD160 4d2cf218f2cf7415fcc5e0bef85791bd7b8ee1fb files/digest-bitpim-0.9.07 247
-SHA256 3b1bd6599bd0b306914d4d79ebfd42958d2d55e9141f4a356635c28706ebef47 files/digest-bitpim-0.9.07 247
+MD5 087513d43c2cea84aebf1a95184562e1 files/digest-bitpim-0.9.07-r1 247
+RMD160 4d2cf218f2cf7415fcc5e0bef85791bd7b8ee1fb files/digest-bitpim-0.9.07-r1 247
+SHA256 3b1bd6599bd0b306914d4d79ebfd42958d2d55e9141f4a356635c28706ebef47 files/digest-bitpim-0.9.07-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCswc3sf9c6kjmR8RArnmAJsFiYX2TIbVYq2nWBdY+oad0vQtjQCfTeET
-kzUXmCvbVYhu3g+Yy/gQO0w=
-=YmUp
+iD8DBQFFUawW3sf9c6kjmR8RAsW4AJ4itEZc5aGWXaGLVlfTkE92ygIb5gCgkPdU
+sGh3yoD7xRshuJ3QSYjkhWI=
+=nnZ5
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-0.9.00.ebuild b/app-mobilephone/bitpim/bitpim-0.9.00.ebuild
deleted file mode 100644
index 5a34ebacbffa..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.9.00.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.00.ebuild,v 1.1 2006/06/02 20:19:53 mrness Exp $
-
-inherit distutils
-
-DESCRIPTION="This program allows you 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"
-IUSE="crypt usb evo"
-
-DEPEND=">=dev-python/wxpython-2.6.3.2
-	>=dev-python/apsw-3
-	>=dev-python/python-dsv-1.4.0
-	>=dev-python/pyserial-2.0
-	crypt? ( >=dev-python/paramiko-1.5.4 )
-	usb? ( >=dev-lang/swig-1.3.21 >=dev-libs/libusb-0.1.10a )"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-	media-libs/netpbm"
-
-#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://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} || return 1
-	for x in resources packaging src ; do
-		svn export https://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}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	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" || die "compilation of native/usb failed"
-		sh ./build.sh
-	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() {
-	cd "${S}"
-
-	# 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/lib/${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 bitpim" >> "${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/lib/${P}"
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup "${ROOT}/usr/lib/${P}"
-}
diff --git a/app-mobilephone/bitpim/bitpim-0.9.07.ebuild b/app-mobilephone/bitpim/bitpim-0.9.07.ebuild
deleted file mode 100644
index 1ae5fe5c1718..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.9.07.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.07.ebuild,v 1.1 2006/09/15 15:51:44 mrness Exp $
-
-inherit distutils
-
-DESCRIPTION="This program allows you 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"
-IUSE="crypt usb evo"
-
-DEPEND=">=dev-python/wxpython-2.6.3.2
-	>=dev-python/apsw-3
-	>=dev-python/python-dsv-1.4.0
-	>=dev-python/pyserial-2.0
-	crypt? ( >=dev-python/paramiko-1.5.4 )
-	usb? ( >=dev-lang/swig-1.3.21 >=dev-libs/libusb-0.1.10a )"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-	media-libs/netpbm"
-
-#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://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} || return 1
-	for x in resources packaging src ; do
-		svn export https://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}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	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" || die "compilation of native/usb failed"
-		sh ./build.sh
-	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() {
-	cd "${S}"
-
-	# 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/lib/${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 bitpim" >> "${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/lib/${P}"
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup "${ROOT}/usr/lib/${P}"
-}
diff --git a/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch
deleted file mode 100644
index ba656a7a92bb..000000000000
--- a/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nru bitpim-0.9.00.orig/src/common.py bitpim-0.9.00/src/common.py
---- bitpim-0.9.00.orig/src/common.py	2006-04-13 06:13:47.000000000 +0300
-+++ bitpim-0.9.00/src/common.py	2006-06-02 22:51:56.384073500 +0300
-@@ -848,4 +848,4 @@
-         # 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]))
-diff -Nru bitpim-0.9.00.orig/src/conversions.py bitpim-0.9.00/src/conversions.py
---- bitpim-0.9.00.orig/src/conversions.py	2006-03-04 01:37:32.000000000 +0200
-+++ bitpim-0.9.00/src/conversions.py	2006-06-02 22:51:56.384073500 +0300
-@@ -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)
-@@ -125,14 +125,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 -Nru bitpim-0.9.00.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.00/src/native/av/bmp2avi/Makefile
---- bitpim-0.9.00.orig/src/native/av/bmp2avi/Makefile	2006-05-05 10:10:08.000000000 +0300
-+++ bitpim-0.9.00/src/native/av/bmp2avi/Makefile	2006-06-02 22:59:09.295128750 +0300
-@@ -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 --git a/app-mobilephone/bitpim/files/digest-bitpim-0.9.00 b/app-mobilephone/bitpim/files/digest-bitpim-0.9.00
deleted file mode 100644
index 5655ee2a56ee..000000000000
--- a/app-mobilephone/bitpim/files/digest-bitpim-0.9.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ebb17b25b0cf96402f6a9a367c92935 bitpim-0.9.00.tar.bz2 3795414
-RMD160 757797ebe7a595e30fc64321675aeb0cd797bcf7 bitpim-0.9.00.tar.bz2 3795414
-SHA256 b5452e2ac7397f44b0c9db7a20f766aa4d7dc417ba16a5fa3bd3c0b7ae8fff9f bitpim-0.9.00.tar.bz2 3795414
diff --git a/app-mobilephone/bitpim/files/digest-bitpim-0.9.07 b/app-mobilephone/bitpim/files/digest-bitpim-0.9.07
deleted file mode 100644
index 54dff5798fa1..000000000000
--- a/app-mobilephone/bitpim/files/digest-bitpim-0.9.07
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfe1cdeeb955582c746fd5c8ceb05ece bitpim-0.9.07.tar.bz2 3833224
-RMD160 fcee72015ada5623185e145f8b1703e29409c7fd bitpim-0.9.07.tar.bz2 3833224
-SHA256 159faac3ebb0685a30207b592c631b53ad83843a6a8103d5dca9d95a78e5f0df bitpim-0.9.07.tar.bz2 3833224