diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:50:11 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:50:11 +0000 |
commit | 23887686a18caccab666a68402afba4cee84a109 (patch) | |
tree | b96172bb5fffe3ad387d106e297e1b7a711c10f3 /xfce-extra | |
parent | If using sys-power/upower instead of sys-power/upower-pm-utils, force old ver... (diff) | |
download | historical-23887686a18caccab666a68402afba4cee84a109.tar.gz historical-23887686a18caccab666a68402afba4cee84a109.tar.bz2 historical-23887686a18caccab666a68402afba4cee84a109.zip |
Fix dependencies to allow sys-power/upower-pm-utils.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'xfce-extra')
6 files changed, 38 insertions, 31 deletions
diff --git a/xfce-extra/xfce4-systemload-plugin/ChangeLog b/xfce-extra/xfce4-systemload-plugin/ChangeLog index 501d38841511..8d17bed4ced2 100644 --- a/xfce-extra/xfce4-systemload-plugin/ChangeLog +++ b/xfce-extra/xfce4-systemload-plugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/xfce4-systemload-plugin -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.32 2012/11/28 12:19:32 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.33 2014/05/26 19:50:06 ssuominen Exp $ + + 26 May 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-systemload-plugin-1.1.1.ebuild: + Fix dependencies to allow sys-power/upower-pm-utils. 28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-systemload-plugin-1.1.1.ebuild: @@ -140,4 +144,3 @@ +xfce4-systemload-plugin-0.4.2.ebuild, +files/xfce4-systemload-plugin-0.4.2-libtool.patch: Rename xfce4-systemload to xfce4-systemload-plugin. - diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest index e384d7f7beb5..646dbfdad059 100644 --- a/xfce-extra/xfce4-systemload-plugin/Manifest +++ b/xfce-extra/xfce4-systemload-plugin/Manifest @@ -2,17 +2,17 @@ Hash: SHA256 DIST xfce4-systemload-plugin-1.1.1.tar.bz2 299695 SHA256 1ac13efbe9e576c9effd5e0675574a57c8fd44cfee60d6e319eb4d03c1c8d9ae SHA512 892f6645622fbb3581d612a78ff73466cfb407dca557260789d1f8f4e15ea729acbd4ec55e453a22e8ac92ab08aaf061ca61ef6634bed20f02ebf9cc02885227 WHIRLPOOL b54b8212edc1227660c75e4be467fecc3f76e2096cff9dc3b576cf394b3e077ffba5b10efaf11fedc5fefcd7148f43802a28e39d1067714098b925f78b8baaa3 -EBUILD xfce4-systemload-plugin-1.1.1.ebuild 984 SHA256 c3100746c1b0ccae466080fe7e6deb9301e8f387cfe0554b877bda674b467676 SHA512 adcebf4cc52bf92e9a5333115862381b666fa0017dfc63cd7982a1e463c7b6c504465e6d1472072fc2eecc970d7ec1b9dcf306c51ad66fc313f11f49ada1d07e WHIRLPOOL c3cfc0aed0f410e96b928476321fbd2cee5a318c4fb7d535e41740d1be3c4023b011f094857aca18c6ee91c84a3a91c497484d020fe6f56dbe8042dd63553727 -MISC ChangeLog 4558 SHA256 aeafaffaab71f54617041d0812b206fea9cb61dc76d39d703927235423ead110 SHA512 d8097653298a1826d946609bcf235661b0f5ec42c3a6c11cc112a7d5bda8b0d83198329a26a634f4c64b8e4429cd625d93d65ca22b858b17dee9c6ea20798905 WHIRLPOOL 985154d4c1de77784fb5dcae307a094989b50e07ed6ef4aacff2e98ee77a7051ee2898868784ef9d032ef9e44ff5fec65f1561a63773e15e6d9ca4191b88fa7f +EBUILD xfce4-systemload-plugin-1.1.1.ebuild 1017 SHA256 065c2bd334acb259abd7c2362b9e691c78da1ee6f05e2211e19150d96d614ee6 SHA512 31b6c8901d8247188fe062fddf89e91c5c0717433cbd6f22250f1453ac10fb5599b06086698110bd045616fa0c0e6b1c9b7d2edd7f2852f26a646fbf18a14a4f WHIRLPOOL c17a28c97999421b3352ce8ef3ce0ef205ca092a1667d0e38d18221abfc1b53894dbf30a3b4efe456d81888e4e7f3289398d30d3edd9993122b7b225d640fe2b +MISC ChangeLog 4707 SHA256 3f4c671162c4378a8c76f486d77d6604db98e5817f3a604188858c407742dd11 SHA512 5f323c5005721ede883cfb7dee8b70ea4b9a8737908248e353ddabef11672fa9a040bfddbb3e60ffe75cbf607bedbbdb9e1de0a2676feb6d823b7edbab35445c WHIRLPOOL efa896b67551386b20b19006913dc9e3cbcde5eca41f928f48591c4422d52b19bd93bd86fcd6bf87c686c080104e56c884f2363af6448ac572ee6198f9f64994 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJQtgEfAAoJEEdUh39IaPFNJvkH/2ydvlP6OSVlkl6q4FLkqTZh -WBLxXZbZGmcdN3V9Jn6Q43UrzlY1XLO4tzl5tvs5+dHTlpUgbFNhmLehoTq8WYxs -1jbeE87afCF5sVem9tnoEWECqldJyK3G8Fszc8r9IAtqz2bTMRmaxeWK7sKxcQUy -ZGZKxjC6acIJsm9LiOo8mz7s6XIH472TZbS4oh6bcuez4iakf6ZtCG33p9v+K1a8 -oAT2apRecpsWoVu0INRyv2xQrzkl6z7NEIbvPyB9xSJkvfmEgi4LO7FWG3gl67dd -xnexR79WcdcL3tB0HB8cDRtrxFLU3uFHT6TLytsZ3ep1ZxG8F6o9iCLzLIT0SHY= -=dHhv +iQEcBAEBCAAGBQJTg5qMAAoJEEdUh39IaPFNSUkH/3EL6DmlJFwTYmDkB2Ww1dDe +HKoKPpczbNleWTfWe9IO+192sfvtQNorG1i5OEFnLDLSsxnExGnIFM2cht+RC2Yu +ydAC4oilnzgjB11KuzG0/hC8sLX6dl94jV5qsIJMf+lYhADAay06dz6ZQJMzkzuO +Irv+xgKCpwWoDl8GRqnwAXle2bmXHxc11wvbuejGO9fbL2PEZvP7L7rU4gCHO2Ub +2EKoufsqZzbZ8gGxSdaBfyMwQf9E9M8A/eAXyE275ZvPW+H3TUZAys7nkca4SGnf +eL/m9lHzgk++t5CIJaKfeYdV7RAwyszaLOmILpDwddpp0VWunshQrBIk8Ru8YQc= +=XXNr -----END PGP SIGNATURE----- diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild index 8a4b5ec69285..2463801d33bd 100644 --- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild +++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild,v 1.5 2012/11/28 12:19:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild,v 1.6 2014/05/26 19:50:06 ssuominen Exp $ EAPI=5 inherit xfconf @@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 - udev? ( >=sys-power/upower-0.9.16 )" + udev? ( || ( >=sys-power/upower-0.9.16 sys-power/upower-pm-utils ) )" DEPEND="${RDEPEND} dev-util/intltool virtual/pkgconfig" diff --git a/xfce-extra/xfce4-weather-plugin/ChangeLog b/xfce-extra/xfce4-weather-plugin/ChangeLog index 8cd7df949ce9..b4ffa00c2a8d 100644 --- a/xfce-extra/xfce4-weather-plugin/ChangeLog +++ b/xfce-extra/xfce4-weather-plugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/xfce4-weather-plugin -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.33 2013/05/05 17:08:02 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.34 2014/05/26 19:49:28 ssuominen Exp $ + + 26 May 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-weather-plugin-0.8.3.ebuild: + Fix dependencies to allow sys-power/upower-pm-utils. 05 May 2013; Samuli Suominen <ssuominen@gentoo.org> -xfce4-weather-plugin-0.8.2.ebuild: diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest index 518909cd1801..db8b51d8d0a6 100644 --- a/xfce-extra/xfce4-weather-plugin/Manifest +++ b/xfce-extra/xfce4-weather-plugin/Manifest @@ -2,17 +2,17 @@ Hash: SHA256 DIST xfce4-weather-plugin-0.8.3.tar.bz2 2786473 SHA256 40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4 SHA512 24b1f191e12fcd56a9149d2f0dd3d4449a31586503a28f96352b4dd25f795e3ebcb975997d580478840311c98e30d313458403814ca21d049f35865a5e75b687 WHIRLPOOL b857a236c39e9986ad6962cdc670fabb560ac32d1339d3c276fb8b512387a281c163cf66613a57c3858c98978acfdb8dd5c23ff97aec3dd70d8f6e57c954292a -EBUILD xfce4-weather-plugin-0.8.3.ebuild 1065 SHA256 ff47c8d054eb49e15300bcb1b35e8dc4235d29f0fdf76a743f426a532ed6e7ae SHA512 83cebe60d0317ddd52422cf9d5442d72514b4dab3472c291c0cec28314ae0f28cfc5f6f44e5a9581aa83f3f5fc2f7292909b9a85425b6837c7160ce2f82e87e6 WHIRLPOOL 092206119f6fc4f8212e9e2e858848af8d2f9a050f0dd624773aaeca1173865ef0be2b4b46dcf017779343b17c03f7aa34b51cb54c3aa784c9c7bcecc9803e00 -MISC ChangeLog 3311 SHA256 173019dec246a099b0900bfeaf97e10e2c3cb9c1cbf99841dd6d811f7b0b585b SHA512 202edf918a31325ea9d3e306a9c6b74511a269af50bc9a589d70296e3baf511088e3b780389137e98aab16770cdf58655e4958ad84e0b9a64e0f9d90e3ef966f WHIRLPOOL 59496bb636fdc83d0d75598a1ec6e7c264d6788e3a70afdacbbbd8e5574685320ad377008796f9c58e15a967fde48d15b96013622c7e699c00700194d5af0c16 +EBUILD xfce4-weather-plugin-0.8.3.ebuild 1104 SHA256 2e28c294bc0257e7ac62b9e7fb61b13c063b9ae7b0e4192916b2df2a893935ac SHA512 ce651f1bc375fe181b7dc6ea554d88953c1610f2c9b877febdeffb370d6bf35629cde1ea1845e2ab428c82514b4e35ada99a2b8804ecc0709a44882c4442543b WHIRLPOOL 0ab0a0241f3231785146661f4e6b63a9b106bd8eb7de863fafd010801ad2d3edb7678172e43cc118e047fcfdad23f74f40be09063894d020a0881d2226776c9d +MISC ChangeLog 3458 SHA256 efb58d4b3472a1416646ef06fb51c3176a7677aef3affdca3e2e1fb2b9eaeddb SHA512 564b55a7428dd430405a52ebbf2b2cf1e4d37d5f55cfdea9a257d3a3f00fdc43ae5f839584fcd673cc9fc21e65a39f94d6e5214ef0fefff8fd31771df1cd3536 WHIRLPOOL e8fdb92a30389a2538835377225394aa1c6686a9918eae53b6852d8c07fd96f763b1b9a6e3360b9b50b60ab406e2aeda3d366d4ab75270d35344877b730cf626 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJRhpHiAAoJEEdUh39IaPFNNfsH/0WgZDaaHgS0a+BfU/A9NgSe -xCdluaa8hCd/SfLQ9au4CI2djL628DN9q8j8RyiZ6REwn6+X/X+6yGIeoSGxiggE -rCwzBEyGjJFGzGAo4c+ZFvMiSzobW4yJZZgFaFi2xojVuKLwpqLRyGCKF178VBji -AYCjSvF8IYX/BcvNK9LzFju9cWjr7NEwLawJ/9TYl2obWFlby30ClGvUSROLj96t -/BehunKECsDCRTsiaa09lgu+ZRrY1fRDIDEdDgJJ2vOYi0cx7SdioDhT5wsBSQLK -+/p8H5lxKipf41BuqLVjKM5NNyoQ3xbOLXWVH9E/uD6EOTu5Ndc91uGHs1Y66CY= -=IUCm +iQEcBAEBCAAGBQJTg5plAAoJEEdUh39IaPFNSlkH/3slgLjcvSjUxaXcifHAmzdX +KkIGMDhT2MLthLkkPmg2l05gR6EQgoDhTSeXO8NUXKgqc48agKho7bFo5uCxbclC +hv28eMwoe1i1QFC1deYdTiGPSvO+HqI+JP9kM1VJGMN+NlIX5BWTeUrvKX2oDOXc +z8VvRFQXirmlUKOQlTbc2M1I9E055Xodn4NRXmDXMTPuMsxD8z5Uu4JPePNsBcDb +f2elDihTkE2ObkuyjZO8dER/bbHAzlDUzl+vEbjiE3XWHSGGLPUfligYtwQlLaG5 +XCAOt8Q9TC8xNrA5HcrL0uDSdlNFnjQo/GBoD/2JFhrws60yA51vsWHc7hhshgU= +=Tgwt -----END PGP SIGNATURE----- diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild index d0af0b8d5e26..cf1d44a921fb 100644 --- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild +++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild,v 1.3 2013/04/11 18:08:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild,v 1.4 2014/05/26 19:49:28 ssuominen Exp $ EAPI=5 inherit xfconf @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.20 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 - udev? ( >=sys-power/upower-0.9.19 )" + udev? ( || ( >=sys-power/upower-0.9.19 sys-power/upower-pm-utils ) )" DEPEND="${RDEPEND} dev-util/intltool virtual/pkgconfig" |