diff options
3 files changed, 24 insertions, 19 deletions
diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog index c6817de9a6b7..2981542dc908 100644 --- a/gnome-extra/cinnamon-settings-daemon/ChangeLog +++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/cinnamon-settings-daemon # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.15 2015/06/14 01:57:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.16 2015/06/14 04:02:35 tetromino Exp $ + + 14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + cinnamon-settings-daemon-2.6.2.ebuild: + Re-add accidentally dropped upower-pm-utils compatibility (bug #552050, + thanks to salikov.alexey). *cinnamon-settings-daemon-2.6.2 (13 Jun 2015) diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest index 0ce23872789b..692b4f993846 100644 --- a/gnome-extra/cinnamon-settings-daemon/Manifest +++ b/gnome-extra/cinnamon-settings-daemon/Manifest @@ -6,25 +6,25 @@ AUX cinnamon-settings-daemon-2.6.2-optional.patch 3775 SHA256 ab913f4b50ea03d7a9 DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba EBUILD cinnamon-settings-daemon-2.4.3.ebuild 2883 SHA256 cabbb1288fa0f46bc3ab371e7a17d8ae1fbf9e6ecceceb06e783ac163a81652d SHA512 6b16b845731de0c5f0a1ce4c39a3575455eaf8bf804f8b9dbb8b1d4976b074e44ad15851b21aada0381ea6bbcf2e161081920bdf902ffccaf855d8946d237b76 WHIRLPOOL 3cf4620989f7e7e171ce4c0abf73a161d20c06239973d3643e35aaf28f93bdf26884e67a3d7bd606c6a312d4d16cfaff116f2c23e4e52f1c18944679e9b98c73 -EBUILD cinnamon-settings-daemon-2.6.2.ebuild 2864 SHA256 5844faf12d5edda286fa1f83f7b1bd592842f11784f43d820acb6a4893b73f89 SHA512 749815ced924680529ed19c4e94719b93e056909fb4addf650c7717146a3f3690dc8f8b0b4bfdd8015f495b98a257c7d89ef2ce1a6489439215b91575d692954 WHIRLPOOL 012bee06d52b4af37fb842830343a7beb0c77478c718b9cebf5e769ec4bf3b81de401bc2279abf9115d198372fd19c4ab49110e2a81f234e8dc9d7a306511ff8 -MISC ChangeLog 3029 SHA256 eb4662cf131ab951586bd0b452218fa8925122977452919d306f3e04b657243c SHA512 71e9f0581eb1d4d6a74754c806a4ad007434c75ddda3003276d370ed1fd2bffc3b534d21a63b26e556051e2848ba878a59b458a7ae3e0b19110365c7e2d75932 WHIRLPOOL c382dac0b9eee2c0b6ee3d9242df2f5f4935722056657d0c3e50bfdadffcae27a1c3e459bd4f0a61bebd57ec109157b460f47976d93dce36c11738ba055c52fe +EBUILD cinnamon-settings-daemon-2.6.2.ebuild 2897 SHA256 21d0212137631ae3b8370af4080a0dba9442ce3707c2ecfe6823a5caf99c69da SHA512 887b9f928d349ed17f9f805adc7eb11894b42fb39249bfa02d69875ab002d1185b00384f137936bf18e292c973fedeb6545a44dbec829f100e42eaac45c839b2 WHIRLPOOL 3b21ce33a961ec07dd0c29759af69c92c5270ff84169ee3f05f42915fb95e25ae670879927810b5138ce6cd35b97cf947676b684d5c78eadc8ed8ba957e42739 +MISC ChangeLog 3233 SHA256 52a92c598d50895e0d93928007b45a2b7dcb1616d59b8d75ad2104ad51e8cf34 SHA512 8ebfef76640d2fcb2fb173ec92baf7201bfcbe0000c706de8a260dd6740854888a8e2da727d66cb71ddf829df73df996ee566149e6ae5d6d5b4865f98f38d3ed WHIRLPOOL 33ea0bc62c1709f6a85c89365219ad829850575be4ee296f53c90e010294734f7e83c98ccb0dbfb19650db544d41de4c6fc704826a0a1581267f6b2ace3b23ed MISC metadata.xml 257 SHA256 8d6f87c88d3da1d9a4e3f7c1bbfe1f5b6bdc74bf2a785531d8479dc74f92f3b7 SHA512 865f4729d377504a8848dee7aee28d33d99106d097608e7d4eb01f127922b4e48f072506963532c08b432d31192c074da3b2d7cde2d9182e3018fe6125a4f580 WHIRLPOOL 6b5d874e8edc033b2b738ab962ee87aaedfa57819cb194183ccece1729b17e8a829b89319c45f9cb0390de9fc67e5cf9b1000287bafc0769a5871967cb0634d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVfN9/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVfPzdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx -OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNIK4P/R5jG9zHcZuOxxiiSWxuOHqh -S34h3oRGPCgLBkTzf6V2oq4IhzyKCioVWIlJn0xQo9Qk1jD0eYOttsdDHoRjXumW -OK/J//OQe8lnBxrFrMc8ixw3GYBkbArD34kgYEUd/W5IEClquRdU0OK0bpJ2FQuO -NamcsHWKSwytDG46fMga40y35djK7KPC0IAb4kyl+YJIi41LVtbGY5giFXEl/fRW -fEk1yh5zAdETcA/zpopStFbOXUWk6t6wR2ymz8VSG2yiLHdlTKCN2oUseF3LtdYn -qKSKB5Amy+N/oYiCKi+xJK7yvlRGeDmWf+7mfSJPGF/q8yneuUBnGnD8WppdnrMv -SEVnmE/os0QFASL8mzEOVu3XOgVHBBeyFXX4Chn1kPk7Zrl5AV+vcIcrtnZfMh5v -ZpjYikgc/vwwWxP0i3rNCkiKSN5xxA6gBThWkSjbDtoCFDlqU8fMhgLJpfaPUdbu -Sta9ewGrL8lZ6g7TBLmzGPoh4HgKJJP9y9RYtXBlv2ZOcIzlqVBlRGi8qDhr4TQ/ -m0lPJIDuKM75LGgze2utiTUFJXCAyfLYHA5505sKlOWazY1qRTh+uxz8Q5q4ZnZG -SMRebvTLXJIW+RacVlQtCHPyhqHyOxAgefhw5Om9Z4LSEPdMiQ+9I+hU25OWtUan -Q/UySC4wXG+Cp+f0RdNq -=5Ksb +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNgSgQAMOPdVCFZ7D5fP5C/0ZAA0Y5 +x6qOuBXajydgqNAINhGDhJQroPGX+IuAdH4lvFZw4S5R/e3Irq385uc3M6nEl/Hf +YgObPCgGBjM5yeJPIRAl8cYIJjxt9m6CYYO2SY4JvblqDNV/wvMxyrWA8+Hvv4CI +cYrTxJRGfnfayJNSFmUdO5mgxQ8TXlAlXu3CMSdooT3Uknkl1O6hwP8t2F/R3baA +6BD4PTqzQcBzqAIz/x7Il6Vnl1buoz2jcAhd7BSaVJnrkuGyEV0s4X+yf9vkeGvF +Qo6vzKAfI+PvDeO3pu8U6Kx1CcU2HFDdmWKT2hdxmGqVwFO+iDZE8l5RwXJlEF+C +2tYI7csydT29ktCo+BAf4Sl5otDqVMTkyxk+hCfUDnE+zvb/kLd3HvY7lOAx2/ku +p7jCMeRMSHp7xihfy4esOHGjCXyWxj8GwdPcZQtRAlZOG1J28RkMazou8vUAN7or +eYiatwon5K4IW8eCKZOjz7+pi3DZNNHlNBKyz1lVuVCaANz/f9OiqoLOaQx0dmw2 +tdyMkpoHn7oMhbol4VJMRG67sNE+G6+gC0lQFD5TXYkPrg0GuVxqluFQ2k0KnH2H +D3TBu6DJYdpCF/SWao47cvhkGNw2yZCIBaYfz0Tv8fiL/lQYOH5ErY2pxfbL9xje +S0p5dnnpb5k62Hy08pt1 +=2CGI -----END PGP SIGNATURE----- diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild index ec3022d25cc2..982fe7845866 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.1 2015/06/14 01:57:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.2 2015/06/14 04:02:35 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -29,7 +29,7 @@ RDEPEND=" >=media-sound/pulseaudio-0.9.16:0= sys-apps/dbus >=sys-auth/polkit-0.97 - >=sys-power/upower-0.9.11:= + || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= |