Removed deprecated versions, added 9.21 final (same as the weekly I removed, basically), added patch for bug #179224.

Package-Manager: portage-2.1.2.7

6 files changed, 61 insertions, 242 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 012297d43547..85b4ac35a1bd 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2007/05/14 03:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.92 2007/05/21 19:04:48 jer Exp $
+
+*opera-9.21 (21 May 2007)
+
+  21 May 2007; Jeroen Roovers <jer@gentoo.org> -opera-9.20-r1.ebuild,
+  +opera-9.21.ebuild, -opera-9.21.641.ebuild:
+  Removed deprecated versions, added 9.21 final (same as the weekly I removed,
+  basically), added patch for bug #179224.
 
   14 May 2007; Jeroen Roovers <jer@gentoo.org> opera-9.20-r1.ebuild,
   opera-9.21.641.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c24dcbee5cb2..4417214e1fe1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -22,32 +22,28 @@ DIST opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346 RMD160 af7f1d4fe9d13
 DIST opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208 RMD160 4c9ccb4a84d875c76dd34ba936b2a5eb2d0b8dc4 SHA1 0265412de769b40319ec312eda2f6e5b210bfe56 SHA256 5b7c588345006c6b610ecb4e483335fa6962cb5756d58fbba4004a69e13b7f3c
 DIST opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848 RMD160 b6334db5e7cfd551d03d9709d55ecb62fbbb4d54 SHA1 f92b522ea36e26edabc3c0125924bd762ffabd6e SHA256 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41
 DIST opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714 RMD160 c2bea2262311a4689fac12b94eb429102807acd2 SHA1 251c6bb5a0db01b6900c89ce80e09081a79ffe8d SHA256 31232712ac42928288f3042c51bf258da6be1af0168d45a8f5969addd1655c83
-DIST opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626 RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 SHA1 d8679765141483165da05e558930090fa0f6a311 SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd
-DIST opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602 RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f SHA1 92d23afc813ec990e59d29769056edb704a39171 SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820
-DIST opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553 RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb SHA1 716970f0945a9d60b7a23a00473759f5b202715e SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a
-DIST opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110 RMD160 4f46b242089d14000faaa2cade625514db9baea8 SHA1 02aeabc40840534c30283450535a90312b25eb51 SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1
-DIST opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430 RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 SHA1 014c13098b061be853245077b6c08be2966328de SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242
-DIST opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934 RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d SHA1 9a9fc5767705f39a93efcd3e7f1e9c85a1a914cc SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d
+DIST opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626 RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 SHA1 d8679765141483165da05e558930090fa0f6a311 SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd
+DIST opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602 RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f SHA1 92d23afc813ec990e59d29769056edb704a39171 SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820
+DIST opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553 RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb SHA1 716970f0945a9d60b7a23a00473759f5b202715e SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a
+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.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
-EBUILD opera-9.20-r1.ebuild 5419 RMD160 3db56f39d0dc78bed0273d1eeffd795bd7bbca7f SHA1 baa5dcf79c442a16e7b7d9a2667ca2b40fee0f06 SHA256 8581a4089696874ea6a733387bf5ecb544c772ec544395aa548aaf62e26d26bc
-MD5 028e597554b621e42d4a9cc0812e4731 opera-9.20-r1.ebuild 5419
-RMD160 3db56f39d0dc78bed0273d1eeffd795bd7bbca7f opera-9.20-r1.ebuild 5419
-SHA256 8581a4089696874ea6a733387bf5ecb544c772ec544395aa548aaf62e26d26bc opera-9.20-r1.ebuild 5419
 EBUILD opera-9.20.ebuild 5037 RMD160 713313033c28a310f81345f3c739c54d67c928fe SHA1 f5eb68ed3c1686d6b3265a9eecc90beda8b2efe7 SHA256 9b3ba2ed350d33c5493465e0d571c8834534cf0b7911db8d019b33b945cad6de
 MD5 8422cefd439ee05ba5140226f78c4681 opera-9.20.ebuild 5037
 RMD160 713313033c28a310f81345f3c739c54d67c928fe opera-9.20.ebuild 5037
 SHA256 9b3ba2ed350d33c5493465e0d571c8834534cf0b7911db8d019b33b945cad6de opera-9.20.ebuild 5037
-EBUILD opera-9.21.641.ebuild 5601 RMD160 0e1a73398a6fb8a0e77f76ccd1b2bf4b28068903 SHA1 98990e6676136551e3f656dc7b274b02c057397b SHA256 96048f5c0352518d362ce82a8846b3c7a06e404bcca0223ba7f39b38c154351a
-MD5 b0ac3e3f5f0dee89f7b7488ecec07674 opera-9.21.641.ebuild 5601
-RMD160 0e1a73398a6fb8a0e77f76ccd1b2bf4b28068903 opera-9.21.641.ebuild 5601
-SHA256 96048f5c0352518d362ce82a8846b3c7a06e404bcca0223ba7f39b38c154351a opera-9.21.641.ebuild 5601
-MISC ChangeLog 26369 RMD160 5ab2eae3e1e4c43036e6863ec06ba0144b616906 SHA1 d3f758e4db6da19178d1982074f12ed0302abd02 SHA256 3c91ce83a00847408518505786acb4e0337e306d10a79a779b489d6959377147
-MD5 85ee853d3f5539ae3897b762c95003aa ChangeLog 26369
-RMD160 5ab2eae3e1e4c43036e6863ec06ba0144b616906 ChangeLog 26369
-SHA256 3c91ce83a00847408518505786acb4e0337e306d10a79a779b489d6959377147 ChangeLog 26369
+EBUILD opera-9.21.ebuild 5645 RMD160 a8982725d5107a9e9c61c3e34aa793116e1eb3c2 SHA1 f660ed83f10f39f8307210b4a3be95014250d38a SHA256 d41861942cae7261185f9767f8454c6c9e19de901fdb332433ee0c36c0b4d770
+MD5 8791c5ba9bb5481dd8a8206fe2c5c5a6 opera-9.21.ebuild 5645
+RMD160 a8982725d5107a9e9c61c3e34aa793116e1eb3c2 opera-9.21.ebuild 5645
+SHA256 d41861942cae7261185f9767f8454c6c9e19de901fdb332433ee0c36c0b4d770 opera-9.21.ebuild 5645
+MISC ChangeLog 26635 RMD160 985c70d71f66efc40f8cb49a60d4f21115b6871a SHA1 738dc89fcedf2fb9183439ccfb695208324c7709 SHA256 39b789f112be7a3861e5f46afaba6a1fa1cd0024d086dabc3e6b9a2f4df28441
+MD5 8a537991b0dbda3fb61729d679965139 ChangeLog 26635
+RMD160 985c70d71f66efc40f8cb49a60d4f21115b6871a ChangeLog 26635
+SHA256 39b789f112be7a3861e5f46afaba6a1fa1cd0024d086dabc3e6b9a2f4df28441 ChangeLog 26635
 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8
 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314
 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314
@@ -58,9 +54,6 @@ SHA256 aa4af149ddf2a7d58c7089756e5616687cde714c6fadc0b4c3572da5de3289c9 files/di
 MD5 f2f96e9fb4cbf8d8fb5ada1b447238d2 files/digest-opera-9.20 1998
 RMD160 a5ee69aa49105718ccbaba3a73e2166a16f7db9c files/digest-opera-9.20 1998
 SHA256 80936f89483d2f8dff6cf50325712076ba40645fd637a6a1e1686ae99fdf4fa8 files/digest-opera-9.20 1998
-MD5 f2f96e9fb4cbf8d8fb5ada1b447238d2 files/digest-opera-9.20-r1 1998
-RMD160 a5ee69aa49105718ccbaba3a73e2166a16f7db9c files/digest-opera-9.20-r1 1998
-SHA256 80936f89483d2f8dff6cf50325712076ba40645fd637a6a1e1686ae99fdf4fa8 files/digest-opera-9.20-r1 1998
-MD5 ed94986c8a3c600a52f92e983511eb5d files/digest-opera-9.21.641 2070
-RMD160 c739347dd5b1ce3ad4761068f48537ac16f3f72d files/digest-opera-9.21.641 2070
-SHA256 45ea4893326a71222d652c31b4c94ee7435ac7af9b9ca8bd7bb95de3e2cf3a83 files/digest-opera-9.21.641 2070
+MD5 b0cd126d493e76e297f4a89c3ceb2fff files/digest-opera-9.21 1998
+RMD160 5b776b2f5946bcc0c30866db9776dc3b6bdab99b files/digest-opera-9.21 1998
+SHA256 73e201315fa5357161151022ec2f98af26862f3b03be08e4aa18bf413033b9f6 files/digest-opera-9.21 1998
diff --git a/www-client/opera/files/digest-opera-9.20-r1 b/www-client/opera/files/digest-opera-9.20-r1
deleted file mode 100644
index 499f0e89936a..000000000000
--- a/www-client/opera/files/digest-opera-9.20-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 dd5365a5ca0f31b373deafdb80a17ac7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-RMD160 b2d4d0791ea63a3727e7cfa708d2b2833a0972f7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-SHA256 4ea0e5d407e11e3df247a643412eac19962c923177f2f22c23566a776dc8945f opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-MD5 21892c3663f9ce73719045de65bcd259 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-RMD160 d7063b7a7da24d8b18b175511f500e15f0614a4e opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-SHA256 434dadf22984dea89a08a850da8a1359f4e89b963509270da680ea348a9ebc35 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-MD5 cc5be6d9ec178eb7cb02bc20e0238c26 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-RMD160 af7f1d4fe9d1337621b2b6e1b22b42b1d70294a8 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-SHA256 2300c15a76faa728fd6d90232df586f06a052715bafe1851aac920606e2849c2 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-MD5 43c9cc58c26979db270f05141ee7cc99 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-RMD160 4c9ccb4a84d875c76dd34ba936b2a5eb2d0b8dc4 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-SHA256 5b7c588345006c6b610ecb4e483335fa6962cb5756d58fbba4004a69e13b7f3c opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-MD5 ae34b8fde421b3d27b9090ec0ad6fb17 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-RMD160 b6334db5e7cfd551d03d9709d55ecb62fbbb4d54 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-SHA256 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-MD5 3d4b6805d97f72f104a4d1dfe4c61f62 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
-RMD160 c2bea2262311a4689fac12b94eb429102807acd2 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
-SHA256 31232712ac42928288f3042c51bf258da6be1af0168d45a8f5969addd1655c83 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
diff --git a/www-client/opera/files/digest-opera-9.21.641 b/www-client/opera/files/digest-opera-9.21
index a7e1d38f8ce1..93cca4b6f7c0 100644
--- a/www-client/opera/files/digest-opera-9.21.641
+++ b/www-client/opera/files/digest-opera-9.21
@@ -1,18 +1,18 @@
-MD5 42e3039163f7bbfd49119860cfac60d0 opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-MD5 361c26cf5392c8f0d063a182d832ff2e opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820 opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-MD5 5a74849836a5cd0315983e5f1e6852a4 opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-MD5 031f3e4ea5d0e691f8bc4a1631396ffa opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-RMD160 4f46b242089d14000faaa2cade625514db9baea8 opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1 opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-MD5 adeb325cc356432f79190026b9ff58fe opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242 opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-MD5 de48ec6a3c2e4804477d1d38982aeb10 opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
-RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
-SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
+MD5 42e3039163f7bbfd49119860cfac60d0 opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+MD5 361c26cf5392c8f0d063a182d832ff2e opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820 opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+MD5 5a74849836a5cd0315983e5f1e6852a4 opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+MD5 031f3e4ea5d0e691f8bc4a1631396ffa opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+RMD160 4f46b242089d14000faaa2cade625514db9baea8 opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1 opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+MD5 adeb325cc356432f79190026b9ff58fe opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242 opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+MD5 de48ec6a3c2e4804477d1d38982aeb10 opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
+RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
+SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
diff --git a/www-client/opera/opera-9.21.641.ebuild b/www-client/opera/opera-9.21.641.ebuild
deleted file mode 100644
index 68ec8e137a7e..000000000000
--- a/www-client/opera/opera-9.21.641.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.641.ebuild,v 1.2 2007/05/14 03:55:45 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Opera web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="qt-static spell gnome"
-RESTRICT="strip mirror"
-
-OPERALNG="en"
-OPERASUFF="641"
-OPERAVER="9.21-20070510"
-
-OPERA_URI="http://snapshot.opera.com/unix/Weekly-${OPERASUFF}/"
-# http://snapshot.opera.com/unix/Weekly-641/intel-linux/opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2
-# http://snapshot.opera.com/unix/Weekly-641/intel-linux/opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2
-SRC_URI="
-	x86? ( qt-static? (
-	${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	x86? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}sparc-linux/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc-linux/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
-	x86-fbsd? ( !qt-static? ( ${OPERA_URI}intel-freebsd/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	x86-fbsd? ( qt-static? ( ${OPERA_URI}/intel-freebsd/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )"
-
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/setarch )"
-
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
-	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
-			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-			  spell? ( app-text/aspell )
-			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
-			  media-libs/jpeg )"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-9.21-install.patch"
-
-	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-		-e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-		-e "s:/etc/X11:${D}/etc/X11:g" \
-		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:read str_answer:return 0:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./install.sh --prefix="${D}"/opt/opera || die
-	fi
-
-	# java workaround
-	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' ${D}/opt/opera/bin/opera
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins images/opera.xpm
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps/
-		newins images/opera_${res}.png opera.png
-	done
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	# fix plugin path
-	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc
-
-	# enable spellcheck
-	if use spell; then
-		if use qt-static; then
-			DIR=$OPERAVER.1
-		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# symlink to libflash-player.so:
-	dosym /opt/netscape/plugins/libflashplayer.so \
-		/opt/opera/lib/opera/plugins/libflashplayer.so
-}
-
-pkg_postinst() {
-	use gnome && gnome2_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 would like to watch videos on websites like YouTube, you will"
-	elog "need to edit \$HOME/.opera/pluginpath.ini and set:"
-	elog " /opt/netscape/plugins=2"
-}
-
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.20-r1.ebuild b/www-client/opera/opera-9.21.ebuild
index 113f8f5fbbd1..f007f2f70626 100644
--- a/www-client/opera/opera-9.20-r1.ebuild
+++ b/www-client/opera/opera-9.21.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.20-r1.ebuild,v 1.3 2007/05/14 03:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21.ebuild,v 1.1 2007/05/21 19:04:48 jer Exp $
 
 inherit eutils gnome2
 
@@ -15,9 +15,9 @@ IUSE="qt-static spell gnome"
 RESTRICT="strip mirror"
 
 OPERALNG="en"
-OPERASUFF="638"
-OPERAVER="9.20-20070409"
-OPERAFTP="920/final/${OPERALNG}"
+OPERASUFF="641"
+OPERAVER="9.21-20070510"
+OPERAFTP="921/final/${OPERALNG}"
 
 OPERA_URI="mirror://opera/"
 SRC_URI="
@@ -52,7 +52,9 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 	!amd64? ( media-libs/libexif
 			  spell? ( app-text/aspell )
 			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
-			  media-libs/jpeg )"
+			  media-libs/jpeg )
+	x86-fbsd? ( =virtual/libstdc++-3*
+	            !qt-static? ( =x11-libs/qt-3* ) )"
 
 S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
 
@@ -84,7 +86,7 @@ src_install() {
 	dodir /etc
 
 	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
+	if use amd64; then
 		linux32 ./install.sh --prefix="${D}"/opt/opera || die
 	else
 		./install.sh --prefix="${D}"/opt/opera || die
@@ -129,7 +131,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 [ ${ARCH} = "x86-fbsd" ]; then
+	if use 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 ]];
@@ -157,9 +159,16 @@ pkg_postinst() {
 	elog " /opt/opera/share/opera/ini/spellcheck.ini"
 	elog "and emerge app-dicts/aspell-language."
 	elog
-	elog "If you would like to watch videos on websites like YouTube, you will"
-	elog "need to edit \$HOME/.opera/pluginpath.ini and set:"
+	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"
+
+	if use x86-fbsd; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "	sysctl kern.ipc.shm_allow_removed=1"
+	fi
 }