Remove := subslot operator from || () block since it is meaningless and broken.

Package-Manager: portage-2.2.11_p178/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 24 insertions, 12 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index 2c4b84ab945a..4bd855c967d1 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/sddm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.8 2014/07/24 11:28:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.9 2014/09/01 16:43:24 mgorny Exp $
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> sddm-0.1.0-r1.ebuild:
+  Remove := subslot operator from || () block since it is meaningless and
+  broken.
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Punt description for USE="upower" and correct description for USE="consolekit"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index ea44a18af2bb..bda62e796e5b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -5,17 +5,25 @@ AUX sddm-0.1.0-clang.patch 2759 SHA256 78c0711149f7f8734476379b75aafcacd0d8bd994
 AUX sddm-0.1.0-cmake.patch 1266 SHA256 e34eedffe8d48cd5b3c6c8ae1778e57a4275a3756ae7436f12349403a77303db SHA512 7b9f57d77184a3a81a81f31e3da5d98766edb551376b943a337edd942e9891eb427c3f932ff568ad56096cdec6336f2f5611e0fa86bafd6122c508100486681b WHIRLPOOL c10fd3f106aa262425ba16a784c52fb065605322342c98cb010613605a2cf269b1eccbeca3e291df4ef142d24975d63565ccbb0405576c1be521e7a18d4f2671
 AUX sddm-0.1.0-consolekit.patch 499 SHA256 b46859a705539219102c8ee29e5ae00b5ae8aa1c3f593e94b7d7891531a721d0 SHA512 97f4ade68aabbf46371d445f12d86a0ef40381f8d68d3e1e6bfcf6f53be8bd9b6df0fcb6845ac106f167a2976fec357b203823a64927e0d2859ff34541777d24 WHIRLPOOL d365acebc2bf535d3d8a6f4afbad1b3cbd6dede5b5e8e37f578c376145c04a1c1f401b2171d05057d75f3cc25dc9ad36e7ee017a8c734f9cecf7a3dddb388265
 DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a
-EBUILD sddm-0.1.0-r1.ebuild 1639 SHA256 461bafae9c06ccd7a5b44ace6e1f11bf8f4d874be88bd05a2eae59806065ecef SHA512 41aba87ca7c23aa3f70d1c1b333ceea5fb60f81bea3aa99c11b3b1445d6bfa108a45cb739a3b4f056106d28e74689b7a48a3a27183918f0b30028f34300ab5f3 WHIRLPOOL 2dcccaed1cd98e672a7df7e420585f15b47783090332b2057155994b555f4388474cf9cceec7de4ccf2d3bbfbb803b5284b2bd9b62e911a2c4d57e689501194a
-MISC ChangeLog 1484 SHA256 7c42fbd6908b06526cd6e258f9f6aae8201b5d9c76ad0bf91cc1bc87ac644749 SHA512 21b5bb374934919d980be976ffd548b543bc89d1d600a545766c041fd75164f1fbfa07df64d2bece00a78090e391dfb7c128c0de89f3cfb7c31c76df151234ac WHIRLPOOL f32a8749c02babb33e2b577c237c339c4866d88f5370118c9dfc7931ce5ff094ff68a91f3c23d0da7667366ecfc519b3e915c1fab1b0a8e87afcced44d8c0d0b
+EBUILD sddm-0.1.0-r1.ebuild 1638 SHA256 77f19ee6b7f3a4fbc6503a8480571a88e13758d39701e1f66b199874aae6fe93 SHA512 026a159b61124cf3a8dac221f0be63c39b023483a62d441e690e56acc4772528c984ed1cce4c2c915b0cad0e42cdbac4d29967979542a9e4e8de21a1d7506071 WHIRLPOOL 862316e81d6fa1f24d5e2f591956916317c3d8d74460bf8d6442a49ce752f172162ad5c1b0c5b77d25ad3e82e54de0c6a3bd2c22eef8a2f9c0c8704495e8ff97
+MISC ChangeLog 1638 SHA256 9d5b9cd06f60a43ff7debd5be6e0efcf295363958a96c619c5fb93085cab9933 SHA512 393b6138df575e7513ae4e7d148e3dfb5399aebb3ec08d0ebff724f7a12ae2a4be0bf3ef40ad1ffb0d096871b7384c6b3a9e767af623a568be3fd9c1acc689aa WHIRLPOOL 9590442c6b43faa8f1db7cd28c0b74947ce86609b377774ffebef1f2d48534aa8bbe5a8e8ab6124a2883c23fa855087cf6bb5d30457ab99df35a6899b7bda768
 MISC metadata.xml 684 SHA256 260a9c7c0edd03a2986bee9e483994c9fb135707e9c02340a03c49cfbc2d3f2c SHA512 2cb1389468e2879bab30fcfbb21bc38cf6c35cd7927786cf4293e7775e838a660f488816f1738e6ecb1420b44b8fd1039541614dfe6d2d1d8c629d4a63b1e558 WHIRLPOOL f26b41cbea499725954de851b80f1815b62b6220fa639da5d699a0716a387c279b8a5ea9462a4ef008f407cd777be31859ad43cf77a9c48ab1a0dd6e14fbbee3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0O3eAAoJEEdUh39IaPFNGb4H/3paYBEOkHV0txLm57pvlxi7
-XW/n6vf01zXsFdCyLMVt/4pUQxPyFWgAcKr0VTdKwjQwRCQ7MB7/yPGNZpsPikw6
-hJA/DFk0VMYpC5PXuHoZNF3sPfmSaD/g3oJw6H9RVPv+4RvxWITdxOeqkDGm7xci
-6ejH401xNH9bCBn60jWhVvdwdYg/QEbpSIFS3i3eGQL9ZJaC/8eS0OvVjVFEe3EZ
-v11xPwpl3Dp1MbVboBPw5kOdo1ecmBX85IGdD6k6zDR7qL++w9vwPJp/GbF9CJey
-Zh3Kf5839UvPr0CUZtXDF05B8H91vPnYvlFjFoPf0hg6qsL7Xau98+fbUvm7MkE=
-=T/iI
+iQJ8BAEBCABmBQJUBKItXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0EEP/34Jc1GrBKizU6BHZEixTR2u
+K3HoINqJ52B51pOK03SYfzJhWpoY1x6kcd89RmXFyTU7dg13jyDKKcU1k3V3mSmF
+bOEichRw6EsNrGVLI7URlEZGZzRNo1nMbxQ2kdMbpZuNRUm5P/xpMet9tI6WKWhX
+OQ2D1UQaUy0occfE/Px/nYPUVg+Nuynf7W7fFy81hD6uf2t6XpE8b+sjDyDmSfWe
+fp1gkPzdIROtNc7lyawnSPibfuyMy45sGRpCuuO3nt49/6J3xAmLR1JBQKMyvqSS
+GuIMBfjv8yOaF6Wh8ruL6URtYgE9jtBXuDGW7sDn0+EY5tpfvmkgTxSsLM9WAgLD
+sBBzhXqQOZfZNvrLhFf6xKQ/EVfr9974s+oK4ihaV2tIPzsVQ6FkgG5vZpq88kuf
+IN7AvjCB3XPn83iF8AqaIC5xkuMGxcIj4NHp5RULSOeFakm06AkopbQh1lc3DLyy
+mXGtH62uhYKiU1k8tedhL5bNUsY1aBV6ICUjo4xESOx/eJLrPVfhomKveD+HsKUr
+NH+FNXt5863q8VAYdjWQ733Vizv4U703h4A8NdqKr9CizhhSvEvZ1gMMSzKo5MrG
+NMdBW7PbRx12Nw29I7Vh+Uec+4M7WyXEsiPS4oNMciBdvk424BHuUWje4vCsjeNJ
+PzPFr77UBnQFXr4B9r1h
+=y+uM
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sddm/sddm-0.1.0-r1.ebuild b/x11-misc/sddm/sddm-0.1.0-r1.ebuild
index e1dc6e6a901b..d4e3be6b4ee1 100644
--- a/x11-misc/sddm/sddm-0.1.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.1.0-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/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.4 2014/06/08 11:32:01 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.5 2014/09/01 16:43:24 mgorny Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs
@@ -21,7 +21,7 @@ RDEPEND="sys-libs/pam
 	dev-qt/qtdbus:4
 	consolekit? ( sys-auth/consolekit )
 	systemd? ( sys-apps/systemd:= )
-	upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${RDEPEND}
 	>=sys-devel/gcc-4.7.0
 	virtual/pkgconfig"