Work with multilib-strict (#154839).

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

3 files changed, 14 insertions, 180 deletions

diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index 4b34ccfdab5f..0f4b4a13afa6 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -6,25 +6,25 @@ 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.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
+EBUILD bitpim-0.9.07-r2.ebuild 4366 RMD160 eb743ef384d133bfb69ef839a06d9498d6bb0918 SHA1 f8333b3b98daa6ba35a6529bdba0f90fefc7ad97 SHA256 0e51bae254b396eb4f0b352dcdea354acef3199931977c3d3f7d7960d0b19f8c
+MD5 7d3ac2c16bf6bf3785507089a243b54f bitpim-0.9.07-r2.ebuild 4366
+RMD160 eb743ef384d133bfb69ef839a06d9498d6bb0918 bitpim-0.9.07-r2.ebuild 4366
+SHA256 0e51bae254b396eb4f0b352dcdea354acef3199931977c3d3f7d7960d0b19f8c bitpim-0.9.07-r2.ebuild 4366
+MISC ChangeLog 3606 RMD160 b99c2783c41df87b73eb0d2a5ae4fc5c38d577d8 SHA1 2558f2297ac1a8179743bd2b334bddf6c24028e8 SHA256 c3d45139bda90a0d777b719c3b1c331b03c2ed35c0e7d6c0bd0fa1ca0a24b964
+MD5 f2aed64dfed4c365f174c27cd0ed46f4 ChangeLog 3606
+RMD160 b99c2783c41df87b73eb0d2a5ae4fc5c38d577d8 ChangeLog 3606
+SHA256 c3d45139bda90a0d777b719c3b1c331b03c2ed35c0e7d6c0bd0fa1ca0a24b964 ChangeLog 3606
 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 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
+MD5 087513d43c2cea84aebf1a95184562e1 files/digest-bitpim-0.9.07-r2 247
+RMD160 4d2cf218f2cf7415fcc5e0bef85791bd7b8ee1fb files/digest-bitpim-0.9.07-r2 247
+SHA256 3b1bd6599bd0b306914d4d79ebfd42958d2d55e9141f4a356635c28706ebef47 files/digest-bitpim-0.9.07-r2 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUawW3sf9c6kjmR8RAsW4AJ4itEZc5aGWXaGLVlfTkE92ygIb5gCgkPdU
-sGh3yoD7xRshuJ3QSYjkhWI=
-=nnZ5
+iD8DBQFFVvwt3sf9c6kjmR8RAtOiAKDCaws4BAXbhAD3hGWUuzN2mr2PIQCfZ++I
+q+kRGoKKet5HUbA4hJxysDQ=
+=Nl8q
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-0.9.07-r1.ebuild b/app-mobilephone/bitpim/bitpim-0.9.07-r1.ebuild
deleted file mode 100644
index 38acb8e745d1..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.9.07-r1.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-r1.ebuild,v 1.1 2006/11/08 10:06:04 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/digest-bitpim-0.9.07-r1 b/app-mobilephone/bitpim/files/digest-bitpim-0.9.07-r1
deleted file mode 100644
index 54dff5798fa1..000000000000
--- a/app-mobilephone/bitpim/files/digest-bitpim-0.9.07-r1
+++ /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