Fix update checker removal.

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

8 files changed, 30 insertions, 22 deletions

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index c80906874b4b..eb497822e2c4 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.170 2013/02/05 18:09:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.171 2013/02/06 18:37:25 jer Exp $
+
+  06 Feb 2013; Jeroen Roovers <jer@gentoo.org> opera-next-12.13_pre1733.ebuild,
+  opera-next-12.14_pre1737.ebuild:
+  Fix update checker removal.
 
 *opera-next-12.14_pre1737 (05 Feb 2013)
 
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 0f896d9d20e7..73be1e35d097 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -7,14 +7,14 @@ DIST opera-next-12.13-1733.x86_64.linux.tar.xz 13694832 SHA256 536a9b3bae8f82533
 DIST opera-next-12.14-1737.i386.freebsd.tar.xz 13519432 SHA256 709bc515c1a92002db2fe5c308932d47196311632a2bc1d29584187807f798af SHA512 de9b2cb584981dcfe4742f747a2d774f5ddb25e36a16d3f6d618420f3bf55a2b4e226c484aea1895dad092de6da031dbc95b2b8ce199449d111f7bf21254a49e WHIRLPOOL d4d94031cd24b9e368081a79a508eb54adc44ad74adbcc07a8457ebed491dbaa1e7550989dff3800b5380d8357fc660a92d846ae7907104582837f996af4726d
 DIST opera-next-12.14-1737.i386.linux.tar.xz 13554708 SHA256 cba39bf41c676394f3adeaa61f96ddfed28607366651370f7ab230a8ce6e25c8 SHA512 1fe25d3cf16c787c7c59a8de05097a99aced99b999af08e9890ed9d945f420c4174ea1a17c8619c87ddf156f526bf803c12f82a1e1be500a46c0014276cb53ad WHIRLPOOL 1ac1c239ff51daa56810ce24a0093b419a69301aa7b8cd8f75c65254cc4b2b20ef9adc94bf59463a788be48713b9cf4c4c6c6c1db21c0e87952ce1d8e7b26a30
 DIST opera-next-12.14-1737.x86_64.linux.tar.xz 13679612 SHA256 0e0153158a4836b76e3134b94a53e8141527f3ff86b27c682cb3c48307d041e9 SHA512 981c6480cfc4d548ffe81286024039159d82ade75c6cbc03b4fd01b656e1e7dc11c9ed158ff6d2b326ea19eb4584f136577fc2335ba51771f156bba28c6f7893 WHIRLPOOL a1ab4f5bb3c0482404050946a48474c414779d041a60dc3c53d3860a1c2c7a0d76a093fef1a41bd9b267b94aa03e5db307076d7fe6e13a26d6188f1342239d9c
-EBUILD opera-next-12.13_pre1733.ebuild 6198 SHA256 f4fcd1fac396321c46e6ea8e1bcd80d078cf856afe858e79f393d7bde2d1b91f SHA512 0faa9233ed37397fb6565b7c069579cab77036b6cb1304e10d4a614b8e12b382fd65727bac9cf01ed965891a1b52afc68a33b14076af8d2092f869ae92263d30 WHIRLPOOL db82f615556b2710b54be2af875d28992b4e402015fde668d252890921669184530c77f6634f86d0d5bd4aab9d6e03110d2d29e2cfb3163b7b2bc7233ba72fe0
-EBUILD opera-next-12.14_pre1737.ebuild 6203 SHA256 9b34392ab195354e0201ed18561bec2ed7ef17a8a774b41a17635fcc539b4a63 SHA512 99a3a566a70757aa80b82ef6a05ecda487a3669b0d479020ae57db0cdc5b1cf11f68f48208930b8257579187854738676be5a6a542320762ba54b3e138087dac WHIRLPOOL 3e1fa31ed6dc79f766a704361709d85e2887c05f669b9d0e8c092d4ebe067fdf8a38076a53a04c68fd0e97ac2d954dbfdf057dd607bb71423b500fe62403c209
-MISC ChangeLog 34455 SHA256 669e7831273c51564948838e4b914a80d095d00d0f00beda6cda511800a3d0da SHA512 7f7d0a4e733e27b18f1e0a452af70dbeabaa3a01c6b8868e28b4c6ed553b74d2cfad859866f2271dd0b77412b97a72c7a801538f60ae5f2c087d032def08517a WHIRLPOOL 5683187d02117a3f1ceda520793891aeb5a02bcd66a3bd92988a6a87ade436475c0d77d51c7eaa6402ea483cf18e933ab633dfce5246866740516bdfb4584772
+EBUILD opera-next-12.13_pre1733.ebuild 6202 SHA256 a7be6169cb83b71373325ec0a059b6ef9d60fe1745dfb65396290256025b043f SHA512 a264cdaec4dcaddbd75845c53ea65fbeb4eb0881ece56e5e6fff47ffce5656d0f04972dd784bfb1911730b8a4ad5ee30934b0c06c0a362814d94eb0446754055 WHIRLPOOL 106a55c2ecc9132ce4adfde91e30f4fa6480e406ef45f9f9aa523952bb46660561b86e3f9f7a2c0fe789876d86e739e64545833b7b160ec2802f50866d79447f
+EBUILD opera-next-12.14_pre1737.ebuild 6207 SHA256 4421f1b628a2dfa8a155056debdf795f566f6600ac75501246fbe39cfb84ccf0 SHA512 a21cbe89d4d69163af254f8048e87b86f8c1f5badcd6d1f52b5713c2231ba2bfbab849979f9d2d2d22c3e7ec22ba4b84af92356c845ba72545bc5c36a6263101 WHIRLPOOL e9e8f42af06327612603f976365a8c71b6b13bde45e2f5ac6ced2a88501d407b969b3919fca29e8acccaa58966f1b2fd8e67f84d1d3f374352b9be8379989232
+MISC ChangeLog 34601 SHA256 f0ead51e6f32cf9a9be8c3b81e31ae821f8f8c92f69a150037a7becfb560a9b0 SHA512 0ac2f272c23ec780ddb9ab77a8265fe78b365f42c547e16cc83562df088b9fbd40191be9e78b53b317019f38f15c6b019eaaf8039cd421971acc9f782f12edc2 WHIRLPOOL 99eec5b202f4a3ba854038a519a0c790c3727e942b1adc639a3f9e373f209ce7b5c372a7566c43337afcfef69206be7a456f2fcdec3c7e847b1d4c8800e3227d
 MISC metadata.xml 1523 SHA256 425b559a6232d98e76a1dd960c7518aa27509021792868ffe3bd6928ec18d68b SHA512 b2d0a81b199eab70512105df691525d969865950e16f0f3646c1ef5307177391d34d157b02436fe6d156431b6727e4bb07cb7210e03a284abb531d22c8f723d7 WHIRLPOOL 7bbb0acf3ea48057939f6e652c2112d2a294030109bda2b0bab114a8922ecc67a5b9f807530ff0a2854225ad09dd98e90e3e8b510109b403cb51c1bf405f6d3e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlERSvIACgkQVWmRsqeSphPw8QCfbllAI3B5dZ/oVwJ/rNQdBH9r
-PV4AnjFDxjPxrwSIS71f8buYOi7II9U0
-=jIvM
+iEYEAREIAAYFAlESousACgkQVWmRsqeSphP6vACfY3rzqo0vFn0KYdbHxUsdVDpJ
+3ccAniq0dzTGERVeoTC0Le8CmOCdKUtW
+=n5QL
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-next/opera-next-12.13_pre1733.ebuild b/www-client/opera-next/opera-next-12.13_pre1733.ebuild
index c263474273bf..1228395d000e 100644
--- a/www-client/opera-next/opera-next-12.13_pre1733.ebuild
+++ b/www-client/opera-next/opera-next-12.13_pre1733.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.13_pre1733.ebuild,v 1.2 2013/01/30 14:48:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.13_pre1733.ebuild,v 1.3 2013/02/06 18:37:25 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -200,7 +200,7 @@ src_prepare() {
 src_install() {
 	# We install into usr instead of opt as Opera does not support the latter
 	dodir /usr
-	rm -f lib/opera/opera_autoupdatechecker
+	rm lib/${PN}/opera_autoupdatechecker || die
 	mv lib/ "${D}/${OPREFIX}" || die
 	mv share/ "${D}/usr/" || die
 
diff --git a/www-client/opera-next/opera-next-12.14_pre1737.ebuild b/www-client/opera-next/opera-next-12.14_pre1737.ebuild
index 0a2f1fee5b37..e19e9d143c0d 100644
--- a/www-client/opera-next/opera-next-12.14_pre1737.ebuild
+++ b/www-client/opera-next/opera-next-12.14_pre1737.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.14_pre1737.ebuild,v 1.1 2013/02/05 18:09:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.14_pre1737.ebuild,v 1.2 2013/02/06 18:37:25 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -200,7 +200,7 @@ src_prepare() {
 src_install() {
 	# We install into usr instead of opt as Opera does not support the latter
 	dodir /usr
-	rm -f lib/opera/opera_autoupdatechecker
+	rm lib/${PN}/opera_autoupdatechecker || die
 	mv lib/ "${D}/${OPREFIX}" || die
 	mv share/ "${D}/usr/" || die
 
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 6aaa4a8f6f3a..57dc68178e49 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.799 2013/02/05 17:59:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.800 2013/02/06 18:37:52 jer Exp $
+
+  06 Feb 2013; Jeroen Roovers <jer@gentoo.org> opera-12.13_p1734.ebuild,
+  opera-12.14_p1738.ebuild:
+  Fix update checker removal.
 
 *opera-12.14_p1738 (05 Feb 2013)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 89475ae273dc..179a5a2f35a8 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -7,15 +7,15 @@ DIST opera-12.13-1734.x86_64.linux.tar.xz 13697376 SHA256 d980e7e2a362d89c712022
 DIST opera-12.14-1738.i386.freebsd.tar.xz 13488412 SHA256 8c706c578ed6151a22ba30a1311e8aa51cd789851f962eab76df9d7c22db9d5a SHA512 48d35d35be1c5f55e9176b0632f268642b4cdcfc9fdcec7777d0048b7233c9c94b646b18be4ed09679f6543ed32c591451af7b184f936b7ac8726e9860268d1d WHIRLPOOL d36967b6d909d84ddc5c2579be47ccd9a2358c0d2f86f8afeb2449b7ac541b9a6d1927b25319367ca61781d1dcd20e455b4a4c6afa0b72717330a405cb3bc5ee
 DIST opera-12.14-1738.i386.linux.tar.xz 13590832 SHA256 00721be8475bd967ff0017d3db6c57d9d03b329bdcab2fba44231afccb0b9bd9 SHA512 5f32cdb6ac87e004dcebe820aa818257b7dc0b1f79282268f2bd3db0ab6e02454e9a1d37de2b36413947de3ae86199c190e5233115371a949baf7eca6c0faaee WHIRLPOOL cfcbbfa493b657a4522a1300acc44eb7edd44656f6431ad6ec0e2d1e74b1d84e3a4557603ed722c82ce124cc5aca778ff211678504672c829097e6435a8be838
 DIST opera-12.14-1738.x86_64.linux.tar.xz 13680464 SHA256 d38c2a7ae40ba3b0ba9829409167c71ba1f2125b88fcddaceda9aca6416d206e SHA512 f27c65b00be7d72c40910e17ba1bbee95f6953b2be3bcbfd2a3eb5bd0ba0df7b943c66826d0ade2e642f8a4056f26fc0fd6c0b952574cc5d7ed7e97a8e2dbbc2 WHIRLPOOL 0f052377d273d8f408215b3e4ad4d70a7d8fe7f94d44033752ac68ad0e2fda4c000aa15c669202e8990f66ed2ea353ca50579fa67942769a6eda3d522e73e1a2
-EBUILD opera-12.13_p1734.ebuild 6184 SHA256 68e8e9bf36a32a0fec9bf1bff779b45b9af3e0db818460b68c0854678275c346 SHA512 01ffbd42d5ea7e7a008c81a9dbb933b439355a7c2f709d07a6940c59a9ba499b955dbff198ab860afac2988d5d0bc684a448ca941240413fd60d4789dec9f709 WHIRLPOOL d8c6bd7bade2b2e7b7a5bdf109800a2d47d60d03d61885d116a2c2ee075fe72d114b27188df4a650b364d23dafc630d5092107cb4d7e4a6b63fc3aa4e182d622
-EBUILD opera-12.14_p1738.ebuild 6192 SHA256 2602fccb0f49a5606b773e19e5f1cf438ec3eb24e7468034031c141486d8daff SHA512 35a48ac2394f5249bb9b86d641658e5b5ecdce663745a5854819a038a47f9a0a20e0ec045985dd2f84289dc5a38424b887ae5a1eca5d615007f51268d85a51da WHIRLPOOL 9e5bbf280cb55d6b14d0be591b3da0c3be7976d04fd76e54f41aac7a91037bbd6499c53577222e58f425de324cb6929c0239c31374c87456cff0c0f1dd51ca3b
-MISC ChangeLog 35795 SHA256 0b2ffbe7c79413f8249f079300566dc489571ebd75440eeb56d1a6ee94556655 SHA512 5bf71db053b392e7e6158553b30b953858ebd92d2840cf4785fd3af21f7a511ebbdae5a874b4ba8bb310c5396224fd0ae0b9f29f83870e7b9d252e239bc9c2a3 WHIRLPOOL e9f4e8adf9d310bd2162ec4f3622a0f2a77675cdf19e0f16abdc6b0592eacaed3881b14355044f1fc1ee18a262fb3b113667cabdd469aa16d1d446a6b7f19709
+EBUILD opera-12.13_p1734.ebuild 6188 SHA256 b9e9c2efa4a531d04ba8778abaecc643716baede95938584bc2db1ce709a7b30 SHA512 42c2bfdf710bd9736700bda580dc23ba288923416643dcaa9bf3f801ed1586d3fe83d033e4533e7e995c15394df46066f1ee8ef69dd00dc3a48308424e9cb278 WHIRLPOOL c4649b5e231c5416a4b8f5f53831fc294e0220801b0253ac2a4e42171e1515a093dc1f8381efdb6e0d96d4d77c30adc33ecfd0cc13ce0550ce1222cf4c5199cf
+EBUILD opera-12.14_p1738.ebuild 6196 SHA256 641bd887d714337bdf12b30b23c727e465cc1e3ce1f57f3df26f8c161a57179b SHA512 275b522b7b1833fa6488845eda475699516c44709db50020f507973b5cd96ecccd2be1a1ec67c8e1e5af93a0ff4dea4fad1a46b959c532bfcb401ecb103d863c WHIRLPOOL 4d00b405cb1656ac62aecde1250b83b4d4d89d7d42a8737f4ad3445d79a6c132e3d88c4e481b5707f478e01cb64c80c63f5deb4e2df86ec8513e2964b3841a94
+MISC ChangeLog 35927 SHA256 0f6e31f79270fa1bedd62aaaaf649f43171a27a586d9f3f00f6c48ab5c5e90f9 SHA512 df4cd5b78f3727e9e9d91d6ec4ef201353cb895b53ef868ea91b319c86fbb97ed624e015a0ebd286c6136fa433699ae0760fb1ab79217cebe09d93b4e2dfb38e WHIRLPOOL 473e9883d154a740555a5ee5b14c1dd406c5c17aba7eccac4c1fd46943ee4327590b9cd0293df5958572f46e972ce512ebc5b521d81e0b19de3ca244a0f63ee8
 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)
 
-iEYEAREIAAYFAlERSJoACgkQVWmRsqeSphOaYQCfWjQa+UVsPI8fReQUUfrlF2Tz
-vxkAmwZI1KvrhaSHL7ybjyzqYr3Ja3qH
-=ABt+
+iEYEAREIAAYFAlESowIACgkQVWmRsqeSphMy/ACbBdXTALOfJLUUc5JqqX+8DjRP
+onsAoIEuzhWmruV2Abi5Tg7N40SdqJX/
+=vuWt
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-12.13_p1734.ebuild b/www-client/opera/opera-12.13_p1734.ebuild
index 0f54cff44a2d..8e1f0f955937 100644
--- a/www-client/opera/opera-12.13_p1734.ebuild
+++ b/www-client/opera/opera-12.13_p1734.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.13_p1734.ebuild,v 1.4 2013/01/30 22:44:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.13_p1734.ebuild,v 1.5 2013/02/06 18:37:52 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -200,7 +200,7 @@ src_prepare() {
 src_install() {
 	# We install into usr instead of opt as Opera does not support the latter
 	dodir /usr
-	rm -f lib/opera/opera_autoupdatechecker
+	rm lib/${PN}/opera_autoupdatechecker || die
 	mv lib/ "${D}/${OPREFIX}" || die
 	mv share/ "${D}/usr/" || die
 
diff --git a/www-client/opera/opera-12.14_p1738.ebuild b/www-client/opera/opera-12.14_p1738.ebuild
index c93eb8d0aebb..e12001a503ed 100644
--- a/www-client/opera/opera-12.14_p1738.ebuild
+++ b/www-client/opera/opera-12.14_p1738.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.14_p1738.ebuild,v 1.1 2013/02/05 17:59:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.14_p1738.ebuild,v 1.2 2013/02/06 18:37:52 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -200,7 +200,7 @@ src_prepare() {
 src_install() {
 	# We install into usr instead of opt as Opera does not support the latter
 	dodir /usr
-	rm -f lib/opera/opera_autoupdatechecker
+	rm lib/${PN}/opera_autoupdatechecker || die
 	mv lib/ "${D}/${OPREFIX}" || die
 	mv share/ "${D}/usr/" || die