summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-11-28 18:26:31 +0000
committerJeroen Roovers <jer@gentoo.org>2012-11-28 18:26:31 +0000
commit66b11a91921a00873a2dba9b3bf863ad89698e3a (patch)
treeb589544b7fc526d932b90f1062f62f529e6e94ef /www-client/opera
parentFix LICENSE (bug #445040 by ulm). (diff)
downloadgentoo-2-66b11a91921a00873a2dba9b3bf863ad89698e3a.tar.gz
gentoo-2-66b11a91921a00873a2dba9b3bf863ad89698e3a.tar.bz2
gentoo-2-66b11a91921a00873a2dba9b3bf863ad89698e3a.zip
Merge O_B mangling into O_P concatenation.
(Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key A792A613)
Diffstat (limited to 'www-client/opera')
-rw-r--r--www-client/opera/ChangeLog5
-rw-r--r--www-client/opera/opera-12.12_pre1662.ebuild8
2 files changed, 7 insertions, 6 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 4374a7924882..a3564cd8064e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/opera
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.776 2012/11/28 17:26:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.777 2012/11/28 18:26:31 jer Exp $
+
+ 28 Nov 2012; Jeroen Roovers <jer@gentoo.org> opera-12.12_pre1662.ebuild:
+ Merge O_B mangling into O_P concatenation.
*opera-12.12_pre1662 (28 Nov 2012)
diff --git a/www-client/opera/opera-12.12_pre1662.ebuild b/www-client/opera/opera-12.12_pre1662.ebuild
index 1254bdffebef..a9f45e0456ee 100644
--- a/www-client/opera/opera-12.12_pre1662.ebuild
+++ b/www-client/opera/opera-12.12_pre1662.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.12_pre1662.ebuild,v 1.1 2012/11/28 17:26:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.12_pre1662.ebuild,v 1.2 2012/11/28 18:26:31 jer Exp $
EAPI=4
inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -30,9 +30,8 @@ O_LINGUAS="
# == End of variables that often change ==
if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
- O_B="${O_B/pre}" # remove _pre
O_D="${O_K}_${O_V}-${O_B}" # directory string
- O_P="${PN}-${O_V}-${O_B}" # package string
+ O_P="${PN}-${O_V}-${O_B/pre}" # package string
O_U="http://snapshot.opera.com/unix/" # base URI
SRC_URI="
@@ -41,9 +40,8 @@ if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
"
else # release: _p
- O_B="${O_B/p}" # remove _p
O_D="${O_V/./}" # directory string
- O_P="${PN}-${O_V}-${O_B}" # package string
+ O_P="${PN}-${O_V}-${O_B/p}" # package string
O_U="mirror://opera/" # base URI
SRC_URI="