diff options
| -rw-r--r-- | www-client/opera/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/opera/files/opera | 2 | ||||
| -rw-r--r-- | www-client/opera/opera-10.53_pre6330-r1.ebuild | 11 | ||||
| -rw-r--r-- | www-client/opera/opera-10.54_pre6336-r1.ebuild | 11 |
4 files changed, 22 insertions, 8 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index be1c9ae0da0b..208cc66692ac 100644 --- 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/files/opera b/www-client/opera/files/opera index 902f28635df2..2292801aa17b 100644 --- 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 eaafb426ad52..cafcb923f17a 100644 --- 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 42e25f49b847..76fc4bcff719 100644 --- 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 |