Patch from Toffanin for x86-fbsd (bug #171841).

Package-Manager: portage-2.1.2.2

4 files changed, 42 insertions, 15 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 4030b0c61e62..be6b7095b370 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.80 2007/02/06 05:02:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.81 2007/04/05 04:52:51 jer Exp $
+
+  05 Apr 2007; Jeroen Roovers <jer@gentoo.org> opera-9.10.ebuild:
+  Patch from Toffanin for x86-fbsd (bug #171841).
 
   06 Feb 2007; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Set myself up as (co)maintainer while axxo is away. You know, just to catch
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 9e8be1be9502..edac1fce288a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -11,21 +11,23 @@ MD5 bafbdb86632b055a10fe826d16ea5b7f files/opera.desktop 147
 RMD160 4413b32af8f46f0dc0fe7271e528f81dd295832f files/opera.desktop 147
 SHA256 39bcc8d03bf27d048f98ebb92b5490a27538dcba22492907e45930573d4fa9b9 files/opera.desktop 147
 DIST opera-9.10-20061214.1-static-qt.i386-en.tar.bz2 6719119 RMD160 66802961788986263dd46b7bc4790d6f1aae39f1 SHA1 229e689b36312e20e73d31867a013042da76e7f2 SHA256 b1c7152a4c71433cb4c3bf1ae7fc148fef3ced87e658a65530e8d478db089f7f
+DIST opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2 6469740 RMD160 e36496dab7ef2bcd0461b764cc6505e215207390 SHA1 dc8f43ba97895c8f77b2f7906f7ec4663f1bd24d SHA256 d9ef50faa78daa52f0c204b3e71620de439880b59279b573dd7dd727f2fbb377
 DIST opera-9.10-20061214.1-static-qt.ppc-en.tar.bz2 6768592 RMD160 6b570dc360affd8c76d055d38f2583c6387f465e SHA1 95c64e491ce04b2c7d1ab67f5eecd08ab0b4a76f SHA256 ecf0955829cf8bc19efea85d782e5d84ff3c3b54d2e1c7cb982fac90ed63d2c6
 DIST opera-9.10-20061214.1-static-qt.sparc-en.tar.bz2 6665822 RMD160 70d3fb8119105b6c8ab033de0647a1810e225aed SHA1 3f567849ce6c28b9872f02c2cd348046a15ef073 SHA256 72412222538de10be2764c391bfb11a087b2a50a110cbe84f690513e81303c92
+DIST opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2 5070029 RMD160 89455be5dca73a536d1bd4f74f6f0088fde0807e SHA1 0cd5b4e0782a6b1bfd53b2e3e807374571d36cf8 SHA256 eef25201c0c45d6ff5eae4739844dc9ef624cea8d7e9f9809506a9789f2cb7e4
 DIST opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2 5141554 RMD160 e7ffc8a1773a8e803263deae03ab3954d317b62b SHA1 a66caf047b19a58174f6dd17065fbecc3f71fb07 SHA256 df88e002895c01e7ac34cc52378f2234ae95a606c87d57470eae04c805764785
-EBUILD opera-9.10.ebuild 4316 RMD160 4690828c59ddec39b66bb3cdc5ec5b316e5cc3f5 SHA1 e9c2d15aa0ba6bcf450f306d26ab487c2c9e82f9 SHA256 6e041a006644999e0033d70ca77b43664fed5809c3982175b5de7da128fd1674
-MD5 e0cf4ad9943206c42f80b67152ca5505 opera-9.10.ebuild 4316
-RMD160 4690828c59ddec39b66bb3cdc5ec5b316e5cc3f5 opera-9.10.ebuild 4316
-SHA256 6e041a006644999e0033d70ca77b43664fed5809c3982175b5de7da128fd1674 opera-9.10.ebuild 4316
-MISC ChangeLog 24839 RMD160 e72e1ef411c241af249c2f247d216e86e61c96b8 SHA1 4830a8050ac4280bfb028f5523fefa94cbc5717a SHA256 064ea6cb5eb91accfc78119e32bf222f153f367e23435c5fbbf74dabd11c5f36
-MD5 e79658d8abac847e0091322fdaaef8eb ChangeLog 24839
-RMD160 e72e1ef411c241af249c2f247d216e86e61c96b8 ChangeLog 24839
-SHA256 064ea6cb5eb91accfc78119e32bf222f153f367e23435c5fbbf74dabd11c5f36 ChangeLog 24839
+EBUILD opera-9.10.ebuild 5040 RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b SHA1 4fc31b1bbf768e859b1353a0ba5047ef258e5dd8 SHA256 5b0ebd67ac24e765eec5d0b2ead87a7baf76b3f371a6fe3778830bedaaf239e9
+MD5 e2e73cc0b2f13e2938a948d54439b57b opera-9.10.ebuild 5040
+RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b opera-9.10.ebuild 5040
+SHA256 5b0ebd67ac24e765eec5d0b2ead87a7baf76b3f371a6fe3778830bedaaf239e9 opera-9.10.ebuild 5040
+MISC ChangeLog 24956 RMD160 ff49e8778f2e1fb4bbfb746afab497e869e76d67 SHA1 35d52f24d7522035c44d33069333539113c42a79 SHA256 6502936b68069c235e732260405bf9279bd120c9473d33e40af5972bb5e6947a
+MD5 e71939ca4b87c69ddb7a8150d7ff0811 ChangeLog 24956
+RMD160 ff49e8778f2e1fb4bbfb746afab497e869e76d67 ChangeLog 24956
+SHA256 6502936b68069c235e732260405bf9279bd120c9473d33e40af5972bb5e6947a ChangeLog 24956
 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8
 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314
 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314
 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8 metadata.xml 314
-MD5 3b6b9572725ae704fd56d9cd2ffd0149 files/digest-opera-9.10 1300
-RMD160 7dcfd3689a68a10f71e4ab9a0b592b3279ba6191 files/digest-opera-9.10 1300
-SHA256 7d571422545372a5e5cb73a5581b5bb790d89e15b377dce6d1f6e682409cfd77 files/digest-opera-9.10 1300
+MD5 91c1c6f603acd417e0838501d3bdf023 files/digest-opera-9.10 1998
+RMD160 562e1dfa4a5ffdff9252df5d4e1a3ea529224a3b files/digest-opera-9.10 1998
+SHA256 aa4af149ddf2a7d58c7089756e5616687cde714c6fadc0b4c3572da5de3289c9 files/digest-opera-9.10 1998
diff --git a/www-client/opera/files/digest-opera-9.10 b/www-client/opera/files/digest-opera-9.10
index 434740d92e76..373a89fbc5cf 100644
--- a/www-client/opera/files/digest-opera-9.10
+++ b/www-client/opera/files/digest-opera-9.10
@@ -1,12 +1,18 @@
 MD5 dccdc5252ffc6658f3c46f32c64c8219 opera-9.10-20061214.1-static-qt.i386-en.tar.bz2 6719119
 RMD160 66802961788986263dd46b7bc4790d6f1aae39f1 opera-9.10-20061214.1-static-qt.i386-en.tar.bz2 6719119
 SHA256 b1c7152a4c71433cb4c3bf1ae7fc148fef3ced87e658a65530e8d478db089f7f opera-9.10-20061214.1-static-qt.i386-en.tar.bz2 6719119
+MD5 72bcdaf0d674590e913ff85617a80726 opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2 6469740
+RMD160 e36496dab7ef2bcd0461b764cc6505e215207390 opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2 6469740
+SHA256 d9ef50faa78daa52f0c204b3e71620de439880b59279b573dd7dd727f2fbb377 opera-9.10-20061214.1-static-qt.i386.freebsd-en.tar.bz2 6469740
 MD5 d67428a09a036e786efc22e03150a344 opera-9.10-20061214.1-static-qt.ppc-en.tar.bz2 6768592
 RMD160 6b570dc360affd8c76d055d38f2583c6387f465e opera-9.10-20061214.1-static-qt.ppc-en.tar.bz2 6768592
 SHA256 ecf0955829cf8bc19efea85d782e5d84ff3c3b54d2e1c7cb982fac90ed63d2c6 opera-9.10-20061214.1-static-qt.ppc-en.tar.bz2 6768592
 MD5 e7bcbbaa48a63827d0efc60cf6fef68d opera-9.10-20061214.1-static-qt.sparc-en.tar.bz2 6665822
 RMD160 70d3fb8119105b6c8ab033de0647a1810e225aed opera-9.10-20061214.1-static-qt.sparc-en.tar.bz2 6665822
 SHA256 72412222538de10be2764c391bfb11a087b2a50a110cbe84f690513e81303c92 opera-9.10-20061214.1-static-qt.sparc-en.tar.bz2 6665822
+MD5 fc6d9252233f784df8fe9957dce754ce opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2 5070029
+RMD160 89455be5dca73a536d1bd4f74f6f0088fde0807e opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2 5070029
+SHA256 eef25201c0c45d6ff5eae4739844dc9ef624cea8d7e9f9809506a9789f2cb7e4 opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2 5070029
 MD5 f4d7007948c2841583314f321ff88e30 opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2 5141554
 RMD160 e7ffc8a1773a8e803263deae03ab3954d317b62b opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2 5141554
 SHA256 df88e002895c01e7ac34cc52378f2234ae95a606c87d57470eae04c805764785 opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2 5141554
diff --git a/www-client/opera/opera-9.10.ebuild b/www-client/opera/opera-9.10.ebuild
index 70b4ca00dc1c..6bdd29eee03b 100644
--- a/www-client/opera/opera-9.10.ebuild
+++ b/www-client/opera/opera-9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.10.ebuild,v 1.7 2007/01/09 12:22:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.10.ebuild,v 1.8 2007/04/05 04:52:51 jer Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.opera.com"
 
 SLOT="0"
 LICENSE="OPERA-9.0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 
 IUSE="qt-static spell gnome"
 RESTRICT="strip mirror"
@@ -26,7 +26,9 @@ SRC_URI="
 	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
 	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
 	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 )"
+	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 )
+	x86-fbsd? ( !qt-static? ( mirror://opera/unix/freebsd/${OPERAFTPDIR}/shared/opera-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) )
+	x86-fbsd? ( qt-static? ( mirror://opera/unix/freebsd/${OPERAFTPDIR}/static/opera-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) )"
 
 DEPEND=">=sys-apps/sed-4
 	amd64? ( sys-apps/setarch )"
@@ -125,6 +127,20 @@ src_install() {
 
 	dodir /etc/revdep-rebuild
 	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/revdep-rebuild/90opera
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if [ ${ARCH} = "x86-fbsd" ]; then
+		scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${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
 }
 
 pkg_postinst() {