--- bitpim-1.0.6-r1.ebuild	2012-09-05 09:31:05.000000000 +0200
+++ bitpim-1.0.6-r2.ebuild	2013-03-30 15:13:13.799215093 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.8 2012/09/05 07:16:37 jlec Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.5"
 
 inherit distutils eutils fdo-mime multilib
@@ -42,7 +42,10 @@
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-ffmpeg_quality.patch"
 	epatch "${FILESDIR}/${P}-gcc43.patch"
-	sed -i "s/^PYTHONVER=.*/PYTHONVER=$(PYTHON)/" src/native/usb/build.sh
+	sed -i "s/^PYTHONVER=.*/PYTHONVER=$(PYTHON)/" \
+		src/native/usb/build.sh || die "sed failed"
+	sed -i "s/\$(EXTRADEFINES) -O2/\$(CXXFLAGS) \$(LDFLAGS)/" \
+		src/native/av/bmp2avi/Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -58,7 +61,7 @@
 
 	# bmp2avi
 	cd "${S}/src/native/av/bmp2avi"
-	PLATFORM=linux make || die "compilation of native/bmp2avi failed"
+	PLATFORM=linux emake CXX="$(tc-getCXX)"
 }
 
 src_install() {
@@ -133,8 +136,12 @@
 	fi
 
 	# Desktop file
-	sed -i -e "s|%%INSTALLBINDIR%%|/usr/bin|" -e "s|%%INSTALLLIBDIR%%|${RLOC}|" \
-		packaging/bitpim.desktop
+	sed -i \
+		-e "s|%%INSTALLBINDIR%%|/usr/bin|" \
+		-e "s|%%INSTALLLIBDIR%%|${RLOC}|" \
+		-e "s|Terminal=0|Terminal=true|" \
+		-e "s|Application;Calendar;ContactManagement;Utility;|Calendar;ContactManagement;Utility;|" \
+		packaging/bitpim.desktop || die "sed failed"
 	domenu packaging/bitpim.desktop
 }