From ef67c1c019f51d619178e415b9374891d55af50e Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Mon, 29 Jan 2018 17:54:54 -0500
Subject: [PATCH] pentoo-desktop: merging things from fsscript

---
 pentoo/pentoo-desktop/files/gtkrc-2.0             |  2 ++
 pentoo/pentoo-desktop/files/xsettings.xml         |  4 ++--
 ...8.0.ebuild => pentoo-desktop-2018.0-r1.ebuild} | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 pentoo/pentoo-desktop/files/gtkrc-2.0
 rename pentoo/pentoo-desktop/{pentoo-desktop-2018.0.ebuild => pentoo-desktop-2018.0-r1.ebuild} (95%)

diff --git a/pentoo/pentoo-desktop/files/gtkrc-2.0 b/pentoo/pentoo-desktop/files/gtkrc-2.0
new file mode 100644
index 000000000..7ecfcc062
--- /dev/null
+++ b/pentoo/pentoo-desktop/files/gtkrc-2.0
@@ -0,0 +1,2 @@
+gtk-theme-name=Xfce-basic
+gtk-icon-theme-name=Tango
diff --git a/pentoo/pentoo-desktop/files/xsettings.xml b/pentoo/pentoo-desktop/files/xsettings.xml
index 791dac58b..d38bc84f3 100644
--- a/pentoo/pentoo-desktop/files/xsettings.xml
+++ b/pentoo/pentoo-desktop/files/xsettings.xml
@@ -15,7 +15,7 @@
   </property>
   <property name="Xft" type="empty">
     <property name="DPI" type="empty"/>
-    <property name="Antialias" type="empty"/>
+    <property name="Antialias" type="int" value="1"/>
     <property name="Hinting" type="empty"/>
     <property name="HintStyle" type="string" value="hintfull"/>
     <property name="RGBA" type="string" value="rgb"/>
@@ -35,4 +35,4 @@
     <property name="CursorThemeSize" type="empty"/>
     <property name="DecorationLayout" type="empty"/>
   </property>
-</channel>
\ No newline at end of file
+</channel>
diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2018.0.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2018.0-r1.ebuild
similarity index 95%
rename from pentoo/pentoo-desktop/pentoo-desktop-2018.0.ebuild
rename to pentoo/pentoo-desktop/pentoo-desktop-2018.0-r1.ebuild
index 7adbdc869..cfe71cb34 100644
--- a/pentoo/pentoo-desktop/pentoo-desktop-2018.0.ebuild
+++ b/pentoo/pentoo-desktop/pentoo-desktop-2018.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 KEYWORDS="amd64 arm x86"
 DESCRIPTION="Pentoo meta ebuild to install all X and WM/DE related things"
@@ -116,10 +116,15 @@ src_install() {
 	doins "${FILESDIR}"/domo-roolz.jpg
 	doins "${FILESDIR}"/domo-roolz-shmoocon2014.png
 	doins "${FILESDIR}"/tux-winfly-killah.1600x1200.jpg
-	insinto /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
-	doins "${FILESDIR}"/xfce4-desktop.xml
-	doins "${FILESDIR}"/xsettings.xml
 	dosym /usr/share/pentoo/wallpaper/domo-roolz.jpg /usr/share/backgrounds/xfce/domo-roolz.jpg
 	dosym /usr/share/pentoo/wallpaper/domo-roolz-shmoocon2014.png /usr/share/backgrounds/xfce/domo-roolz-shmoocon2014.png
 	dosym /usr/share/pentoo/wallpaper/tux-winfly-killah.1600x1200.jpg /usr/share/backgrounds/xfce/tux-winfly-killah.1600x1200.jpg
+
+	insinto /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
+	doins "${FILESDIR}"/xfce4-desktop.xml
+	doins "${FILESDIR}"/xsettings.xml
+
+	#gtk-theme-switch needs X so do it manually
+	insinto /etc/skel
+	newins "${FILESDIR}"/gtkrc-2.0 .gtkrc-2.0
 }