summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-14 17:39:45 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-14 17:39:45 +0000
commit14602be46d57be35196f51096264b1ca80e64222 (patch)
treea7f59a4dd76f14ea096cfae0306a11130cf077a3 /gnome-extra
parent[QA] Remove emul-linux-x86-* from dependencies. (diff)
downloadhistorical-14602be46d57be35196f51096264b1ca80e64222.tar.gz
historical-14602be46d57be35196f51096264b1ca80e64222.tar.bz2
historical-14602be46d57be35196f51096264b1ca80e64222.zip
Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon/ChangeLog6
-rw-r--r--gnome-extra/cinnamon/Manifest32
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.6.7.ebuild4
3 files changed, 23 insertions, 19 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index c8df40661019..9af17ad266f1 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/cinnamon
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.59 2015/06/14 01:59:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.60 2015/06/14 17:39:40 tetromino Exp $
+
+ 14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+ cinnamon-2.6.7.ebuild:
+ Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex.
*cinnamon-2.6.7 (14 Jun 2015)
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 66d073700543..6ecd07a7ebbb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -22,25 +22,25 @@ DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a22
DIST cinnamon-2.6.7.tar.gz 2967804 SHA256 839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004 SHA512 f76aa7401e44b0529ec5041b613df2ad95393701949fe8a25de75332984d102b441da32d08b06618cdf132d5026a92cd21ebaf8cac1707798dae667c468d57f0 WHIRLPOOL 0b1acc4e4e03c374cfcf12abe1e9cfb2593d0b72c2ace10db113665e517b1d9204ac54bdb9237ae2dc544b50b10b94d581fa7163ea2a0b07669bfbd0f8a3e30b
EBUILD cinnamon-2.4.6.ebuild 8420 SHA256 0771b3abecdbc455cc9f7f26c59fe1dc318b099c3b769623a1837c341dbe74ce SHA512 aaceda46cc0f002325d23145c43138411c02757afea482268187a4edf9969bbeb86a7fc9db342e01525a35ebe1cc00e93c4dd971e265b717e8675eba09b620e9 WHIRLPOOL 03eb83357ab9cb51a057e7a80ad95dc6e7b7f8ae53c410a407febc3d153f81a1774fa89177b82c1b45f823e5528bf7063964796e79b840c5c604d6b7382fce20
EBUILD cinnamon-2.4.7.ebuild 8426 SHA256 7a8ab76dde16638f4d76259ca540a29cbeb9f7577a27f5c7bc306d3f476d052a SHA512 58ebcf834d2cff460e9acd6590030faa9ebb927a201e653559fde1b50ad268ed51c83a397ffd0e706591cfcf84e180dc341b2495e6fea22a734a3c3ba900bd3b WHIRLPOOL f03fd8742c0ac58604ef9470dcc47fbae90629cb1f91206d99b1d5bc59019f70a9404239084c7dd8e2803251448f5bb2f79c603474b6d20bc909f95b91bf669a
-EBUILD cinnamon-2.6.7.ebuild 8840 SHA256 fcc5a6577d955ab84bda316b903b0cb0c896a9aaa865c7adc6126711d2acea33 SHA512 a388773f3b8b6658cf787242cf54c5d3bb95cb14d4341c454e517e4518994b700e922d5b5c9b9cf69161d5a01ed60ba8b4850588f18c5b43bb9844f4e75eef09 WHIRLPOOL d07206b8d03c7b7782865433b9044c94550b1941517c2a8e224dbf19f474f9e49c215e02f0124a505491814da9d489d62f25eab7e3b1ad4b414f1f5ee1079423
-MISC ChangeLog 13535 SHA256 22aac8e91f0b562e8c6af0ec84eeb09f07935304d6ad0c65a75b497643b6d60f SHA512 3e357ce8811950781d63b883146b64716452afac45babfe02e0593aee83dbdb71125ae06b5a33455eedafe0235f797db048edc27c2f36c326be86ded5f32d45f WHIRLPOOL 758c799eb832b13dac017f8bcfee6bbeacb48b506c3d89a3974f63a10ea5f6cbb063e7eb983ba1cc10c0f26c06e2d87e094be157969ba65aaff6a70f4d085ce1
+EBUILD cinnamon-2.6.7.ebuild 8888 SHA256 946d86c1d1ab7f24e2310fc1a03a347da15e3a99fcd8760424072d07f02ea5e8 SHA512 64a854492b221a02d0854757f60f9d3d77c23c5257828283b571fe3b148f7a39e7adfbf488bb7a5137e29ee70bf50c1626987ce21f5bc10b41b3ea0364afbf62 WHIRLPOOL bc79dcfc074488c27ab16d81aebcde4fe823f3f7a13028fa548ed47bf2850ef41244f90f988aea666f2a020912fbd9528ff1bd4ec03801a1b080d821a46fea0c
+MISC ChangeLog 13698 SHA256 22993107ad3a272964d42bececa4344f5b479d5f43377f8244ac45f48266f806 SHA512 a53c3a7af07969ea5d6c8d0ca562b15d272bcc31d298e248e0a10b3faa8be29805a22d3455dbec102f93674f3d4e8b1ce6a01792a2d8213c9ff8abd9631ccb02 WHIRLPOOL 517b08eb50463277ebc26ad8fe7e752d3b0cc1f09db2636a7478943ea60bb9412faa69c1bb99936e984c2857fd14e15a948c6b324992647e023c44e5f5918d4f
MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJVfOAPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfbxdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNjW4P/jF2xvogFtIR+mRTPfNqWw6Y
-AZ7mlAMb9jIyHMWX76Frm85MStxRWNKGcL0Wf71J7EZ+P1eS4Q9jRDU7DDhNwGcz
-PysjHqiwYTWw3QMv8KQ/s9+bRwZM2UB6zeX6GJlqOohxLZtoCykRUuRAYO9BjJwJ
-PUYKtBj55v7thLIP0EbtIVTXg5YPzHd26UB8c3SR15/ArJcBV0IKjVevzJTsWFLz
-U30ZlGDjXT5HQOaqFu20F0sAuxjJnTnJNarVDt57K/Gi6kgp1XzIQnkxUhSRdL6O
-T4qiosLlyZcPYYRoEs4/C3WcrRV0gJdUV0F9cI0PIXn30fK4y1GTpSaQNICCcycl
-BUvCNAHsAtbkBXbtzZDdRkQcggB9rBwlLkPII7sJBtrt00jPQLBWEpiYeKRgrttE
-rasYLDrNW863y+Y8cDTAwQYgnc0hPdzIrsuky7i8F1yUjIZ23xGPY44eFxKjkZ6/
-8RqHK1DjEufep8NVNVbARgM8bXvuTEU/+wvOOBtRueKLgTVYW2na/5eszyR/eTdX
-sTQ+4CwikL9iRjAD4FxokLbqbzygGynP6trNdW0+YQTRHXOJdrvm8CrdsA2b1LU6
-tirSU21Oa3XOGVss9wbSnFPBw/mLh5U0E3HafdEJ1ud5pIGQZT7p2Fy9KKFyG6am
-O8BjnJwUUg1mnUjixuS6
-=LkzS
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNTNkP/0tmlZRoNRf/vzGBcJnXR8fx
+uVdSH2+sB0A7vBTM/WcBp3dAa1jNkZNG+/hocN8pxa4O8zfpo94LALO1frh1O3aO
+LJQZ9xrKwnByEVQeL3q2vDGOECKKnsItN3HFnCWy64xccPhxFA1rfF3fZKJqvFMS
+2piwIzgnwUz4ocLYF7hxc68B3ogWT1sronn3c0WvLmOIjOhJFXFSoQDMh/Hk90ys
+h1reCHTmUJe92DpYqddMM5raNd++Y04pil3yLwwnMR6V1xPsLn1F48SliYuZVBGg
+c9OpHhDJbA8T+AX2Hd64W+1be4FuQ3XgamqYx1u7NM3dC5PbnQqGYmC/4vCXSZzY
+GE6WmUhuk/gY9k3hy5hugfcQ6W2v3FjR5wc++T7c9SelPCZCRJ5uzao+tv71hoqQ
+j09iuRJTI9cvpcQLcHHmq/l1x1QignzOjbrPAFotzbOR2uIy8iyL/BZB7csKFHPh
+kcuExddYNDdf+fEeQB5GhfgkrL3AzQUFcCLVxsCmykRq16FFJGxDlchWcG71awIC
+Skr3z29ku/vNdEMdBP9tNt1LeIevHPoVeZkpmk6CfsRYteNHrQpGnryHgLouUDJP
+QW0fvigElSMIEWCCpKHC5baET/5kYy/lJOm7ceqaYx2bvCGrsL2jUzaBk9ui5PXm
+/xstl1JSv3LOJgl7RNX1
+=VRSS
-----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
index 12a93504ec84..291576f5e102 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.7.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/cinnamon-2.6.7.ebuild,v 1.1 2015/06/14 01:59:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.2 2015/06/14 17:39:40 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -83,7 +83,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
>=gnome-base/dconf-0.4.1
>=gnome-base/libgnomekbd-2.91.4[introspection]
- sys-power/upower[introspection]
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
>=gnome-extra/cinnamon-session-2.4
>=gnome-extra/cinnamon-settings-daemon-2.4