Merge O_B mangling into O_D/O_P concatenation.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0xA792A613

4 files changed, 20 insertions, 20 deletions

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index 0f52bf534523..eb7532030426 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera-next
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.157 2012/11/28 17:40:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.158 2012/11/28 18:34:00 jer Exp $
+
+  28 Nov 2012; Jeroen Roovers <jer@gentoo.org> opera-next-12.11_pre1661.ebuild,
+  opera-next-12.12_pre1662.ebuild:
+  Merge O_B mangling into O_D/O_P concatenation.
 
 *opera-next-12.12_pre1662 (28 Nov 2012)
 *opera-next-12.11_pre1661 (28 Nov 2012)
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 7f6227204aa5..68ea99dd2f13 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -7,14 +7,14 @@ DIST opera-next-12.11-1661.x86_64.linux.tar.xz 13636872 SHA256 897103e28b09e4b62
 DIST opera-next-12.12-1662.i386.freebsd.tar.xz 13513760 SHA256 9e5d8c867107bcfb8d38ad8bccd5171ef09114b36b4474c51ac3c902fcf3a212 SHA512 e11f0dfbe2afa3b8988cdff20158e65fb1c16a57d53b932ead342f5ef81fd1d964eee719ae853776e11ec7c555f9aaf5d10e0aaa67fe72e55a686aed7f7bd2db WHIRLPOOL af411b4e718476c212ddf2d861963182fa2bdf74f88960ac46a9b03b6fbad9be4471acb1c2e2a16da5aab7c8f01246f3a442eea6cb278c3cf50c3da7a4c9f644
 DIST opera-next-12.12-1662.i386.linux.tar.xz 13562988 SHA256 7cce59f9ea4799af3276e3f949def36fa0a75d69c5f2f6f9bd90454bbb4d6cc1 SHA512 0afd9ae11430f56625604d7c9f874e140af69327323b15cafcfb4d886e6883d7a20a1b14464b43ab95f8d601a7d474c2820218d149ccc669447a8c7e250cb33f WHIRLPOOL 12210fcf42d24e817bd24acb8e4e7e848b078cc06255e6eb65be7b3ab2e676bc523d0101ea2330dbfb32ddcb7393a587d14d760556024755036fb936fbfcb11d
 DIST opera-next-12.12-1662.x86_64.linux.tar.xz 13634232 SHA256 b02a52143f64191a8e3c7c0ff54944c225d3c023ca2e0c0a0c13d607ac4e38c0 SHA512 9526d2d1e8db44efad2adc5e10e74c0f4392dda6b31ff64be0ec949e656584cfad12a9d528ec062bcd7eea8130066158381e88f2e2ae511dd3151bf6cf9cced0 WHIRLPOOL 85e5e38a660bd03552082e8131c28246c9624f36d252949b3a6389e1d83e910058829469e3b1137d0bca3ae4f14f37be65c753967ac24388f933b0c1566a015f
-EBUILD opera-next-12.11_pre1661.ebuild 6276 SHA256 0e68e993a5f1d7de48b0e82ac56e2cd6323cb67cbc0806416e197062a3726fd4 SHA512 4886b691f82235a43ef078b5774f1e46740abe4482c35c70dc8a5ee49112a4b7a7f9267dd765b8cc76201d265d3b6e76767f0271dcf8d72576a09ae1fb54777b WHIRLPOOL 3a509bb5909faa869ef0e0adbab5ae1b8ba12b6915aa9cf97d5fb4dfe9f55d26cead9bf42b7331f12218bd6749e1c35d6844e31cd97fe50fe61714a867e9cf73
-EBUILD opera-next-12.12_pre1662.ebuild 6280 SHA256 5115eaf9163440727331773ddae56ef78d778b4fcce057110cb2489f32b736de SHA512 ddb35290153b4d31a9bae87a587dcc211406dcd5d44cb5fae80fb1dabd020af6e8cd63920e0d0abdbb90d287fa0c3b7f468d749526f2e3b7bf0c399c81dfeae1 WHIRLPOOL e057c98c364ede2b28cd238bb01b702e42441e04bea4bde80bf2f84440b4f23ef5a5e6d47e6621b3c0973714c8c90bdbfc43bc04805ce9180a0193a87506365b
-MISC ChangeLog 32009 SHA256 062c3662caa03ece457c21059e1c083f8676d5aeb3aa59ecf81491b63e96e3ab SHA512 728403fa4a413bbe0da9423185e6abae2363f485f636c1c1bc4f340033b0281aeed0b79427b283db6c743fefdaeff9b6ae02e37aebb772547df5710857a2c705 WHIRLPOOL 22af5772767e2766311b290b201f9a63e0b603eb2d59f5f14b900ab6bc7b46f4bb539a6543d6e2acac795531f2fb95871017d5bdebb48dcf12bd9ced41a65bc8
+EBUILD opera-next-12.11_pre1661.ebuild 6219 SHA256 40ed3ca7f102b0baf2e32a0b54b5a7fe992b0a7d883b2b1cd38abf08228dde20 SHA512 fd009cb8bc48f84863dd25eb5193db9fcbbf2aeccbd2781df40f3c450dbd1514a17d03743f67cd3db529f37be8b004cbf40f5efa33a22085fa7e9e6e4a1d8600 WHIRLPOOL 03f507f7fc6d73efbf2b941a9782ae28feec55ce5d33156ab27ae15d6004029ac04fb972fed5fc01ece5f94bfaa7d832434a7067cdd230645716de245a26273c
+EBUILD opera-next-12.12_pre1662.ebuild 6220 SHA256 5b4520f59d76c8a6533bd35d1cdb0a7ae771c8fa868054c9594e74552293329e SHA512 377165de172f1dbe64d13bef9f047dc5fa2ff4c976f4cfc6accd1bdd0ab6a72036601560373dcf2a99f83fbea2516c8c2ef0e6344e982ef4891053a364a0a79f WHIRLPOOL 716aebd102c0c3bc1e8c1dd5e4edbcf587506f654dd7b6d63e656e0048d140db9e984192017709691bfbdff7d2930fdccf76af8eb3fd902654852707ccb33748
+MISC ChangeLog 32174 SHA256 34b4879bba2b29d8f7051ec41456063d3d0436d05d172e40b7a85aa94f29d84a SHA512 484f3301bfffcdd0e046767984227e74c7bbafb49d82e99a8af23f8cdf2bb7c960a32a4e4b767f1a79e281ba7e425364c0f61740452c6f429312b88bac7159c1 WHIRLPOOL 9edc55cee5cadf139d69fb58bf440289767141b629dd581745009e41f103d6de35afcf91163effbd4da051e404e15d180962ec0b82823bc899588c1796d080b2
 MISC metadata.xml 1523 SHA256 425b559a6232d98e76a1dd960c7518aa27509021792868ffe3bd6928ec18d68b SHA512 b2d0a81b199eab70512105df691525d969865950e16f0f3646c1ef5307177391d34d157b02436fe6d156431b6727e4bb07cb7210e03a284abb531d22c8f723d7 WHIRLPOOL 7bbb0acf3ea48057939f6e652c2112d2a294030109bda2b0bab114a8922ecc67a5b9f807530ff0a2854225ad09dd98e90e3e8b510109b403cb51c1bf405f6d3e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC2TIYACgkQVWmRsqeSphPjxwCePF8WBgN/UHvI/xlHE4SJietn
-Fi8An0hrdMaUudnsImIlPbcJ8Mc60y5o
-=M+fQ
+iEYEAREIAAYFAlC2WRoACgkQVWmRsqeSphNQvwCfTmIZVozbHaZ9EWRf5f5JdJqc
+7JgAn11bu3k6rul0GVYOwTMd0IBVuWCg
+=gqAL
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-next/opera-next-12.11_pre1661.ebuild b/www-client/opera-next/opera-next-12.11_pre1661.ebuild
index e70e8d07831d..83b3fc219d84 100644
--- a/www-client/opera-next/opera-next-12.11_pre1661.ebuild
+++ b/www-client/opera-next/opera-next-12.11_pre1661.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-next/opera-next-12.11_pre1661.ebuild,v 1.1 2012/11/28 17:40:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.11_pre1661.ebuild,v 1.2 2012/11/28 18:34:00 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -19,7 +19,7 @@ O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
 # == Variables that often change ==
 # All other variables should be accounted for by _pre/_p
 
-O_K="" # The key to the snapshot URL
+O_K="rev" # The key to the snapshot URL
 
 O_LINGUAS="
 	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
@@ -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_D="${O_K}_${O_V}-${O_B/pre}"			# directory 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="
diff --git a/www-client/opera-next/opera-next-12.12_pre1662.ebuild b/www-client/opera-next/opera-next-12.12_pre1662.ebuild
index 0587c09a0185..d457f62e9f10 100644
--- a/www-client/opera-next/opera-next-12.12_pre1662.ebuild
+++ b/www-client/opera-next/opera-next-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-next/opera-next-12.12_pre1662.ebuild,v 1.1 2012/11/28 17:40:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1662.ebuild,v 1.2 2012/11/28 18:34:00 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_D="${O_K}_${O_V}-${O_B/pre}"			# directory 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="