Add blocker on gnome-applets to make sure it gets uninstalled on 3.8 upgrade.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 36 insertions, 38 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 231a6c5b0be9..db1be4ae6995 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.372 2013/04/01 18:24:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.373 2013/09/01 17:34:43 tetromino Exp $
+
+  01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-applets-3.6.0-r1.ebuild:
+  Pin libgweather dependency to 3.6.x (bug #483286, thanks to lluixhi).
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   gnome-applets-2.32.1.1-r2.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 4962f5774841..53d3f6d3dfb5 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -8,23 +8,17 @@ DIST gnome-applets-2.32.1.1.tar.bz2 10083534 SHA256 2b92fe4b3062dfbe264f45472b4d
 DIST gnome-applets-3.6.0-unofficial.tar.xz 7899932 SHA256 92153757010c93c8b237d1ec868c0da1d8fd79d4b7cbad22849b95034fc81bae SHA512 d5941ba689469480ef2d77a16e9837bae39ef9906cee2fbb717bc5b0c421435fe465a3e82c60cb06a9bd4c91d22861e7e57b1d015cf08107c2a9fb47ada87145 WHIRLPOOL 2dfaf24c365895dd4168f1aecc55856006b548cc0a395380c34e93944d34ff68c4b18c6f3f63e008f5244daa624f599018db1ee8051aecd8f6140040b8e69277
 EBUILD gnome-applets-2.32.1.1-r1.ebuild 3688 SHA256 ea384683a379b824cba41871be35f9a2a046232bc287c8c9bfd04d49140251f5 SHA512 90112e7a8410bef817862edc52e0dcab1873ca5cbe03166d1c4be5c91c72ce8bb89fae7446042216fda3347de2b60126707e904ba30bb18c15cf8c81c30e2005 WHIRLPOOL b00e66bfed6aecfa8847accea7f7868e62c9ca8cb039c4e99012674f2fd31a7b71a1a99819caff79ec3847044a63533862e610d033617828c45c10eabac5e4dc
 EBUILD gnome-applets-2.32.1.1-r2.ebuild 3727 SHA256 5cd5423e4dfc1176dae53196cb67ad078a568120c909ab5fbab19a8eaf7001e5 SHA512 8fe6978ccd8c8ec7881db255e01b58351f7cc8ce94e13230866b76868f044bc8a47b799622101c4331afd075cd2d39f261f6adf274a748e846902d63ff197ae8 WHIRLPOOL 632d68e6841e3c6899680b9b6413f85da920fe48e25be7c4fa132059f760f605fd2c530222feb03236a1b853cf1d729b0f24d5b98770d213862a642ffffb7b89
-EBUILD gnome-applets-3.6.0-r1.ebuild 3288 SHA256 d19687aa9c4213a2ab38b12bce56644ee1c692607b3cd1bee1b0cc0619b3d856 SHA512 de46ad3f5ce1b71f752c80a736194fd78cdd25deb055127cac2011c6ac164d793a8a53e1e6d2d7b2a78b5331c4e34e39108a71b147a7007e8eab9aeeae76fa12 WHIRLPOOL 09e6a195e08ce05eccf58cc674a9cd0226e8dd179a0ac226fd0f72a22db4ac641c913d7a591b9cb454c42a0fbb8cc295f7b9ebf482ca3b3ac854bc21d2fe246b
-MISC ChangeLog 54297 SHA256 05a6bc45f29c174394e0582cbd9b8f064b4367991214f4afcf687270abdff9da SHA512 c9d8e3065199d8024a2d5fcf7b84369d8e7a1baef6d9fd8cd4e5d25d8cd56c60ec7d99add9a7c4a70e49ed506d0f6158d4796d518d89476f5f06a243bc159b81 WHIRLPOOL 8cdaf5f006dc0709fab559dd18c604572a031aacb9d22583cc26c5cf07b2de5907d857ee3a24938cb140c698079ebffc89336826118120b757260d06fb486b5d
+EBUILD gnome-applets-3.6.0-r1.ebuild 3294 SHA256 4539e2d067ab065a5e1cf8bd14678dd54dec362c5fe8ae7a72e4f6721e1027a9 SHA512 533ce21abdb31f09da46df724655fddc561786e7c847cd24065ee5a3908a672fc54d92d15ca57a9463411dca82ff91f25eda1da04b5f6645d6c575981ba54973 WHIRLPOOL 450cf232b1489a020781c068c36982ad2d6bd127667c43de49e12e2454dac23f56b88d5fa8fc2969b49f77227d069cb5887ece341781b7f618e5561bbdcb4894
+MISC ChangeLog 54468 SHA256 9eb02ebf50fb970a51132666727a7a601269d1853afa015d38542e3afc3ab13e SHA512 32a0ca3e20e4ac49e9c3f9943a0cb37435d4d57cbb991b4c8cb56869c00cb41d41cdda3dfa3b45d23d98de449044c7f6d1bbf1512eb234f5ec877e9b8e013e0d WHIRLPOOL 1ec63c4260427866ae47dc3623d70cfedfa4e79ab2dbc52cdcf16b23110dffe7ceaf594d0db05a471ae36db3fad533a8d431d5c69389a4897e94a5d3642994c2
 MISC metadata.xml 243 SHA256 100f028a0419128558ccb877c0fb3554ed92ca1a3925a36ce55cb9ee8081f7b0 SHA512 257865213bd5064bd3c6a4b9a67302880bb340c12c696493e3672183ea880a5ef421c4243ea1778d0ceb405968eac895934e33427e68915d50f6ee3599aa2d84 WHIRLPOOL 8338d92e76dc81f73a310ad7edaeff28b7ed38ac0f93857a6c01eaebb0ffe7a26b014b893d03d201677dbe6ee6009d96624325b9d2e961151b28f08b2012f4f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWdDiAAoJELp701BxlEWfNuIP/R1eRbw+E3+YoMDHmDGZF1xR
-v5grc/o7izQsWDHOFTxCg8s+v4HX9g2i4x4pg/K4jFQvpViApNLkFFZS0R8eD7qL
-VDGow6ABJPGcmanRCPefM/LoEYBIrMxzi0BdLmD5Mlbk0qjGM+JMsNUpFSG+SSZz
-QVksevNUctydHSUYaL+TsS9Rf+GH8H/Sp7azEkKFwat+GPdVspl1+bwfMyd3uKzW
-kAmXJ9WCGSXSAbKjsLtkwRMaOWozXtXNTdiomvoK4wmaH/Dwdy58Bjj6/I0oF0k6
-nuBlBMTcJamDDCnNLstaYMIgDtrsr1Z06qqLCD4Nas/ukjqaBAEUcowSsfEgtuaM
-dul+g1Lojw3CafBM0VbuDoXcutyLF9gSfEgHzZ3e+/wolTRVqSifDeV1ZSbhI3SO
-lK26B41GcT50dghw/KxVP3vTbuzxKOaOpc21lCN2j+vKhJgeye4tnL1hnfFglmR6
-rZe59rwwgPv3selhIIaA+y42YRfNL44nyMxTvnSsyDOsTGSAsq4sHhXVrdQvCBon
-Yalmk6QdPVwpj3tfL2i9Vqc+BRwZ0XPvWeA6QtIhuPWkWv2IKC2Rgs3faqYsRNcY
-QJ6xKIQXRDz5na0M+ohuYCRMb2b41PQQmiTtK7dRkeed2HpxVLURHHQYDojsEImz
-sU6yY9xXNyIXcCbQLkEK
-=JXHa
+iQEcBAEBCAAGBQJSI3qyAAoJEJ0WA1zPCt1hDYIIAIij0HZ1WkI3UWQy4pZaHk9D
+IdXuepeSNCVr6ltmu8HchaxKp0UCSDZwABLWyPUnFYj+J4oQUZM4rRg1s9SQN8Ky
+UxquJSnQ1PePRmUbYdVj1ol1MzScpVJosFN4WgcdherhLmpfeDljWoEKtC0y0sdP
+5+BW55tbv8IEiiLsSCJE4IQ9POEiIYyBwlMfPaHZfydrMv3WHjU7P2xHOenY5okb
+Ojh2bUtup9AJ9tQcJiRI5RFNbBTJvpnRFHdQHPQifQrwRgSaQKNf0X1Gg+1sVoaN
+YHswmb8Q0h8k3u9lRUuNYyOfPZ08q1w/9BbX89uQx6uQl38Ep3yswcLeLyWk50E=
+=8tTz
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild
index 636bf02f5da2..ed18eedd2568 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild,v 1.2 2012/12/24 17:17:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild,v 1.3 2013/09/01 17:34:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/libxml2-2.5
 	>=x11-themes/gnome-icon-theme-2.15.91
-	>=dev-libs/libgweather-3.5:=
+	=dev-libs/libgweather-3.6*:=
 	x11-libs/libX11
 
 	gnome?	(
diff --git a/gnome-base/gnome-core-apps/ChangeLog b/gnome-base/gnome-core-apps/ChangeLog
index 7c5d620c5937..180566dff78c 100644
--- a/gnome-base/gnome-core-apps/ChangeLog
+++ b/gnome-base/gnome-core-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-core-apps
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.14 2013/05/13 17:48:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.15 2013/09/01 17:35:34 tetromino Exp $
+
+  01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-core-apps-3.8.0.ebuild:
+  Add blocker on gnome-applets to make sure it gets uninstalled on 3.8 upgrade.
 
   13 May 2013; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-core-apps-3.8.0.ebuild:
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 44885c4c473b..0a43a0581ff6 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -2,23 +2,17 @@
 Hash: SHA256
 
 EBUILD gnome-core-apps-3.6.2.ebuild 1827 SHA256 dd7fd76036779c90fee1fc6a2001a6786ed10d00d2e62670e1b421ccb133bd1b SHA512 c1dcaa03031d34c4df2e6d631da53eb019210c5efe5be1ea44f71a41da8c9255cc4ebadb17667dd04da25238f0ac2c8986838136431fb72441b6625ae795081d WHIRLPOOL f2d9847d5723be63bea7cc95d9b584e1e07ecc14e3925e038817c1d7215981a18a05784c896f92fe1735362eef9bb8f16ca7d00137bdedbd5d259e562cbf18f3
-EBUILD gnome-core-apps-3.8.0.ebuild 1721 SHA256 7bd41807e0c4ca7c8a8ea79074f4d0b1ead21bf1bfaab4d40858365ff7e4db24 SHA512 de6d975895741e30d186374892bbfa1719e82607e82cec3a00d5c2afbcc16453fdb106dfc3651cb2cd02af9d057fbe2d43334d45e5cf9eb08ae2d91ff042dd68 WHIRLPOOL d7c3a0ce32292204bd5852b5f28ef77701f5619cacd643692b7247f13ed209568d5460199ada67d3ec077b499a6fef49162cb6b4490d8dde2fc29da34a4c3e9e
-MISC ChangeLog 2379 SHA256 ef21494233d919a22d54ea6a6fae96b1fb595cbfde46eb29bd12adda2cb10299 SHA512 bfdbe51210d18985a6b2d3e49453eab363f3e01b534eead0f227d99d3d050cbb629a949e22eb323a83686babd746a529037347536f1f51853bda1a7c8dbeedad WHIRLPOOL b377cf222f413058b765a9c60239d3e61bc8f6d85e21a693ac7c2f03fdbf2c5d69a5110a5d99a071471d4377e0b3f84b15a55ba2386ee691e77ac1bbe997aee5
+EBUILD gnome-core-apps-3.8.0.ebuild 1750 SHA256 143bca016a01194ae44a0a958d3ceb4cb18f4b907a8de08a5cec71168c053786 SHA512 665a9e2da849f7af3c87ab57d86412b287b9d247a268701ea6625545ec35b0f7921b194e690150df5b2695f9cb6a0156bb026a11a01fd7c99815bfd4297d24da WHIRLPOOL 60a1b9eacc65fac6eb1deff3554e4fc642cd2384085c50ea16ae38e3f5b4becab9fe6ddbdb62aa67cfe50b4e2f8dba5e47a96eb95b1c744a2e6a2d8dd927b162
+MISC ChangeLog 2552 SHA256 412b03be2af0032adae433d8c5727964714fb3790b222edd7f9616665b9e4a9d SHA512 eb444f0700a33f0860033146564dd02ccb0c78c76c2dd15cbe8eb25e3d4261c6a77af2b9c99e1af240f88f82e3c8167dd8a5959c869bb0b82de8847b725ab6d8 WHIRLPOOL a79cd55f2e8725497d17c51c1c328757e672942c45ab367fb02e124832c3a44a056b13eeacc6e1fe4ce411b8f3d23d6b532b341c118705d8bab68a3da641c2dd
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkSeAAAoJEO/kOhxWD91kZfcP/i67S1BTc3mnoo0DFfbAFHnS
-CiigEd3iI2CuTIplpTy7LEqN5WWiYxdCMF1vtv0BXLC2NJTErETQOHnp9u6ECuqi
-wqmlCV5S2xnPr1iaL9VnKG8AA0LIflXG22B+CxKoQMaqcq5RrJWHFSjZo3aTc2y9
-ykDA/QCgHMCQ/3o2Ys+aYhnhIMLg7e2GiFIj+ksmo6XlidF66rl4pxgTkU5YJPb8
-B15sHwH3+Fxdz2ukFD6G+8B6x7rIQPnjbh2jMGp7uru3DoqhxeSIMCXtoYlIAqbl
-mYMx83Vh2780eJEZWmNQnmfxin03q1uWMRtDcDEb5jJg+L4PQEdF0/YTHRm0Q2xn
-mzIk67n9aXOhSG3fmJLy/eBBk7kRLXcuFbuo2Ne/WKz6iXaEkpGwwlg/VN0+Sd5c
-6ICfO2kZ2ufF+OnJ0nWrfdwxtGEolWtBOYBsjly7JOlk9wNC2l6HlmPdpXAlpOYp
-SMRD7zJldg9DE27lmWUgFD6v2WOu0MKI6gg7xBQSynL6kewRnvh3LHR+8uDodNst
-z2RuB42khZnqCfa6v9PPMBeCae9j5xOxsvuNKuqdhFcwnD8t/DIAjvfnGEWBvn0U
-jhZTW/31FYG0cQB+IkYdVF10qQrku/C1Viwg0xjqcdqcsZcR5kbkT+ZuBNDnpaR6
-JBa2KGxkoBIzNo/tx1oP
-=c7uh
+iQEcBAEBCAAGBQJSI3rlAAoJEJ0WA1zPCt1hkjwH/jGI0bO+sIRMpiCAeYf7lV3g
+39Xn9CSh3wo3pjkqCRo395cSaM6V1vgywDsMFyNpVDFyDzkpTAgOh5A/CUafiX87
+2pE76raLpjm4qmXqMYkSSFSMBqODx/aIs/BuM3D06Os93He5dT/aCgak8RUC+tNA
+vqwsnSEnP95uYKxTfUfekoqnfyaeOhpEKZ1YStG6dGD98HZ04ayFUFxVDyXdwv8/
+mTeoH4kHzQJH4U0sJPT7jkujgO4Vrj2lVUM5+BVrg5oZakQX18UCqk9lLeeYM0YA
+TuX9maD0y2o+uRkmq0quxPmUC+gZZoeWiAg0UNWyTSSbUo8feK7l4zDwX74nBfU=
+=uyT7
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild
index f5ac946d4d61..fe86f6513ed2 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.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/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild,v 1.2 2013/05/13 17:48:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild,v 1.3 2013/09/01 17:35:34 tetromino Exp $
 
 EAPI="5"
 
@@ -50,6 +50,8 @@ RDEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
 	cdr? ( >=app-cdr/brasero-${PV} )
 	networkmanager? ( >=gnome-extra/nm-applet-0.9.8.0[bluetooth?] )
+
+	!gnome-base/gnome-applets
 "
 DEPEND=""