Fix elog messages wrt bug #183689. Add MANPATH to /etc/env.d/90opera.

Package-Manager: portage-2.1.2.9

4 files changed, 29 insertions, 24 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 903b1caceab9..adf2d07b2755 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # 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.102 2007/07/07 18:08:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.103 2007/07/07 20:43:17 jer Exp $
+
+  07 Jul 2007; Jeroen Roovers <jer@gentoo.org>
+  files/opera-9.21-pluginpath.patch, opera-9.21-r1.ebuild:
+  Fix elog messages wrt bug #183689. Add MANPATH to /etc/env.d/90opera.
 
   07 Jul 2007; Jeroen Roovers <jer@gentoo.org>
   -files/opera-9.21-install.patch:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 769ab9611e16..3650978f439e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,10 +2,10 @@ AUX opera-9.00-install.patch 320 RMD160 2bc2e345193c007d10db4b39335e7695cd85e4ba
 MD5 de8c242f353b3b072c7b64150f597fd0 files/opera-9.00-install.patch 320
 RMD160 2bc2e345193c007d10db4b39335e7695cd85e4ba files/opera-9.00-install.patch 320
 SHA256 c0415f9832624b0f4527b4707f01f1bf069bc9cb63c25fc180218c5543471ed2 files/opera-9.00-install.patch 320
-AUX opera-9.21-pluginpath.patch 362 RMD160 73385b13479a9b36f4ca32f4d7f3d100652f36f8 SHA1 38dd4eb94267a98ab5d24d8f05d460ff7798b3c7 SHA256 790d1657a4fd760af4b896abcf30aec86b61b3ca52e5e7bf3438870761dbf7a9
-MD5 368d2f60b85ce3bcf96ace4b943d020e files/opera-9.21-pluginpath.patch 362
-RMD160 73385b13479a9b36f4ca32f4d7f3d100652f36f8 files/opera-9.21-pluginpath.patch 362
-SHA256 790d1657a4fd760af4b896abcf30aec86b61b3ca52e5e7bf3438870761dbf7a9 files/opera-9.21-pluginpath.patch 362
+AUX opera-9.21-pluginpath.patch 387 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90eb1e SHA1 0533c681e26f2521c38a93e3c731ffe42cd1f54d SHA256 4fc3ae28d7d105bd45c30a45696222cd2bfa9e49bd32c2e7cb8073dd59b2da19
+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.desktop 203 RMD160 9b20ec9dc2881d952c3a7faa3df0f05c576045ff SHA1 64192ee66aef471cb013bcd736bda73e41407ebb SHA256 e4f0514e81cfeca34c0dbab093a4d9b9d4aca2623fd7ae48a59fc16a05722675
 MD5 53f0b96c563a81120a763b72d43ca796 files/opera.desktop 203
 RMD160 9b20ec9dc2881d952c3a7faa3df0f05c576045ff files/opera.desktop 203
@@ -16,18 +16,18 @@ DIST opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553 RMD160 3ccbe11c534b6
 DIST opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110 RMD160 4f46b242089d14000faaa2cade625514db9baea8 SHA1 02aeabc40840534c30283450535a90312b25eb51 SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1
 DIST opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430 RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 SHA1 014c13098b061be853245077b6c08be2966328de SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242
 DIST opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934 RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d SHA1 9a9fc5767705f39a93efcd3e7f1e9c85a1a914cc SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d
-EBUILD opera-9.21-r1.ebuild 5711 RMD160 e3d5e57d0ade474284732d937e4635486643bf7a SHA1 6076a88b878b4d2a7f941ceeb9e52b901d284242 SHA256 6c96504d2b843dc6144ad9b67cf6a668a41879c78aaae5e14fec6086b9b3212d
-MD5 46844a1ecbe7d12ee29b47669631e225 opera-9.21-r1.ebuild 5711
-RMD160 e3d5e57d0ade474284732d937e4635486643bf7a opera-9.21-r1.ebuild 5711
-SHA256 6c96504d2b843dc6144ad9b67cf6a668a41879c78aaae5e14fec6086b9b3212d opera-9.21-r1.ebuild 5711
+EBUILD opera-9.21-r1.ebuild 5720 RMD160 d9e59e28048246572b006e4b9421e140022fcd72 SHA1 60c4f91ab0e90890e1ad9a1397ec529e8c389a95 SHA256 fe0916ca6a6cb853e1d29eec9ad2e40e0092ff6d3105ea8efd566e19d77a58ea
+MD5 2ce5aa2c348ae15324c94909627023ec opera-9.21-r1.ebuild 5720
+RMD160 d9e59e28048246572b006e4b9421e140022fcd72 opera-9.21-r1.ebuild 5720
+SHA256 fe0916ca6a6cb853e1d29eec9ad2e40e0092ff6d3105ea8efd566e19d77a58ea opera-9.21-r1.ebuild 5720
 EBUILD opera-9.21.ebuild 5661 RMD160 d2366882ab24dbb2e1be1fc1d28f3388e8bebb14 SHA1 d517c19ebe001e11941ddda0edae0422635aeab3 SHA256 c4ef58681bf373874c194cfc16961db7d314b224939be7b73e721382064c4e7b
 MD5 1b7a6ad4f142394bb5bb84aea999c849 opera-9.21.ebuild 5661
 RMD160 d2366882ab24dbb2e1be1fc1d28f3388e8bebb14 opera-9.21.ebuild 5661
 SHA256 c4ef58681bf373874c194cfc16961db7d314b224939be7b73e721382064c4e7b opera-9.21.ebuild 5661
-MISC ChangeLog 27948 RMD160 b62b0c95dbf9338289be658bb4b0d8429dca3591 SHA1 f18bf552036baea294686d0fdb558ccf5ae98b9c SHA256 ff970fbb5a6cac778c91cbeec6fb142189fc16f45c0b8c049b15714cef62bbb8
-MD5 1c912aea1f1ebd6b48503b9bf60ec560 ChangeLog 27948
-RMD160 b62b0c95dbf9338289be658bb4b0d8429dca3591 ChangeLog 27948
-SHA256 ff970fbb5a6cac778c91cbeec6fb142189fc16f45c0b8c049b15714cef62bbb8 ChangeLog 27948
+MISC ChangeLog 28127 RMD160 fdf74ab0cb787052e18eef6c441a354da94a83e5 SHA1 b7e192cd594a9399a8438d5dc3b389f03df10b03 SHA256 1c312c229d206bf2c5216eaccc7ad5c560a61e9bb965ca124be40b6b4036cd05
+MD5 7535ceb4192e9f701229f14b98f3ecfa ChangeLog 28127
+RMD160 fdf74ab0cb787052e18eef6c441a354da94a83e5 ChangeLog 28127
+SHA256 1c312c229d206bf2c5216eaccc7ad5c560a61e9bb965ca124be40b6b4036cd05 ChangeLog 28127
 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8
 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314
 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314
diff --git a/www-client/opera/files/opera-9.21-pluginpath.patch b/www-client/opera/files/opera-9.21-pluginpath.patch
index eda1422a4dc5..babe984f5950 100644
--- a/www-client/opera/files/opera-9.21-pluginpath.patch
+++ b/www-client/opera/files/opera-9.21-pluginpath.patch
@@ -7,6 +7,7 @@ Should fix bug 181300 - JeR
  $HOME/.netscape6/plugins=1
  $HOME/.netscape/plugins=1
 +/usr/lib/nsbrowser/plugins=1
- /opt/netscape/plugins=1
+-/opt/netscape/plugins=1
++/opt/netscape/plugins=2
  /usr/lib/netscape/plugins=1
  /usr/local/netscape/plugins=1
diff --git a/www-client/opera/opera-9.21-r1.ebuild b/www-client/opera/opera-9.21-r1.ebuild
index 6d188e9b7b32..2b7db5c30858 100644
--- a/www-client/opera/opera-9.21-r1.ebuild
+++ b/www-client/opera/opera-9.21-r1.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.21-r1.ebuild,v 1.1 2007/07/07 17:52:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21-r1.ebuild,v 1.2 2007/07/07 20:43:17 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -82,6 +82,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script or Makefile exists.
 	true
 }
 
@@ -151,6 +153,10 @@ src_install() {
 	# symlink to libflash-player.so:
 	dosym /opt/netscape/plugins/libflashplayer.so \
 		/opt/opera/lib/opera/plugins/libflashplayer.so
+
+	# Add the Opera man dir to MANPATH:
+	insinto /etc/env.d
+	echo 'MANPATH="/opt/opera/share/man"' >> ${D}/etc/env.d/90opera
 }
 
 pkg_postinst() {
@@ -159,19 +165,13 @@ pkg_postinst() {
 	elog "For localized language files take a look at:"
 	elog " http://www.opera.com/download/languagefiles/index.dml"
 	elog
-	elog "To change the spellcheck language edit"
-	elog " /opt/opera/share/opera/ini/spellcheck.ini"
-	elog "and emerge app-dicts/aspell-language."
-	elog
-	elog "If you want to watch videos on websites like YouTube,"
-	elog "you will need to emerge net-www/netscape-flash,"
-	elog "then edit \$HOME/.opera/pluginpath.ini and set:"
-	elog " /opt/netscape/plugins=2"
+	elog "To use the spellchecker (USE=spell) for non-English simply do"
+	elog "$ emerge app-dicts/aspell-[your language]."
 
 	if use x86-fbsd; then
 		elog
 		elog "To improve shared memory usage please set:"
-		elog "	sysctl kern.ipc.shm_allow_removed=1"
+		elog "$	sysctl kern.ipc.shm_allow_removed=1"
 	fi
 }