Fix the difference between snapshot and release builds in the version string.

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

3 files changed, 43 insertions, 16 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 42e13eedc152..4374a7924882 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.775 2012/11/26 18:06:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.776 2012/11/28 17:26:14 jer Exp $
+
+*opera-12.12_pre1662 (28 Nov 2012)
+
+  28 Nov 2012; Jeroen Roovers <jer@gentoo.org> +opera-12.12_pre1662.ebuild,
+  -opera-12.12.1662.ebuild:
+  Fix the difference between snapshot and release builds in the version string.
 
 *opera-12.12.1662 (26 Nov 2012)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3d7f8271c40d..4ad917093eca 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -8,14 +8,14 @@ DIST opera-12.12-1662.i386.freebsd.tar.xz 13507092 SHA256 817b0c022f9df3975076a2
 DIST opera-12.12-1662.i386.linux.tar.xz 13553860 SHA256 1828f7ebd2448d462cf38713ba5602210efc7104d2533e822f40c8817a817c1a SHA512 872269ba50af0a2d95a6b67200d6788d2ce07a2b882afd944f9bf0b99b0f15250052c2f3cdab87097017fd713223dcc85a2af1d9957b52dfdaa407bfa618275f WHIRLPOOL 798749db07b418099f777902990a1bc9a0d43fa9e528209b68f9d865bcc3136a67a16e584162d787b275198a9e46573c8930fa4860ed736fc1e05f2082086664
 DIST opera-12.12-1662.x86_64.linux.tar.xz 13633220 SHA256 73bbb4a1c06adae416fd5e56f67c23da98287509099d3f652c47e6c9f8753585 SHA512 256671eddb22fffba73061cdd4488272f70a33647e28760efc5535614e9eeff85a55c853d7a14d0078ff11592562855a8798e8f12f4bf91a53fa1c521a82a815 WHIRLPOOL 0c165d21bc011d347457847d83a31b00899d80eeaee47abd1d3bd1bd4898b7629a51aa5072b156476b7f9b25abf3e122e299882d47547d07e720233776b493d5
 EBUILD opera-12.11.1661.ebuild 5530 SHA256 0ba798d6eced3bb9588758abe200e4e765a6cd052227d44206d48833e33717d2 SHA512 3dd55ef17f21cbbe5bb0c5a74fca6b39f0e3a41c4ca9ab9da7149854aa1f5fe0eca299292e5245c1329964e5f1f6e4966db44d1e2a7ca644594331a0fa648a24 WHIRLPOOL f3b55c8b17fc9a598f09c1caec56c84d279c4a499a84195d027ab0eb98d1a01ab12c76ec18d143df04eea266b2d1661cf54da46995f4164a3ca9de184aa6c834
-EBUILD opera-12.12.1662.ebuild 5546 SHA256 f8f9a2a8b5b3f7fd22d97ce54d19f4c6707f677041ac4c2f4070ca14cd5b7b2d SHA512 06acdc4f3380f4258ed72763f32f9964a5c505f2c02165d757bc2335b99805349dc869e0ecb1d8862cdeffd11ba980cf0cded10b772455b42ae0285e76813cde WHIRLPOOL 1c583497a4bc8c9e77c4f1a9470f0afb3570e28e710c0d56fa9cb1a01d700c99a047c7f4efe323e5bfc67a3f2bf74dc475587df3ec9df9b881dbf1f1e4d8d551
-MISC ChangeLog 32250 SHA256 f351ba039c1f00a9c65a29539810955bb6b2dae34a26893bac0aa98430bfae4d SHA512 480211e7970320bd2310578ff4ae6742154385aa9da7904a292d9f11a0c99e7f01191b74afbc06b9dd76a95bd31bf039fde166917cfabbac4365269664aa629d WHIRLPOOL 88a2e29e52b1fdf16e91bfba4932a639272760088f02033efa022f140884eab9c7cc586d4310bad41fcbc59dd5047876170347b33c05a14602e4d62986aee3b5
+EBUILD opera-12.12_pre1662.ebuild 6276 SHA256 99ce322392e820661ed046f9a9dea4683a98a6bf3cfb2e19075084bc45585128 SHA512 00f9112b682b64c73417da2c3e4962df76ca4a276c3752b22c4a31cc494f905e8bf56627065188d7b5ac3c740cec9206292c51af4b8e3128b22e916c962d8701 WHIRLPOOL b22432971f794f9826c98d9ebcf90b915fee52ca4ed5818bc64047b54bfc337b6b7ec50b5117f4409a31d3077a23dabf4434f705cd4d7ddd6c944c830077da0f
+MISC ChangeLog 32471 SHA256 d86de24589358ed611050a9d25dd4cbb7d1f7a27d2cd10c1508053321a7a3f16 SHA512 f542d12044b589bcd21d165dbbd4143b340a8ef20b87c54c69379edc7b5d915fb752030ae31c476f5051a173a4ab86a3d24dbd52e0d0dd0bff3359373c1f917b WHIRLPOOL 452b6c5704f255d1f75f4cb95fcd74e5ba2aabd88ac0a5f23b212243490086155f28b4bf259c90f7930ae434c79cd23fc35b1c09b1fbe41def029666967e6351
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC metadata.xml 672 SHA256 3fdb3d81bfb1c469bdf86811329eb4888ce909cce63d2aa71257b91a6f8f012e SHA512 4aae9fbf8a753b30b7ef5868b0084c1eb55ed34cc9e1ece8814db13230e07b455f45be936c810bc8a9426ce6c9eaa7449612ac50b47aad253dcae57a683b5b6a WHIRLPOOL 9dc490f6cffad6c3ff1beb27a74818fc66a194856b7d5a84972d387a6bcdf81cda95bb2d1f2b5cb9d58f47cf898bcede39b2a68fdaa5405c5efbffaa51986f3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCzr78ACgkQVWmRsqeSphPZNwCfdIv/ziCG/7g0KvdEyZHR2IVx
-r80An2nDy1DxHyGp+/Gyt16jlgXYixPm
-=b715
+iEYEAREIAAYFAlC2STcACgkQVWmRsqeSphPaRwCfdWOkWLxSyAGUbv4VJI/uFh68
+XpAAn35Uy6Vc58pHSAqoUYy42xXlIhEJ
+=LNcs
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-12.12.1662.ebuild b/www-client/opera/opera-12.12_pre1662.ebuild
index 24914900d825..1254bdffebef 100644
--- a/www-client/opera/opera-12.12.1662.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.1662.ebuild,v 1.1 2012/11/26 18:06:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.12_pre1662.ebuild,v 1.1 2012/11/28 17:26:14 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -16,21 +16,42 @@ IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
 O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
 
-O_D="mantismech_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
+# == Variables that often change ==
+# All other variables should be accounted for by _pre/_p
 
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
+O_K="mantismech" # 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
 	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
 	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-"
+" # Supported 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_U="http://snapshot.opera.com/unix/"	# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+		x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+		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_U="mirror://opera/"		# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+		x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+		x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
+	"
+fi
 
 for O_LINGUA in ${O_LINGUAS}; do
 	IUSE+=" linguas_${O_LINGUA/-/_}"