Apply fbsd pluginpath.ini patch to 9.50. Change 9.23 to use the same conditional scheme.

Package-Manager: portage-2.1.2.12

5 files changed, 38 insertions, 20 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 9a2f95028679..872febb7e2cf 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.133 2007/09/06 17:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.134 2007/09/07 04:11:05 jer Exp $
+
+  07 Sep 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/opera-9.50-pluginpath-fbsd.patch, opera-9.23.ebuild,
+  opera-9.50_alpha1567.ebuild:
+  Apply fbsd pluginpath.ini patch to 9.50. Change 9.23 to use the same
+  conditional scheme.
 
   06 Sep 2007; Jeroen Roovers <jer@gentoo.org>
   +files/opera-9.23-pluginpath-fbsd.patch, opera-9.23.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 051f2a999214..f2b689bf3950 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -10,6 +10,10 @@ AUX opera-9.23-pluginpath-fbsd.patch 297 RMD160 d2f1039d2d84f6fd0b7dc1430ade8064
 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-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
+MD5 3d20a6571d4a46cc5701f0b0a072e617 files/opera-9.50-pluginpath-fbsd.patch 341
+RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 files/opera-9.50-pluginpath-fbsd.patch 341
+SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023 files/opera-9.50-pluginpath-fbsd.patch 341
 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
@@ -30,18 +34,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 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 32391 RMD160 f936ec226733e8e30204bfb8956dae147c93dc0d SHA1 0fec0765ea8d08c29ddf19ef44713d5a0b1fc5c2 SHA256 a4c2ea83fb41c654fc704ee832ab6bce099bfeb768d5376bfea0b21372184328
-MD5 47d589254bb0acf80764f8baeb562fcf ChangeLog 32391
-RMD160 f936ec226733e8e30204bfb8956dae147c93dc0d ChangeLog 32391
-SHA256 a4c2ea83fb41c654fc704ee832ab6bce099bfeb768d5376bfea0b21372184328 ChangeLog 32391
+EBUILD opera-9.23.ebuild 5778 RMD160 c8e7c1cf1513fc752e5c0373b6684bf0ecce245a SHA1 155331161bbcc5c66658899dcf9656dcc1842737 SHA256 47e2176671aa8f5879366616de4511c09567216b65fa0399ec73a6e90bf92d5a
+MD5 7a0fe53798073b725c0c37d371fd0bee opera-9.23.ebuild 5778
+RMD160 c8e7c1cf1513fc752e5c0373b6684bf0ecce245a opera-9.23.ebuild 5778
+SHA256 47e2176671aa8f5879366616de4511c09567216b65fa0399ec73a6e90bf92d5a opera-9.23.ebuild 5778
+EBUILD opera-9.50_alpha1567.ebuild 5574 RMD160 caf5d0a9d59a511761c42e6a65a89e5ae2e32f73 SHA1 4aa8f8b0d27605bd789b419ac825c2b22445f763 SHA256 c4e99085913e2e5532c5d0658eccb72f3f6ee15004b74a243dd2c85f3455c9fa
+MD5 829c3b7a3e3c7cc920e3901f5c805323 opera-9.50_alpha1567.ebuild 5574
+RMD160 caf5d0a9d59a511761c42e6a65a89e5ae2e32f73 opera-9.50_alpha1567.ebuild 5574
+SHA256 c4e99085913e2e5532c5d0658eccb72f3f6ee15004b74a243dd2c85f3455c9fa opera-9.50_alpha1567.ebuild 5574
+MISC ChangeLog 32625 RMD160 ec306686f9d48e7ed3f89a44bb4a2dd40c5c84d1 SHA1 18f0ef31b6d334f0aae26744b6eea4683e66a1b9 SHA256 9bf1622ec62363698998ee540c19ab8a3622eb8718c08810c6da3775a0165070
+MD5 d12fccbbc045549ac4f68350a54decef ChangeLog 32625
+RMD160 ec306686f9d48e7ed3f89a44bb4a2dd40c5c84d1 ChangeLog 32625
+SHA256 9bf1622ec62363698998ee540c19ab8a3622eb8718c08810c6da3775a0165070 ChangeLog 32625
 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.50-pluginpath-fbsd.patch b/www-client/opera/files/opera-9.50-pluginpath-fbsd.patch
new file mode 100644
index 000000000000..8720125ae11c
--- /dev/null
+++ b/www-client/opera/files/opera-9.50-pluginpath-fbsd.patch
@@ -0,0 +1,10 @@
+--- usr/local/share/opera/ini/pluginpath.ini	2007-09-06 18:53:54 +0200
++++ usr/local/share/opera/ini/pluginpath.ini	2007-09-06 18:55:49 +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 2cea17a9cf94..bcd2760fd8d9 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.6 2007/09/06 17:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.23.ebuild,v 1.7 2007/09/07 04:11:05 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -63,11 +63,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-9.00-install.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
+	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.21-pluginpath.patch"
+	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.23-pluginpath-fbsd.patch"
 
 	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
diff --git a/www-client/opera/opera-9.50_alpha1567.ebuild b/www-client/opera/opera-9.50_alpha1567.ebuild
index 4eab5fa61103..bf2492382f82 100644
--- a/www-client/opera/opera-9.50_alpha1567.ebuild
+++ b/www-client/opera/opera-9.50_alpha1567.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.50_alpha1567.ebuild,v 1.3 2007/09/06 16:31:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_alpha1567.ebuild,v 1.4 2007/09/07 04:11:05 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -62,6 +62,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-9.00-install.patch"
 	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
+	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
 
 	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \