Apply a different pluginpath.ini patch for elibc_FreeBSD (bug #181300, comment #4).

Package-Manager: portage-2.1.2.12

4 files changed, 40 insertions, 14 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 5243cd2df344..9a2f95028679 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.132 2007/09/06 16:31:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.133 2007/09/06 17:00:01 jer Exp $
+
+  06 Sep 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/opera-9.23-pluginpath-fbsd.patch, opera-9.23.ebuild:
+  Apply a different pluginpath.ini patch for elibc_FreeBSD (bug #181300,
+  comment #4).
 
   06 Sep 2007; Jeroen Roovers <jer@gentoo.org> opera-9.50_alpha1567.ebuild:
   Remove unneeded amd64? qt-static? for this build.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index bad7de87a32a..051f2a999214 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -6,6 +6,10 @@ AUX opera-9.21-pluginpath.patch 387 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90e
 MD5 f10550fa7aed8ae006af53b35498b837 files/opera-9.21-pluginpath.patch 387
 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90eb1e files/opera-9.21-pluginpath.patch 387
 SHA256 4fc3ae28d7d105bd45c30a45696222cd2bfa9e49bd32c2e7cb8073dd59b2da19 files/opera-9.21-pluginpath.patch 387
+AUX opera-9.23-pluginpath-fbsd.patch 297 RMD160 d2f1039d2d84f6fd0b7dc1430ade806431b74d70 SHA1 28640e570ef2654baae09337ab18b9444ea0c975 SHA256 5f3f7ae85c4329d54f9aeeaf16e5db280c4c966d5f776342946da2231163a482
+MD5 e8f84ea590ec4adbd1e8eb7b823b4099 files/opera-9.23-pluginpath-fbsd.patch 297
+RMD160 d2f1039d2d84f6fd0b7dc1430ade806431b74d70 files/opera-9.23-pluginpath-fbsd.patch 297
+SHA256 5f3f7ae85c4329d54f9aeeaf16e5db280c4c966d5f776342946da2231163a482 files/opera-9.23-pluginpath-fbsd.patch 297
 AUX opera-9.50-pluginpath.patch 425 RMD160 53d3c9755eee6f836b9ca446512963de9c8c3145 SHA1 dc5392dd12151f4aef64df0b01ba4eb2cb2a6ab4 SHA256 659c33dd45ebe42e63e4fb791879bf8057c746138538eb0693bfa2a76714c670
 MD5 3570d7729403b0f3cacd0436df1fa81c files/opera-9.50-pluginpath.patch 425
 RMD160 53d3c9755eee6f836b9ca446512963de9c8c3145 files/opera-9.50-pluginpath.patch 425
@@ -26,18 +30,18 @@ DIST opera-9.50-20070903.2-shared-qt.x86_64-1567.tar.bz2 5948870 RMD160 59a2f8e8
 DIST opera-9.50-20070903.4-shared-qt.i386.freebsd-1567.tar.bz2 5519387 RMD160 343a77d78d1a8e338de58da2ffffbfa20b0bd654 SHA1 3d951de46538a63bed47ef07e9d4ca07f7144972 SHA256 4d59955feb278fbadc97cd2799be32255db56911e044dcb6f91ec1c3f322459b
 DIST opera-9.50-20070903.6-shared-qt.i386-1567.tar.bz2 5453240 RMD160 19fe0393724f9a1c6180be1d56346cf127a16812 SHA1 03a11117416f27bdd3d7f243b95c99a6c6835e23 SHA256 cac425846b3d3c59ec9f6255e822fe91326cd7503acb305e082f399e9b685f70
 DIST opera-9.50-20070903.9-static-qt.i386-1567.tar.bz2 7675902 RMD160 d10771b18d42a0cf6c621d5cb908ff5a800d3d1e SHA1 701bb0a4f02b7ec82bfc8bb7522dfbf8d4a15bbd SHA256 10f84c44bddec74a9915179a45d28bcd37423fd732cc0c2e7ed19f90756b4620
-EBUILD opera-9.23.ebuild 5646 RMD160 24e5e89e4ea043208fbc6b20274c9237cc0f61e7 SHA1 f7f526f4868a374f14f6bc2e8de502a0d99b576c SHA256 78f75d61634cc445f124eba565a776435da203ea7fd5ba64e4d96cf7058f81d9
-MD5 b7ce197d82d9c0413541ebe206a9b010 opera-9.23.ebuild 5646
-RMD160 24e5e89e4ea043208fbc6b20274c9237cc0f61e7 opera-9.23.ebuild 5646
-SHA256 78f75d61634cc445f124eba565a776435da203ea7fd5ba64e4d96cf7058f81d9 opera-9.23.ebuild 5646
+EBUILD opera-9.23.ebuild 5776 RMD160 b66fdd0796f683fea56ce1e9ac5869680b94e478 SHA1 e5fb18358cbe021ae424a066c6b35c7ac2ed54e7 SHA256 f61842704660e58bf8924e708cb6359bac3ed944716b7cf261afd49613c7a8eb
+MD5 3c0a42c37ca006d129c8c70201707f58 opera-9.23.ebuild 5776
+RMD160 b66fdd0796f683fea56ce1e9ac5869680b94e478 opera-9.23.ebuild 5776
+SHA256 f61842704660e58bf8924e708cb6359bac3ed944716b7cf261afd49613c7a8eb opera-9.23.ebuild 5776
 EBUILD opera-9.50_alpha1567.ebuild 5498 RMD160 a38cbfd93d909f98dd1af1b690dfa449c07155d3 SHA1 398bad2e4358308d57f950c3b701acd1ef7b8929 SHA256 f70f792341f32a0ce7bd0933517b8bb2074b55fa685abd3d2bf17bc07baff6ea
 MD5 1bcabae527f103d9ff36c7918b550941 opera-9.50_alpha1567.ebuild 5498
 RMD160 a38cbfd93d909f98dd1af1b690dfa449c07155d3 opera-9.50_alpha1567.ebuild 5498
 SHA256 f70f792341f32a0ce7bd0933517b8bb2074b55fa685abd3d2bf17bc07baff6ea opera-9.50_alpha1567.ebuild 5498
-MISC ChangeLog 32193 RMD160 64ef45608771d6bdf85f539088ade834b4703415 SHA1 f1110f2a2e4b6494a60641ae164c9245cfa23781 SHA256 656bedef15026d43cc139f1000c4f0dec1dd84ffece211b670e30200a2e2aaea
-MD5 b9f8366ce44269d2a2ab6e5a94e2432b ChangeLog 32193
-RMD160 64ef45608771d6bdf85f539088ade834b4703415 ChangeLog 32193
-SHA256 656bedef15026d43cc139f1000c4f0dec1dd84ffece211b670e30200a2e2aaea ChangeLog 32193
+MISC ChangeLog 32391 RMD160 f936ec226733e8e30204bfb8956dae147c93dc0d SHA1 0fec0765ea8d08c29ddf19ef44713d5a0b1fc5c2 SHA256 a4c2ea83fb41c654fc704ee832ab6bce099bfeb768d5376bfea0b21372184328
+MD5 47d589254bb0acf80764f8baeb562fcf ChangeLog 32391
+RMD160 f936ec226733e8e30204bfb8956dae147c93dc0d ChangeLog 32391
+SHA256 a4c2ea83fb41c654fc704ee832ab6bce099bfeb768d5376bfea0b21372184328 ChangeLog 32391
 MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
 MD5 fbe6e8a03b222b84e9afcf23787c30dc metadata.xml 252
 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 metadata.xml 252
diff --git a/www-client/opera/files/opera-9.23-pluginpath-fbsd.patch b/www-client/opera/files/opera-9.23-pluginpath-fbsd.patch
new file mode 100644
index 000000000000..635a8c5f5efb
--- /dev/null
+++ b/www-client/opera/files/opera-9.23-pluginpath-fbsd.patch
@@ -0,0 +1,10 @@
+--- ini/pluginpath.ini	2007-09-06 18:12:38 +0200
++++ ini/pluginpath.ini	2007-09-06 18:14:24 +0200
+@@ -21,6 +21,7 @@
+ ; Netscape Plug-in Paths
+ /usr/X11R6/lib/browser_plugins=1
+ $HOME/.netscape/plugins=1
++/usr/lib/nsbrowser/plugins=1
+ 
+ ; FreeBSD Plug-in Paths
+ /usr/local/lib/npapi/symlinks/opera
diff --git a/www-client/opera/opera-9.23.ebuild b/www-client/opera/opera-9.23.ebuild
index c799c425063b..2cea17a9cf94 100644
--- a/www-client/opera/opera-9.23.ebuild
+++ b/www-client/opera/opera-9.23.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.23.ebuild,v 1.5 2007/08/15 21:27:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.23.ebuild,v 1.6 2007/09/06 17:00:01 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="OPERA-9.0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 
-IUSE="qt-static spell gnome"
+IUSE="qt-static spell gnome elibc_FreeBSD"
 RESTRICT="strip mirror"
 
 OPERALNG="en"
@@ -59,8 +59,15 @@ S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-	epatch "${FILESDIR}/${PN}-9.21-pluginpath.patch"
+
+	# bug #181300:
+	if use elibc_FreeBSD; then
+		epatch "${FILESDIR}/${PN}-9.23-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-9.21-pluginpath.patch"
+	fi
 
 	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
@@ -133,7 +140,7 @@ src_install() {
 	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 use x86-fbsd; then
+	if use elibc_FreeBSD; 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 ]];
@@ -164,7 +171,7 @@ pkg_postinst() {
 	elog "To use the spellchecker (USE=spell) for non-English simply do"
 	elog "$ emerge app-dicts/aspell-[your language]."
 
-	if use x86-fbsd; then
+	if use elibc_FreeBSD; then
 		elog
 		elog "To improve shared memory usage please set:"
 		elog "$ sysctl kern.ipc.shm_allow_removed=1"