Depend unconditionally on dev-python/apsw (#230363).

Fix broken build when compiled with gcc-4.3 (#230043).
Package-Manager: portage-2.1.4.4

4 files changed, 40 insertions, 12 deletions

diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index 1a7de898efd2..fc6bfabbcc5a 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.25 2008/06/24 20:04:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.26 2008/07/01 18:56:50 mrness Exp $
+
+  01 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  +files/bitpim-1.0.5-gcc43.patch, bitpim-1.0.5.ebuild:
+  Depend unconditionally on dev-python/apsw (#230363). Fix broken build when
+  compiled with gcc-4.3 (#230043).
 
   24 Jun 2008; Alin Năstac <mrness@gentoo.org>
   -files/bitpim-0.9.10-gentoo.patch, -files/bitpim-0.9.13-gentoo.patch,
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index ba74d3c634ac..d2ff47dccae6 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX bitpim-1.0.5-ffmpeg_quality.patch 697 RMD160 de30fce5943333ccfe3a013eca308ec196d68445 SHA1 e6d44e04ed34859904a89235263dd21f20db0e9c SHA256 4af3689f5eef2608f34e44c30b53c59507672375cd67e276268a8e8b5fc0f1cf
+AUX bitpim-1.0.5-gcc43.patch 834 RMD160 c3bfbca9470752707e5bf352a80bd6399d5040c1 SHA1 2e2e11cda90ccfd11366c5b7890e911edcd37a58 SHA256 22abf3a9dd1c77777ddfa771bc6ed965e51c3fffffbb1864eb18fe9fa57b9a6e
 AUX bitpim-1.0.5-gentoo.patch 3024 RMD160 28c49c3623279667fbddc32a499a28b28199a443 SHA1 e99066f60ed3980739d8cce30aac2ff716e55d97 SHA256 30031bed2470e5f9bf0782fddc9363e5d95da086053df37e49e9cdbfd96d3c00
 DIST bitpim-1.0.5.tar.bz2 4526097 RMD160 5d078ebd419a729c8c15ce287529fbacd0386ed4 SHA1 abd3d6a2606c2a0fbc4b9fdf2ab21b246b21bb14 SHA256 f880ddfde79cb8bcf9d56b5c937af2c1548f11eaf00a5a690b14de18e1369826
-EBUILD bitpim-1.0.5.ebuild 4731 RMD160 ac48c463eebbdb7fddfeeb14d52fd058129b9d6e SHA1 a1b48fa34ae28231871d005e1f35639125534c0c SHA256 01d918b5c8c2c24093d50dd876f799651308d1d8fcaa47dd8f482f6e80ffa939
-MISC ChangeLog 5484 RMD160 3f777d36917a7f55effc45ce2c3395dfd39d8949 SHA1 51aac2af74c9745256a96363015d1a1c4e58c76e SHA256 1df1161c83d8689b8d9931db67fe2f56d7de23c1c49aa7c59f9d7521569233a8
+EBUILD bitpim-1.0.5.ebuild 4668 RMD160 0a91d16b30f76e3f076684e1de104037695ecf8c SHA1 5838258a4fa9e71dc92256285f9257590e9d2ed6 SHA256 0b9200c4988f7e95051816b4b9a670a698c118e63a740301bf29b825a27e4a56
+MISC ChangeLog 5701 RMD160 5543eb815f93110427d6f4a99aaec68a0debbb68 SHA1 542c9520d5b7b02f7458d01ff5376f51db489ae9 SHA256 9126f4a0a2f0f905e51c5ec7a3e912b4179f136f553bba351c5030e1435136ed
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhhU2YACgkQ+fWpoTWIA9HBxwCgiSAA+EYKggkjObX9I/7lzO05
-K4sAn08egAZFgE6cRru+x1Q6FtF8bFCP
-=2orG
+iEYEARECAAYFAkhqff4ACgkQPrHvTlXvhtsfiwCfcOgtn/WHzOnmAkU/KwsTFoXz
+j3IAn14mNBerxkZCh+bZYG3flukUjjCp
+=XiFA
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild
index 304165bbb75c..4ddddd7a8352 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.4 2008/06/24 20:04:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.5.ebuild,v 1.5 2008/07/01 18:56:50 mrness Exp $
 
 inherit distutils fdo-mime multilib
 
@@ -13,13 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # this needs fixing
 #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="crypt evo sqlite usb"
+IUSE="crypt evo usb"
 
 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 )
+	>=dev-python/apsw-3.3.13.1
 	crypt? ( >=dev-python/paramiko-1.7.1
 		>=dev-python/pycrypto-2.0.1 )
 	usb? ( >=dev-libs/libusb-0.1.10a )"
@@ -60,8 +59,9 @@ maketarball() { #For building the tarball. To be used only by ebuild maintainers
 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"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-ffmpeg_quality.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 	sed -i "s/python2.3/${python}/" "${S}/src/native/usb/build.sh"
 }
 
diff --git a/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch b/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch
new file mode 100644
index 000000000000..ae77ba1e2bb3
--- /dev/null
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch
@@ -0,0 +1,22 @@
+diff -ur bitpim-1.0.5.orig/src/native/av/bmp2avi/avi_file.cxx bitpim-1.0.5/src/native/av/bmp2avi/avi_file.cxx
+--- bitpim-1.0.5.orig/src/native/av/bmp2avi/avi_file.cxx	2005-02-18 07:55:03.000000000 +0100
++++ bitpim-1.0.5/src/native/av/bmp2avi/avi_file.cxx	2008-07-01 19:59:57.000000000 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "avi_file.h"
+ #include "byte_order.h"
++#include <cstring>
+ 
+ // endian conversion routines
+ 
+diff -ur bitpim-1.0.5.orig/src/native/av/bmp2avi/bmp_file.cxx bitpim-1.0.5/src/native/av/bmp2avi/bmp_file.cxx
+--- bitpim-1.0.5.orig/src/native/av/bmp2avi/bmp_file.cxx	2005-02-18 07:55:03.000000000 +0100
++++ bitpim-1.0.5/src/native/av/bmp2avi/bmp_file.cxx	2008-07-01 20:00:48.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <string>
+ #include "bmp_file.h"
+ #include "byte_order.h"
++#include <cstring>
+ 
+ using namespace std;
+