[QA] Revision bump. EAPI bump. Convert to distutils-r1. Respect CFLAGS, bug 443240. Respect LDFLAGS, bug 336233. Fix QA errors with .desktop files. Credit to iamnr3 for the latter three fixes.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x28DB029C

3 files changed, 55 insertions, 39 deletions

diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index e2ed6d59fcd4..4c03dab35f20 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/bitpim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.36 2014/04/09 07:14:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.37 2014/06/19 16:53:51 creffett Exp $
+
+*bitpim-1.0.6-r2 (19 Jun 2014)
+
+  19 Jun 2014; Chris Reffett <creffett@gentoo.org> +bitpim-1.0.6-r2.ebuild,
+  -bitpim-1.0.6-r1.ebuild:
+  [QA] Revision bump. EAPI bump. Convert to distutils-r1. Respect CFLAGS, bug
+  443240. Respect LDFLAGS, bug 336233. Fix QA errors with .desktop files. Credit
+  to iamnr3 for the latter three fixes.
 
   09 Apr 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   [QA] Dissolve the mobile-phone herd to maintainer-needed because it is empty
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index dbca9974336a..7c275bcb29ed 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -6,17 +6,25 @@ AUX bitpim-1.0.6-gcc43.patch 836 SHA256 d40819fd5cd9b12628c3cd8a07d838384b1fef34
 AUX bitpim-1.0.6-gentoo.patch 3342 SHA256 4b0e0d59da000a0450a1e7fc0124e8cdf58f1b7caebc193c0a4dbc3719ba55e3 SHA512 2d0e42ab3ef93e9b3da00814b6ffaa0679839e1066a946ed620b9610e0dc7ee87f29c2d934e954aef20404ef08c259a9db024542db9bdb1093f2d270cf5ba5b8 WHIRLPOOL 6883106c28e4450aafb3def8fe1fdae99a7890c60f0e5f179052477ef83eee74069d6846fe85a03ba68abdb5b2389def375d2a8e1170b146125bbeef3c4c518d
 AUX maketarball 916 SHA256 74e267ea8ca9d5375f52b5c47515a46bfea43d04ec309f4c4ff794c7cc20c800 SHA512 24ce4aa26475a9bcb60c9fa77f0a157bb1deae3cc0de6855c853c8b3abd9751413af0b54aad171471163670bcf3fd96959f59df6095bbf3a203d42c520d49605 WHIRLPOOL c4688898c12bafee79d7c52ead3acf3bb62476196337e8a2c5e22c73e5baaed8d9fadfcb74e681a432215d679361d84ac0ddd69501d5de248890a860c93a1fb4
 DIST bitpim-1.0.6.tar.bz2 4595216 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d SHA512 6ef4f56e1afa360b60a4522e6c0dc3526bf30e43d8ad783c247724c7cc212056cdb2664da09b0b5883e0eb38ed68d046f259043bf9b34ad0aa51773119c49c74 WHIRLPOOL 3cd092067d5fd11d325208f0e670135e28aa5aa2de769ffca7eaee7d8d339c55c036d4dbc2b0c34601fee11f78f0d0466c749f17ae02c5dd033935cd8dc5572f
-EBUILD bitpim-1.0.6-r1.ebuild 3516 SHA256 bd37ce629761d5f1fa09734aa14bd5bc6394f6cb2ae1e237b3296bc606fc39b8 SHA512 ae3b17bf029dc56c37b231bb59ea9cfc8e037635b08adc41228940c717b7f78cce7efc001aa8d9d02a0c86d8fc66d546b7c7fd1b30edf3dd884e91befffcc59b WHIRLPOOL 46add2fa7c72f0f589e480487574d489648a2d3123454fedf78dac26ea0ac8181c16906371581622469b5dce7fb240df37a9aa57b3c16b815b14c99f905e5513
-MISC ChangeLog 7277 SHA256 45ba46b8dd0a67d07e8966cc9b3db41fa3b67499bd5a116d03a3f57d68257947 SHA512 0c77626e89d83a841d62bb8816b2be6e182e32d6250243cbf9a8d7b57a7de381b2761eea9058aa5b0d3a67d0c35f22ca697137525847b17f6ecc888ff358c454 WHIRLPOOL 0b34eaa3861b69b2bca09cdd6cad0a96fe0ba4570a771454339ecd67c3319888cb958055bcc1c5f220ed4715a0102f854df52c32306d1ffc9c350c1e61c78a02
+EBUILD bitpim-1.0.6-r2.ebuild 3742 SHA256 ed3c2a06b1d006ace6a69c9854cf1dbe4fdaa59d89fd651a30a4bc7753b1a8c6 SHA512 778b68d7601f0acaae29fe095a7784862d0703ef35c1d6debcc2733ee121444d024f7017b293c8a004401ca62cd54f56501577335a0a59bec3050ce0588d5135 WHIRLPOOL 50b0fd21f5bdc0383719f6cfe64cb1c73a0541e50029114aa17cd49cc722ffcf9d12ba4eabfd79cd6c52a795af6e9704d6b8548e667b32c49363b32d94bdae06
+MISC ChangeLog 7614 SHA256 f9728c3a457caa3704eb3098b9dfd2f77bb5541da46fa1b2f5073e5ebd7fc5e0 SHA512 8143e1617d4c47f1e3dba9c9e53feae0ff64e3ea017914da5f2fdbfb2804c79672165c3718b046c42e458baf0745ef4d574017781863dcb48bea05a0b71ffa05 WHIRLPOOL 75084fb3e70c03ed29fc8e5e62e7f4e5613eddf9b15b69f0c79b99173dbfb6e0d25f51b3e8df14a2e92f1d44485766cc528b28156d1c3b380aede03764877a84
 MISC metadata.xml 536 SHA256 1c87b3e2520894bce2557e356dbcc1255a8b4a7e66abfdc07501e189862f93f3 SHA512 f5103e382b1bfca815f1c5896059ed4990170fee9692c0d5e0b059691bf9244edf46103d9e03c971e7b2be3ab7ec47a8e0ab5f369e3b36c294b6f71534bf847a WHIRLPOOL 02202ebf6de53e6bcc636bd6f90aa8e299f51ba11630e200dced298142021e5e3dc5ca5b6c2d9241d3ff79c7cb08fce89f7696d61331d27359749371acb33994
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTRPMYAAoJEJWyH81tNOV9hJMH/0+YVtdNjbmUklcL9Tp11WDr
-uFh9DOyvIXt/l/6RFD/Os9xr1FD39tdyHo/es7+T3WmcrrvGd62G6WkdkVX2TMGx
-UrKR4mZex6hRHRvS6HKRm4BppEBpTsatJo/PxYntC1bwO1odKXQiLtCBKSu4Cgzk
-1AgXWu4fjZoVd4PNm0RpNpfoUz8JgzqFpv8CeHRvc8ouOEIMfnUt7NRAYZSZg7i9
-2g9xpQqHrBKufpGFbUoZOGPIgnQ2815zvjUrky7OT3oYTs4SSjCyCkQqwGgOiYri
-OkmyARthBHpCiaJ+wG7XjM/27ZDDF/FD4wCvFdcqkkbKewx3XD9gf82Y4gth3/s=
-=xs6x
+iQJ8BAEBCABmBQJToxWjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
+MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcYJ4P/3kHHWKTAF9P5r+V7aGbljGW
+qQ6nn7aKOiHiWJmNmOzEVhCy7oGkYKqO5uQhPHPQB7gbxQFHtJDH+63UEw2KaRxi
+npEUuE4hKIavtB/rciuloawd1x7uc1LpkpW79Dpu4GChQ3mTTtY917cc7V0wEoDy
+LGW0WhLXYupoF+v1fK1JHws90TgHl9F/m9OKDyuH3YB1/4yGb2RWUVOsmXzXIYr8
++sHnWjbY/SlDVMi5OuXlwB228SWjq20IaOr4DwxhlHPlIuC2zSk2TBDmAv37D1++
+GmA8PQy3CblpPReNEXWFyLR2P4mPicx/jUQsKOS513hoFQr/k3Wvmllyl1GdTlup
+vyxpKoiaNd9ziKiOB6hMPcE7rj5p2lQo9pj6cMF8kelhbSludL1B76GDdkS+Z1SC
+vnXFysNggC3b/Cbur6E06dUeJMJucLDdHCJhHmQrcTF+tzRPvCuNBvFW9J7FsX0s
+Qb6HiBhmEBsnCMUppvXR9VaAImG4RYCemtfWOlAzDfISoL+PtvHgl01ZTL2c55O7
+RsQ3uPAyQ+HCYOLvlTaMjYmcLGPBpXoVb4igBCOrUnQKGoGxBI1Cyf3ED4coB0+W
+F3/GvgCnLIqNmW/ahkQef2DZc1pJU2hVrBS5AP6jO6zIf73mYNgJym1meNF5SSC4
+/MpxRxS3HKfpTfGGPi3s
+=y6P3
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild b/app-mobilephone/bitpim/bitpim-1.0.6-r2.ebuild
index 788c03b1ea31..08c2fc39f7ae 100644
--- a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
+++ b/app-mobilephone/bitpim/bitpim-1.0.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r2.ebuild,v 1.1 2014/06/19 16:53:51 creffett Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils eutils fdo-mime multilib
+inherit distutils-r1 eutils 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/"
@@ -18,13 +18,13 @@ KEYWORDS="~amd64 ~x86"
 #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="crypt evo usb"
 
-COMMON_DEPEND="dev-python/apsw
-	dev-python/pyserial
+COMMON_DEPEND="dev-python/apsw[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-python/python-dsv
-	dev-python/wxpython:2.8
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/paramiko-1.7.1
-		dev-python/pycrypto
+		>=dev-python/paramiko-1.7.1[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
 	)
 	usb? ( virtual/libusb:0 )"
 DEPEND="${COMMON_DEPEND}
@@ -33,16 +33,15 @@ RDEPEND="${COMMON_DEPEND}
 	media-libs/netpbm
 	virtual/ffmpeg"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" "${FILESDIR}/${P}-ffmpeg_quality.patch" "${FILESDIR}/${P}-gcc43.patch" )
 
 src_prepare() {
-	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
+	distutils-r1_src_prepare
+	python_setup
+	sed -i -e "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() {
@@ -54,11 +53,11 @@ src_compile() {
 
 	# strings
 	cd "${S}/src/native/strings"
-	distutils_src_compile
+	distutils-r1_src_compile
 
 	# bmp2avi
 	cd "${S}/src/native/av/bmp2avi"
-	PLATFORM=linux make || die "compilation of native/bmp2avi failed"
+	PLATFORM=linux emake CXX="$(tc-getCXX)"
 }
 
 src_install() {
@@ -95,7 +94,7 @@ src_install() {
 
 	# strings
 	cd "${S}/src/native/strings"
-	distutils_src_install
+	distutils-r1_src_install
 
 	cd "${S}"
 	insinto $RLOC/native/strings
@@ -124,27 +123,28 @@ src_install() {
 
 	# Creating scripts
 	echo '#!/bin/sh' > "${T}/bitpim"
-	echo "exec $(PYTHON) ${RLOC}/bp.py \"\$@\"" >> "${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"
+		echo "exec $PYTHON ${RLOC}/bp.py \"\$@\" bitfling" >> "${T}/bitfling"
 		dobin "${T}/bitfling"
 	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
 }
 
 pkg_postinst() {
-	# Optimize in installed directory
-	python_mod_optimize /usr/$(get_libdir)/${P}
 	fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${P}
 	fdo-mime_desktop_database_update
 }