profiles: Add targets/desktop/gnome/systemd and gate relevant via it

Add a new targets/desktop/gnome/systemd profile, which parents
targets/desktop/gnome and targets/systemd, like the specific gnome
systemd profiles did. Change all these specific user exposed
desktop/gnome/systemd profiles to go through that instead of directly
to targets/systemd. This will allow us to do package.use,
make.defaults (default USE flags) and other tweaks separate from the
main gnome profile, which is now also used for non-systemd (elogind).

Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/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
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/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
index f7739b4058774090be28d5d4af087c5c7f5a58bb..2122741fb81c0fe86e53c8388ae04b7ad28c72ce 100644 (file)
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../targets/systemd
+../../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
index f7739b4058774090be28d5d4af087c5c7f5a58bb..2122741fb81c0fe86e53c8388ae04b7ad28c72ce 100644 (file)
--- a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../targets/systemd
+../../../../../../../../targets/desktop/gnome/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
index 5d9d87f6d91e48e88b276805dcd56f002490d85a..288aeccdce827ce286c96e77a216bba4db72bf46 100644 (file)
--- 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
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/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
index 5d9d87f6d91e48e88b276805dcd56f002490d85a..288aeccdce827ce286c96e77a216bba4db72bf46 100644 (file)
--- 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
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d91e48e88b276805dcd56f002490d85a..288aeccdce827ce286c96e77a216bba4db72bf46 100644 (file)
--- a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d91e48e88b276805dcd56f002490d85a..288aeccdce827ce286c96e77a216bba4db72bf46 100644 (file)
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/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
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
index 44f88d3e2df0fce7f124f3ec745288ec371806de..f5c1ae438de470eaa588bf97d29faedb03fd66b9 100644 (file)
--- a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
+++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd

diff --git a/profiles/targets/desktop/gnome/systemd/eapi b/profiles/targets/desktop/gnome/systemd/eapi
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/targets/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/targets/desktop/gnome/systemd/parent b/profiles/targets/desktop/gnome/systemd/parent
new file mode 100644 (file)
index 0000000..ead7379
--- /dev/null
+++ b/profiles/targets/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../systemd