summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-02-01 19:14:45 +0000
committerJeroen Roovers <jer@gentoo.org>2010-02-01 19:14:45 +0000
commit5f035556dd6ef4c585b612a230eaa1c7a727ee92 (patch)
tree32072dfecd42f587fcdef02504f1b1a4a6bedef6 /www-client
parentAdd ~sparc wrt #284655 (diff)
downloadgentoo-2-5f035556dd6ef4c585b612a230eaa1c7a727ee92.tar.gz
gentoo-2-5f035556dd6ef4c585b612a230eaa1c7a727ee92.tar.bz2
gentoo-2-5f035556dd6ef4c585b612a230eaa1c7a727ee92.zip
Add die() when dobin fails. Use mv again instead of doins to preserve filename permissions thanks to Jochen (bug #303066).
(Portage version: 2.2_rc62/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/opera/ChangeLog7
-rw-r--r--www-client/opera/opera-10.50_pre6201.ebuild6
-rw-r--r--www-client/opera/opera-10.50_pre6204.ebuild6
3 files changed, 12 insertions, 7 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 50c4c8befc2e..4638ea64fd2d 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
# 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.443 2010/02/01 18:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.444 2010/02/01 19:14:45 jer Exp $
+
+ 01 Feb 2010; Jeroen Roovers <jer@gentoo.org> opera-10.50_pre6201.ebuild,
+ opera-10.50_pre6204.ebuild:
+ Add die() when dobin fails. Use mv again instead of doins to preserve
+ filename permissions thanks to Jochen (bug #303066).
*opera-10.50_pre6204 (01 Feb 2010)
diff --git a/www-client/opera/opera-10.50_pre6201.ebuild b/www-client/opera/opera-10.50_pre6201.ebuild
index e7943c8fe8bd..b5a6c0cd1600 100644
--- a/www-client/opera/opera-10.50_pre6201.ebuild
+++ b/www-client/opera/opera-10.50_pre6201.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.50_pre6201.ebuild,v 1.4 2010/02/01 18:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.50_pre6201.ebuild,v 1.5 2010/02/01 19:14:45 jer Exp $
EAPI="2"
@@ -117,12 +117,12 @@ src_prepare() {
src_install() {
# This alpha build hardcodes /usr as prefix
- doins -r etc/ usr/
+ mv etc/ usr/ "${D}"/ || die "mv etc/ usr/ failed"
make_desktop_entry ${PN} Opera ${PN} # TODO
# Install startup script
- dobin ${PN}
+ dobin ${PN} || die "dobin failed"
# Stop revdep-rebuild from checking opera binaries
dodir /etc/revdep-rebuild
diff --git a/www-client/opera/opera-10.50_pre6204.ebuild b/www-client/opera/opera-10.50_pre6204.ebuild
index 85a98894ed0a..14ab57cf919a 100644
--- a/www-client/opera/opera-10.50_pre6204.ebuild
+++ b/www-client/opera/opera-10.50_pre6204.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.50_pre6204.ebuild,v 1.1 2010/02/01 18:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.50_pre6204.ebuild,v 1.2 2010/02/01 19:14:45 jer Exp $
EAPI="2"
@@ -118,12 +118,12 @@ src_prepare() {
src_install() {
# This alpha build hardcodes /usr as prefix
- doins -r etc/ usr/
+ mv etc/ usr/ "${D}"/ || die "mv etc/ usr/ failed"
make_desktop_entry ${PN} Opera ${PN} # TODO
# Install startup script
- dobin ${PN}
+ dobin ${PN} || die "dobin failed"
# Stop revdep-rebuild from checking opera binaries
dodir /etc/revdep-rebuild