Merge branch 'master' into 'master'

bumping theme to 2.2



See merge request !7

11 files changed, 87 insertions, 112 deletions

diff --git a/app-misc/kogaion-skel/files/3.0/img/kogaion-weblink.png b/app-misc/kogaion-skel/files/3.0/img/kogaion-weblink.png
index 2aaec569..2999a556 100644
--- a/app-misc/kogaion-skel/files/3.0/img/kogaion-weblink.png
+++ b/app-misc/kogaion-skel/files/3.0/img/kogaion-weblink.png
diff --git a/app-misc/kogaion-skel/files/3.0/plasma-appletsrc b/app-misc/kogaion-skel/files/3.0/plasma-appletsrc
deleted file mode 100644
index 25f33463..00000000
--- a/app-misc/kogaion-skel/files/3.0/plasma-appletsrc
+++ /dev/null
@@ -1,104 +0,0 @@
-[Containments][1]
-activity=
-desktop=0
-formfactor=0
-geometry=0,0,1024,768
-immutability=1
-location=0
-plugin=desktop
-screen=0
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][1][Applets][31]
-geometry=750,540,269,188
-immutability=1
-plugin=rssnow
-zvalue=170
-
-[Containments][1][Applets][31][Configuration]
-animations=true
-droptarget=false
-feeds=http://www.rogentos.ro/feeds/news.rss,http://planet.rogentos.ro/?feed=rss2
-interval=30
-logo=true
-maxAge=0
-switchInterval=10
-
-[Containments][1][Wallpaper][image]
-slideTimer=600
-slidepaths=/usr/kde/4.2/share/wallpapers/
-userswallpapers=/usr/share/backgrounds/kogaionlinux.png
-wallpaper=/usr/share/backgrounds/kogaionlinux.png
-wallpapercolor=32,64,86
-wallpaperposition=0
-
-[Containments][3]
-activity=
-desktop=-1
-formfactor=2
-geometry=0,-41,1024,35
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][3][Applets][4]
-geometry=0,3,32,32
-immutability=1
-plugin=launcher
-zvalue=0
-
-[Containments][3][Applets][4][Shortcuts]
-global=Alt+F1
-
-[Containments][3][Applets][5]
-geometry=36,3,32,32
-immutability=1
-plugin=notifier
-zvalue=0
-
-[Containments][3][Applets][6]
-geometry=72,3,43,32
-immutability=1
-plugin=pager
-zvalue=0
-
-[Containments][3][Applets][7]
-geometry=119,3,699,32
-immutability=1
-plugin=tasks
-zvalue=0
-
-[Containments][3][Applets][8]
-geometry=822,3,112,32
-immutability=1
-plugin=systemtray
-zvalue=0
-
-[Containments][3][Applets][8][Configuration][PopupApplet]
-DialogHeight=72
-DialogWidth=200
-
-[Containments][3][Applets][9]
-geometry=938,3,64,32
-immutability=1
-plugin=digital-clock
-zvalue=0
-
-[Containments][3][Applets][9][Configuration][ExtenderItems][1]
-extenderIconName=view-pim-calendar
-extenderItemName=calendar
-extenderTitle=Calendar
-sourceAppletId=9
-sourceAppletPluginName=digital-clock
-
-[Containments][3][Applets][9][Configuration][PopupApplet]
-DialogHeight=268
-DialogWidth=250
-
-[Containments][3][Configuration]
-maximumSize=1024,35
-minimumSize=1024,35
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-gentoo.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-gentoo.desktop
index 9c1b0f0c..ac9b3f6c 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-gentoo.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-gentoo.desktop
@@ -6,4 +6,5 @@ Exec=xdg-open http://www.gentoo.org/doc/en/index.xml
 Icon=kogaion-weblink
 
 Name=Gentoo Documentation
+Name[ro]=Documentație Gentoo
 
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-getlivehelp.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-getlivehelp.desktop
index 27858af4..1bd3e6e6 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-getlivehelp.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-getlivehelp.desktop
@@ -6,4 +6,4 @@ Exec=xdg-open http://webchat.freenode.net/?channels=rogentos-dezvoltare
 Icon=kogaion-weblink
 
 Name=Get Live Help
-
+Name[ro]=Cere Ajutor Online
\ No newline at end of file
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-git.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-git.desktop
index 8bca52a9..0b13214a 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-git.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-git.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Type=Application
 
-Exec=xdg-open https://github.com/Rogentos
+Exec=xdg-open https://gitlab.com/kogaion/kogaion-desktop
 Icon=kogaion-weblink
 
 Name=Kogaion Git Repos
-
+Name[ro]=Depozite Kogaion
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-homepage.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-homepage.desktop
index d37e1466..247ee027 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-homepage.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-homepage.desktop
@@ -6,4 +6,5 @@ Exec=xdg-open http://rogentos.ro/
 Icon=kogaion-weblink
 
 Name=Kogaion Homepage
+Name[ro]=Pagina Web Kogaion
 
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-kogaion.directory b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-kogaion.directory
index 1e8dda1e..733d9c96 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-kogaion.directory
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-kogaion.directory
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 
-Icon=start-here
+Icon=kogaion-logo
 Name=Kogaion
 
 
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-mirrors.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-mirrors.desktop
index 225834b1..90b0bfd9 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-mirrors.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-mirrors.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Type=Application
 
-Exec=xdg-open http://rogentos.ro/#download
+Exec=xdg-open http://bpr.bluepink.ro/~rogentos/iso/kogaion/
 Icon=kogaion-weblink
 
-Name=Download Locations
-
+Name=Download
+Name[ro]=Descarcare
\ No newline at end of file
diff --git a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-wiki.desktop b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-wiki.desktop
index 889feb29..6cb812af 100644
--- a/app-misc/kogaion-skel/files/3.0/xdg/kogaion-wiki.desktop
+++ b/app-misc/kogaion-skel/files/3.0/xdg/kogaion-wiki.desktop
@@ -2,8 +2,9 @@
 Encoding=UTF-8
 Type=Application
 
-Exec=xdg-open http://wiki.rogentos.ro/wiki/Pagina_principal%C4%83
+Exec=xdg-open http://wiki.rogentos.ro/wiki/Categorie:Kogaion_Linux
 Icon=kogaion-weblink
 
 Name=Kogaion Documentation
+Name[ro]=Documentație Kogaion
 
diff --git a/app-misc/kogaion-skel/kogaion-skel-2.1.ebuild b/app-misc/kogaion-skel/kogaion-skel-2.1.ebuild
new file mode 100644
index 00000000..abf8beae
--- /dev/null
+++ b/app-misc/kogaion-skel/kogaion-skel-2.1.ebuild
@@ -0,0 +1,48 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+EGIT_REPO_URI="https://gitlab.com/kogaion/kogaion-skel.git"
+
+inherit eutils git-2 fdo-mime
+
+DESCRIPTION="Kogaion Linux skel tree"
+HOMEPAGE="http://www.rogentos.ro/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+DEPEND=""
+RDEPEND="
+	x11-themes/kogaion-theme
+	x11-themes/numix-icon-theme
+	x11-themes/numix-icon-theme-circle
+	x11-themes/kogaion-artwork-core"
+
+src_install () {
+	dodir /etc/xdg/menus
+	cp "${S}"/* "${D}"/etc/ -Ra
+	chown root:root "${D}"/etc/skel -R
+
+	dodir /usr/share/desktop-directories
+	cp "${FILESDIR}"/3.0/xdg/*.directory "${D}"/usr/share/desktop-directories/
+	dodir /usr/share/kogaion
+	cp -a "${FILESDIR}"/3.0/* "${D}"/usr/share/kogaion/
+	doicon "${FILESDIR}"/3.0/img/kogaion-weblink.png
+}
+
+pkg_postinst() {
+	if [ -x "/usr/bin/xdg-desktop-menu" ]; then
+		xdg-desktop-menu install \
+			/usr/share/kogaion/xdg/kogaion-kogaion.directory \
+			/usr/share/kogaion/xdg/*.desktop
+	fi
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_prerm() {
+	if [ -x "/usr/bin/xdg-desktop-menu" ]; then
+		xdg-desktop-menu uninstall /usr/share/kogaion/xdg/kogaion-kogaion.directory /usr/share/kogaion/xdg/*.desktop
+	fi
+}
diff --git a/x11-themes/kogaion-theme/kogaion-theme-2.2.ebuild b/x11-themes/kogaion-theme/kogaion-theme-2.2.ebuild
new file mode 100644
index 00000000..0d40452f
--- /dev/null
+++ b/x11-themes/kogaion-theme/kogaion-theme-2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2015 Rogentos
+# Distributed under the terms of the GNU General Public License v3
+# Maintainer bionel <bionel @ rogentos.ro >
+
+EAPI=5
+
+inherit eutils git-2
+
+DESCRIPTION="Official Kogaion-Linux GTK theme"
+HOMEPAGE="http://www.rogentos.ro"
+
+EGIT_BRANCH="master"
+EGIT_REPO_URI="https://gitlab.com/kogaion/kogaion-theme.git"
+EGIT_COMMIT="c682cce4ed7db2ff2bc4bd95a3355a318fb72825"
+
+
+LICENSE="GPLv3"
+SLOT="0"
+KEYWORDS="~arm x86 amd64"
+IUSE=""
+RDEPEND=""
+
+src_install() {
+	rm README.md
+	rm to_review
+	insinto /usr/share/themes
+	doins -r *
+}