Add systemd subprofiles (#481920 and http://gentoo.2317880.n4.nabble.com/Addition-of-systemd-subprofiles-td270299.html )

13 files changed, 73 insertions, 16 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cf52373d8ea0..5b18dfd95619 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,26 @@
 # ChangeLog for profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8288 2013/10/09 17:10:37 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8289 2013/10/09 18:07:17 pacho Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  09 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +default/linux/amd64/13.0/desktop/gnome/systemd/parent,
+  +default/linux/arm/13.0/desktop/gnome/systemd/parent,
+  +default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent,
+  +default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
+  ,
+  +default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
+  , +default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent,
+  +default/linux/x86/13.0/desktop/gnome/systemd/parent, profiles.desc,
+  +targets/systemd/make.defaults, +targets/systemd/package.mask,
+  +targets/systemd/package.use.mask, +targets/systemd/use.mask:
+  Add systemd subprofiles (#481920 and
+  http://gentoo.2317880.n4.nabble.com/Addition-of-systemd-subprofiles-td270299.
+  html )
+
   09 Oct 2013; Thomas Kahle <tomka@gentoo.org> package.mask:
   Mask dev-games/gigi for removal
 
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 2cf3d4f966f7..fd409c7b4ca8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -18,6 +18,7 @@ amd64           default/linux/amd64/13.0                        stable
 amd64           default/linux/amd64/13.0/selinux                dev
 amd64           default/linux/amd64/13.0/desktop                stable
 amd64           default/linux/amd64/13.0/desktop/gnome          stable
+amd64		default/linux/amd64/13.0/desktop/gnome/systemd	stable
 amd64           default/linux/amd64/13.0/desktop/kde            stable
 amd64           default/linux/amd64/13.0/developer              stable
 amd64           default/linux/amd64/13.0/no-multilib            dev
@@ -27,6 +28,7 @@ amd64           default/linux/amd64/13.0/x32                    dev
 arm             default/linux/arm/13.0                          stable
 arm             default/linux/arm/13.0/desktop                  dev
 arm             default/linux/arm/13.0/desktop/gnome            dev
+arm		default/linux/arm/13.0/desktop/gnome/systemd	dev
 arm             default/linux/arm/13.0/desktop/kde              dev
 arm             default/linux/arm/13.0/developer                dev
 arm             default/linux/arm/13.0/armv4                    dev
@@ -89,23 +91,26 @@ mips            default/linux/mips/13.0/mipsel/multilib/n32     dev
 mips            default/linux/mips/13.0/mipsel/multilib/n64     exp
 
 # PPC32 Profiles
-ppc             default/linux/powerpc/ppc32/13.0                stable
-ppc             default/linux/powerpc/ppc32/13.0/desktop        stable
-ppc             default/linux/powerpc/ppc32/13.0/desktop/gnome  stable
-ppc             default/linux/powerpc/ppc32/13.0/desktop/kde    stable
-ppc             default/linux/powerpc/ppc32/13.0/developer      stable
+ppc             default/linux/powerpc/ppc32/13.0                		stable
+ppc             default/linux/powerpc/ppc32/13.0/desktop        		stable
+ppc             default/linux/powerpc/ppc32/13.0/desktop/gnome  		stable
+ppc		default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd		stable
+ppc             default/linux/powerpc/ppc32/13.0/desktop/kde    		stable
+ppc             default/linux/powerpc/ppc32/13.0/developer      		stable
 
 # PPC64 Profiles
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland                 stable
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop         stable
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome   stable
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde     stable
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/developer       stable
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland                 stable
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop         stable
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome   stable
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde     stable
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/developer       stable
+ppc             default/linux/powerpc/ppc64/13.0/32bit-userland                 	stable
+ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop         	stable
+ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome   	stable
+ppc		default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd	stable
+ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde     	stable
+ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/developer       	stable
+ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland                 	stable
+ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop         	stable
+ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome   	stable
+ppc64		default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd	stable
+ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde     	stable
+ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/developer      		stable
 
 # S390 Profiles
 s390            default/linux/s390/13.0                         dev
@@ -130,6 +135,7 @@ x86             default/linux/x86/13.0                          stable
 x86             default/linux/x86/13.0/selinux                  dev
 x86             default/linux/x86/13.0/desktop                  stable
 x86             default/linux/x86/13.0/desktop/gnome            stable
+x86		default/linux/x86/13.0/desktop/gnome/systemd	stable
 x86             default/linux/x86/13.0/desktop/kde              stable
 x86             default/linux/x86/13.0/developer                stable
 
diff --git a/profiles/targets/systemd/make.defaults b/profiles/targets/systemd/make.defaults
new file mode 100644
index 000000000000..d729c2611e9c
--- /dev/null
+++ b/profiles/targets/systemd/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/make.defaults,v 1.1 2013/10/09 18:07:18 pacho Exp $
+
+USE="systemd"
diff --git a/profiles/targets/systemd/package.mask b/profiles/targets/systemd/package.mask
new file mode 100644
index 000000000000..addbaf9cded5
--- /dev/null
+++ b/profiles/targets/systemd/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.mask,v 1.1 2013/10/09 18:07:18 pacho Exp $
+
+# sys-kernel/genkernel is not compatible with Systemd, you need
+# to use sys-kernel/genkernel-next instead
+sys-kernel/genkernel
diff --git a/profiles/targets/systemd/package.use.mask b/profiles/targets/systemd/package.use.mask
new file mode 100644
index 000000000000..e1a96b16709f
--- /dev/null
+++ b/profiles/targets/systemd/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.use.mask,v 1.1 2013/10/09 18:07:18 pacho Exp $
+
+# 'static-libs' support on sys-apps/systemd is not provided
+virtual/udev static-libs
+sys-fs/cryptsetup static static-libs
+sys-fs/lvm2 static static-libs
diff --git a/profiles/targets/systemd/use.mask b/profiles/targets/systemd/use.mask
new file mode 100644
index 000000000000..a3d5e6ce6671
--- /dev/null
+++ b/profiles/targets/systemd/use.mask
@@ -0,0 +1,2 @@
+# People running systemd must use logind instead
+consolekit