diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-06-19 16:33:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-06-19 16:33:09 +0000 |
| commit | 6658ca864e64f2eacda6def0b19b19d65b44fca7 (patch) | |
| tree | a04cc206cfdbd41c13a1b8e5bf297b82949f72f8 /xfce-base | |
| parent | old (diff) | |
| download | historical-6658ca864e64f2eacda6def0b19b19d65b44fca7.tar.gz historical-6658ca864e64f2eacda6def0b19b19d65b44fca7.tar.bz2 historical-6658ca864e64f2eacda6def0b19b19d65b44fca7.zip | |
Fix dependency of sys-power/upower in -r1 (current stable) to match that of -r2.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfce4-session/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/Manifest | 18 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild | 7 |
3 files changed, 20 insertions, 12 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index 6d9430ed3a1f..d3465be600a4 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/xfce4-session # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.210 2014/06/02 16:40:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.211 2014/06/19 16:33:04 ssuominen Exp $ + + 19 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-session-4.10.1-r1.ebuild: + Fix dependency of sys-power/upower in -r1 (current stable) to match that of + -r2. 02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> -xfce4-session-4.11.0.ebuild: diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index 3d1fc384f884..df0a32719e38 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -6,19 +6,19 @@ AUX xfce4-session-4.10.1-systemd.patch 12922 SHA256 0e90469248180390ce7736a5621a AUX xfce4-session-4.11.0-upower-0.99.patch 11987 SHA256 babd6f01c39165c3f178708096695745b3e3d8a7434c8bc762c2ee4a0883c028 SHA512 962e33bac39cea783651ff2b6b89cdaa66b4af06752acf91e6270ade3b3a2947ac903da044330d268042be9a3aa5c2508226cd21969e65bc44cda3afcc664421 WHIRLPOOL d140fc8de712f1d0c527fca4edb6df73da49bbce68d5a5ea425bef8abd9463426b90a9ca5c97c51ab9358ffc02524e6381df137926607ffbbfdbb3cdc32eb3f1 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7e24d58a065991eba9cfcb99e5d59a7c8e SHA512 cbb574117acdefb4781ecb16f7e4681c4c31e624eea2976c88199d3bba883c9a1f114d8b88eebfdd1f5e2c298a672ebf6171ee2b0a117dc54cb675ebd38db90e WHIRLPOOL fa14aa5e321339903460df8471b59b018d34c8453f639f8726e6961d88383aded6319448704d08f74be53ca08c03625dc76857ee328b19cfbaeffadce160d1fe -EBUILD xfce4-session-4.10.1-r1.ebuild 1767 SHA256 ff110abecc8a14df6cc49a30455de2c3ae747e65d7e6a90b81bee3666e8527dd SHA512 8b01527cc1f76bd8ad5ddffa8e9158581eb3c67e307a2578cfe561f2db15ccc25ebad62b8442e8c5f6eae53b5842858ba0083df690a8fc88069e5b1b5c18f3fd WHIRLPOOL 85febc5aa20fb062488ae4d810d4396dfb6c0d1b849c7058166e9ab97b2c48f42e0da5d36d178b926cd3858b54bf5fa471f4a250c237728b29621685d72b6279 +EBUILD xfce4-session-4.10.1-r1.ebuild 1859 SHA256 38c4c3431a395f141d4998aedf398876d1e0a2e9a610c16358c0b805de48af4a SHA512 43d6b9f2553a39a3c4567ae09b4027714c35a2b97f43292510ec87ccbe43577d77d6d5fd6fa96df8bcd15a74c8278fb3e77115ddd4ebbd5fc729c0d756b30149 WHIRLPOOL d12c7ee237a11cfd60adb8d7e8cd40b58486ad557a4e9363968c8014a87780a7b0103f750287878439abd8923742e41535bc4fe0553c68db8eb0a20c4ed5e5cf EBUILD xfce4-session-4.10.1-r2.ebuild 1920 SHA256 2c5dcd96d2de4ce4b3225910fa9ea3d59430ef7aeb89d35839d0fe8011c98f83 SHA512 a22831757392f94d658d2330372ab202eeb15a688ba06140425a13a762a6df026f27af168033e68a0f22ee77a17a5d4934aa7e7d085bb12d642e319ff5ba0c08 WHIRLPOOL 67f4d0068c76f09e3ffec8bf346e27332ad5acfb8d49caf238d3cc43b9cc9d52b15c62143a673cc3e2c3ec42008d6e8e6d877db2766b0049e9a4d3f1ba99296a EBUILD xfce4-session-4.11.0-r1.ebuild 1939 SHA256 f4a6f46a7f0db83110b6575324a48e7915bcbc4dea42eafab5e1ae5fa8333a41 SHA512 b48a819c2d4a9fd64932d6ba2e590c9a1871806291d99fee3c32b515b6a0e8b0dae69810bb455ebaeb8b4ea11e7c6fa9a6cbaecc82b4f31d86936ad98bee0d9a WHIRLPOOL 142a45303b8702ac2cd60e7a691637a24ad407373c1bec4150d49ef697f8bfcaeeb7f5f0c4b6ba0f392b64dc6aede2a2e1aadcfc8952178b3f2f8495e63171e1 -MISC ChangeLog 28955 SHA256 a1ea0a17e6d5ede7a668aff1420dc147d9c04767f5123f1e0e54ddb9dc40fa1e SHA512 93ff49df69547f76fb14799f5c229ea0c028cbede4b2b2f3683e4b0a5750e998261bf1092b171da648d683f72fefaf37ce2fada613b2aad546627537b8e76706 WHIRLPOOL 6e746c3e757ff52f636d6fd35f0abf048711cab59ce36f9c168c0a96962078c415ef2b8dc83fff44f823fb6fadbc7fb2547f13075bcfba2f59324d41c62708ad +MISC ChangeLog 29129 SHA256 23d90f944b7f662719d35cadb89c3c21231f7585b166ad502a0541b036dc9ac7 SHA512 fd351b327c3485abcf3f96bd184348c0e4ee36a422faf381fdb77f4ed43b8c6379596bc6b5ebb46944f8b2a8218059fcc4f6a94864af8c5625c98833a796f541 WHIRLPOOL f27f3dad9e1b14edc902b1b848580db4d7f02e78fda99f1f53c307268dbe02032e0dbd7955cab9e44760c96510b8ac8177bd9fc7dbafd8366a1205c8202c2a61 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTjKhrAAoJEEdUh39IaPFNT3UH/0Kw0ZMHMVt3eyBKXNs5BsTd -gqEGAQjJR2K/q/nIIQ6yaYpQru2uYrcakWXYuEwNc4+aN2G6Iu8je3L+YEjmLnX+ -SHORcfjHWKcO6XWBWz+/4IWnL7AMuLUZ2t/nrUiYcu4QH7B4zyZOIUjM2fBp49jj -jm+wuUaP5n0HCP37KprIylM4qf2ThLl8is4Y5Cb+mOMQ8HialsaUyl8CaH6poO/k -dBfb7TafMRpBpmb5pD08fHEfVuGbVEZkgzX/XJM6FzLaFPTOWdWmzAiA+StUQHVd -+hTgDu/C6NRRmsvVk4botoVZYJ/26x5QMaZnP3PjRqRIMfxrp4ISMeAhwgD7GU4= -=yV18 +iQEcBAEBCAAGBQJTow/zAAoJEEdUh39IaPFNxTsIAI3tBIt+OoJWQPhzGotrbmIB +EKW21wyV8FIAIMVxQPmlSTbo1nh3chrX4dFUgdYfSHRomY07LalWCtkkDNaoVSj7 +GQ4HAGQf25olJ3Ccow2YiybC8kN01WOX7UJXimO7M1ZMOY43UT6h+byIhi5d132e +rJy1Z7SxSW+yU2MQ7npBcm3qkUK3hOHh97iLbj1bwqajJn1UCiGvKfmalI/6JwrB +9P1qhx7nkD0YK1QGUpdDxHOkRK5dgpcyMf8EeqFnqBZnMHXVRl8mpw0Wq2jTOAp9 +LI5U+v7Jsp253pfoSwbFMgY1S3cq9nG4ZDxwR+4m5Pj0a4CAos0euBlSn/GdJ1A= +=LrfQ -----END PGP SIGNATURE----- diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild index 3597dce1e423..041bc179948b 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.14 2014/05/26 19:48:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.15 2014/06/19 16:33:04 ssuominen Exp $ EAPI=5 inherit xfconf @@ -27,7 +27,10 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 RDEPEND="${COMMON_DEPEND} x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) - udev? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) + udev? ( + systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + !systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) + ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver |