Fix libdir in opera script too.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index be1c9ae0da0bf5088aabe94f97b558c75d8cf107..208cc66692acaf6126732d20a283cd18459ce69c 100644 (file)
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.475 2010/05/18 15:49:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.476 2010/05/18 15:59:07 jer Exp $
+
+  18 May 2010; Jeroen Roovers <jer@gentoo.org>
+  opera-10.53_pre6330-r1.ebuild, opera-10.54_pre6336-r1.ebuild, files/opera:
+  Fix libdir in opera script too.
 
 *opera-10.54_pre6336-r1 (18 May 2010)
 *opera-10.53_pre6330-r1 (18 May 2010)

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index cd093b6ec769dbbea766b31072723598126ee212..3a944b9fcda75ecb7a8d7cc1fbb9d35d581a00ba 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
-AUX opera 119 RMD160 57ecc76b5ce383acdc8e69163eab5461059045fd SHA1 fa772ae15b64ab77b3db3161f3595659716b0ac7 SHA256 a50cc11a45a7ee31d0b948ebaec62ef85c1baa04b679d62dbb4ea120c35e48a3
+AUX opera 123 RMD160 69142622c1e9930354e708f1cb59a5cb529957df SHA1 be6610d3fe5bd60cf9d4c31ca4072155130c54c3 SHA256 bd412849d77521621398feb0efa342aaa31901746d395a6078065422502bd428
 AUX opera-10.00-pluginpath-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
 AUX opera-10.00-pluginpath.patch 439 RMD160 9fc1bcb8430d185d040a811c2714077eaad159af SHA1 37a6b63d4d1d34e8f43f6ba838d09ceec6cfd607 SHA256 b34e438bab40599b70a7dfd4946a82e718fb46de0384062b41c51db5a047db4c
 AUX opera-freedesktop.patch 995 RMD160 9ebe36fa34b25a4ab151033a10f7b53494cb4a4a SHA1 e1613110be5c4c4061227776db590f069041f525 SHA256 dc5e4b56ae89049e9708fa3180f375b2de795219fff7d868b8dbbffd99fd7ec5
@@ -19,9 +19,9 @@ DIST opera-10.54-6336.ppc.linux.tar.bz2 13576807 RMD160 df632c494fcf1968ca425321
 DIST opera-10.54-6336.x86_64.linux.tar.bz2 14239967 RMD160 5fb6d0c4682e8584acb531f47bc5b4da1af897e1 SHA1 744be6c1c401d9d0e4d541dbe5e2eb9907b1e542 SHA256 a7fa219e7d0098f4d8fce7e687d287b7de9a2f7ae951e93e017ef64a80d8d28c
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
-EBUILD opera-10.53_pre6330-r1.ebuild 4473 RMD160 1a52f8847fb541e3d0b838450760fe696309e1f0 SHA1 f3c520a91c93e6553565eb647cc431a78949ce6b SHA256 ea1a77515b9c4ac418f7d0c051dbf29be634aa2eaf41a4988714a6d49f6e7f63
+EBUILD opera-10.53_pre6330-r1.ebuild 4598 RMD160 0f0c884992a7ab4e38e083927128356564bce117 SHA1 fb40b1f66ea4f5e3353728e33424d92a544c4ec9 SHA256 ea9515c2abee597a995e777ecce79df8311bea5db0f7fb48af2bca81508aa48c
 EBUILD opera-10.53_pre6330.ebuild 4452 RMD160 2c3d32943320a121a6193fc8be04d72d13aba753 SHA1 d8459e063e0b2e03dfa852bb6689694fbb1eb18c SHA256 1aa7f5d05e1692445fef7eeec2a436d1c2af300ae664d8af22fb2a107e623b11
-EBUILD opera-10.54_pre6336-r1.ebuild 4473 RMD160 42816eb586c3ee00518c149f633f20624ece3dc9 SHA1 7b16584d1ae5bd0576d60e304f37f91f1431fd50 SHA256 77a88a6243710d8d631a9a74f1edb6eeebd4ca34196a0cc67e9cc600afad14d3
+EBUILD opera-10.54_pre6336-r1.ebuild 4598 RMD160 f5df8035255257a54d6197453f654f23581c7563 SHA1 cdbc5be16751f7a58922e00e5e03460307b5e706 SHA256 f75cf53297c66c511ba5e8a604dd9d92f0371263961c8426394438022d12623d
 EBUILD opera-10.54_pre6336.ebuild 4452 RMD160 25cd4355ff29a0b34a50060af3de3e5cc3a2902b SHA1 bac6fa060245ade5482e232733778cf31bf4f86e SHA256 f5ea20765d1393f86afdd73fea89d83c357f8721a789662c3035424d5ea47dba
-MISC ChangeLog 92253 RMD160 0b19e2d418b072f543ec31c06c941f16ce4464e6 SHA1 ae992473356a6bfaeede98fc4bf16e14154762d6 SHA256 bcf1809741a6f2378395a6a43e394b8169f34de2b6206aebe6daa470b8402875
+MISC ChangeLog 92412 RMD160 38392c7e1baf3291556ea9dc14dfab5a537bff2c SHA1 79f8c7511c8be1f9ccfe647f1211aaf12bb668f1 SHA256 940345d8f4e01208da07b552e459d5d4b4b65d10108583b71b3d1885a9ff6ff5
 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a

diff --git a/www-client/opera/files/opera b/www-client/opera/files/opera
index 902f28635df2eebbfb383ec1314a84fc476e8b89..2292801aa17b6a4e238e91876cc9bc78bb769b30 100644 (file)
--- a/www-client/opera/files/opera
+++ b/www-client/opera/files/opera
@@ -1,4 +1,4 @@
 #!/bin/bash
 export OPERA_DIR=/usr/share/opera
 export OPERA_PERSONALDIR="${HOME}/.opera"
-exec /usr/lib/opera/opera "$@"
+exec OPERA_LIBDIR/opera/opera "$@"

diff --git a/www-client/opera/opera-10.53_pre6330-r1.ebuild b/www-client/opera/opera-10.53_pre6330-r1.ebuild
index eaafb426ad5222176fc947b7dca5114dd0a451f1..cafcb923f17a395cc8c9743e9d7273982ff42959 100644 (file)
--- a/www-client/opera/opera-10.53_pre6330-r1.ebuild
+++ b/www-client/opera/opera-10.53_pre6330-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.53_pre6330-r1.ebuild,v 1.1 2010/05/18 15:49:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.53_pre6330-r1.ebuild,v 1.2 2010/05/18 15:59:07 jer Exp $
 
 EAPI="2"
 
@@ -132,8 +132,13 @@ src_install() {
                "${D}"/usr/share/applications/opera-browser.desktop \
                "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
 
-       # Install startup script
-       dobin ${PN}-widget-manager "${FILESDIR}"/opera || die "dobin failed"
+       # Sed libdir in opera script
+       sed "${FILESDIR}"/opera \
+               -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+               || die "sed opera script failed"
+
+       # Install startup scripts
+       dobin ${PN} ${PN}-widget-manager || die "dobin failed"
 
        # Stop revdep-rebuild from checking opera binaries
        dodir /etc/revdep-rebuild

diff --git a/www-client/opera/opera-10.54_pre6336-r1.ebuild b/www-client/opera/opera-10.54_pre6336-r1.ebuild
index 42e25f49b84766a8c5ad6d66c242e1cc698af694..76fc4bcff719106a818bc841ce743194af650840 100644 (file)
--- a/www-client/opera/opera-10.54_pre6336-r1.ebuild
+++ b/www-client/opera/opera-10.54_pre6336-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6336-r1.ebuild,v 1.1 2010/05/18 15:49:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6336-r1.ebuild,v 1.2 2010/05/18 15:59:07 jer Exp $
 
 EAPI="2"
 
@@ -132,8 +132,13 @@ src_install() {
                "${D}"/usr/share/applications/opera-browser.desktop \
                "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
 
-       # Install startup script
-       dobin ${PN}-widget-manager "${FILESDIR}"/opera || die "dobin failed"
+       # Sed libdir in opera script
+       sed "${FILESDIR}"/opera \
+               -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+               || die "sed opera script failed"
+
+       # Install startup scripts
+       dobin ${PN} ${PN}-widget-manager || die "dobin failed"
 
        # Stop revdep-rebuild from checking opera binaries
        dodir /etc/revdep-rebuild