Merge upstream

6 files changed, 29 insertions, 32 deletions

diff --git a/x11-themes/kogaion-artwork-grub/Manifest b/x11-themes/kogaion-artwork-grub/Manifest
index e4208e98..71ad7e86 100644
--- a/x11-themes/kogaion-artwork-grub/Manifest
+++ b/x11-themes/kogaion-artwork-grub/Manifest
@@ -1 +1 @@
-DIST kogaion-artwork-grub-2.1.tar.gz 235174 SHA256 8a43caf517663d00d66b7f24e9a9148ec2eb290fe72ff900751a2c5c51b5aa81 SHA512 2476ab2b3470ed643ba0d3d39d3b16611fde22e0bad6cfad6fec992dfd492da073d772cfd9c35e686a9858a7b8866025493908cb46ce26a24d960b5c10592d32 WHIRLPOOL b3afa770fcf980b7fff3d86926768ec3c056c6e6e1f1163ce15ad0a748b6ba7eced49ec543f2b910aef0f4b2e2ae2312876893599535108d5bebabb944bf94fc
+DIST kogaion-artwork-grub-2.1.tar.gz 15426 SHA256 190391044e136a9c98c2d460355323fb1c401f6a1552cd757886bfbe662316fe SHA512 6e53b63b0dd850a828837f73bfe7721adbbd61eb0e47097603b7cd6192e8b698770f8608cabbd7e59eb8b580bbe4ef699f33f7d83d9b2533b6543b4f656a6f94 WHIRLPOOL e903bc74f2de8cb3d14ddde78d314670cac5e45ff2f795fea41a85d422ca3a826ac89f18c7d2a5a7ac25e682069531a41c8564e80226899a397e8821221a65b4
diff --git a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild
index 98f87573..779188e1 100644
--- a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild
+++ b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 DESCRIPTION="Kogaion dark theme"
 HOMEPAGE="http://rogentos.ro"
 SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz
-	https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz"
+	http://bpr.bluepink.ro/~rogentos/kogaion/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz"
 
 LICENSE="GPL"
 SLOT="0"
diff --git a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild
index 6db84e33..7812f94b 100644
--- a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild
+++ b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild
@@ -7,14 +7,13 @@ EAPI=4
 DESCRIPTION="Kogaion dark theme"
 HOMEPAGE="http://rogentos.ro"
 SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz
-	https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz
 	http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz
 	mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="gtk3 gtk2 gnome-shell unity cinnamon xfwm4"
+IUSE="gtk3 gtk2 gnome-shell xfwm4" #cinnamon unity"
 
 RDEPEND="gtk3? ( x11-themes/gtk-engines-unico )
 	x11-themes/gtk-engines-equinox
@@ -52,17 +51,17 @@ src_install() {
 	ewarn "Gnome-shell Files were not copied"
 	fi
 
-	if use cinnamon; then
-		doins -r "${S}"/cinnamon || die "Cannot copy cinnamon"
-	else
-	ewarn "Cinnamon Files were not copied"
-	fi
+	#if use cinnamon; then
+	#	doins -r "${S}"/cinnamon || die "Cannot copy cinnamon"
+	#else
+	#ewarn "Cinnamon Files were not copied"
+	#fi
 
-	if use unity; then
-		doins -r "${S}"/unity || die "Cannot copy unity"
-	else
-	ewarn "Unity Files were not copied"
-	fi
+	#if use unity; then
+	#	doins -r "${S}"/unity || die "Cannot copy unity"
+	#else
+	#ewarn "Unity Files were not copied"
+	#fi
 
 	if use xfwm4; then
 		doins -r "${S}"/xfwm4 || die "Cannot copy xfwm"
diff --git a/x11-themes/kogaion-elementary-icons/Manifest b/x11-themes/kogaion-elementary-icons/Manifest
index 2c805843..cd774f07 100644
--- a/x11-themes/kogaion-elementary-icons/Manifest
+++ b/x11-themes/kogaion-elementary-icons/Manifest
@@ -1 +1 @@
-DIST kogaion-elementary-icons-1.0.tar.gz 13559327 SHA256 9d3dc457a8c891c6e7982931d9b454ffcae47e75e27e63fd02076dd3c2c0863c SHA512 c7fa4545721b109bbc026421468d3d672336c1955353b2dcaa8efaa976f5eaf5653ffad8cd18b9340a2c55ff6476390a26771fbeb8a95543877a2defe9249dbe WHIRLPOOL 4d612164339f46eebef13945ec01d4e45f5081de47a8fa50fa00439b4620df5189f6b418977a48c7e3a42e3a23db9662e49bebdd9519cdcc6c3f44c90ab98ac5
+DIST kogaion-elementary-icons-1.0.tar.gz 15766945 SHA256 62b3a445afd212c0991b1fd98cc1e6b51445faf8ced522facfbdc68a7418222a SHA512 fedf78bec293fa6871e97768d2f4ffd102fca2e813292c82103cc706432af2205824c8b0e350eace42ee3f40e0e3918e4ba63db2938ee64df85c042cdc409266 WHIRLPOOL 0c83843cb6cee75d69c2d0fbd4bb3a459c3adfe0a52ea1eaf813690100bf0bd626a1c6edf7498d640af0542f86afd0e08257bc07d4f33cf7a5ef64956aa1721c
diff --git a/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild b/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild
index 9cc86395..8135ba51 100644
--- a/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild
+++ b/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Kogaion elementary icons"
 HOMEPAGE="https://github.com/bionel/kogaion-src"
-SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${P}.tar.gz
-	https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${P}.tar.gz
-	http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz
-	mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz"
+SRC_URI="http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz"
+	#mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +18,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 DEST="/usr/share/icons"
-S="${WORKDIR}"
+S="${WORKDIR}/${PN}"
 
 src_install() {
 	insinto ${DEST} || die
diff --git a/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild b/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild
index 7411e403..f5192a8c 100644
--- a/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild
+++ b/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="gtk3 gtk2 gnome-shell unity cinnamon xfwm4"
+IUSE="gtk3 gtk2 gnome-shell xfwm4" #unity cinnamon"
 
 RDEPEND="gtk3? ( x11-themes/gtk-engines-unico )
 	x11-themes/gtk-engines-murrine
@@ -52,17 +52,17 @@ src_install() {
 	ewarn "Gnome-shell Files were not copied"
 	fi
 
-	if use cinnamon; then
-		doins -r "${S}"/cinnamon || die "Cannot copy cinnamon"
-	else
-	ewarn "Cinnamon Files were not copied"
-	fi
+	#if use cinnamon; then
+	#	doins -r "${S}"/cinnamon || die "Cannot copy cinnamon"
+	#else
+	#ewarn "Cinnamon Files were not copied"
+	#fi
 
-	if use unity; then
-		doins -r "${S}"/unity || die "Cannot copy unity"
-	else
-	ewarn "Unity Files were not copied"
-	fi
+	#if use unity; then
+	#	doins -r "${S}"/unity || die "Cannot copy unity"
+	#else
+	#ewarn "Unity Files were not copied"
+	#fi
 
 	if use xfwm4; then
 		doins -r "${S}"/xfwm4 || die "Cannot copy xfwm"