Use multilib (bug #319861).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 23 insertions, 200 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index b1df8d8446fa..be1c9ae0da0b 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.474 2010/05/12 14:20:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.475 2010/05/18 15:49:15 jer Exp $
+
+*opera-10.54_pre6336-r1 (18 May 2010)
+*opera-10.53_pre6330-r1 (18 May 2010)
+
+  18 May 2010; Jeroen Roovers <jer@gentoo.org>
+  +opera-10.53_pre6330-r1.ebuild, -opera-10.54_pre6331.ebuild,
+  -opera-10.54_pre6333.ebuild, -opera-10.54_pre6335.ebuild,
+  +opera-10.54_pre6336-r1.ebuild:
+  Use multilib (bug #319861).
 
 *opera-10.54_pre6336 (12 May 2010)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index a685cab9dd8a..cd093b6ec769 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -13,28 +13,15 @@ DIST opera-10.53-6330.i386.freebsd.tar.bz2 13234238 RMD160 6cf7e6e0b7570a5a5fbf7
 DIST opera-10.53-6330.i386.linux.tar.bz2 13175607 RMD160 f62028d1f23483188688a8d8e4a0fa6f1e613b27 SHA1 dda61ad91c9dba5561ab85bfc118bcf1a99dee44 SHA256 0be054ee8ba155cd8975f67dbf5e874a3d6566b9f8acdef0917cea7ba27bdcb7
 DIST opera-10.53-6330.ppc.linux.tar.bz2 13475840 RMD160 0f5fe941c7a8513835ecb86498c065e5162d20ae SHA1 42737fd4dc5b1695befef9466a089070a4b8cc5c SHA256 4528f9549e4fb0648872a28956f2fb66bebb69940a60dd61f87c726f0a859d0c
 DIST opera-10.53-6330.x86_64.linux.tar.bz2 14161882 RMD160 78cdc69f1c7a1757dcb59b8fd5bd893db7475a8e SHA1 4c58ef2ae4e36d2956b27599261b57d41583ffc0 SHA256 d415398dea5c7e943d052b5a86918dfa032b4ed2e725198bfe775e6b9b3d3ce0
-DIST opera-10.54-6331.i386.freebsd.tar.bz2 13234832 RMD160 fbd339e45a8ec1e39957ed0d559db3bfad46f12e SHA1 f2cfd273af8d6fc08e901d2cd028afecec0f9e58 SHA256 c051a27a68245d72535671300d3e2f8977677e396a4257923b5e35a7c3bd154e
-DIST opera-10.54-6331.i386.linux.tar.bz2 13172034 RMD160 006a5be9022bd8ef8b2970831420982c51e8ede9 SHA1 03a3b3515ba479ec0e95497ccfd6d19c29731c39 SHA256 21becec8fd233b5c8b34bf912f16c6abaabb9b2df2b657841b408e5bbd755c58
-DIST opera-10.54-6331.ppc.linux.tar.bz2 13473036 RMD160 cd9652c49cfb710357b375b31ceea5285155ad9a SHA1 ea6d8b09edf1daa7e3a3e61aa80456c72dd64396 SHA256 07563966a288c64174b03a1fcf5e1fc815ba7cf88d8b249940c664b5035415ba
-DIST opera-10.54-6331.x86_64.linux.tar.bz2 14161935 RMD160 b08af573ae3b2f8738f5e5629c5708b559998356 SHA1 db09435f31d32b0fe5162f68e67198f6c4ba4186 SHA256 ab2220ac7bae7a41f1907cdcb404c3938eb189cb5447a89357e7f9a618244d14
-DIST opera-10.54-6333.i386.freebsd.tar.bz2 13301185 RMD160 96852dc75308623f7c5a0e154ccf80e3a654b2b6 SHA1 82df25820b451727cba5804e6cc98894299b5b47 SHA256 3f2a6c90c014f402789b3e27b447d51b5b7cfe46f93e5c58d0f71a0b365df678
-DIST opera-10.54-6333.i386.linux.tar.bz2 13269589 RMD160 2c2c036540f8c483de77acda93526726d04bea26 SHA1 1becc20ec8f5bc7c49d22138f2f1ad0ee8eabb82 SHA256 341cdc6c34f9326dfd70e6199718191633c340c297038826d669cf62e2399811
-DIST opera-10.54-6333.ppc.linux.tar.bz2 13579443 RMD160 61c3a9e3308bcef213763ccf3f5e70969ca0d0cd SHA1 99b453e6c7d920271d044cbd362fdc9609a0bd15 SHA256 6c53775d6a6b63c796a72aa68c25fac0aa1a8e65ab6240a8968e26fa85f9cd2a
-DIST opera-10.54-6333.x86_64.linux.tar.bz2 14251170 RMD160 2b4039c3e52ed992286532f28b687456933b6a92 SHA1 64f9ab2ccb8b49758ac3e5e22a39c4ede1b21eab SHA256 f17ff0430aa4495a43bcf2dfe4e067b1103340e8959c1af8d7537be9294dee2b
-DIST opera-10.54-6335.i386.freebsd.tar.bz2 13297637 RMD160 24dbcb320602919dd6cc016e6cab3b22f520257c SHA1 39614a7657de5f368b087bd1328defc2d41fe6b7 SHA256 8732c09b7329f113eff596559d474adf69001e5738ac122249e5f63f1cc4659a
-DIST opera-10.54-6335.i386.linux.tar.bz2 13264925 RMD160 8d72fd1a118a9cddda81441f9e34aefdcbc1d507 SHA1 efc168775c9ca73a4b2611c3e5975a641fe6959e SHA256 f1ec9aa3500a876f8033636e39340c86ae42f94ca44c7c6b78468f60d679fdb5
-DIST opera-10.54-6335.ppc.linux.tar.bz2 13572780 RMD160 d41658a87ce18856281d33ff521c4d4031519462 SHA1 b4f7db8d4289c098561f5be92cfb86848f5409be SHA256 edc0f54d4bc08901fb0cf5b0571855ef0130e546c9d9e6992f2b7ebdd93838c4
-DIST opera-10.54-6335.x86_64.linux.tar.bz2 14236508 RMD160 c74e6928b04b2fc4825694527d1ff50c792aee74 SHA1 8e9dda3f89800c538339721682f24b5162d73503 SHA256 c31b87c0791238e62858da58546788b0c028e9cb9652a0998a51f926b7bfd2b2
 DIST opera-10.54-6336.i386.freebsd.tar.bz2 13299174 RMD160 837a17959df5cf71c9b64a44bbc6d8f322d5ed19 SHA1 d07682ae85c5b9531686d58fde66cb1ca2459d5a SHA256 6191a05b3acf26addd8a345bc5d917ad95effe2ed30c13b5154575383a81b530
 DIST opera-10.54-6336.i386.linux.tar.bz2 13268671 RMD160 5470d627638bfaa0a3ed9ab7b69557dcfe69f946 SHA1 8f7c3edd575c6e79b60c69e1fe3a6bb09e808c85 SHA256 70b3ae27599b09a9edb0ffe4f6985424728a84c966fe7f8e63bffc2bd5042c5c
 DIST opera-10.54-6336.ppc.linux.tar.bz2 13576807 RMD160 df632c494fcf1968ca425321d092137fb2358ff0 SHA1 e372aa7d574dea1c6cfbcc1d73e00e44a8f04939 SHA256 7ac29643f67aa1b15798a5f4a945be04729415387be3b701933306985a20f3a0
 DIST opera-10.54-6336.x86_64.linux.tar.bz2 14239967 RMD160 5fb6d0c4682e8584acb531f47bc5b4da1af897e1 SHA1 744be6c1c401d9d0e4d541dbe5e2eb9907b1e542 SHA256 a7fa219e7d0098f4d8fce7e687d287b7de9a2f7ae951e93e017ef64a80d8d28c
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
+EBUILD opera-10.53_pre6330-r1.ebuild 4473 RMD160 1a52f8847fb541e3d0b838450760fe696309e1f0 SHA1 f3c520a91c93e6553565eb647cc431a78949ce6b SHA256 ea1a77515b9c4ac418f7d0c051dbf29be634aa2eaf41a4988714a6d49f6e7f63
 EBUILD opera-10.53_pre6330.ebuild 4452 RMD160 2c3d32943320a121a6193fc8be04d72d13aba753 SHA1 d8459e063e0b2e03dfa852bb6689694fbb1eb18c SHA256 1aa7f5d05e1692445fef7eeec2a436d1c2af300ae664d8af22fb2a107e623b11
-EBUILD opera-10.54_pre6331.ebuild 4452 RMD160 16c5a1f25f05ca56d3dc59b88b090f84a2b08102 SHA1 128a2c323aecdd90f727e4d2a30026d538e7f4a0 SHA256 22b0589dd3e3461505791557f29f654a982ad86fa68338a52179cec37a6eefa0
-EBUILD opera-10.54_pre6333.ebuild 4452 RMD160 17d015ff20c7cf870b1261206f7168dfc77ce010 SHA1 34ca7f31498029a3b719c020bcb2d9ba2724bc0f SHA256 f386b12f72a45208c608b1aceb8e752541bbc35a0af9176215b06238b68f5b66
-EBUILD opera-10.54_pre6335.ebuild 4452 RMD160 670d9aefb0f4fbd40a793189c0fa1232dcb70545 SHA1 459f08646cac2ccc5f0aba2542eef2d8bf112ca2 SHA256 2f6532e9abd7c8d13985aabc8d7051b05e2d067fe38c80195c953e93d0fdab04
+EBUILD opera-10.54_pre6336-r1.ebuild 4473 RMD160 42816eb586c3ee00518c149f633f20624ece3dc9 SHA1 7b16584d1ae5bd0576d60e304f37f91f1431fd50 SHA256 77a88a6243710d8d631a9a74f1edb6eeebd4ca34196a0cc67e9cc600afad14d3
 EBUILD opera-10.54_pre6336.ebuild 4452 RMD160 25cd4355ff29a0b34a50060af3de3e5cc3a2902b SHA1 bac6fa060245ade5482e232733778cf31bf4f86e SHA256 f5ea20765d1393f86afdd73fea89d83c357f8721a789662c3035424d5ea47dba
-MISC ChangeLog 91941 RMD160 b4da9800efb54ad7aca7e10de5902f4b21cbcff6 SHA1 b04a72a82b3ae85ee3cb2dafc3dbbae8fc1851a4 SHA256 1191b4d573fef5ba2a496d04e0147894b27f1d1650964b775083d355110f2554
+MISC ChangeLog 92253 RMD160 0b19e2d418b072f543ec31c06c941f16ce4464e6 SHA1 ae992473356a6bfaeede98fc4bf16e14154762d6 SHA256 bcf1809741a6f2378395a6a43e394b8169f34de2b6206aebe6daa470b8402875
 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a
diff --git a/www-client/opera/opera-10.54_pre6333.ebuild b/www-client/opera/opera-10.53_pre6330-r1.ebuild
index 8b8abd328404..eaafb426ad52 100644
--- a/www-client/opera/opera-10.54_pre6333.ebuild
+++ b/www-client/opera/opera-10.53_pre6330-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6333.ebuild,v 1.1 2010/05/08 04:36:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.53_pre6330-r1.ebuild,v 1.1 2010/05/18 15:49:15 jer Exp $
 
 EAPI="2"
 
-OPREFIX="/usr/lib"
-
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A standards-compliant graphical Web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -14,14 +12,15 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD"
 
 RESTRICT="mirror test"
 
+OPREFIX="/usr/$(get_libdir)"
+
 QA_DT_HASH="${OPREFIX}/${PN}/.*"
 QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
 
-IUSE="elibc_FreeBSD"
-
 MY_LINGUAS="
 	be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
 	ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
diff --git a/www-client/opera/opera-10.54_pre6335.ebuild b/www-client/opera/opera-10.54_pre6335.ebuild
deleted file mode 100644
index 8ef7696c71e4..000000000000
--- a/www-client/opera/opera-10.54_pre6335.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6335.ebuild,v 1.1 2010/05/11 16:31:29 jer Exp $
-
-EAPI="2"
-
-OPREFIX="/usr/lib"
-
-inherit eutils
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror test"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-IUSE="elibc_FreeBSD"
-
-MY_LINGUAS="
-	be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
-	ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
-	zh-TW
-"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${PV/*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
-	ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
-	x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
-	x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
-"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	=x11-libs/gtk+-2*
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/glitz
-	media-plugins/gst-plugins-meta
-	media-libs/libpng
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-libs/pixman
-	x11-libs/xcb-util
-	"
-
-opera_linguas() {
-	# Remove unwanted LINGUAS:
-	local LINGUA
-	local LNGDIR="${D}usr/share/${PN}/locale"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for LINGUA in ${MY_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}"
-		fi
-	done
-}
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_install() {
-	# Remove "license directory" (bug #315473)
-	rm -rf "share/doc/opera"
-
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ share/ "${D}"/usr/ || die "mv lib/ share/ failed"
-
-	# Unzip the man pages before sedding
-	gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX and SUFFIX in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		"${D}"/usr/share/mime/packages/opera-widget.xml \
-		"${D}"/usr/share/man/man1/* \
-		"${D}"/usr/share/applications/opera-browser.desktop \
-		"${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
-
-	# Install startup script
-	dobin ${PN}-widget-manager "${FILESDIR}"/opera || die "dobin failed"
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-	fi
-
-	[[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /usr/share/opera/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-}
diff --git a/www-client/opera/opera-10.54_pre6331.ebuild b/www-client/opera/opera-10.54_pre6336-r1.ebuild
index 71597cbad167..42e25f49b847 100644
--- a/www-client/opera/opera-10.54_pre6331.ebuild
+++ b/www-client/opera/opera-10.54_pre6336-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6331.ebuild,v 1.1 2010/05/05 21:44:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6336-r1.ebuild,v 1.1 2010/05/18 15:49:15 jer Exp $
 
 EAPI="2"
 
-OPREFIX="/usr/lib"
-
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A standards-compliant graphical Web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -14,14 +12,15 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD"
 
 RESTRICT="mirror test"
 
+OPREFIX="/usr/$(get_libdir)"
+
 QA_DT_HASH="${OPREFIX}/${PN}/.*"
 QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
 
-IUSE="elibc_FreeBSD"
-
 MY_LINGUAS="
 	be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
 	ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK