6 files changed, 168 insertions, 29 deletions
diff --git a/x11-themes/numix-gtk-theme-dark/Manifest b/x11-themes/numix-gtk-theme-dark/Manifest
new file mode 100644
index 00000000..d5a7f2d8
--- /dev/null
+++ b/x11-themes/numix-gtk-theme-dark/Manifest
@@ -0,0 +1 @@
+DIST numix-gtk-theme_2.4.orig.tar.gz 70818 SHA256 b50c827e3f42b01963e858f7a0d69efb93f435b2d84d9e17aa47f64b598b6a2d SHA512 d4ec9c077aff740927ab8aca861ea694542542dc560934a38e5ddaa8533c2d3cc396cc448ada9220ddd7fdc8333f943c352bbf968f238b7ec0dc7dabc51c1b9e WHIRLPOOL d927f521deaa24d8e8f86f5532163be3d63c12445984bbccdf41f07cbbe5205230c14d82c519f0c6848ff0bfe9fd0b021bd288090bcde880429bfe030883977c
diff --git a/x11-themes/numix-gtk-theme-dark/files/dark.patch b/x11-themes/numix-gtk-theme-dark/files/dark.patch
new file mode 100644
index 00000000..dfc0a671
--- /dev/null
+++ b/x11-themes/numix-gtk-theme-dark/files/dark.patch
@@ -0,0 +1,58 @@
+diff -Nur a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
+--- a/gtk-2.0/gtkrc	2014-05-04 12:48:11.000000000 +0300
++++ b/gtk-2.0/gtkrc	2015-03-15 15:49:42.744944342 +0200
+@@ -1,6 +1,6 @@
+ # Numix GTK Theme
+ 
+-gtk-color-scheme = "bg_color:#dedede\nfg_color:#555555\nbase_color:#f9f9f9\ntext_color:#333333\nselected_bg_color:#d64937\nselected_fg_color:#f9f9f9\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dcdcdc\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
++gtk-color-scheme = "bg_color:#2d2d2d\nfg_color:#dedede\nbase_color:#2d2d2d\ntext_color:#dedede\nselected_bg_color:#d64937\nselected_fg_color:#dedede\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dedede\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dedede\ntoolbar_bg_color:#2d2d2d\ntoolbar_fg_color:#dedede\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dedede\npanel_bg_color:#2d2d2d\npanel_fg_color:#dedede\nlink_color:#fc6f5d"
+ 
+ # Default Style
+ 
+diff -Nur a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
+--- a/gtk-3.0/gtk.css	2014-05-04 12:48:11.000000000 +0300
++++ b/gtk-3.0/gtk.css	2015-03-15 15:50:38.198859149 +0200
+@@ -1,16 +1,16 @@
+ /* default color scheme */
+-@define-color bg_color #dedede;
+-@define-color fg_color #555555;
+-@define-color base_color #f9f9f9;
+-@define-color text_color #333333;
++@define-color bg_color #2d2d2d;
++@define-color fg_color #dedede;
++@define-color base_color #2d2d2d;
++@define-color text_color #dedede;
+ @define-color selected_bg_color #d64937;
+-@define-color selected_fg_color #f9f9f9;
++@define-color selected_fg_color #dedede;
+ @define-color tooltip_bg_color #2d2d2d;
+-@define-color tooltip_fg_color #dcdcdc;
++@define-color tooltip_fg_color #dedede;
+ 
+ /* dark color scheme */
+ @define-color dark_bg_color #2d2d2d;
+-@define-color dark_fg_color #dcdcdc;
++@define-color dark_fg_color #dedede;
+ 
+ /* colormap actually used by the theme, to be overridden in other css files */
+ @define-color theme_bg_color @bg_color;
+diff -Nur a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
+--- a/gtk-3.0/gtk-dark.css	2014-05-04 12:48:11.000000000 +0300
++++ b/gtk-3.0/gtk-dark.css	2015-03-15 15:50:45.192974328 +0200
+@@ -1,12 +1,12 @@
+ /* default color scheme */
+-@define-color base_color #333333;
++@define-color base_color #2d2d2d;
+ @define-color bg_color #2d2d2d;
+ @define-color text_color #dedede;
+-@define-color fg_color #dcdcdc;
++@define-color fg_color #2d2d2d;
+ @define-color selected_bg_color #d64937;
+-@define-color selected_fg_color #f9f9f9;
++@define-color selected_fg_color #dedede;
+ @define-color tooltip_bg_color #2d2d2d;
+-@define-color tooltip_fg_color #dcdcdc;
++@define-color tooltip_fg_color #2d2d2d;
+ 
+ /* dark color scheme */
+ @define-color dark_bg_color #2d2d2d;
diff --git a/x11-themes/numix-gtk-theme-dark/numix-gtk-theme-dark-2.4.ebuild b/x11-themes/numix-gtk-theme-dark/numix-gtk-theme-dark-2.4.ebuild
new file mode 100644
index 00000000..6feb78f9
--- /dev/null
+++ b/x11-themes/numix-gtk-theme-dark/numix-gtk-theme-dark-2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+MY_P="numix-gtk-theme"
+MY_PN="NumixDark"
+
+DESCRIPTION="Numix GTK Theme"
+HOMEPAGE="https://numixproject.org/"
+SRC_URI="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/${MY_P}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+gtk3 metacity openbox unity xfwm4"
+
+DEPEND=""
+RDEPEND="x11-themes/gtk-engines-murrine
+	gtk3? ( x11-themes/gtk-engines-unico )"
+
+S="${WORKDIR}/${MY_P}-${PV}"
+
+src_prepare() {
+	epatch -p1 "${FILESDIR}/dark.patch"
+}
+
+src_install() {
+	cd "${S}"
+	dodir /usr/share/themes/${MY_PN}
+	insinto /usr/share/themes/${MY_PN}
+	doins -r "${S}"/*
+
+	use gtk3 || {
+		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+	}
+	
+	use metacity || {
+		rm -R "${D}"/usr/share/themes/*/metacity-1 || die
+	}
+	
+	use openbox || {
+		rm -R "${D}"/usr/share/themes/*/openbox-3 || die
+	}
+	
+	use unity || {
+		rm -R "${D}"/usr/share/themes/*/unity || die
+	}
+	
+	use xfwm4 || {
+		rm -R "${D}"/usr/share/themes/*/xfwm4 || die
+	}
+
+}
diff --git a/x11-themes/numix-gtk-theme/Manifest b/x11-themes/numix-gtk-theme/Manifest
new file mode 100644
index 00000000..d5a7f2d8
--- /dev/null
+++ b/x11-themes/numix-gtk-theme/Manifest
@@ -0,0 +1 @@
+DIST numix-gtk-theme_2.4.orig.tar.gz 70818 SHA256 b50c827e3f42b01963e858f7a0d69efb93f435b2d84d9e17aa47f64b598b6a2d SHA512 d4ec9c077aff740927ab8aca861ea694542542dc560934a38e5ddaa8533c2d3cc396cc448ada9220ddd7fdc8333f943c352bbf968f238b7ec0dc7dabc51c1b9e WHIRLPOOL d927f521deaa24d8e8f86f5532163be3d63c12445984bbccdf41f07cbbe5205230c14d82c519f0c6848ff0bfe9fd0b021bd288090bcde880429bfe030883977c
diff --git a/x11-themes/numix-gtk-theme/numix-gtk-theme-2.4.ebuild b/x11-themes/numix-gtk-theme/numix-gtk-theme-2.4.ebuild
new file mode 100644
index 00000000..a5655681
--- /dev/null
+++ b/x11-themes/numix-gtk-theme/numix-gtk-theme-2.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="Numix"
+
+DESCRIPTION="Numix GTK Theme"
+HOMEPAGE="https://numixproject.org/"
+SRC_URI="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+gtk3 metacity openbox unity xfwm4"
+
+DEPEND=""
+RDEPEND="x11-themes/gtk-engines-murrine
+	gtk3? ( x11-themes/gtk-engines-unico )"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+src_install() {
+	cd "${S}"
+	dodir /usr/share/themes/${MY_PN}
+	insinto /usr/share/themes/${MY_PN}
+	doins -r "${S}"/*
+	
+	use gtk3 || {
+		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+	}
+	
+	use metacity || {
+		rm -R "${D}"/usr/share/themes/*/metacity-1 || die
+	}
+	
+	use openbox || {
+		rm -R "${D}"/usr/share/themes/*/openbox-3 || die
+	}
+	
+	use unity || {
+		rm -R "${D}"/usr/share/themes/*/unity || die
+	}
+	
+	use xfwm4 || {
+		rm -R "${D}"/usr/share/themes/*/xfwm4 || die
+	}
+}
diff --git a/x11-themes/numix/numix-9999.ebuild b/x11-themes/numix/numix-9999.ebuild
deleted file mode 100644
index 1c59ac7f..00000000
--- a/x11-themes/numix/numix-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit git-r3
-
-DESCRIPTION="modern flat theme"
-HOMEPAGE="https://github.com/shimmerproject/Numix"
-EGIT_REPO_URI="git://github.com/shimmerproject/Numix"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	x11-themes/gtk-engines-murrine
-"
-DEPEND="
-	${RDEPEND}
-"
-
-RESTRICT="binchecks strip"
-
-src_install() {
-	insinto /usr/share/themes/${PN}
-	doins -r *
-}