Remove obsolete versions.

Remove swig runtime dependency (#221455).
Package-Manager: portage-2.1.4.4

7 files changed, 17 insertions, 493 deletions

diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index d52cb5653d78..1a7de898efd2 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/bitpim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.24 2008/05/29 15:44:38 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.25 2008/06/24 20:04:42 mrness Exp $
+
+  24 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  -files/bitpim-0.9.10-gentoo.patch, -files/bitpim-0.9.13-gentoo.patch,
+  -bitpim-0.9.10.ebuild, -bitpim-0.9.13.ebuild, bitpim-1.0.5.ebuild:
+  Remove obsolete versions. Remove swig runtime dependency (#221455).
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> bitpim-0.9.10.ebuild,
   bitpim-0.9.13.ebuild, bitpim-1.0.5.ebuild:
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index 84d590387bac..ba74d3c634ac 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
 DIST bitpim-1.0.5.tar.bz2 4526097 RMD160 5d078ebd419a729c8c15ce287529fbacd0386ed4 SHA1 abd3d6a2606c2a0fbc4b9fdf2ab21b246b21bb14 SHA256 f880ddfde79cb8bcf9d56b5c937af2c1548f11eaf00a5a690b14de18e1369826
-EBUILD bitpim-0.9.10.ebuild 4305 RMD160 fcd1f4c1b2492bc99904df21339a6e123175a67b SHA1 3ca54b8604c801fb830194c7360ef84a5f24cf87 SHA256 c7589006a52cafb5e84afa894ea518031f098516654ab0e68ff41b4ba6864e87
-EBUILD bitpim-0.9.13.ebuild 4328 RMD160 dd367eb61f0be5f2a3d8510ecacd20e882c8fe34 SHA1 5cd5517bc0a1a91b0555c775339d48bf23cda91c SHA256 86269316400a5d1ba72efa3ffe519dd4a26608e0a06628b7123e5b9ca1573720
-EBUILD bitpim-1.0.5.ebuild 4683 RMD160 e88b5663f44d80107656e98a62cd8e8ecfc02e70 SHA1 8a6d4e8ee0083c24905dfa07e515d46558c3cf6e SHA256 6ff4f02bf8d351e1a9a3b458e1ffb999856e25db6972380201f3a0fc20632014
-MISC ChangeLog 5225 RMD160 85a0c92fac70c11d9c89d6b511c0b61dba28f04f SHA1 69912f7de53559e1f00627026e310e73ce7775d7 SHA256 5141a04ae504b6527e05ffd011de8610bda5f3c4527902013674319d120b160e
+EBUILD bitpim-1.0.5.ebuild 4731 RMD160 ac48c463eebbdb7fddfeeb14d52fd058129b9d6e SHA1 a1b48fa34ae28231871d005e1f35639125534c0c SHA256 01d918b5c8c2c24093d50dd876f799651308d1d8fcaa47dd8f482f6e80ffa939
+MISC ChangeLog 5484 RMD160 3f777d36917a7f55effc45ce2c3395dfd39d8949 SHA1 51aac2af74c9745256a96363015d1a1c4e58c76e SHA256 1df1161c83d8689b8d9931db67fe2f56d7de23c1c49aa7c59f9d7521569233a8
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+z2kACgkQQU4yORhF8iBlNQCfQxhI5AyuTIIoP1+/1LbLzJT3
-NlgAn2dtGkYJZLQ5Bo3boHzXYTpMCY4m
-=7YeK
+iEYEARECAAYFAkhhU2YACgkQ+fWpoTWIA9HBxwCgiSAA+EYKggkjObX9I/7lzO05
+K4sAn08egAZFgE6cRru+x1Q6FtF8bFCP
+=2orG
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-0.9.10.ebuild b/app-mobilephone/bitpim/bitpim-0.9.10.ebuild
deleted file mode 100644
index 2e6160fbb7f9..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.9.10.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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.6 2008/05/29 15:44:38 hawking Exp $
-
-inherit distutils 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"
-IUSE="crypt usb evo"
-
-DEPEND="=dev-python/wxpython-2.6*
-	>=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://bitpim.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://bitpim.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() {
-
-	# 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 /usr/$(get_libdir)/${P}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${P}
-}
diff --git a/app-mobilephone/bitpim/bitpim-0.9.13.ebuild b/app-mobilephone/bitpim/bitpim-0.9.13.ebuild
deleted file mode 100644
index 994e895b7c77..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.9.13.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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.7 2008/05/29 15:44:38 hawking Exp $
-
-inherit distutils 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"
-IUSE="crypt usb evo"
-
-DEPEND="=dev-python/wxpython-2.6*
-	>=dev-python/apsw-3.3.10.1
-	>=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://bitpim.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://bitpim.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() {
-
-	# 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 /usr/$(get_libdir)/${P}
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/${P}
-}
diff --git a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
index eb8362013672..304165bbb75c 100644
--- a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
+++ b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2008/05/29 15:44:38 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.5.ebuild,v 1.4 2008/06/24 20:04:42 mrness Exp $
 
 inherit distutils fdo-mime multilib
 
@@ -15,16 +15,17 @@ KEYWORDS="~amd64 ~x86"
 #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="crypt evo sqlite usb"
 
-DEPEND="=dev-python/wxpython-2.8.7.1*
+COMMON_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}
+	usb? ( >=dev-libs/libusb-0.1.10a )"
+DEPEND="${COMMON_DEPEND}
+	usb? ( >=dev-lang/swig-1.3.21 )"
+RDEPEND="${COMMON_DEPEND}
 	media-video/ffmpeg
 	media-libs/netpbm
 	>=dev-lang/python-2.5"
diff --git a/app-mobilephone/bitpim/files/bitpim-0.9.10-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-0.9.10-gentoo.patch
deleted file mode 100644
index 4427eccb5198..000000000000
--- a/app-mobilephone/bitpim/files/bitpim-0.9.10-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru bitpim-0.9.10.orig/src/common.py bitpim-0.9.10/src/common.py
---- bitpim-0.9.10.orig/src/common.py	2006-12-23 12:43:23.000000000 +0200
-+++ bitpim-0.9.10/src/common.py	2007-01-16 19:36:41.000000000 +0200
-@@ -850,4 +850,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.10.orig/src/conversions.py bitpim-0.9.10/src/conversions.py
---- bitpim-0.9.10.orig/src/conversions.py	2006-05-28 06:10:52.000000000 +0300
-+++ bitpim-0.9.10/src/conversions.py	2007-01-16 19:36:41.000000000 +0200
-@@ -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.10.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.10/src/native/av/bmp2avi/Makefile
---- bitpim-0.9.10.orig/src/native/av/bmp2avi/Makefile	2006-05-05 10:10:08.000000000 +0300
-+++ bitpim-0.9.10/src/native/av/bmp2avi/Makefile	2007-01-16 19:36:41.000000000 +0200
-@@ -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 -Nru bitpim-0.9.10.orig/src/native/usb/build.sh bitpim-0.9.10/src/native/usb/build.sh
---- bitpim-0.9.10.orig/src/native/usb/build.sh	2006-03-04 06:57:24.000000000 +0200
-+++ bitpim-0.9.10/src/native/usb/build.sh	2007-01-16 19:36:41.000000000 +0200
-@@ -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 --git a/app-mobilephone/bitpim/files/bitpim-0.9.13-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-0.9.13-gentoo.patch
deleted file mode 100644
index 4b5805701bdc..000000000000
--- a/app-mobilephone/bitpim/files/bitpim-0.9.13-gentoo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nru bitpim-0.9.13.orig/src/common.py bitpim-0.9.13/src/common.py
---- bitpim-0.9.13.orig/src/common.py	2007-03-08 05:20:16.000000000 +0200
-+++ bitpim-0.9.13/src/common.py	2007-03-26 11:52:31.000000000 +0300
-@@ -859,7 +859,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 -Nru bitpim-0.9.13.orig/src/conversions.py bitpim-0.9.13/src/conversions.py
---- bitpim-0.9.13.orig/src/conversions.py	2006-05-28 06:10:52.000000000 +0300
-+++ bitpim-0.9.13/src/conversions.py	2007-03-26 11:52:31.000000000 +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.13.orig/src/importexport.py bitpim-0.9.13/src/importexport.py
---- bitpim-0.9.13.orig/src/importexport.py	2007-01-10 00:28:37.000000000 +0200
-+++ bitpim-0.9.13/src/importexport.py	2007-03-26 11:52:41.000000000 +0300
-@@ -21,7 +21,7 @@
- import wx.html
- 
- # Others
--from thirdparty import DSV
-+import DSV
- 
- # My modules
- import common
-diff -Nru bitpim-0.9.13.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.13/src/native/av/bmp2avi/Makefile
---- bitpim-0.9.13.orig/src/native/av/bmp2avi/Makefile	2006-05-05 10:10:08.000000000 +0300
-+++ bitpim-0.9.13/src/native/av/bmp2avi/Makefile	2007-03-26 11:52:31.000000000 +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 -Nru bitpim-0.9.13.orig/src/native/usb/build.sh bitpim-0.9.13/src/native/usb/build.sh
---- bitpim-0.9.13.orig/src/native/usb/build.sh	2006-03-04 06:57:24.000000000 +0200
-+++ bitpim-0.9.13/src/native/usb/build.sh	2007-03-26 11:52:31.000000000 +0300
-@@ -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 -Nru bitpim-0.9.13.orig/src/phones/com_samsung.py bitpim-0.9.13/src/phones/com_samsung.py
---- bitpim-0.9.13.orig/src/phones/com_samsung.py	2007-01-10 00:28:37.000000000 +0200
-+++ bitpim-0.9.13/src/phones/com_samsung.py	2007-03-26 11:52:47.000000000 +0300
-@@ -16,7 +16,7 @@
- import time
- 
- # site-packages
--from thirdparty import DSV
-+import DSV
- 
- # BitPim modules
- import bpcalendar