added hardened/targets: testing bug #492312

5 files changed, 39 insertions, 2 deletions

diff --git a/profiles/hardened/linux/amd64/desktop/deprecated b/profiles/hardened/linux/amd64/desktop/deprecated
deleted file mode 100644
index d287b949..00000000
--- a/profiles/hardened/linux/amd64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/amd64
diff --git a/profiles/hardened/linux/amd64/desktop/parent b/profiles/hardened/linux/amd64/desktop/parent
index 8bd86303..d13cb7df 100644
--- a/profiles/hardened/linux/amd64/desktop/parent
+++ b/profiles/hardened/linux/amd64/desktop/parent
@@ -1,2 +1,2 @@
 ..
-../../../../targets/desktop
+../../../targets/desktop/
diff --git a/profiles/hardened/targets/desktop/make.defaults b/profiles/hardened/targets/desktop/make.defaults
new file mode 100644
index 00000000..5c13f821
--- /dev/null
+++ b/profiles/hardened/targets/desktop/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/desktop/make.defaults,v 1.26 2013/01/20 13:43:03 dilfridge Exp $
+
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/hardened/targets/desktop/package.use b/profiles/hardened/targets/desktop/package.use
new file mode 100644
index 00000000..135b01df
--- /dev/null
+++ b/profiles/hardened/targets/desktop/package.use
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.31 2013/12/03 07:20:49 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# Replaced by USE="udisks" in make.defaults for -r1 and higher
+<gnome-base/gvfs-1.14 gdu -udisks
+
+# Jeremy Olexa <darkside@gentoo.org> (07 Oct 2011)
+# Required by mesa, ultimately by xorg-server (every desktop) bug 385843
+dev-libs/libxml2 python
+
+# Samuli Suominen <ssuominen@gentoo.org> (27 Sep 2011)
+# Required by mozilla browsers wrt #372419
+media-libs/libpng apng
+
+# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
+# gudev, required by freedesktop.org udev helpers like udisks and upower
+# introspection, exception, enabled from here instead of ebuild to skip extra deps for a system package
+sys-apps/systemd gudev introspection
+sys-fs/eudev gudev introspection
+sys-fs/udev gudev introspection
+virtual/udev gudev introspection
+
+# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
+# Support for desktop file icons
+xfce-base/xfdesktop thunar
+
+# Chris Gianelloni <wolf31o2@gentoo.org> (26 Mar 2008)
+# While we may need LDAP client support, who needs the server on a desktop?
+# Did I mention that this also fixes the horrible perl dependency hell, too?
+net-nds/openldap minimal
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index bcbdaf8e..e2792f02 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -158,6 +158,7 @@ x86-fbsd	default/bsd/fbsd/x86/9.2			dev
 
 # Hardened Profiles
 amd64		hardened/linux/amd64					stable
+amd64		hardened/linux/amd64/desktop				dev
 amd64		hardened/linux/amd64/selinux				stable
 amd64		hardened/linux/amd64/no-multilib			stable
 amd64		hardened/linux/amd64/no-multilib/selinux		stable