Provide masked openrc-force USE (#480336)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 26 insertions, 10 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 9f5df2e83a0f..0bc698350d84 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.47 2013/09/01 18:47:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.48 2013/09/28 09:27:38 pacho Exp $
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.8.4-r1.ebuild,
+  metadata.xml:
+  Provide masked openrc-force USE (#480336)
 
   01 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.8.4-r1.ebuild:
   Drop notes about intel[gallium] as it works fine for me and haven't seen any
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index fdd53326e966..cf5a433c252c 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -16,13 +16,13 @@ AUX gnome-shell-defaults.patch 889 SHA256 83ddd289cc3a6ab29a7e8b4a19d2d10a7ffd05
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
 DIST gnome-shell-3.8.4.tar.xz 1517048 SHA256 547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47 SHA512 e35ccf9b4a52c98754ef80712f489f660e355b2694c41165ab4c398a53935f7cad6f7d2a5655d03557684e93fb684dfe817767a12017c227a143b77785b3b073 WHIRLPOOL 72c6c25d53226f6336e3c0c214cc85c4f18aaa76557bc3599d3a579aeff9b46edb05be451d2bbab5713f6b3f0eba7e5b9a4d627786d0d639a4799c803946d439
 EBUILD gnome-shell-3.6.3.1.ebuild 7138 SHA256 e8e1bf07cb3768a303714db4fd16b3ba59adc67624ee4b83de35a8b1a3d17f25 SHA512 600e3a5c38dfe9742d4d0540b8cc6a87fc5bf663d99cd76fcc160a0ce97f967e3d93fb750120e30abee8580c84c00cf8ba08190e9f856e34938afdb01ab3574b WHIRLPOOL 30c66e7a010818f69d0387c145041bdcc2354f44e83939796c9b3ace20e77b5e469838f055da342451baa24e940474f0aec4e74fce8e92434fbb98c0334de6c6
-EBUILD gnome-shell-3.8.4-r1.ebuild 7778 SHA256 d859080601a207de0667dff923bd99eeed7a06df068c2f32639a3185d7e864fb SHA512 25831ff6cba574464808dce0066219f704eb76a00d1cc4b2aa62b4782296f5d35a6aa9015a2871994cff024736050149fd1b430e84cb64b3e76c43fd309480c7 WHIRLPOOL 5365f67d233f629b54d5227619c1460bb85070ed81f1bdd9c1340ce21b354bd37d3d00e3a65799431054ee96cba1f1dbe302154d573c13740cb0fe453e61ceb8
-MISC ChangeLog 11446 SHA256 3a84c645616a8c05b0c589ecd0588ce939458e859e5f9bf29bfcef46a300f47b SHA512 2c27ad00a10c01e6f5d348152f11fdc754ca0602d816609ed3dbaf5d1a32da1d25c920e415b122a30d06f0074f7a121c0b30b8519b90cbd6b03b69e205381f3f WHIRLPOOL 362c8481b38236e62a4f1d7b27cbb070da4ac92835d3034b9387578c54551b1515a41cea6ece703abe5701e9f051e2c5f2cb7778614abc01532c5b7a7bfb3e2d
-MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
+EBUILD gnome-shell-3.8.4-r1.ebuild 8198 SHA256 b73471d7998d67a7a54df67b99a93934f2409fdeae59605fd2e3bed3c0bc7450 SHA512 eeb82eaedb1a18013bae7784b93c6451d1663c68d48b99d1fa06e4cd8f3b33f9f274d5481db2f23f97bff3969e88027de799579c8a841e0114e5b5e0e5fdfb9f WHIRLPOOL 3acca25364b280b2fc5f4703f36ad23e3420d2b1f8f785752d5fa2412db8be2b8fc9874b21f749867e97ebc3d527b10967c360b9823effa1610bd182707a2e06
+MISC ChangeLog 11582 SHA256 60daa0098ad0218d5dd97c0bd4dc87264a59fef0fd727c6b1fba939b925e464f SHA512 b67917bd5f525bf242fa74b2f653030277e24a104b4c4ddf4863b9b2b3081616cf4d9bb2ad0ec270afc1e930beb022212d55892b48ffab0ba4a94f33ecf514e4 WHIRLPOOL 9ea26c6dac6cec3b77131b153b78f89b991b92c26855ba4c7cb5a98dfdd8b23dbdb3fb307b7ea88d2d78282949a6a1c262badc62f6a0980e0958074ccb6c3e60
+MISC metadata.xml 629 SHA256 cb22d3276b34bccb63689e7c61eaa5776e8a5610bbf48c3f7cab33ddcde23a8f SHA512 5c3983ec8346c5f1c9fc00199621662413892451c90db33aa9771a700bb96451d90040ab6ce06c172b0e1a0c51c3354d4d120f1ef8f4aca0735fd1c3e68d62f7 WHIRLPOOL 7b149c2598e1f9ca787ab2b21844939e5cdb13f99d3a51cc8c6bb7eac3657367503d7c71c4ec6ae8366580d3f90add5f94ee263f5a15c36cb8fc1ce19577bf11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIji9cACgkQCaWpQKGI+9RTyACfRhDEwN4e3X0dhzmysxZQUU0Y
-LhIAn193pXjq4n3uHS199SZNi4kkywJp
-=2u1+
+iEYEAREIAAYFAlJGoQsACgkQCaWpQKGI+9R3KACdHmhAtkX9HCrsKzx4drueLbIl
+Jj4An21LQQc374qpIkdLNamXrX+avpOQ
+=MlRw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild
index 7cb37f40b059..c8893b689eb0 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild,v 1.3 2013/09/01 18:47:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild,v 1.4 2013/09/28 09:27:38 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager"
+IUSE="+bluetooth +i18n +networkmanager -openrc-force"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
@@ -94,7 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.8.3
 	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 
-	>=sys-apps/systemd-31
+	!openrc-force? ( >=sys-apps/systemd-31 )
 
 	x11-misc/xdg-utils
 
@@ -222,4 +222,12 @@ pkg_postinst() {
 		ewarn "properly. Please follow this guide to migrate:"
 		ewarn "http://wiki.gentoo.org/wiki/Systemd"
 	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
 }
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index ad30ffa25276..a5b078d6087c 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -5,6 +5,10 @@
 <use>
 	<flag name="i18n">Enable support for enhanced input methods through
 		<pkg>app-i18n/ibus</pkg></flag>
+	<flag name="openrc-force">Skip systemd dependency (#480336),
+		enabling this flag will become your setup to be fully
+		unsupported by upstream and downstream Gnome team. Do not
+		try to enable it unless completely needed</flag>
 	<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 		<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 </use>