From 051627348d7f500bc56f11d2c9bd816808f59ae9 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Mon, 29 Jun 2015 08:35:42 +0300
Subject: [net-dns/avahi*] added new stable revision

---
 net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild | 224 +++++++++++++++++++++++++
 net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild   | 170 +++++++++++++++++++
 net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild | 155 +++++++++++++++++
 net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild | 170 +++++++++++++++++++
 net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild     | 155 +++++++++++++++++
 net-dns/avahi/avahi-0.6.31-r5.ebuild           |   2 +-
 net-dns/avahi/avahi-0.6.31-r6.ebuild           |  26 +++
 7 files changed, 901 insertions(+), 1 deletion(-)
 create mode 100644 net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild
 create mode 100644 net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
 create mode 100644 net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
 create mode 100644 net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
 create mode 100644 net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
 create mode 100644 net-dns/avahi/avahi-0.6.31-r6.ebuild

diff --git a/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild b/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild
new file mode 100644
index 00000000..afb9721d
--- /dev/null
+++ b/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
+MY_P=${P/-${AVAHI_MODULE}}
+MY_PN=${PN/-${AVAHI_MODULE}}
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network (base pkg)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="autoipd bookmarks dbus doc gdbm howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat nls python selinux test"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	python? ( dbus gdbm )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
+	dev-libs/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection )
+	python? (
+		${PYTHON_DEPS}
+		dbus? ( dev-python/dbus-python )
+	)
+	selinux? ( sec-policy/selinux-avahi )
+	bookmarks? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	doc? (
+		app-doc/doxygen
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+"
+
+pkg_preinst() {
+	enewgroup netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd; then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+src_prepare() {
+	if use ipv6; then
+		sed -i \
+			-e s/use-ipv6=no/use-ipv6=yes/ \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i\
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--disable-mono \
+		--enable-glib \
+		--enable-gobject \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-gtk \
+		--disable-gtk3 \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doxygen/html/. || die
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/rc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use autoipd; then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
+		elog
+	fi
+}
diff --git a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
new file mode 100644
index 00000000..4583e15e
--- /dev/null
+++ b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
+MY_P=${P/-${AVAHI_MODULE}}
+MY_PN=${PN/-${AVAHI_MODULE}}
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network (gtk pkg)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="dbus gdbm introspection nls python utils"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	~net-dns/avahi-base-${PV}[dbus=,gdbm=,introspection=,nls=,python=,${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2
+	python? ( dev-python/pygtk )
+"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			--enable-pygtk
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--disable-pygtk \
+		--enable-glib \
+		--enable-gobject \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		--disable-qt3 \
+		--disable-qt4 \
+		$(multilib_is_native_abi && echo -n --enable-gtk || echo -n --disable-gtk) \
+		$(multilib_is_native_abi && echo -n --enable-gtk-utils || echo -n --disable-gtk-utils) \
+		--disable-gtk3 \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		for target in avahi-common avahi-client avahi-glib avahi-ui; do
+			cd "${BUILD_DIR}"/${target} || die
+			emake || die
+		done
+		cd "${BUILD_DIR}" || die
+		emake avahi-ui.pc || die
+	fi
+}
+
+multilib_src_install() {
+	mkdir -p "${D}/usr/bin" || die
+
+	if multilib_is_native_abi; then
+		cd "${BUILD_DIR}"/avahi-ui || die
+		emake DESTDIR="${D}" install || die
+		if use python; then
+			cd "${BUILD_DIR}"/avahi-python/avahi-discover || die
+			emake install DESTDIR="${D}" || die
+		fi
+		cd "${BUILD_DIR}" || die
+		dodir /usr/$(get_libdir)/pkgconfig
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins avahi-ui.pc
+
+		# Workaround for avahi-ui.h collision between avahi-gtk and avahi-gtk3
+		root_avahi_ui="${ROOT}usr/include/avahi-ui/avahi-ui.h"
+		if [ -e "${root_avahi_ui}" ]; then
+			rm -f "${D}usr/include/avahi-ui/avahi-ui.h"
+		fi
+
+		# provided by avahi-gtk3
+		rm "${D}"usr/bin/bshell || die
+		rm "${D}"usr/bin/bssh || die
+		rm "${D}"usr/bin/bvnc || die
+		rm "${D}"usr/share/applications/bssh.desktop || die
+		rm "${D}"usr/share/applications/bvnc.desktop || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}
diff --git a/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild b/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
new file mode 100644
index 00000000..1f1b21f2
--- /dev/null
+++ b/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
+MY_P=${P/-${AVAHI_MODULE}}
+MY_PN=${PN/-${AVAHI_MODULE}}
+
+WANT_AUTOMAKE=1.11
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network (gtk3 pkg)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="bookmarks dbus gdbm introspection nls python utils"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	~net-dns/avahi-base-${PV}[bookmarks=,dbus=,gdbm=,introspection=,nls=,python=,${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3
+"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# necessary until the UI libraries are ported
+	/usr/include/avahi-ui/avahi-ui.h
+)
+
+src_prepare() {
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--disable-pygtk \
+		--enable-glib \
+		--enable-gobject \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-gtk \
+		$(multilib_is_native_abi && echo -n --enable-gtk3 --enable-utils || echo -n --disable-gtk3 --disable-utils) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		for target in avahi-common avahi-client avahi-glib avahi-ui; do
+			cd "${BUILD_DIR}"/${target} || die
+			emake || die
+		done
+		cd "${BUILD_DIR}" || die
+		emake avahi-ui-gtk3.pc || die
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		mkdir -p "${D}/usr/bin" || die
+		cd "${BUILD_DIR}"/avahi-ui || die
+		emake DESTDIR="${D}" install || die
+		cd "${BUILD_DIR}" || die
+		dodir /usr/$(get_libdir)/pkgconfig
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins avahi-ui-gtk3.pc
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	use bookmarks && use python && use dbus || \
+		rm -f "${D}"/usr/bin/avahi-bookmarks
+}
diff --git a/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
new file mode 100644
index 00000000..8f8560ed
--- /dev/null
+++ b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
+MY_P=${P/-${AVAHI_MODULE}}
+MY_PN=${PN/-${AVAHI_MODULE}}
+
+WANT_AUTOMAKE=1.11
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network (mono pkg)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="dbus doc gdbm gtk introspection nls python utils"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	~net-dns/avahi-base-${PV}[dbus=,gdbm=,introspection=,nls=,python=,${MULTILIB_USEDEP}]
+	gtk? (
+		~net-dns/avahi-gtk-${PV}[dbus=,gdbm=,introspection=,nls=,python=,${MULTILIB_USEDEP}]
+		>=dev-dotnet/gtk-sharp-2
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( >=virtual/monodoc-1.1.8 )"
+RDEPEND="${COMMON_DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--disable-pygtk \
+		--enable-glib \
+		--enable-gobject \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-gtk --disable-gtk-utils \
+		--disable-gtk3 \
+		$(multilib_is_native_abi && echo -n --enable-mono || echo -n --disable-mono) \
+		$(multilib_is_native_abi && echo -n --enable-monodoc || echo -n --disable-monodoc) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		for target in avahi-common avahi-client avahi-glib avahi-sharp; do
+			cd "${BUILD_DIR}"/${target} || die
+			emake || die
+		done
+		cd "${BUILD_DIR}" || die
+		emake avahi-sharp.pc || die
+
+		if use gtk; then
+			cd "${BUILD_DIR}"/avahi-ui-sharp || die
+			emake || die
+			cd "${BUILD_DIR}" || die
+			emake avahi-ui-sharp.pc || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	mkdir -p "${D}/usr/bin" || die
+
+	if multilib_is_native_abi; then
+		cd "${BUILD_DIR}"/avahi-sharp || die
+		emake install DESTDIR="${D}" || die
+		if use gtk; then
+			cd "${BUILD_DIR}"/avahi-ui-sharp || die
+			emake install DESTDIR="${D}" || die
+		fi
+		cd "${BUILD_DIR}" || die
+		dodir /usr/$(get_libdir)/pkgconfig
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins *.pc
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}
diff --git a/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild b/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
new file mode 100644
index 00000000..0d9e68df
--- /dev/null
+++ b/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
+MY_P=${P/-${AVAHI_MODULE}}
+MY_PN=${PN/-${AVAHI_MODULE}}
+
+WANT_AUTOMAKE=1.11
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network (qt4 pkg)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="dbus gdbm introspection nls python utils"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	~net-dns/avahi-base-${PV}[dbus=,gdbm=,introspection=,nls=,python=,${MULTILIB_USEDEP}]
+	dev-qt/qtcore:4
+"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# necessary until the UI libraries are ported
+	/usr/include/avahi-qt4/qt-watch.h
+)
+
+src_prepare() {
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--disable-pygtk \
+		--enable-glib \
+		--enable-gobject \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		--disable-qt3 \
+		--disable-gtk3 \
+		--disable-gtk --disable-gtk-utils \
+		$(multilib_is_native_abi && echo -n --enable-qt4 || echo -n --disable-qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		cd "${BUILD_DIR}"/avahi-common || die
+		emake || die
+		cd "${BUILD_DIR}"/avahi-qt || die
+		emake || die
+		cd "${BUILD_DIR}" || die
+		emake avahi-qt4.pc || die
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		mkdir -p "${D}/usr/bin" || die
+
+		cd "${BUILD_DIR}"/avahi-qt || die
+		emake install DESTDIR="${D}" || die
+
+		cd "${BUILD_DIR}" || die
+		dodir /usr/$(get_libdir)/pkgconfig
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins avahi-qt4.pc
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}
diff --git a/net-dns/avahi/avahi-0.6.31-r5.ebuild b/net-dns/avahi/avahi-0.6.31-r5.ebuild
index 6fcd7c9a..18ca5eb4 100644
--- a/net-dns/avahi/avahi-0.6.31-r5.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="System which facilitates service discovery on a local network (meta
 HOMEPAGE="http://avahi.org/"
 SRC_URI=""
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild
new file mode 100644
index 00000000..18ca5eb4
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="System which facilitates service discovery on a local network (meta package)"
+HOMEPAGE="http://avahi.org/"
+SRC_URI=""
+
+KEYWORDS="amd64 ~arm x86"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+
+COMMON_DEPEND="=net-dns/avahi-base-${PVR}[autoipd=,bookmarks=,dbus=,doc=,gdbm=,howl-compat=,introspection=,ipv6=,mdnsresponder-compat=,python=,test=,nls=,selinux=,${MULTILIB_USEDEP}]
+	gtk? ( =net-dns/avahi-gtk-${PVR}[bookmarks=,gdbm=,nls=,python=,dbus=,${MULTILIB_USEDEP}] )
+	utils? ( =net-dns/avahi-gtk3-${PVR}[utils,${MULTILIB_USEDEP}] )
+	gtk3? ( =net-dns/avahi-gtk3-${PVR}[${MULTILIB_USEDEP}] )
+	mono? ( =net-dns/avahi-mono-${PVR}[${MULTILIB_USEDEP}] )
+	qt4? ( =net-dns/avahi-qt-${PVR}[${MULTILIB_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
-- 
cgit v1.2.3


From 301ec9b33478e42a70d94a1fc5cd5216416b6413 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Mon, 29 Jun 2015 10:14:17 +0300
Subject: [avahi-mono] adaugat o eclas-a lipsa

---
 net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
index 8f8560ed..ce71e88e 100644
--- a/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
+++ b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
@@ -14,7 +14,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="gdbm"
 
 inherit autotools eutils flag-o-matic multilib multilib-minimal \
-	python-r1 systemd user
+	python-r1 systemd user mono-env
 
 DESCRIPTION="System which facilitates service discovery on a local network (mono pkg)"
 HOMEPAGE="http://avahi.org/"
-- 
cgit v1.2.3


From d1af559fedc2b530501ba7d79da125c18fdc0930 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Mon, 29 Jun 2015 11:05:27 +0300
Subject: [lightdm-base] creat symlink de failsafe pentru lightdm-base in caz
 ca incearca sa-si ia configuratiile din /etc/lightdm-base

---
 x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild | 7 ++++++-
 x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
index ca1c16e7..1657b27c 100644
--- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
+++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="+introspection"
 S="${WORKDIR}/${REAL_P}"
 
@@ -105,4 +105,9 @@ src_install() {
 	readme.gentoo_create_doc
 
 	systemd_dounit "${FILESDIR}/${REAL_PN}.service"
+	if [[ -d ${D}/etc/lightdm-base ]] ; then
+		ewarn "The directory exists."
+	else
+		dosym /etc/lightdm /etc/"${PN}"
+	fi
 }
diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
index ca1c16e7..5055d565 100644
--- a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
+++ b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
@@ -105,4 +105,10 @@ src_install() {
 	readme.gentoo_create_doc
 
 	systemd_dounit "${FILESDIR}/${REAL_PN}.service"
+
+        if [[ -d ${D}/etc/lightdm-base ]] ; then
+                ewarn "The directory exists."
+        else
+                dosym /etc/lightdm /etc/"${PN}"
+        fi
 }
-- 
cgit v1.2.3


From 567d268a8caa290a53ae84ff896c22bbf54e5a05 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Mon, 29 Jun 2015 19:34:49 +0300
Subject: [inux-live-brrc] adding live-brrc ebuild for live kernel

---
 .../linux-live-brrc/linux-live-brrc-3.14.30.ebuild | 30 ++++++++++++++++++++++
 sys-kernel/linux-live-brrc/linux-live-brrc.skel    | 30 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
 create mode 100644 sys-kernel/linux-live-brrc/linux-live-brrc.skel

diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
new file mode 100644
index 00000000..8f7905fa
--- /dev/null
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2004-2013 Sabayon Linux
+# Copyright 2015 Kogaion
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator
+
+K_ROGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
+K_ROGKERNEL_FORCE_SUBLEVEL="0"
+K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+
+_ver="$(get_version_component_range 1-2)"
+if use arm; then
+	K_KERNEL_IMAGE_NAME="uImage dtbs"
+elif [ "${_ver}" = "3.9" ]; then
+	K_ROGKERNEL_ZFS="1"
+fi
+K_KERNEL_NEW_VERSIONING="1"
+
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
+
+inherit kogaion-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc.skel b/sys-kernel/linux-live-brrc/linux-live-brrc.skel
new file mode 100644
index 00000000..aeae1309
--- /dev/null
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc.skel
@@ -0,0 +1,30 @@
+# Copyright 2004-2013 Sabayon Linux
+# Copyright 2015 Kogaion
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator
+
+K_ROGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
+K_ROGKERNEL_FORCE_SUBLEVEL="0"
+K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+
+_ver="$(get_version_component_range 1-2)"
+if use arm; then
+	K_KERNEL_IMAGE_NAME="uImage dtbs"
+elif [ "${_ver}" = "3.9" ]; then
+	K_ROGKERNEL_ZFS="1"
+fi
+K_KERNEL_NEW_VERSIONING="1"
+
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
+
+inherit kogaion-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Kogaion Linux Standard kernel image"
+RESTRICT="mirror"
-- 
cgit v1.2.3


From 626d521b45da83a8b9a8af65349d9544ae644081 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Tue, 30 Jun 2015 10:14:23 +0300
Subject: [linux-live-brrc] added linux live kernel image

---
 eclass/argent-artwork.eclass                       |  60 ++
 eclass/argent-kernel.eclass                        | 967 +++++++++++++++++++++
 sys-kernel/linux-live-brrc/Manifest                |   1 +
 .../linux-live-brrc/linux-live-brrc-3.14.30.ebuild |   2 +-
 4 files changed, 1029 insertions(+), 1 deletion(-)
 create mode 100644 eclass/argent-artwork.eclass
 create mode 100644 eclass/argent-kernel.eclass
 create mode 100644 sys-kernel/linux-live-brrc/Manifest

diff --git a/eclass/argent-artwork.eclass b/eclass/argent-artwork.eclass
new file mode 100644
index 00000000..f430903a
--- /dev/null
+++ b/eclass/argent-artwork.eclass
@@ -0,0 +1,60 @@
+# Copyright 2004-2009 Sabayon Project
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+inherit eutils
+
+# @ECLASS-VARIABLE: KERN_INITRAMFS_SEARCH_NAME
+# @DESCRIPTION:
+# Argument used by `find` to search inside ${ROOT}boot Linux
+# Kernel initramfs files to patch
+KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*}"
+
+# @ECLASS-VARIABLE: GFX_SPLASH_NAME
+# @DESCRIPTION:
+# Default splash theme name to use
+GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-argent}"
+
+# @ECLASS-VARIABLE: PLYMOUTH_THEME
+# @DESCRIPTION:
+# Default plymouth theme name to use
+PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}"
+
+# @FUNCTION: update_kernel_initramfs_splash
+# @USAGE: update_kernel_initramfs_splash [splash_theme] [splash_file]
+# @RETURN: 1, if something went wrong
+#
+# @MAINTAINER:
+# Fabio Erculiani
+update_kernel_initramfs_splash() {
+
+	[[ -z "${2}" ]] && die "wrong update_kernel_splash arguments"
+
+	if ! has_version "media-gfx/splashutils"; then
+		ewarn "media-gfx/splashutils not found, cannot update kernel splash"
+		return 1
+	fi
+	splash_geninitramfs -a "${2}" ${1}
+	return ${?}
+
+}
+
+# @FUNCTION: update_argent_kernel_initramfs_splash
+# @USAGE: update_argent_kernel_initramfs_splash
+#
+# @MAINTAINER:
+# Fabio Erculiani
+update_argent_kernel_initramfs_splash() {
+	local splash_name="${GFX_SPLASH_NAME}"
+	local override_splash_file="${ROOT}etc/oem/splash_name"
+	if [ -f "${override_splash_file}" ]; then
+		found_splash_name=$(cat "${override_splash_file}" | cut -d" " -f 1)
+		if [ -d "/etc/splash/${found_splash_name}" ]; then
+			splash_name="${found_splash_name}"
+		fi
+	fi
+	for bootfile in `find ${ROOT}boot -name "${KERN_INITRAMFS_SEARCH_NAME}"`; do
+		einfo "Updating boot splash for ${bootfile}"
+		update_kernel_initramfs_splash "${GFX_SPLASH_NAME}" "${bootfile}"
+	done
+}
diff --git a/eclass/argent-kernel.eclass b/eclass/argent-kernel.eclass
new file mode 100644
index 00000000..f5d200ac
--- /dev/null
+++ b/eclass/argent-kernel.eclass
@@ -0,0 +1,967 @@
+# Copyright 2004-2014 RogentOS Team
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_NAME
+# @DESCRIPTION:
+# The kernel name used by the ebuild, it should be the ending ${PN} part
+# for example, of linux-argent it is "${PN/${PN/-*}-}" (argent)
+K_ARGKERNEL_NAME="${K_ARGKERNEL_NAME:-${PN/${PN/-*}-}}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_SELF_TARBALL_NAME
+# @DESCRIPTION:
+# If the main kernel sources tarball is generated in-house and available
+# on the "argent" mirror, set this variable to the extension name (see example
+# below). This will disable ALL the extra/local patches (since they have to
+# be applied inside the tarball). Moreover, K_ARGKERNEL_NAME,
+# K_KERNEL_PATCH_VER will be ignored.
+# Example:
+#   K_ARGKERNEL_SELF_TARBALL_NAME="argent"
+#   This would generate:
+#   SRC_URI="mirror://argent/sys-kernel/linux-${PV}+argent.tar.${K_TARBALL_EXT}"
+K_ARGKERNEL_SELF_TARBALL_NAME="${K_ARGKERNEL_SELF_TARBALL_NAME:-}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_PATCH_UPSTREAM_TARBALL
+# @DESCRIPTION:
+# If set to 1, the ebuild will fetch the upstream kernel tarball and
+# apply the RogentOS patch against it. This strategy avoids the need of
+# creating complete kernel source tarballs. The default value is 0.
+K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL:-0}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_FORCE_SUBLEVEL
+# @DESCRIPTION:
+# Force the rewrite of SUBLEVEL in kernel sources Makefile
+K_ARGKERNEL_FORCE_SUBLEVEL="${K_ARGKERNEL_FORCE_SUBLEVEL:-}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_RESET_EXTRAVERSION
+# @DESCRIPTION:
+# Force the rewrite of EXTRAVERSION in kernel sources Makefile (setting it to "")
+K_ARGKERNEL_RESET_EXTRAVERSION="${K_ARGKERNEL_RESET_EXTRAVERSION:-}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_LONGTERM
+# @DESCRIPTION:
+# Consider Kernel stable patchset as longterm (changing URL)
+K_ARGKERNEL_LONGTERM="${K_ARGKERNEL_LONGTERM:-}"
+
+# @ECLASS-VARIABLE: K_KERNEL_SOURCES_PKG
+# @DESCRIPTION:
+# The kernel sources package used to build this kernel binary
+K_KERNEL_SOURCES_PKG="${K_KERNEL_SOURCES_PKG:-${CATEGORY}/${PN/*-}-sources-${PVR}}"
+
+# @ECLASS-VARIABLE: K_KERNEL_PATCH_VER
+# @DESCRIPTION:
+# If set to "3" for example, it applies the upstream kernel
+# patch corresponding to patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.3.${K_TARBALL_EXT}
+# @TODO: deprecate and remove once 2.6.x kernels are retired
+K_KERNEL_PATCH_VER="${K_KERNEL_PATCH_VER:-}"
+
+# @ECLASS-VARIABLE: K_KERNEL_PATCH_HOTFIXES
+# @DESCRIPTION:
+# If there is the need to quickly apply patches to the kernel
+# without bumping the kernel patch tarball (for eg. in case
+# of just released security fixes), set this variable in your ebuild
+# pointing to space separated list of patch paths.
+K_KERNEL_PATCH_HOTFIXES="${K_KERNEL_PATCH_HOTFIXES:-}"
+
+# @ECLASS-VARIABLE: K_KERNEL_DISABLE_PR_EXTRAVERSION
+# @DESCRIPTION:
+# Set this to "1" if you want to tell kernel-2 eclass to
+# not use ${PR} in kernel EXTRAVERSION (K_NOUSEPR). Otherwise, set
+# this to "0" to not set K_NOUSEPR at all.
+K_KERNEL_DISABLE_PR_EXTRAVERSION="${K_KERNEL_DISABLE_PR_EXTRAVERSION:-1}"
+
+# @ECLASS-VARIABLE: K_KERNEL_SLOT_USEPVR
+# @DESCRIPTION:
+# Set this to "1" if you want to use ${PVR} in SLOT variable, instead of ${PV}
+# sys-kernel/linux-vserver (vserver-sources) require this. This won't work for
+# firmware pkgs.
+K_KERNEL_SLOT_USEPVR="${K_KERNEL_SLOT_USEPVR:-0}"
+
+# @ECLASS-VARIABLE: K_KERNEL_NEW_VERSIONING
+# @DESCRIPTION:
+# Set this to "1" if your kernel ebuild uses the new Linux kernel upstream
+# versioning and ${PV} contains the stable revision, like 3.7.1.
+# In the example above, this makes the SLOT variable contain only "3.7".
+# The sublevel version can be forced using K_ARGKERNEL_FORCE_SUBLEVEL
+K_KERNEL_NEW_VERSIONING="${K_KERNEL_NEW_VERSIONING:-0}"
+
+# @ECLASS-VARIABLE: K_KERNEL_IMAGE_NAME
+# @DESCRIPTION:
+# Set this to a custom kernel image make target if the default does not
+# fit your needs. This value if set, is passed to genkernel through the
+# --kernel-target= flag.
+K_KERNEL_IMAGE_NAME="${K_KERNEL_IMAGE_NAME:-}"
+
+# @ECLASS-VARIABLE: K_KERNEL_LTS
+# @DESCRIPTION:
+# Set this to 1 to mark the kernel as Long Term Stable. "virtual/linux-binary-lts"
+# shall be appended to ${PROVIDE}.
+K_KERNEL_LTS="${K_KERNEL_LTS:-}"
+
+# @ECLASS-VARIABLE: K_KERNEL_IMAGE_PATH
+# @DESCRIPTION:
+# Set this to a custom relative kernel image path to override the default
+# one. This value if set, is passed to genkernel through the
+# --kernel-binary= flag.
+K_KERNEL_IMAGE_PATH="${K_KERNEL_IMAGE_PATH:-}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_FIRMWARE
+# @DESCRIPTION:
+# Set this to "1" if your ebuild is a kernel firmware package
+K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}"
+
+# @ECLASS-VARIABLE: K_ONLY_SOURCES
+# @DESCRIPTION:
+# For every kernel binary package, there is a kernel source package associated
+# if your ebuild is one of them, set this to "1"
+K_ONLY_SOURCES="${K_ONLY_SOURCES:-}"
+
+# @ECLASS-VARIABLE: K_REQUIRED_LINUX_FIRMWARE_VER
+# @DESCRIPTION:
+# Minimum required version of sys-kernel/linux-formware package, if any
+K_REQUIRED_LINUX_FIRMWARE_VER="${K_REQUIRED_LINUX_FIRMWARE_VER:-}"
+
+# @ECLASS-VARIABLE: K_WORKAROUND_SOURCES_COLLISION
+# @DESCRIPTION:
+# For kernel binary packages, Workaround file collisions with kernel
+# sources already providing certain files (like Makefile). Used
+# by linux-openvz and linux-vserver
+K_WORKAROUND_SOURCES_COLLISION="${K_WORKAROUND_SOURCES_COLLISION:-}"
+
+# @ECLASS-VARIABLE: K_WORKAROUND_USE_REAL_EXTRAVERSION
+# @DESCRIPTION:
+# Some kernel sources are shipped with their own EXTRAVERSION and
+# we're kindly asked to not touch it, if this is your case, set
+# this variable and depmod will work correctly.
+K_WORKAROUND_USE_REAL_EXTRAVERSION="${K_WORKAROUND_USE_REAL_EXTRAVERSION:-}"
+
+# @ECLASS-VARIABLE: K_ARGKERNEL_ZFS
+# @DESCRIPTION:
+# If set, this kernel features ZFS.
+K_ARGKERNEL_ZFS="${K_ARGKERNEL_ZFS:-}"
+
+# @ECLASS-VARIABLE: K_GENKERNEL_ARGS
+# @DESCRIPTION:
+# Provide extra genkernel arguments using K_GENKERNEL_ARGS
+K_GENKERNEL_ARGS="${K_GENKERNEL_ARGS:-}"
+
+# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ADDRESS
+# @DESCRIPTION:
+# [ARM ONLY] Provide the ramdisk load address to be used with mkimage
+K_MKIMAGE_RAMDISK_ADDRESS="${K_MKIMAGE_RAMDISK_ADDRESS:-}"
+
+# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ENTRYPOINT
+# @DESCRIPTION:
+# [ARM ONLY] Provide the ramdisk entry point address to be used with mkimage
+K_MKIMAGE_RAMDISK_ENTRYPOINT="${K_MKIMAGE_RAMDISK_ENTRYPOINT:-}"
+
+# @ECLASS-VARIABLE: K_MKIMAGE_WRAP_INITRAMFS
+# @DESCRIPTION:
+# [ARM ONLY] Execute mkimage against the generated initramfs Default is yes ("1").
+K_MKIMAGE_WRAP_INITRAMFS="${K_MKIMAGE_WRAP_INITRAMFS:-1}"
+
+# @ECLASS-VARIABLE: K_MKIMAGE_KERNEL_ADDRESS
+# @DESCRIPTION:
+# [ARM ONLY] Provide the kernel load address to be used with mkimage
+K_MKIMAGE_KERNEL_ADDRESS="${K_MKIMAGE_KERNEL_ADDRESS:-}"
+
+KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*${K_ARGKERNEL_NAME}}"
+
+# Disable deblobbing feature
+K_DEBLOB_AVAILABLE=0
+ETYPE="sources"
+K_TARBALL_EXT="${K_TARBALL_EXT:-xz}"
+
+inherit versionator
+if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
+	CKV="$(get_version_component_range 1-2)"
+fi
+
+inherit eutils multilib kernel-2 argent-artwork mount-boot linux-info
+
+# from kernel-2 eclass
+detect_version
+detect_arch
+
+DESCRIPTION="Argent linux kernel functions and phases"
+
+
+K_LONGTERM_URL_STR=""
+if [ -n "${K_ARGKERNEL_LONGTERM}" ]; then
+	K_LONGTERM_URL_STR="/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+fi
+
+## kernel-2 eclass settings
+if [ "${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL}" = "1" ]; then
+	_patch_name="$(get_version_component_range 1-2)-${K_ARGKERNEL_SELF_TARBALL_NAME}-${PVR}.patch.xz"
+	SRC_URI="${KERNEL_URI}"
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${_patch_name}"
+	unset _patch_name
+elif [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then
+	SRC_URI="http://bpr.bluepink.ro/~rogentos/argent/${CATEGORY}/linux-${PVR}+${K_ARGKERNEL_SELF_TARBALL_NAME}.tar.${K_TARBALL_EXT}"
+else
+	SRC_URI="${KERNEL_URI}"
+fi
+
+if [ -z "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then
+	if [ -n "${K_KERNEL_PATCH_VER}" ]; then
+		K_PATCH_NAME="patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${K_KERNEL_PATCH_VER}.${K_TARBALL_EXT}"
+		SRC_URI="${SRC_URI}
+			mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}${K_LONGTERM_URL_STR}/${K_PATCH_NAME}"
+		UNIPATCH_LIST="${DISTDIR}/${K_PATCH_NAME}
+			${UNIPATCH_LIST}"
+	fi
+fi
+if [ -n "${K_KERNEL_PATCH_HOTFIXES}" ]; then
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${K_KERNEL_PATCH_HOTFIXES}"
+fi
+
+_get_real_kv_full() {
+	if [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then
+		echo "${ORIGINAL_KV_FULL}"
+	elif [[ "${OKV/.*}" = "3" ]]; then
+		# Linux 3.x support, KV_FULL is set to: 3.0-argent
+		# need to add another final .0 to the version part
+		echo "${ORIGINAL_KV_FULL/-/.0-}"
+	else
+		echo "${ORIGINAL_KV_FULL}"
+	fi
+}
+
+# replace "linux" with K_ARGKERNEL_NAME, usually replaces
+# "linux" with "argent" or "server" or "openvz"
+KV_FULL="${KV_FULL/${PN/-*}/${K_ARGKERNEL_NAME}}"
+EXTRAVERSION="${EXTRAVERSION/${PN/-*}/${K_ARGKERNEL_NAME}}"
+# drop -rX if exists
+if [[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] \
+		&& [[ -z "${K_NOSETEXTRAVERSION}" ]]; then
+	EXTRAVERSION="${EXTRAVERSION%-r*}"
+	KV_FULL="${KV_FULL%-r*}"
+	KV="${KV%-r*}"
+fi
+# rewrite it
+ORIGINAL_KV_FULL="${KV_FULL}"
+KV_FULL="$(_get_real_kv_full)"
+
+# Starting from linux-3.0, we still have to install
+# sources stuff into /usr/src/linux-3.0.0-argent (example)
+# where the last part must always match uname -r
+# otherwise kernel-switcher (and RELEASE_LEVEL file)
+# will complain badly
+KV_OUT_DIR="/usr/src/linux-${KV_FULL}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+
+if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
+	SLOT="0"
+elif [ "${K_KERNEL_SLOT_USEPVR}" = "1" ]; then
+	SLOT="${PVR}"
+elif [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
+	SLOT="$(get_version_component_range 1-2)"
+else
+	SLOT="${PV}"
+fi
+
+_is_kernel_binary() {
+	if [ -z "${K_ONLY_SOURCES}" ] && [ -z "${K_FIRMWARE_PACKAGE}" ]; then
+		# yes it is
+		return 0
+	else
+		# no it isn't
+		return 1
+	fi
+}
+
+_is_kernel_lts() {
+	local _ver="$(get_version_component_range 1-2)"
+	[ "${_ver}" = "3.0" ] && return 0
+	[ "${_ver}" = "3.2" ] && return 0
+	[ "${_ver}" = "3.4" ] && return 0
+	[ "${_ver}" = "3.10" ] && return 0
+	[ "${_ver}" = "3.12" ] && return 0
+	[ "${_ver}" = "3.14" ] && return 0
+	return 1
+}
+
+# provide extra virtual pkg
+if _is_kernel_binary; then
+	PROVIDE="virtual/linux-binary"
+# LTS support
+	if [ "${K_KERNEL_LTS}" = "1" ] || _is_kernel_lts; then
+		PROVIDE+=" virtual/linux-binary-lts"
+	fi
+fi
+
+if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then
+	HOMEPAGE="https://github.com/Rogentos/kernel"
+else
+	HOMEPAGE="http://www.argent.ro"
+fi
+
+# Returns success if _set_config_file_vars was called.
+_is_config_file_set() {
+	[[ ${_config_file_set} = 1 ]]
+}
+
+# Returns the arm kernel config file extension for the current subarch
+_get_arm_subarch() {
+	local target="${CTARGET:-${CHOST}}"
+	local arm_arch=${target%%-*}
+	if [[ ${arm_arch} == armv7? ]]; then
+		echo "armv7"
+	elif [[ ${arm_arch} == armv6? ]]; then
+		echo "armv6"
+	elif [[ ${arm_arch} == armv5? ]]; then
+		echo "armv5"
+	fi
+}
+
+_get_arch() {
+	if use arm; then
+		_get_arm_subarch
+	elif use amd64; then
+		echo "amd64"
+	elif use x86; then
+		echo "x86"
+	fi
+}
+
+_set_config_file_vars() {
+	# Setup kernel configuration file name
+	local pvr="${PVR}"
+	local pv="${PV}"
+	if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
+		pvr="$(get_version_component_range 1-2)"
+		pv="${pvr}"
+		if [ "${PR}" != "r0" ]; then
+			pvr+="-${PR}"
+		fi
+	fi
+
+	K_ARGKERNEL_CONFIG_FILES=()
+	K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-${pvr}-$(_get_arch).config" )
+	K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-${pv}-$(_get_arch).config" )
+	K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-$(_get_arch).config" )
+
+	_config_file_set=1
+}
+
+if [ -n "${K_ONLY_SOURCES}" ] || [ -n "${K_FIRMWARE_PACKAGE}" ]; then
+	IUSE="${IUSE}"
+	DEPEND="sys-apps/sed"
+	RDEPEND="${RDEPEND}"
+else
+	IUSE="dmraid dracut iscsi luks lvm mdadm plymouth splash"
+	if [ -n "${K_ARGKERNEL_ZFS}" ]; then
+		IUSE="${IUSE} zfs"
+	fi
+	DEPEND="app-arch/xz-utils
+		sys-apps/sed
+		sys-devel/autoconf
+		sys-devel/make
+		|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-3.4.45-r2 )
+		arm? ( dev-embedded/u-boot-tools )
+		amd64? ( sys-apps/v86d )
+		x86? ( sys-apps/v86d )
+		splash? ( x11-themes/argent-artwork-core )
+		lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools )
+		plymouth? (
+			|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-5 )
+			sys-boot/plymouth
+		)
+		dracut? ( sys-apps/v86d sys-kernel/dracut )"
+	RDEPEND="sys-apps/sed
+		sys-kernel/linux-firmware"
+	if [ -n "${K_REQUIRED_LINUX_FIRMWARE_VER}" ]; then
+		RDEPEND+=" >=sys-kernel/linux-firmware-${K_REQUIRED_LINUX_FIRMWARE_VER}"
+	fi
+fi
+
+# internal function
+#
+# FUNCTION: _update_depmod
+# @USAGE: _update_depmod <-r depmod>
+# DESCRIPTION:
+# It updates the modules.dep file for the current kernel.
+# This is more or less the same of linux-mod update_depmod, with the
+# exception of accepting parameter which is passed to depmod -r switch
+_update_depmod() {
+
+        # if we haven't determined the version yet, we need too.
+        get_version;
+
+	ebegin "Updating module dependencies for ${KV_FULL}"
+	if [ -r "${KV_OUT_DIR}"/System.map ]; then
+		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r "${1}"
+		eend $?
+	else
+		ewarn
+		ewarn "${KV_OUT_DIR}/System.map not found."
+		ewarn "You must manually update the kernel module dependencies using depmod."
+		eend 1
+		ewarn
+	fi
+}
+
+argent-kernel_pkg_setup() {
+	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
+		einfo "Preparing kernel firmwares"
+	else
+		einfo "Preparing kernel and its modules"
+	fi
+}
+
+argent-kernel_src_unpack() {
+	local okv="${OKV}"
+	if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ] && [ "${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL}" != "1" ]; then
+		OKV="${PVR}+${K_ARGKERNEL_SELF_TARBALL_NAME}"
+	fi
+	if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
+		# workaround for kernel-2's universal_unpack assumptions
+		UNIPATCH_LIST_DEFAULT= KV_MAJOR=0 kernel-2_src_unpack
+	else
+		kernel-2_src_unpack
+	fi
+	if [ -n "${K_ARGKERNEL_FORCE_SUBLEVEL}" ]; then
+		# patch out Makefile with proper sublevel
+		sed -i "s:^SUBLEVEL = .*:SUBLEVEL = ${K_ARGKERNEL_FORCE_SUBLEVEL}:" \
+			"${S}/Makefile" || die
+	fi
+	if [ -n "${K_ARGKERNEL_RESET_EXTRAVERSION}" ]; then
+		sed -i "s:^EXTRAVERSION =.*:EXTRAVERSION = :" "${S}/Makefile" || die
+		# some sources could have multiple append-based EXTRAVERSIONs
+		sed -i "s/^EXTRAVERSION :=.*//" "${S}/Makefile" || die
+	fi
+	OKV="${okv}"
+
+	# Let's handle EAPIs 0 and 1...
+	case ${EAPI:-0} in
+		0|1) argent-kernel_src_prepare ;;
+	esac
+}
+
+argent-kernel_src_prepare() {
+	_set_config_file_vars
+}
+
+argent-kernel_src_compile() {
+	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
+		_firmwares_src_compile
+	elif [ -n "${K_ONLY_SOURCES}" ]; then
+		kernel-2_src_compile
+	else
+		_kernel_src_compile
+	fi
+}
+
+_firmwares_src_compile() {
+	einfo "Starting to compile firmwares..."
+	_kernel_copy_config "${S}/.config"
+	cd "${S}" || die "cannot find source dir"
+
+	export LDFLAGS=""
+	OLDARCH="${ARCH}"
+	unset ARCH
+	emake firmware || die "cannot compile firmwares"
+	ARCH="${OLDARCH}"
+}
+
+_kernel_copy_config() {
+	_is_config_file_set \
+		|| die "Kernel configuration file not set. Was argent-kernel_src_prepare() called?"
+
+	local base_path="${DISTDIR}"
+	if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then
+		base_path="${S}/argent/config"
+	fi
+
+	local found= cfg=
+	for cfg in "${K_ARGKERNEL_CONFIG_FILES[@]}"; do
+		cfg="${base_path}/${cfg}"
+		if [ -f "${cfg}" ]; then
+			cp "${cfg}" "${1}" || die "cannot copy kernel config ${cfg} -> ${1}"
+			elog "Using kernel config: ${cfg}"
+			found=1
+			break
+		fi
+	done
+	[[ -z "${found}" ]] && die "cannot find kernel configs among: ${K_ARGKERNEL_CONFIG_FILES[*]}"
+}
+
+_kernel_src_compile() {
+	# disable sandbox
+	export SANDBOX_ON=0
+
+	# needed anyway, even if grub use flag is not used here
+	if use amd64 || use x86; then
+		mkdir -p "${WORKDIR}"/boot/grub
+	else
+		mkdir -p "${WORKDIR}"/boot
+	fi
+
+	einfo "Starting to compile kernel..."
+	_kernel_copy_config "${WORKDIR}"/config
+
+	# do some cleanup
+	rm -rf "${WORKDIR}"/lib
+	rm -rf "${WORKDIR}"/cache
+	rm -rf "${S}"/temp
+
+	# creating workdirs
+	# some kernels fail with make 3.82 if firmware dir is not created
+	mkdir "${WORKDIR}"/lib/lib/firmware -p
+	mkdir "${WORKDIR}"/cache
+	mkdir "${S}"/temp
+
+	cd "${S}" || die
+	local GKARGS=()
+	GKARGS+=( "--no-menuconfig" "--no-save-config" "--e2fsprogs" "--udev" )
+	# use splash && GKARGS+=( "--splash=argent" ) #NO MORE fbsplash!!!
+	use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" ) #reverted to use variable (check the eclass)
+	use dmraid && GKARGS+=( "--dmraid" )
+	use iscsi && GKARGS+=( "--iscsi" )
+	use mdadm && GKARGS+=( "--mdadm" )
+	use luks && GKARGS+=( "--luks" )
+	use lvm && GKARGS+=( "--lvm" )
+	if [ -n "${K_ARGKERNEL_ZFS}" ]; then
+		use zfs && GKARGS+=( "--zfs" )
+	fi
+
+	export DEFAULT_KERNEL_SOURCE="${S}"
+	export CMD_KERNEL_DIR="${S}"
+	for opt in ${MAKEOPTS}; do
+		if [ "${opt:0:2}" = "-j" ]; then
+			mkopts="${opt}"
+			break
+		fi
+	done
+	[ -z "${mkopts}" ] && mkopts="-j3"
+
+	if [ -n "${K_KERNEL_IMAGE_NAME}" ]; then
+		GKARGS+=( "--kernel-target=${K_KERNEL_IMAGE_NAME}" )
+	elif use arm; then
+		# backward compat + provide sane defaults.
+		GKARGS+=( "--kernel-target=uImage" )
+	fi
+	if [ -n "${K_KERNEL_IMAGE_PATH}" ]; then
+		GKARGS+=( "--kernel-binary=${K_KERNEL_IMAGE_PATH}" )
+	elif use arm; then
+		# backward compat + provide sane defaults.
+		GKARGS+=( "--kernel-binary=arch/arm/boot/uImage" )
+	fi
+
+	# Workaround bug in splash_geninitramfs corrupting the initramfs
+	# if xz compression is used (newer genkernel >3.4.24)
+	local support_comp=$(genkernel --help | grep compress-initramfs-type)
+	if [ -n "${support_comp}" ]; then
+		GKARGS+=( "--compress-initramfs-type=gzip" )
+	fi
+
+	# Use --disklabel if genkernel supports it
+	local support_disklabel=$(genkernel --help | grep -- --disklabel)
+	if [ -n "${support_disklabel}" ]; then
+		GKARGS+=( "--disklabel" )
+	fi
+
+	if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then
+		export LOADADDR="${K_MKIMAGE_KERNEL_ADDRESS}"
+	fi
+	OLDARCH="${ARCH}"
+	unset ARCH
+	unset LDFLAGS
+	DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" genkernel "${GKARGS[@]}" ${K_GENKERNEL_ARGS} \
+		--kerneldir="${S}" \
+		--kernel-config="${WORKDIR}"/config \
+		--cachedir="${WORKDIR}"/cache \
+		--makeopts="${mkopts}" \
+		--tempdir="${S}"/temp \
+		--logfile="${WORKDIR}"/genkernel.log \
+		--bootdir="${WORKDIR}"/boot \
+		--mountboot \
+		--module-prefix="${WORKDIR}"/lib \
+		all || die "genkernel failed"
+
+	if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then
+		unset LOADADDR
+	fi
+
+	ARCH=${OLDARCH}
+}
+
+_setup_mkimage_ramdisk() {
+	local initramfs=$(ls "${WORKDIR}"/boot/${KERN_INITRAMFS_SEARCH_NAME}* 2> /dev/null)
+	if [ ! -e "${initramfs}" ] || [ ! -f "${initramfs}" ]; then
+		ewarn "No initramfs at ${initramfs}, cannot run mkimage on it!"
+	elif [ "${K_MKIMAGE_WRAP_INITRAMFS}" = "1" ]; then
+		einfo "Setting up u-boot initramfs for: ${initramfs}"
+		mkimage -A arm -O linux -T ramdisk -C none -a \
+			"${K_MKIMAGE_RAMDISK_ADDRESS}" \
+			-e "${K_MKIMAGE_RAMDISK_ENTRYPOINT}" -d "${initramfs}" \
+			"${initramfs}.u-boot" || return 1
+		mv "${initramfs}.u-boot" "${initramfs}" || return 1
+	else
+		einfo "mkimage won't be called for: ${initramfs}"
+	fi
+	return 0
+}
+
+argent-kernel_src_install() {
+	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
+		_firmwares_src_install
+	elif [ -n "${K_ONLY_SOURCES}" ]; then
+		_kernel_sources_src_install
+	else
+		_kernel_src_install
+	fi
+	# File collisions between slots, debug stuff
+	# not really needed for a kernel
+	rm -rf "${D}/usr/lib/debug"
+}
+
+_firmwares_src_install() {
+	dodir /lib/firmware
+	keepdir /lib/firmware
+	cd "${S}" || die
+	emake INSTALL_FW_PATH="${D}/lib/firmware" firmware_install || die "cannot install firmwares"
+}
+
+_kernel_sources_src_install() {
+	_kernel_copy_config ".config"
+	kernel-2_src_install
+	cd "${D}${KV_OUT_DIR}" || die
+	local oldarch="${ARCH}"
+	unset ARCH
+	if ! use sources_standalone; then
+		make modules_prepare || die "failed to run modules_prepare"
+		rm .config || die "cannot remove .config"
+		rm Makefile || die "cannot remove Makefile"
+		rm -f include/linux/version.h
+		rm -f include/generated/uapi/linux/version.h
+	fi
+	ARCH="${oldarch}"
+}
+
+_kernel_src_install() {
+	if use arm; then
+		_setup_mkimage_ramdisk || die "cannot setup mkimage"
+	fi
+
+	dodir "${KV_OUT_DIR}"
+	insinto "${KV_OUT_DIR}"
+
+	_kernel_copy_config ".config"
+	doins ".config" || die "cannot copy kernel config"
+	doins Makefile || die "cannot copy Makefile"
+	doins Module.symvers || die "cannot copy Module.symvers"
+	doins System.map || die "cannot copy System.map"
+
+	# NOTE: this is a workaround caused by linux-info.eclass not
+	# being ported to EAPI=2 yet
+	local version_h_dir="include/linux"
+	local version_h_dir2="include/generated/uapi/linux"
+	local version_h=
+	local version_h_src=
+	for ver_dir in "${version_h_dir}" "${version_h_dir2}"; do
+		version_h="${ROOT}${KV_OUT_DIR/\//}/${ver_dir}/version.h"
+		if [ -f "${version_h}" ]; then
+			einfo "Discarding previously installed version.h to avoid collisions"
+			addwrite "${version_h}"
+			rm -f "${version_h}"
+		fi
+
+		# Include include/linux/version.h to make Portage happy
+		version_h_src="${S}/${ver_dir}/version.h"
+		if [ -f "${version_h_src}" ]; then
+			dodir "${KV_OUT_DIR}/${ver_dir}"
+			insinto "${KV_OUT_DIR}/${ver_dir}"
+			doins "${version_h_src}" || die "cannot copy version.h"
+		fi
+	done
+
+	insinto "/boot"
+	doins "${WORKDIR}"/boot/* || die "cannot copy /boot over"
+	cp -Rp "${WORKDIR}"/lib/* "${D}/" || die "cannot copy /lib over"
+
+	# Install dtbs if found
+	if use arm; then
+		local dtb_dir="/lib/dts/${KV_FULL}"
+		elog "Installing .dtbs (if any) into ${dtb_dir}"
+		insinto "${dtb_dir}"
+		local dtb=
+		for dtb in "${S}/arch/arm/boot/dts"/*.dtb; do
+			if [ -f "${dtb}" ]; then
+				elog "Installing dtb: ${dtb}"
+				doins "${dtb}"
+			fi
+		done
+	fi
+
+	# This doesn't always work because KV_FULL (when K_NOSETEXTRAVERSION=1) doesn't
+	# reflect the real value used in Makefile
+	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/source" || die "cannot install source symlink"
+	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/build" || die "cannot install build symlink"
+	cd "${D}"/lib/modules/* || die "cannot enter /lib/modules directory, more than one element?"
+	# cleanup previous
+	rm -f build source || die
+	# create sane symlinks
+	ln -sf "../../..${KV_OUT_DIR}" source || die "cannot create source symlink"
+	ln -sf "../../..${KV_OUT_DIR}" build || die "cannot create build symlink"
+	cd "${S}" || die
+
+	# drop ${D}/lib/firmware, virtual/linux-firmwares provides it
+	rm -rf "${D}/lib/firmware"
+
+	if [ -n "${K_WORKAROUND_SOURCES_COLLISION}" ]; then
+		# Fixing up Makefile collision if already installed by
+		# openvz-sources
+		einfo "Workarounding source package collisions"
+		make_file="${KV_OUT_DIR/\//}/Makefile"
+		einfo "Makefile: ${make_file}"
+		if [ -f "${ROOT}/${make_file}" ]; then
+			elog "Removing ${D}/${make_file}"
+			rm -f "${D}/${make_file}"
+		fi
+	fi
+
+	# Install kernel configuration information
+	# useful for Entropy kernel-switcher
+	# release level is enough for now
+	base_dir="/etc/kernels/${P}"
+	dodir "${base_dir}"
+	insinto "${base_dir}"
+	echo "${KV_FULL}" > "RELEASE_LEVEL"
+	doins "RELEASE_LEVEL"
+	einfo "Installing ${base_dir}/RELEASE_LEVEL file: ${KV_FULL}"
+
+	use dracut && \
+		_dracut_initramfs_create "${KV_FULL}"
+}
+
+argent-kernel_pkg_preinst() {
+	if _is_kernel_binary; then
+		mount-boot_pkg_preinst
+	fi
+}
+argent-kernel_grub2_mkconfig() {
+	if [ -x "${ROOT}usr/sbin/grub2-mkconfig" ]; then
+		# Grub 2.00
+		"${ROOT}usr/sbin/grub2-mkconfig" -o "${ROOT}boot/grub/grub.cfg"
+	elif [ -x "${ROOT}sbin/grub-mkconfig" ]; then
+		# Grub 1.99
+		"${ROOT}sbin/grub-mkdevicemap" --device-map="${ROOT}boot/grub/device.map"
+		"${ROOT}sbin/grub-mkconfig" -o "${ROOT}boot/grub/grub.cfg"
+	else
+		echo
+		ewarn "Attention, Grub2 is not installed !!!"
+		ewarn "Grub2 bootloader configuration won't be updated"
+		echo
+	fi
+}
+
+_get_real_extraversion() {
+	make_file="${ROOT}${KV_OUT_DIR}/Makefile"
+	local extraver=$(grep -r "^EXTRAVERSION =" "${make_file}" | cut -d "=" -f 2 | head -n 1)
+	local trimmed=${extraver%% }
+	echo ${trimmed## }
+}
+
+_get_release_level() {
+	if [[ -n "${K_WORKAROUND_USE_REAL_EXTRAVERSION}" ]]; then
+		echo "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}$(_get_real_extraversion)"
+	elif [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then
+		echo "${KV_FULL}"
+	elif [[ "${OKV/.*}" = "3" ]] && [[ "${KV_PATCH}" = "0" ]]; then
+		# Linux 3.x support, KV_FULL is set to: 3.0-argent
+		# need to add another final .0 to the version part
+		echo "${KV_FULL/-/.0-}"
+	else
+		echo "${KV_FULL}"
+	fi
+}
+
+argent-kernel_uimage_config() {
+	# Two cases here:
+	# 1. /boot/uImage symlink is broken (pkg_postrm)
+	# 2. /boot/uImage symlink doesn't exist (pkg_postinst)
+
+	if ! has_version app-eselect/uimage; then
+		ewarn "app-eselect/uimage not installed"
+		ewarn "If you are using this tool, please install it"
+		return 0
+	fi
+
+	local uimage_file=$(eselect uimage show --quiet 2> /dev/null)
+	if [ -z "${uimage_file}" ]; then
+		# pick the first listed, sorry!
+		local eselect_list=$(eselect uimage list --quiet 2> /dev/null)
+		if [ -n "${eselect_list}" ]; then
+			eselect uimage set 1
+		else
+			echo
+			ewarn "No more kernels available, you won't be able to boot"
+			echo
+		fi
+	else
+		echo
+		elog "If you use eselect-bzimage, you are currently booting with kernel:"
+		elog "${uimage_file}"
+		elog
+		elog "Use 'eselect uimage' in order to switch between the available ones"
+		echo
+	fi
+}
+
+argent-kernel_bzimage_config() {
+	# Two cases here:
+	# 1. /boot/bzImage symlink is broken (pkg_postrm)
+	# 2. /boot/bzImage symlink doesn't exist (pkg_postinst)
+	local kern_arch
+	use x86 && kern_arch="x86"
+	use amd64 && kern_arch="x86_64"
+
+	if ! has_version app-eselect/eselect-bzimage; then
+		ewarn "app-eselect/eselect-bzimage not installed"
+		ewarn "If you are using this tool, please install it"
+		return 0
+	fi
+
+	local bzimage_file=$(eselect bzimage show --quiet 2> /dev/null)
+	if [ -z "${bzimage_file}" ]; then
+		# try to pic what's being installed
+		local eselect_list=$(eselect bzimage list --quiet 2> /dev/null)
+		if [ -n "${eselect_list}" ]; then
+			eselect bzimage set "kernel-genkernel-${kern_arch}-${KV_FULL}"
+			if [ "${?}" != "0" ]; then
+				# pick the first available, sorry!
+				echo
+				eselect bzimage set 1
+				ewarn "Unable to select the right kernel, falling back"
+				ewarn "to the first available entry. You have been warned"
+				echo
+			fi
+		else
+			echo
+			ewarn "No more kernels available, you might not be able to boot"
+			echo
+		fi
+	else
+		echo
+		ewarn "You are currently booting with kernel:"
+		ewarn "${bzimage_file}"
+		ewarn
+		ewarn "Use 'eselect bzimage' in order to switch between the available ones"
+		echo
+	fi
+}
+
+_dracut_initramfs_create() {
+	local kver="${1}"
+
+	elog "Creating dracut initramfs for ${kver}"
+	addpredict /etc/ld.so.cache~
+	dracut -q -N -f --kver="${kver}" "${D}/boot/initramfs-dracut-${kver}"
+}
+
+argent-kernel_pkg_postinst() {
+	if _is_kernel_binary; then
+		fstab_file="${ROOT}etc/fstab"
+		einfo "Removing extents option for ext4 drives from ${fstab_file}"
+		# Remove "extents" from /etc/fstab
+		if [ -f "${fstab_file}" ]; then
+			sed -i '/ext4/ s/extents//g' "${fstab_file}"
+		fi
+
+		# Update kernel initramfs to match user customizations
+		use splash && update_argent_kernel_initramfs_splash
+
+		# Add kernel to grub.conf
+		if use amd64 || use x86; then
+			if use amd64; then
+				local kern_arch="x86_64"
+			else
+				local kern_arch="x86"
+			fi
+			# grub-legacy
+			if [ -x "${ROOT}usr/sbin/grub-handler" ]; then
+				"${ROOT}usr/sbin/grub-handler" add \
+					"/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \
+					"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}"
+			fi
+
+			argent-kernel_grub2_mkconfig
+		fi
+
+		# Setup newly installed kernel on ARM
+		if use arm; then
+			argent-kernel_uimage_config
+		fi
+		# Setup newly installed kernel on x86/amd64
+		# This is quite handy for static grub1/grub2
+		# configurations (like on Amazon EC2)
+		if use x86 || use amd64; then
+			argent-kernel_bzimage_config
+		fi
+
+		kernel-2_pkg_postinst
+		local depmod_r=$(_get_release_level)
+		_update_depmod "${depmod_r}"
+
+		elog "Please report kernel bugs at:"
+		elog "http://bugs.argent.ro"
+
+		elog "The source code of this kernel is located at"
+		elog "=${K_KERNEL_SOURCES_PKG}."
+		elog "RogentOS Team recommends that portage users install"
+		elog "${K_KERNEL_SOURCES_PKG} if you want"
+		elog "to build any packages that install kernel modules"
+		elog "(such as ati-drivers, nvidia-drivers, virtualbox, etc...)."
+	else
+		kernel-2_pkg_postinst
+	fi
+}
+
+argent-kernel_pkg_prerm() {
+	if _is_kernel_binary; then
+		mount-boot_pkg_prerm
+	fi
+}
+
+argent-kernel_pkg_postrm() {
+	if _is_kernel_binary; then
+		# Remove kernel from grub.conf
+		if use amd64 || use x86; then
+			if use amd64; then
+				local kern_arch="x86_64"
+			else
+				local kern_arch="x86"
+			fi
+			if [ -x "${ROOT}usr/sbin/grub-handler" ]; then
+				"${ROOT}usr/sbin/grub-handler" remove \
+					"/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \
+					"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}"
+			fi
+
+			argent-kernel_grub2_mkconfig
+		fi
+
+		# Setup newly installed kernel on ARM
+		if use arm; then
+			argent-kernel_uimage_config
+		fi
+		# Setup newly installed kernel on x86/amd64
+		# This is quite handy for static grub1/grub2
+		# configurations (like on Amazon EC2)
+		if use x86 || use amd64; then
+			argent-kernel_bzimage_config
+		fi
+	fi
+}
+
+# export all the available functions here
+case ${EAPI:-0} in
+	0|1) extra_export_funcs= ;;
+	*) extra_export_funcs=src_prepare ;;
+esac
+
+EXPORT_FUNCTIONS pkg_setup src_unpack ${extra_export_funcs} \
+	src_compile src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm
diff --git a/sys-kernel/linux-live-brrc/Manifest b/sys-kernel/linux-live-brrc/Manifest
new file mode 100644
index 00000000..adea3d1a
--- /dev/null
+++ b/sys-kernel/linux-live-brrc/Manifest
@@ -0,0 +1 @@
+DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
index 8f7905fa..4ebdafa0 100644
--- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
@@ -23,7 +23,7 @@ K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
 K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
 K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
 
-inherit kogaion-kernel
+inherit argent-kernel
 
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
-- 
cgit v1.2.3


From d2de692338e410aa50b67ed7e1e9d2cc2872d1ec Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Tue, 30 Jun 2015 16:56:35 +0300
Subject: Curatat vechile setari, adaugat dependinta lipsa.

---
 eclass/kogaion-kernel.eclass  |   1 +
 eclass/sabayon-artwork.eclass |  60 ---
 eclass/sabayon-kernel.eclass  | 969 ------------------------------------------
 3 files changed, 1 insertion(+), 1029 deletions(-)
 delete mode 100644 eclass/sabayon-artwork.eclass
 delete mode 100644 eclass/sabayon-kernel.eclass

diff --git a/eclass/kogaion-kernel.eclass b/eclass/kogaion-kernel.eclass
index 36c0888c..581094e6 100644
--- a/eclass/kogaion-kernel.eclass
+++ b/eclass/kogaion-kernel.eclass
@@ -512,6 +512,7 @@ _kernel_src_compile() {
 	local GKARGS=()
 	GKARGS+=( "--no-menuconfig" "--no-save-config" "--e2fsprogs" "--udev" )
 	# use splash && GKARGS+=( "--splash=kogaion" ) #NO MORE fbsplash!!!
+	use btrfs && GKARGS+=( "--btrfs" )
 	use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" ) #reverted to use variable (check the eclass)
 	use dmraid && GKARGS+=( "--dmraid" )
 	use iscsi && GKARGS+=( "--iscsi" )
diff --git a/eclass/sabayon-artwork.eclass b/eclass/sabayon-artwork.eclass
deleted file mode 100644
index f0aac62d..00000000
--- a/eclass/sabayon-artwork.eclass
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2004-2009 Sabayon Project
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-inherit eutils
-
-# @ECLASS-VARIABLE: KERN_INITRAMFS_SEARCH_NAME
-# @DESCRIPTION:
-# Argument used by `find` to search inside ${ROOT}boot Linux
-# Kernel initramfs files to patch
-KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*}"
-
-# @ECLASS-VARIABLE: GFX_SPLASH_NAME
-# @DESCRIPTION:
-# Default splash theme name to use
-GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-sabayon}"
-
-# @ECLASS-VARIABLE: PLYMOUTH_THEME
-# @DESCRIPTION:
-# Default plymouth theme name to use
-PLYMOUTH_THEME="${PLYMOUTH_THEME:-sabayon}"
-
-# @FUNCTION: update_kernel_initramfs_splash
-# @USAGE: update_kernel_initramfs_splash [splash_theme] [splash_file]
-# @RETURN: 1, if something went wrong
-#
-# @MAINTAINER:
-# Fabio Erculiani
-update_kernel_initramfs_splash() {
-
-	[[ -z "${2}" ]] && die "wrong update_kernel_splash arguments"
-
-	if ! has_version "media-gfx/splashutils"; then
-		ewarn "media-gfx/splashutils not found, cannot update kernel splash"
-		return 1
-	fi
-	splash_geninitramfs -a "${2}" ${1}
-	return ${?}
-
-}
-
-# @FUNCTION: update_sabayon_kernel_initramfs_splash
-# @USAGE: update_sabayon_kernel_initramfs_splash
-#
-# @MAINTAINER:
-# Fabio Erculiani
-update_sabayon_kernel_initramfs_splash() {
-	local splash_name="${GFX_SPLASH_NAME}"
-	local override_splash_file="${ROOT}etc/oem/splash_name"
-	if [ -f "${override_splash_file}" ]; then
-		found_splash_name=$(cat "${override_splash_file}" | cut -d" " -f 1)
-		if [ -d "/etc/splash/${found_splash_name}" ]; then
-			splash_name="${found_splash_name}"
-		fi
-	fi
-	for bootfile in `find ${ROOT}boot -name "${KERN_INITRAMFS_SEARCH_NAME}"`; do
-		einfo "Updating boot splash for ${bootfile}"
-		update_kernel_initramfs_splash "${GFX_SPLASH_NAME}" "${bootfile}"
-	done
-}
diff --git a/eclass/sabayon-kernel.eclass b/eclass/sabayon-kernel.eclass
deleted file mode 100644
index 710aa0a7..00000000
--- a/eclass/sabayon-kernel.eclass
+++ /dev/null
@@ -1,969 +0,0 @@
-# Copyright 2004-2010 Sabayon Project
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-# @ECLASS-VARIABLE: K_SABKERNEL_NAME
-# @DESCRIPTION:
-# The kernel name used by the ebuild, it should be the ending ${PN} part
-# for example, of linux-sabayon it is "${PN/${PN/-*}-}" (sabayon)
-K_SABKERNEL_NAME="${K_SABKERNEL_NAME:-${PN/${PN/-*}-}}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_SELF_TARBALL_NAME
-# @DESCRIPTION:
-# If the main kernel sources tarball is generated in-house and available
-# on the "sabayon" mirror, set this variable to the extension name (see example
-# below). This will disable ALL the extra/local patches (since they have to
-# be applied inside the tarball). Moreover, K_SABKERNEL_NAME,
-# K_KERNEL_PATCH_VER will be ignored.
-# Example:
-#   K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
-#   This would generate:
-#   SRC_URI="mirror://sabayon/sys-kernel/linux-${PV}+sabayon.tar.${K_TARBALL_EXT}"
-K_SABKERNEL_SELF_TARBALL_NAME="${K_SABKERNEL_SELF_TARBALL_NAME:-}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_PATCH_UPSTREAM_TARBALL
-# @DESCRIPTION:
-# If set to 1, the ebuild will fetch the upstream kernel tarball and
-# apply the Sabayon patch against it. This strategy avoids the need of
-# creating complete kernel source tarballs. The default value is 0.
-K_SABKERNEL_PATCH_UPSTREAM_TARBALL="${K_SABKERNEL_PATCH_UPSTREAM_TARBALL:-0}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_FORCE_SUBLEVEL
-# @DESCRIPTION:
-# Force the rewrite of SUBLEVEL in kernel sources Makefile
-K_SABKERNEL_FORCE_SUBLEVEL="${K_SABKERNEL_FORCE_SUBLEVEL:-}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_RESET_EXTRAVERSION
-# @DESCRIPTION:
-# Force the rewrite of EXTRAVERSION in kernel sources Makefile (setting it to "")
-K_SABKERNEL_RESET_EXTRAVERSION="${K_SABKERNEL_RESET_EXTRAVERSION:-}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_LONGTERM
-# @DESCRIPTION:
-# Consider Kernel stable patchset as longterm (changing URL)
-K_SABKERNEL_LONGTERM="${K_SABKERNEL_LONGTERM:-}"
-
-# @ECLASS-VARIABLE: K_KERNEL_SOURCES_PKG
-# @DESCRIPTION:
-# The kernel sources package used to build this kernel binary
-K_KERNEL_SOURCES_PKG="${K_KERNEL_SOURCES_PKG:-${CATEGORY}/${PN/*-}-sources-${PVR}}"
-
-# @ECLASS-VARIABLE: K_KERNEL_PATCH_VER
-# @DESCRIPTION:
-# If set to "3" for example, it applies the upstream kernel
-# patch corresponding to patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.3.${K_TARBALL_EXT}
-# @TODO: deprecate and remove once 2.6.x kernels are retired
-K_KERNEL_PATCH_VER="${K_KERNEL_PATCH_VER:-}"
-
-# @ECLASS-VARIABLE: K_KERNEL_PATCH_HOTFIXES
-# @DESCRIPTION:
-# If there is the need to quickly apply patches to the kernel
-# without bumping the kernel patch tarball (for eg. in case
-# of just released security fixes), set this variable in your ebuild
-# pointing to space separated list of patch paths.
-K_KERNEL_PATCH_HOTFIXES="${K_KERNEL_PATCH_HOTFIXES:-}"
-
-# @ECLASS-VARIABLE: K_KERNEL_DISABLE_PR_EXTRAVERSION
-# @DESCRIPTION:
-# Set this to "1" if you want to tell kernel-2 eclass to
-# not use ${PR} in kernel EXTRAVERSION (K_NOUSEPR). Otherwise, set
-# this to "0" to not set K_NOUSEPR at all.
-K_KERNEL_DISABLE_PR_EXTRAVERSION="${K_KERNEL_DISABLE_PR_EXTRAVERSION:-1}"
-
-# @ECLASS-VARIABLE: K_KERNEL_SLOT_USEPVR
-# @DESCRIPTION:
-# Set this to "1" if you want to use ${PVR} in SLOT variable, instead of ${PV}
-# sys-kernel/linux-vserver (vserver-sources) require this. This won't work for
-# firmware pkgs.
-K_KERNEL_SLOT_USEPVR="${K_KERNEL_SLOT_USEPVR:-0}"
-
-# @ECLASS-VARIABLE: K_KERNEL_NEW_VERSIONING
-# @DESCRIPTION:
-# Set this to "1" if your kernel ebuild uses the new Linux kernel upstream
-# versioning and ${PV} contains the stable revision, like 3.7.1.
-# In the example above, this makes the SLOT variable contain only "3.7".
-# The sublevel version can be forced using K_SABKERNEL_FORCE_SUBLEVEL
-K_KERNEL_NEW_VERSIONING="${K_KERNEL_NEW_VERSIONING:-0}"
-
-# @ECLASS-VARIABLE: K_KERNEL_IMAGE_NAME
-# @DESCRIPTION:
-# Set this to a custom kernel image make target if the default does not
-# fit your needs. This value if set, is passed to genkernel through the
-# --kernel-target= flag.
-K_KERNEL_IMAGE_NAME="${K_KERNEL_IMAGE_NAME:-}"
-
-# @ECLASS-VARIABLE: K_KERNEL_LTS
-# @DESCRIPTION:
-# Set this to 1 to mark the kernel as Long Term Stable. "virtual/linux-binary-lts"
-# shall be appended to ${PROVIDE}.
-K_KERNEL_LTS="${K_KERNEL_LTS:-}"
-
-# @ECLASS-VARIABLE: K_KERNEL_IMAGE_PATH
-# @DESCRIPTION:
-# Set this to a custom relative kernel image path to override the default
-# one. This value if set, is passed to genkernel through the
-# --kernel-binary= flag.
-K_KERNEL_IMAGE_PATH="${K_KERNEL_IMAGE_PATH:-}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_FIRMWARE
-# @DESCRIPTION:
-# Set this to "1" if your ebuild is a kernel firmware package
-K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}"
-
-# @ECLASS-VARIABLE: K_ONLY_SOURCES
-# @DESCRIPTION:
-# For every kernel binary package, there is a kernel source package associated
-# if your ebuild is one of them, set this to "1"
-K_ONLY_SOURCES="${K_ONLY_SOURCES:-}"
-
-# @ECLASS-VARIABLE: K_REQUIRED_LINUX_FIRMWARE_VER
-# @DESCRIPTION:
-# Minimum required version of sys-kernel/linux-formware package, if any
-K_REQUIRED_LINUX_FIRMWARE_VER="${K_REQUIRED_LINUX_FIRMWARE_VER:-}"
-
-# @ECLASS-VARIABLE: K_WORKAROUND_SOURCES_COLLISION
-# @DESCRIPTION:
-# For kernel binary packages, Workaround file collisions with kernel
-# sources already providing certain files (like Makefile). Used
-# by linux-openvz and linux-vserver
-K_WORKAROUND_SOURCES_COLLISION="${K_WORKAROUND_SOURCES_COLLISION:-}"
-
-# @ECLASS-VARIABLE: K_WORKAROUND_USE_REAL_EXTRAVERSION
-# @DESCRIPTION:
-# Some kernel sources are shipped with their own EXTRAVERSION and
-# we're kindly asked to not touch it, if this is your case, set
-# this variable and depmod will work correctly.
-K_WORKAROUND_USE_REAL_EXTRAVERSION="${K_WORKAROUND_USE_REAL_EXTRAVERSION:-}"
-
-# @ECLASS-VARIABLE: K_SABKERNEL_ZFS
-# @DESCRIPTION:
-# If set, this kernel features ZFS.
-K_SABKERNEL_ZFS="${K_SABKERNEL_ZFS:-}"
-
-# @ECLASS-VARIABLE: K_GENKERNEL_ARGS
-# @DESCRIPTION:
-# Provide extra genkernel arguments using K_GENKERNEL_ARGS
-K_GENKERNEL_ARGS="${K_GENKERNEL_ARGS:-}"
-
-# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ADDRESS
-# @DESCRIPTION:
-# [ARM ONLY] Provide the ramdisk load address to be used with mkimage
-K_MKIMAGE_RAMDISK_ADDRESS="${K_MKIMAGE_RAMDISK_ADDRESS:-}"
-
-# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ENTRYPOINT
-# @DESCRIPTION:
-# [ARM ONLY] Provide the ramdisk entry point address to be used with mkimage
-K_MKIMAGE_RAMDISK_ENTRYPOINT="${K_MKIMAGE_RAMDISK_ENTRYPOINT:-}"
-
-# @ECLASS-VARIABLE: K_MKIMAGE_WRAP_INITRAMFS
-# @DESCRIPTION:
-# [ARM ONLY] Execute mkimage against the generated initramfs Default is yes ("1").
-K_MKIMAGE_WRAP_INITRAMFS="${K_MKIMAGE_WRAP_INITRAMFS:-1}"
-
-# @ECLASS-VARIABLE: K_MKIMAGE_KERNEL_ADDRESS
-# @DESCRIPTION:
-# [ARM ONLY] Provide the kernel load address to be used with mkimage
-K_MKIMAGE_KERNEL_ADDRESS="${K_MKIMAGE_KERNEL_ADDRESS:-}"
-
-KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*${K_SABKERNEL_NAME}}"
-
-# Disable deblobbing feature
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-K_TARBALL_EXT="${K_TARBALL_EXT:-xz}"
-
-inherit versionator
-if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
-	CKV="$(get_version_component_range 1-2)"
-fi
-
-inherit eutils multilib kernel-2 sabayon-artwork mount-boot linux-info
-
-# from kernel-2 eclass
-detect_version
-detect_arch
-
-DESCRIPTION="Sabayon Linux kernel functions and phases"
-
-
-K_LONGTERM_URL_STR=""
-if [ -n "${K_SABKERNEL_LONGTERM}" ]; then
-	K_LONGTERM_URL_STR="/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-fi
-
-## kernel-2 eclass settings
-if [ "${K_SABKERNEL_PATCH_UPSTREAM_TARBALL}" = "1" ]; then
-	_patch_name="$(get_version_component_range 1-2)-${K_SABKERNEL_SELF_TARBALL_NAME}-${PVR}.patch.xz"
-	SRC_URI="${KERNEL_URI}
-		mirror://sabayon/${CATEGORY}/${_patch_name}
-	"
-	UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${_patch_name}"
-	unset _patch_name
-elif [ -n "${K_SABKERNEL_SELF_TARBALL_NAME}" ]; then
-	SRC_URI="mirror://sabayon/${CATEGORY}/linux-${PVR}+${K_SABKERNEL_SELF_TARBALL_NAME}.tar.${K_TARBALL_EXT}"
-else
-	SRC_URI="${KERNEL_URI}"
-fi
-
-if [ -z "${K_SABKERNEL_SELF_TARBALL_NAME}" ]; then
-	if [ -n "${K_KERNEL_PATCH_VER}" ]; then
-		K_PATCH_NAME="patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${K_KERNEL_PATCH_VER}.${K_TARBALL_EXT}"
-		SRC_URI="${SRC_URI}
-			mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}${K_LONGTERM_URL_STR}/${K_PATCH_NAME}"
-		UNIPATCH_LIST="${DISTDIR}/${K_PATCH_NAME}
-			${UNIPATCH_LIST}"
-	fi
-fi
-if [ -n "${K_KERNEL_PATCH_HOTFIXES}" ]; then
-	UNIPATCH_LIST="${UNIPATCH_LIST} ${K_KERNEL_PATCH_HOTFIXES}"
-fi
-
-_get_real_kv_full() {
-	if [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then
-		echo "${ORIGINAL_KV_FULL}"
-	elif [[ "${OKV/.*}" = "3" ]]; then
-		# Linux 3.x support, KV_FULL is set to: 3.0-sabayon
-		# need to add another final .0 to the version part
-		echo "${ORIGINAL_KV_FULL/-/.0-}"
-	else
-		echo "${ORIGINAL_KV_FULL}"
-	fi
-}
-
-# replace "linux" with K_SABKERNEL_NAME, usually replaces
-# "linux" with "sabayon" or "server" or "openvz"
-KV_FULL="${KV_FULL/${PN/-*}/${K_SABKERNEL_NAME}}"
-EXTRAVERSION="${EXTRAVERSION/${PN/-*}/${K_SABKERNEL_NAME}}"
-# drop -rX if exists
-if [[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] \
-		&& [[ -z "${K_NOSETEXTRAVERSION}" ]]; then
-	EXTRAVERSION="${EXTRAVERSION%-r*}"
-	KV_FULL="${KV_FULL%-r*}"
-	KV="${KV%-r*}"
-fi
-# rewrite it
-ORIGINAL_KV_FULL="${KV_FULL}"
-KV_FULL="$(_get_real_kv_full)"
-
-# Starting from linux-3.0, we still have to install
-# sources stuff into /usr/src/linux-3.0.0-sabayon (example)
-# where the last part must always match uname -r
-# otherwise kernel-switcher (and RELEASE_LEVEL file)
-# will complain badly
-KV_OUT_DIR="/usr/src/linux-${KV_FULL}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-
-if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
-	SLOT="0"
-elif [ "${K_KERNEL_SLOT_USEPVR}" = "1" ]; then
-	SLOT="${PVR}"
-elif [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
-	SLOT="$(get_version_component_range 1-2)"
-else
-	SLOT="${PV}"
-fi
-
-_is_kernel_binary() {
-	if [ -z "${K_ONLY_SOURCES}" ] && [ -z "${K_FIRMWARE_PACKAGE}" ]; then
-		# yes it is
-		return 0
-	else
-		# no it isn't
-		return 1
-	fi
-}
-
-_is_kernel_lts() {
-	local _ver="$(get_version_component_range 1-2)"
-	[ "${_ver}" = "3.0" ] && return 0
-	[ "${_ver}" = "3.2" ] && return 0
-	[ "${_ver}" = "3.4" ] && return 0
-	[ "${_ver}" = "3.10" ] && return 0
-	[ "${_ver}" = "3.12" ] && return 0
-	[ "${_ver}" = "3.14" ] && return 0
-	return 1
-}
-
-# provide extra virtual pkg
-if _is_kernel_binary; then
-	PROVIDE="virtual/linux-binary"
-# LTS support
-	if [ "${K_KERNEL_LTS}" = "1" ] || _is_kernel_lts; then
-		PROVIDE+=" virtual/linux-binary-lts"
-	fi
-fi
-
-if [ -n "${K_SABKERNEL_SELF_TARBALL_NAME}" ]; then
-	HOMEPAGE="https://github.com/Sabayon/kernel"
-else
-	HOMEPAGE="http://www.sabayon.org"
-fi
-
-# Returns success if _set_config_file_vars was called.
-_is_config_file_set() {
-	[[ ${_config_file_set} = 1 ]]
-}
-
-# Returns the arm kernel config file extension for the current subarch
-_get_arm_subarch() {
-	local target="${CTARGET:-${CHOST}}"
-	local arm_arch=${target%%-*}
-	if [[ ${arm_arch} == armv7? ]]; then
-		echo "armv7"
-	elif [[ ${arm_arch} == armv6? ]]; then
-		echo "armv6"
-	elif [[ ${arm_arch} == armv5? ]]; then
-		echo "armv5"
-	fi
-}
-
-_get_arch() {
-	if use arm; then
-		_get_arm_subarch
-	elif use amd64; then
-		echo "amd64"
-	elif use x86; then
-		echo "x86"
-	fi
-}
-
-_set_config_file_vars() {
-	# Setup kernel configuration file name
-	local pvr="${PVR}"
-	local pv="${PV}"
-	if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
-		pvr="$(get_version_component_range 1-2)"
-		pv="${pvr}"
-		if [ "${PR}" != "r0" ]; then
-			pvr+="-${PR}"
-		fi
-	fi
-
-	K_SABKERNEL_CONFIG_FILES=()
-	K_SABKERNEL_CONFIG_FILES+=( "${K_SABKERNEL_NAME}-${pvr}-$(_get_arch).config" )
-	K_SABKERNEL_CONFIG_FILES+=( "${K_SABKERNEL_NAME}-${pv}-$(_get_arch).config" )
-	K_SABKERNEL_CONFIG_FILES+=( "${K_SABKERNEL_NAME}-$(_get_arch).config" )
-
-	_config_file_set=1
-}
-
-if [ -n "${K_ONLY_SOURCES}" ] || [ -n "${K_FIRMWARE_PACKAGE}" ]; then
-	IUSE="${IUSE}"
-	DEPEND="sys-apps/sed"
-	RDEPEND="${RDEPEND}"
-else
-	IUSE="dmraid dracut iscsi luks lvm mdadm plymouth splash"
-	if [ -n "${K_SABKERNEL_ZFS}" ]; then
-		IUSE="${IUSE} zfs"
-	fi
-	DEPEND="app-arch/xz-utils
-		sys-apps/sed
-		sys-devel/autoconf
-		sys-devel/make
-		|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-3.4.45-r2 )
-		arm? ( dev-embedded/u-boot-tools )
-		amd64? ( sys-apps/v86d )
-		x86? ( sys-apps/v86d )
-		splash? ( x11-themes/sabayon-artwork-core )
-		lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools )
-		plymouth? (
-			|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-5 )
-			sys-boot/plymouth
-		)
-		dracut? ( sys-apps/v86d sys-kernel/dracut )"
-	RDEPEND="sys-apps/sed
-		sys-kernel/linux-firmware"
-	if [ -n "${K_REQUIRED_LINUX_FIRMWARE_VER}" ]; then
-		RDEPEND+=" >=sys-kernel/linux-firmware-${K_REQUIRED_LINUX_FIRMWARE_VER}"
-	fi
-fi
-
-# internal function
-#
-# FUNCTION: _update_depmod
-# @USAGE: _update_depmod <-r depmod>
-# DESCRIPTION:
-# It updates the modules.dep file for the current kernel.
-# This is more or less the same of linux-mod update_depmod, with the
-# exception of accepting parameter which is passed to depmod -r switch
-_update_depmod() {
-
-        # if we haven't determined the version yet, we need too.
-        get_version;
-
-	ebegin "Updating module dependencies for ${KV_FULL}"
-	if [ -r "${KV_OUT_DIR}"/System.map ]; then
-		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r "${1}"
-		eend $?
-	else
-		ewarn
-		ewarn "${KV_OUT_DIR}/System.map not found."
-		ewarn "You must manually update the kernel module dependencies using depmod."
-		eend 1
-		ewarn
-	fi
-}
-
-sabayon-kernel_pkg_setup() {
-	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
-		einfo "Preparing kernel firmwares"
-	else
-		einfo "Preparing kernel and its modules"
-	fi
-}
-
-sabayon-kernel_src_unpack() {
-	local okv="${OKV}"
-	if [ -n "${K_SABKERNEL_SELF_TARBALL_NAME}" ] && [ "${K_SABKERNEL_PATCH_UPSTREAM_TARBALL}" != "1" ]; then
-		OKV="${PVR}+${K_SABKERNEL_SELF_TARBALL_NAME}"
-	fi
-	if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then
-		# workaround for kernel-2's universal_unpack assumptions
-		UNIPATCH_LIST_DEFAULT= KV_MAJOR=0 kernel-2_src_unpack
-	else
-		kernel-2_src_unpack
-	fi
-	if [ -n "${K_SABKERNEL_FORCE_SUBLEVEL}" ]; then
-		# patch out Makefile with proper sublevel
-		sed -i "s:^SUBLEVEL = .*:SUBLEVEL = ${K_SABKERNEL_FORCE_SUBLEVEL}:" \
-			"${S}/Makefile" || die
-	fi
-	if [ -n "${K_SABKERNEL_RESET_EXTRAVERSION}" ]; then
-		sed -i "s:^EXTRAVERSION =.*:EXTRAVERSION = :" "${S}/Makefile" || die
-		# some sources could have multiple append-based EXTRAVERSIONs
-		sed -i "s/^EXTRAVERSION :=.*//" "${S}/Makefile" || die
-	fi
-	OKV="${okv}"
-
-	# Let's handle EAPIs 0 and 1...
-	case ${EAPI:-0} in
-		0|1) sabayon-kernel_src_prepare ;;
-	esac
-}
-
-sabayon-kernel_src_prepare() {
-	_set_config_file_vars
-}
-
-sabayon-kernel_src_compile() {
-	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
-		_firmwares_src_compile
-	elif [ -n "${K_ONLY_SOURCES}" ]; then
-		kernel-2_src_compile
-	else
-		_kernel_src_compile
-	fi
-}
-
-_firmwares_src_compile() {
-	einfo "Starting to compile firmwares..."
-	_kernel_copy_config "${S}/.config"
-	cd "${S}" || die "cannot find source dir"
-
-	export LDFLAGS=""
-	OLDARCH="${ARCH}"
-	unset ARCH
-	emake firmware || die "cannot compile firmwares"
-	ARCH="${OLDARCH}"
-}
-
-_kernel_copy_config() {
-	_is_config_file_set \
-		|| die "Kernel configuration file not set. Was sabayon-kernel_src_prepare() called?"
-
-	local base_path="${DISTDIR}"
-	if [ -n "${K_SABKERNEL_SELF_TARBALL_NAME}" ]; then
-		base_path="${S}/sabayon/config"
-	fi
-
-	local found= cfg=
-	for cfg in "${K_SABKERNEL_CONFIG_FILES[@]}"; do
-		cfg="${base_path}/${cfg}"
-		if [ -f "${cfg}" ]; then
-			cp "${cfg}" "${1}" || die "cannot copy kernel config ${cfg} -> ${1}"
-			elog "Using kernel config: ${cfg}"
-			found=1
-			break
-		fi
-	done
-	[[ -z "${found}" ]] && die "cannot find kernel configs among: ${K_SABKERNEL_CONFIG_FILES[*]}"
-}
-
-_kernel_src_compile() {
-	# disable sandbox
-	export SANDBOX_ON=0
-
-	# needed anyway, even if grub use flag is not used here
-	if use amd64 || use x86; then
-		mkdir -p "${WORKDIR}"/boot/grub
-	else
-		mkdir -p "${WORKDIR}"/boot
-	fi
-
-	einfo "Starting to compile kernel..."
-	_kernel_copy_config "${WORKDIR}"/config
-
-	# do some cleanup
-	rm -rf "${WORKDIR}"/lib
-	rm -rf "${WORKDIR}"/cache
-	rm -rf "${S}"/temp
-
-	# creating workdirs
-	# some kernels fail with make 3.82 if firmware dir is not created
-	mkdir "${WORKDIR}"/lib/lib/firmware -p
-	mkdir "${WORKDIR}"/cache
-	mkdir "${S}"/temp
-
-	cd "${S}" || die
-	local GKARGS=()
-	GKARGS+=( "--no-save-config" "--e2fsprogs" "--udev" )
-	use splash && GKARGS+=( "--splash=sabayon" )
-	use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" )
-	use dmraid && GKARGS+=( "--dmraid" )
-	use iscsi && GKARGS+=( "--iscsi" )
-	use mdadm && GKARGS+=( "--mdadm" )
-	use luks && GKARGS+=( "--luks" )
-	use lvm && GKARGS+=( "--lvm" )
-	if [ -n "${K_SABKERNEL_ZFS}" ]; then
-		use zfs && GKARGS+=( "--zfs" )
-	fi
-
-	export DEFAULT_KERNEL_SOURCE="${S}"
-	export CMD_KERNEL_DIR="${S}"
-	for opt in ${MAKEOPTS}; do
-		if [ "${opt:0:2}" = "-j" ]; then
-			mkopts="${opt}"
-			break
-		fi
-	done
-	[ -z "${mkopts}" ] && mkopts="-j3"
-
-	if [ -n "${K_KERNEL_IMAGE_NAME}" ]; then
-		GKARGS+=( "--kernel-target=${K_KERNEL_IMAGE_NAME}" )
-	elif use arm; then
-		# backward compat + provide sane defaults.
-		GKARGS+=( "--kernel-target=uImage" )
-	fi
-	if [ -n "${K_KERNEL_IMAGE_PATH}" ]; then
-		GKARGS+=( "--kernel-binary=${K_KERNEL_IMAGE_PATH}" )
-	elif use arm; then
-		# backward compat + provide sane defaults.
-		GKARGS+=( "--kernel-binary=arch/arm/boot/uImage" )
-	fi
-
-	# Workaround bug in splash_geninitramfs corrupting the initramfs
-	# if xz compression is used (newer genkernel >3.4.24)
-	local support_comp=$(genkernel --help | grep compress-initramfs-type)
-	if [ -n "${support_comp}" ]; then
-		GKARGS+=( "--compress-initramfs-type=gzip" )
-	fi
-
-	# Use --disklabel if genkernel supports it
-	local support_disklabel=$(genkernel --help | grep -- --disklabel)
-	if [ -n "${support_disklabel}" ]; then
-		GKARGS+=( "--disklabel" )
-	fi
-
-	if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then
-		export LOADADDR="${K_MKIMAGE_KERNEL_ADDRESS}"
-	fi
-	OLDARCH="${ARCH}"
-	unset ARCH
-	unset LDFLAGS
-	DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" genkernel "${GKARGS[@]}" ${K_GENKERNEL_ARGS} \
-		--kerneldir="${S}" \
-		--kernel-config="${WORKDIR}"/config \
-		--cachedir="${WORKDIR}"/cache \
-		--makeopts="${mkopts}" \
-		--tempdir="${S}"/temp \
-		--logfile="${WORKDIR}"/genkernel.log \
-		--bootdir="${WORKDIR}"/boot \
-		--mountboot \
-		--module-prefix="${WORKDIR}"/lib \
-		all || die "genkernel failed"
-
-	if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then
-		unset LOADADDR
-	fi
-
-	ARCH=${OLDARCH}
-}
-
-_setup_mkimage_ramdisk() {
-	local initramfs=$(ls "${WORKDIR}"/boot/${KERN_INITRAMFS_SEARCH_NAME}* 2> /dev/null)
-	if [ ! -e "${initramfs}" ] || [ ! -f "${initramfs}" ]; then
-		ewarn "No initramfs at ${initramfs}, cannot run mkimage on it!"
-	elif [ "${K_MKIMAGE_WRAP_INITRAMFS}" = "1" ]; then
-		einfo "Setting up u-boot initramfs for: ${initramfs}"
-		mkimage -A arm -O linux -T ramdisk -C none -a \
-			"${K_MKIMAGE_RAMDISK_ADDRESS}" \
-			-e "${K_MKIMAGE_RAMDISK_ENTRYPOINT}" -d "${initramfs}" \
-			"${initramfs}.u-boot" || return 1
-		mv "${initramfs}.u-boot" "${initramfs}" || return 1
-	else
-		einfo "mkimage won't be called for: ${initramfs}"
-	fi
-	return 0
-}
-
-sabayon-kernel_src_install() {
-	if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
-		_firmwares_src_install
-	elif [ -n "${K_ONLY_SOURCES}" ]; then
-		_kernel_sources_src_install
-	else
-		_kernel_src_install
-	fi
-	# File collisions between slots, debug stuff
-	# not really needed for a kernel
-	rm -rf "${D}/usr/lib/debug"
-}
-
-_firmwares_src_install() {
-	dodir /lib/firmware
-	keepdir /lib/firmware
-	cd "${S}" || die
-	emake INSTALL_FW_PATH="${D}/lib/firmware" firmware_install || die "cannot install firmwares"
-}
-
-_kernel_sources_src_install() {
-	_kernel_copy_config ".config"
-	kernel-2_src_install
-	cd "${D}${KV_OUT_DIR}" || die
-	local oldarch="${ARCH}"
-	unset ARCH
-	if ! use sources_standalone; then
-		make modules_prepare || die "failed to run modules_prepare"
-		rm .config || die "cannot remove .config"
-		rm Makefile || die "cannot remove Makefile"
-		rm -f include/linux/version.h
-		rm -f include/generated/uapi/linux/version.h
-	fi
-	ARCH="${oldarch}"
-}
-
-_kernel_src_install() {
-	if use arm; then
-		_setup_mkimage_ramdisk || die "cannot setup mkimage"
-	fi
-
-	dodir "${KV_OUT_DIR}"
-	insinto "${KV_OUT_DIR}"
-
-	_kernel_copy_config ".config"
-	doins ".config" || die "cannot copy kernel config"
-	doins Makefile || die "cannot copy Makefile"
-	doins Module.symvers || die "cannot copy Module.symvers"
-	doins System.map || die "cannot copy System.map"
-
-	# NOTE: this is a workaround caused by linux-info.eclass not
-	# being ported to EAPI=2 yet
-	local version_h_dir="include/linux"
-	local version_h_dir2="include/generated/uapi/linux"
-	local version_h=
-	local version_h_src=
-	for ver_dir in "${version_h_dir}" "${version_h_dir2}"; do
-		version_h="${ROOT}${KV_OUT_DIR/\//}/${ver_dir}/version.h"
-		if [ -f "${version_h}" ]; then
-			einfo "Discarding previously installed version.h to avoid collisions"
-			addwrite "${version_h}"
-			rm -f "${version_h}"
-		fi
-
-		# Include include/linux/version.h to make Portage happy
-		version_h_src="${S}/${ver_dir}/version.h"
-		if [ -f "${version_h_src}" ]; then
-			dodir "${KV_OUT_DIR}/${ver_dir}"
-			insinto "${KV_OUT_DIR}/${ver_dir}"
-			doins "${version_h_src}" || die "cannot copy version.h"
-		fi
-	done
-
-	insinto "/boot"
-	doins "${WORKDIR}"/boot/* || die "cannot copy /boot over"
-	cp -Rp "${WORKDIR}"/lib/* "${D}/" || die "cannot copy /lib over"
-
-	# Install dtbs if found
-	if use arm; then
-		local dtb_dir="/lib/dts/${KV_FULL}"
-		elog "Installing .dtbs (if any) into ${dtb_dir}"
-		insinto "${dtb_dir}"
-		local dtb=
-		for dtb in "${S}/arch/arm/boot/dts"/*.dtb; do
-			if [ -f "${dtb}" ]; then
-				elog "Installing dtb: ${dtb}"
-				doins "${dtb}"
-			fi
-		done
-	fi
-
-	# This doesn't always work because KV_FULL (when K_NOSETEXTRAVERSION=1) doesn't
-	# reflect the real value used in Makefile
-	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/source" || die "cannot install source symlink"
-	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/build" || die "cannot install build symlink"
-	cd "${D}"/lib/modules/* || die "cannot enter /lib/modules directory, more than one element?"
-	# cleanup previous
-	rm -f build source || die
-	# create sane symlinks
-	ln -sf "../../..${KV_OUT_DIR}" source || die "cannot create source symlink"
-	ln -sf "../../..${KV_OUT_DIR}" build || die "cannot create build symlink"
-	cd "${S}" || die
-
-	# drop ${D}/lib/firmware, virtual/linux-firmwares provides it
-	rm -rf "${D}/lib/firmware"
-
-	if [ -n "${K_WORKAROUND_SOURCES_COLLISION}" ]; then
-		# Fixing up Makefile collision if already installed by
-		# openvz-sources
-		einfo "Workarounding source package collisions"
-		make_file="${KV_OUT_DIR/\//}/Makefile"
-		einfo "Makefile: ${make_file}"
-		if [ -f "${ROOT}/${make_file}" ]; then
-			elog "Removing ${D}/${make_file}"
-			rm -f "${D}/${make_file}"
-		fi
-	fi
-
-	# Install kernel configuration information
-	# useful for Entropy kernel-switcher
-	# release level is enough for now
-	base_dir="/etc/kernels/${P}"
-	dodir "${base_dir}"
-	insinto "${base_dir}"
-	echo "${KV_FULL}" > "RELEASE_LEVEL"
-	doins "RELEASE_LEVEL"
-	einfo "Installing ${base_dir}/RELEASE_LEVEL file: ${KV_FULL}"
-
-	use dracut && \
-		_dracut_initramfs_create "${KV_FULL}"
-}
-
-sabayon-kernel_pkg_preinst() {
-	if _is_kernel_binary; then
-		mount-boot_pkg_preinst
-	fi
-}
-sabayon-kernel_grub2_mkconfig() {
-	if [ -x "${ROOT}usr/sbin/grub2-mkconfig" ]; then
-		# Grub 2.00
-		"${ROOT}usr/sbin/grub2-mkconfig" -o "${ROOT}boot/grub/grub.cfg"
-	elif [ -x "${ROOT}sbin/grub-mkconfig" ]; then
-		# Grub 1.99
-		"${ROOT}sbin/grub-mkdevicemap" --device-map="${ROOT}boot/grub/device.map"
-		"${ROOT}sbin/grub-mkconfig" -o "${ROOT}boot/grub/grub.cfg"
-	else
-		echo
-		ewarn "Attention, Grub2 is not installed !!!"
-		ewarn "Grub2 bootloader configuration won't be updated"
-		echo
-	fi
-}
-
-_get_real_extraversion() {
-	make_file="${ROOT}${KV_OUT_DIR}/Makefile"
-	local extraver=$(grep -r "^EXTRAVERSION =" "${make_file}" | cut -d "=" -f 2 | head -n 1)
-	local trimmed=${extraver%% }
-	echo ${trimmed## }
-}
-
-_get_release_level() {
-	if [[ -n "${K_WORKAROUND_USE_REAL_EXTRAVERSION}" ]]; then
-		echo "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}$(_get_real_extraversion)"
-	elif [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then
-		echo "${KV_FULL}"
-	elif [[ "${OKV/.*}" = "3" ]] && [[ "${KV_PATCH}" = "0" ]]; then
-		# Linux 3.x support, KV_FULL is set to: 3.0-sabayon
-		# need to add another final .0 to the version part
-		echo "${KV_FULL/-/.0-}"
-	else
-		echo "${KV_FULL}"
-	fi
-}
-
-sabayon-kernel_uimage_config() {
-	# Two cases here:
-	# 1. /boot/uImage symlink is broken (pkg_postrm)
-	# 2. /boot/uImage symlink doesn't exist (pkg_postinst)
-
-	if ! has_version app-eselect/uimage; then
-		ewarn "app-eselect/uimage not installed"
-		ewarn "If you are using this tool, please install it"
-		return 0
-	fi
-
-	local uimage_file=$(eselect uimage show --quiet 2> /dev/null)
-	if [ -z "${uimage_file}" ]; then
-		# pick the first listed, sorry!
-		local eselect_list=$(eselect uimage list --quiet 2> /dev/null)
-		if [ -n "${eselect_list}" ]; then
-			eselect uimage set 1
-		else
-			echo
-			ewarn "No more kernels available, you won't be able to boot"
-			echo
-		fi
-	else
-		echo
-		elog "If you use eselect-bzimage, you are currently booting with kernel:"
-		elog "${uimage_file}"
-		elog
-		elog "Use 'eselect uimage' in order to switch between the available ones"
-		echo
-	fi
-}
-
-sabayon-kernel_bzimage_config() {
-	# Two cases here:
-	# 1. /boot/bzImage symlink is broken (pkg_postrm)
-	# 2. /boot/bzImage symlink doesn't exist (pkg_postinst)
-	local kern_arch
-	use x86 && kern_arch="x86"
-	use amd64 && kern_arch="x86_64"
-
-	if ! has_version app-eselect/eselect-bzimage; then
-		ewarn "app-eselect/eselect-bzimage not installed"
-		ewarn "If you are using this tool, please install it"
-		return 0
-	fi
-
-	local bzimage_file=$(eselect bzimage show --quiet 2> /dev/null)
-	if [ -z "${bzimage_file}" ]; then
-		# try to pic what's being installed
-		local eselect_list=$(eselect bzimage list --quiet 2> /dev/null)
-		if [ -n "${eselect_list}" ]; then
-			eselect bzimage set "kernel-genkernel-${kern_arch}-${KV_FULL}"
-			if [ "${?}" != "0" ]; then
-				# pick the first available, sorry!
-				echo
-				eselect bzimage set 1
-				ewarn "Unable to select the right kernel, falling back"
-				ewarn "to the first available entry. You have been warned"
-				echo
-			fi
-		else
-			echo
-			ewarn "No more kernels available, you might not be able to boot"
-			echo
-		fi
-	else
-		echo
-		ewarn "You are currently booting with kernel:"
-		ewarn "${bzimage_file}"
-		ewarn
-		ewarn "Use 'eselect bzimage' in order to switch between the available ones"
-		echo
-	fi
-}
-
-_dracut_initramfs_create() {
-	local kver="${1}"
-
-	elog "Creating dracut initramfs for ${kver}"
-	addpredict /etc/ld.so.cache~
-	dracut -q -N -f --kver="${kver}" "${D}/boot/initramfs-dracut-${kver}"
-}
-
-sabayon-kernel_pkg_postinst() {
-	if _is_kernel_binary; then
-		fstab_file="${ROOT}etc/fstab"
-		einfo "Removing extents option for ext4 drives from ${fstab_file}"
-		# Remove "extents" from /etc/fstab
-		if [ -f "${fstab_file}" ]; then
-			sed -i '/ext4/ s/extents//g' "${fstab_file}"
-		fi
-
-		# Update kernel initramfs to match user customizations
-		use splash && update_sabayon_kernel_initramfs_splash
-
-		# Add kernel to grub.conf
-		if use amd64 || use x86; then
-			if use amd64; then
-				local kern_arch="x86_64"
-			else
-				local kern_arch="x86"
-			fi
-			# grub-legacy
-			if [ -x "${ROOT}usr/sbin/grub-handler" ]; then
-				"${ROOT}usr/sbin/grub-handler" add \
-					"/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \
-					"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}"
-			fi
-
-			sabayon-kernel_grub2_mkconfig
-		fi
-
-		# Setup newly installed kernel on ARM
-		if use arm; then
-			sabayon-kernel_uimage_config
-		fi
-		# Setup newly installed kernel on x86/amd64
-		# This is quite handy for static grub1/grub2
-		# configurations (like on Amazon EC2)
-		if use x86 || use amd64; then
-			sabayon-kernel_bzimage_config
-		fi
-
-		kernel-2_pkg_postinst
-		local depmod_r=$(_get_release_level)
-		_update_depmod "${depmod_r}"
-
-		elog "Please report kernel bugs at:"
-		elog "http://bugs.sabayon.org"
-
-		elog "The source code of this kernel is located at"
-		elog "=${K_KERNEL_SOURCES_PKG}."
-		elog "Sabayon Linux recommends that portage users install"
-		elog "${K_KERNEL_SOURCES_PKG} if you want"
-		elog "to build any packages that install kernel modules"
-		elog "(such as ati-drivers, nvidia-drivers, virtualbox, etc...)."
-	else
-		kernel-2_pkg_postinst
-	fi
-}
-
-sabayon-kernel_pkg_prerm() {
-	if _is_kernel_binary; then
-		mount-boot_pkg_prerm
-	fi
-}
-
-sabayon-kernel_pkg_postrm() {
-	if _is_kernel_binary; then
-		# Remove kernel from grub.conf
-		if use amd64 || use x86; then
-			if use amd64; then
-				local kern_arch="x86_64"
-			else
-				local kern_arch="x86"
-			fi
-			if [ -x "${ROOT}usr/sbin/grub-handler" ]; then
-				"${ROOT}usr/sbin/grub-handler" remove \
-					"/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \
-					"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}"
-			fi
-
-			sabayon-kernel_grub2_mkconfig
-		fi
-
-		# Setup newly installed kernel on ARM
-		if use arm; then
-			sabayon-kernel_uimage_config
-		fi
-		# Setup newly installed kernel on x86/amd64
-		# This is quite handy for static grub1/grub2
-		# configurations (like on Amazon EC2)
-		if use x86 || use amd64; then
-			sabayon-kernel_bzimage_config
-		fi
-	fi
-}
-
-# export all the available functions here
-case ${EAPI:-0} in
-	0|1) extra_export_funcs= ;;
-	*) extra_export_funcs=src_prepare ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack ${extra_export_funcs} \
-	src_compile src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm
-- 
cgit v1.2.3


From f8cb9b6e71fdfa21c96650bb1bf62b001cef3655 Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Tue, 30 Jun 2015 21:24:31 +0300
Subject: Dropping mate, it`s already in Gentoo

---
 mate-base/mate-applets/mate-applets-1.8.1.ebuild   | 103 ----
 mate-base/mate-applets/metadata.xml                |   8 -
 mate-base/mate-session-manager/Manifest            |   1 -
 .../files/10-user-dirs-update-mate                 |  10 -
 .../mate-session-manager/files/15-xdg-data-mate    |   9 -
 mate-base/mate-session-manager/files/MATE          | 109 -----
 mate-base/mate-session-manager/files/defaults.list | 336 -------------
 ...ate-session-manager-1.2.0-idle-transition.patch |  10 -
 ...ate-session-manager-1.5.2-save-session-ui.patch | 535 ---------------------
 .../files/mate-session-manager-upower1.patch       |  86 ----
 .../mate-session-manager-1.8.1-r1.ebuild           | 104 ----
 mate-extra/mate-tweak/Manifest                     |   2 -
 mate-extra/mate-tweak/mate-tweak-3.4.8.ebuild      |  32 --
 mate-extra/mate-tweak/mate-tweak-3.4.9.ebuild      |  32 --
 mate-extra/mate-tweak/mate-tweak-9999.ebuild       |  30 --
 mate-extra/mintmenu/mintmenu-5.6.0.ebuild          |  54 ---
 16 files changed, 1461 deletions(-)
 delete mode 100644 mate-base/mate-applets/mate-applets-1.8.1.ebuild
 delete mode 100644 mate-base/mate-applets/metadata.xml
 delete mode 100644 mate-base/mate-session-manager/Manifest
 delete mode 100755 mate-base/mate-session-manager/files/10-user-dirs-update-mate
 delete mode 100644 mate-base/mate-session-manager/files/15-xdg-data-mate
 delete mode 100644 mate-base/mate-session-manager/files/MATE
 delete mode 100644 mate-base/mate-session-manager/files/defaults.list
 delete mode 100644 mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch
 delete mode 100644 mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch
 delete mode 100644 mate-base/mate-session-manager/files/mate-session-manager-upower1.patch
 delete mode 100644 mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
 delete mode 100644 mate-extra/mate-tweak/Manifest
 delete mode 100644 mate-extra/mate-tweak/mate-tweak-3.4.8.ebuild
 delete mode 100644 mate-extra/mate-tweak/mate-tweak-3.4.9.ebuild
 delete mode 100644 mate-extra/mate-tweak/mate-tweak-9999.ebuild
 delete mode 100644 mate-extra/mintmenu/mintmenu-5.6.0.ebuild

diff --git a/mate-base/mate-applets/mate-applets-1.8.1.ebuild b/mate-base/mate-applets/mate-applets-1.8.1.ebuild
deleted file mode 100644
index ff216ec5..00000000
--- a/mate-base/mate-applets/mate-applets-1.8.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.1.ebuild,v 1.2 2014/12/09 00:22:42 tamiko Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit autotools eutils gnome2 python-single-r1 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X ipv6 networkmanager policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/libmateweather-1.6.1:0
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.6:0
-	>=mate-base/mate-panel-1.8:0
-	>=mate-base/mate-settings-daemon-1.6:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpufrequtils
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-4:0
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/pango:0
-	>=x11-themes/mate-icon-theme-1.6:0
-	virtual/libintl:0
-	networkmanager? ( >=net-misc/networkmanager-0.7:0 )
-	policykit? ( >=sys-auth/polkit-0.92:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	dev-libs/libxslt:0
-	>=mate-base/mate-common-1.6:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	## Kogaion: removal of this patch and sys-power/cpupower replaced by sys-power/cpufrequtils
-	## are the only dependencies
-	#epatch "${FILESDIR}"/${PN}-1.6.2-r1-replace-cpufreq-by-cpupower.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--without-hal \
-		$(use_enable ipv6) \
-		$(use_enable networkmanager) \
-		$(use_enable policykit polkit) \
-		$(use_with upower) \
-		$(use_with X x)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_install() {
-	python_fix_shebang invest-applet timer-applet/src
-	gnome2_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather mini-commander mixer multiload
-			null_applet stickynotes timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
deleted file mode 100644
index dca1781c..00000000
--- a/mate-base/mate-applets/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
deleted file mode 100644
index 6cf562c9..00000000
--- a/mate-base/mate-session-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
deleted file mode 100755
index 35973aae..00000000
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if type xdg-user-dirs-update >/dev/null 2>&1; then
-		xdg-user-dirs-update
-	fi
-fi
diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate
deleted file mode 100644
index df360cf8..00000000
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if [ -z "$XDG_DATA_DIRS" ]; then
-		export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
-	else
-		export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
-	fi
-fi
diff --git a/mate-base/mate-session-manager/files/MATE b/mate-base/mate-session-manager/files/MATE
deleted file mode 100644
index baa154bd..00000000
--- a/mate-base/mate-session-manager/files/MATE
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# This file has bitrotted badly. Someone needs to clean this up.
-#
-
-if [ -f /etc/xdg/menus/mate-applications.menu ] ; then
-	export XDG_MENU_PREFIX=mate-
-fi
-
-for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-#
-#  Distributors:
-#  You should modify the paths here to fit your distro
-#  If you need to do so, send me (jirka@5z.com) a patch
-#  and I'll try to make the script detect the distro stuff
-#
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-if [ -x "$HOME/.materc" ]; then
-	command="$HOME/.materc"
-elif [ -x /etc/X11/gdm/materc ]; then
-	command="/etc/X11/gdm/materc"
-else
-	# as fallback in case the config is screwed
-	command=`which mate-session`
-fi
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
-exec $command
diff --git a/mate-base/mate-session-manager/files/defaults.list b/mate-base/mate-session-manager/files/defaults.list
deleted file mode 100644
index 0d6d6bf9..00000000
--- a/mate-base/mate-session-manager/files/defaults.list
+++ /dev/null
@@ -1,336 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop
-application/x-abiword=abiword.desktop
-text/abiword=abiword.desktop
-text/richtext=abiword.desktop
-text/rtf=abiword.desktop
-text/x-abiword=abiword.desktop
-text/x-xml-abiword=abiword.desktop
-x-content/blank-bd=brasero-caja.desktop
-x-content/blank-dvd=brasero-caja.desktop
-x-content/blank-cd=brasero-caja.desktop
-x-content/blank-hddvd=brasero-caja.desktop
-application/x-dia-diagram=dia.desktop
-image/bmp=eom.desktop
-image/gif=eom.desktop
-image/jpeg=eom.desktop
-image/jpg=eom.desktop
-image/pjpeg=eom.desktop
-image/png=eom.desktop
-image/svg+xml=eom.desktop
-image/svg+xml-compressed=eom.desktop
-image/x-bmp=eom.desktop
-image/x-gray=eom.desktop
-image/x-icb=eom.desktop
-image/x-ico=eom.desktop
-image/x-pcx=eom.desktop
-image/x-png=eom.desktop
-image/x-portable-anymap=eom.desktop
-image/x-portable-bitmap=eom.desktop
-image/x-portable-graymap=eom.desktop
-image/x-portable-pixmap=eom.desktop
-image/x-xbitmap=eom.desktop
-image/x-xpixmap=eom.desktop
-image/vnd.wap.wbmp=eom.desktop
-image/g3fax=gimp.desktop
-image/x-compressed-xcf=gimp.desktop
-image/x-fits=gimp.desktop
-image/x-icon=gimp.desktop
-image/x-psd=gimp.desktop
-image/x-sgi=gimp.desktop
-image/x-sun-raster=gimp.desktop
-image/x-tga=gimp.desktop
-image/x-xcf=gimp.desktop
-image/x-xwindowdump=gimp.desktop
-application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-application/pdf=atril.desktop
-application/x-bzpdf=atril.desktop
-application/x-gzpdf=atril.desktop
-application/postscript=atril.desktop
-application/x-bzpostscript=atril.desktop
-application/x-gzpostscript=atril.desktop
-image/x-eps=atril.desktop
-image/x-bzeps=atril.desktop
-image/x-gzeps=atril.desktop
-application/x-dvi=atril.desktop
-application/x-bzdvi=atril.desktop
-application/x-gzdvi=atril.desktop
-image/vnd.djvu=atril.desktop
-image/tiff=atril.desktop
-application/x-cbr=atril.desktop
-application/x-cbz=atril.desktop
-application/x-cb7=atril.desktop
-application/x-7z-compressed=engrampa.desktop
-application/x-7z-compressed-tar=engrampa.desktop
-application/x-ace=engrampa.desktop
-application/x-alz=engrampa.desktop
-application/x-ar=engrampa.desktop
-application/x-arj=engrampa.desktop
-application/x-bzip=engrampa.desktop
-application/x-bzip-compressed-tar=engrampa.desktop
-application/x-bzip1=engrampa.desktop
-application/x-bzip1-compressed-tar=engrampa.desktop
-application/x-cabinet=engrampa.desktop
-application/x-cd-image=engrampa.desktop
-application/x-compress=engrampa.desktop
-application/x-compressed-tar=engrampa.desktop
-application/x-cpio=engrampa.desktop
-application/x-deb=engrampa.desktop
-application/x-ear=engrampa.desktop
-application/x-gtar=engrampa.desktop
-application/x-gzip=engrampa.desktop
-application/x-java-archive=engrampa.desktop
-application/x-lha=engrampa.desktop
-application/x-lhz=engrampa.desktop
-application/x-lzip=engrampa.desktop
-application/x-lzip-compressed-tar=engrampa.desktop
-application/x-lzma=engrampa.desktop
-application/x-lzma-compressed-tar=engrampa.desktop
-application/x-lzop=engrampa.desktop
-application/x-lzop-compressed-tar=engrampa.desktop
-application/x-rar=engrampa.desktop
-application/x-rar-compressed=engrampa.desktop
-application/x-rpm=engrampa.desktop
-application/x-rzip=engrampa.desktop
-application/x-tar=engrampa.desktop
-application/x-tarz=engrampa.desktop
-application/x-stuffit=engrampa.desktop
-application/x-war=engrampa.desktop
-application/x-xz=engrampa.desktop
-application/x-xz-compressed-tar=engrampa.desktop
-application/x-zip=engrampa.desktop
-application/x-zip-compressed=engrampa.desktop
-application/x-zoo=engrampa.desktop
-application/zip=engrampa.desktop
-multipart/x-zip=engrampa.desktop
-text/plain=pluma.desktop
-text/css=pluma.desktop
-text/javascript=pluma.desktop
-text/mathml=pluma.desktop
-text/x-csrc=pluma.desktop
-text/x-chdr=pluma.desktop
-text/x-dtd=pluma.desktop
-text/x-java=pluma.desktop
-text/x-javascript=pluma.desktop
-text/x-patch=pluma.desktop
-text/x-perl=pluma.destkop
-text/x-php=pluma.destkop
-text/x-python=pluma.destkop
-text/x-sql=pluma.desktop
-text/xml=pluma.desktop
-application/javascript=pluma.destkop
-application/x-cgi=pluma.desktop
-application/x-javascript=pluma.desktop
-application/x-perl=pluma.desktop
-application/x-php=pluma.desktop
-application/x-python=pluma.desktop
-application/xml=pluma.desktop
-application/xml-dtd=pluma.desktop
-application/x-font-ttf=mate-font-viewer.desktop
-application/x-font-pcf=mate-font-viewer.desktop
-application/x-font-type1=mate-font-viewer.desktop
-application/x-font-otf=mate-font-viewer.desktop
-application/csv=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
-application/tab-separated-values=gnumeric.desktop
-application/vnd.lotus-1-2-3=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
-application/x-123=gnumeric.desktop
-application/x-applix-spreadsheet=gnumeric.desktop
-application/x-dbase=gnumeric.desktop
-application/x-dbf=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
-application/x-mps=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
-application/x-oleo=gnumeric.desktop
-application/x-planperfect=gnumeric.desktop
-application/x-quattropro=gnumeric.desktop
-application/x-sc=gnumeric.desktop
-application/x-sylk=gnumeric.desktop
-application/x-xbase=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-application/xls=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-text/csv=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-text/x-csv=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-x-content/software=caja-autorun-software.desktop
-x-directory/gnome-default-handler=caja-folder-handler.desktop
-x-directory/normal=caja-folder-handler.desktop
-inode/directory=caja-folder-handler.desktop
-application/x-gnome-saved-search=caja-folder-handler.desktop
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-x-content/audio-player=rhythmbox.desktop
-x-content/audio-cdda=sound-juicer.desktop
-application/x-shockwave-flash=swfdec-player.desktop
-application/futuresplash=swfdec-player.desktop
-application/mxf=vlc.desktop
-application/ogg=vlc.desktop
-application/ram=vlc.desktop
-application/sdp=vlc.desktop
-application/smil=vlc.desktop
-application/smil+xml=vlc.desktop
-application/vnd.ms-wpl=vlc.desktop
-application/vnd.rn-realmedia=vlc.desktop
-application/x-extension-m4a=vlc.desktop
-application/x-extension-mp4=vlc.desktop
-application/x-flac=vlc.desktop
-application/x-flash-video=vlc.desktop
-application/x-lyx=lyx.desktop
-application/x-matroska=vlc.desktop
-application/x-netshow-channel=vlc.desktop
-application/x-ogg=vlc.desktop
-application/x-quicktime-media-link=vlc.desktop
-application/x-quicktimeplayer=vlc.desktop
-application/x-shorten=vlc.desktop
-application/x-smil=vlc.desktop
-application/xspf+xml=vlc.desktop
-audio/3gpp=vlc.desktop
-audio/ac3=vlc.desktop
-audio/AMR=vlc.desktop
-audio/AMR-WB=vlc.desktop
-audio/basic=vlc.desktop
-audio/midi=vlc.desktop
-audio/mp4=vlc.desktop
-audio/mpeg=vlc.desktop
-audio/mpegurl=vlc.desktop
-audio/ogg=vlc.desktop
-audio/prs.sid=vlc.desktop
-audio/vnd.rn-realaudio=vlc.desktop
-audio/x-ape=vlc.desktop
-audio/x-flac=vlc.desktop
-audio/x-gsm=vlc.desktop
-audio/x-it=vlc.desktop
-audio/x-m4a=vlc.desktop
-audio/x-matroska=vlc.desktop
-audio/x-mod=vlc.desktop
-audio/x-mp3=vlc.desktop
-audio/x-mpeg=vlc.desktop
-audio/x-mpegurl=vlc.desktop
-audio/x-ms-asf=vlc.desktop
-audio/x-ms-asx=vlc.desktop
-audio/x-ms-wax=vlc.desktop
-audio/x-ms-wma=vlc.desktop
-audio/x-musepack=vlc.desktop
-audio/x-pn-aiff=vlc.desktop
-audio/x-pn-au=vlc.desktop
-audio/x-pn-realaudio=vlc.desktop
-audio/x-pn-realaudio-plugin=vlc.desktop
-audio/x-pn-wav=vlc.desktop
-audio/x-pn-windows-acm=vlc.desktop
-audio/x-realaudio=vlc.desktop
-audio/x-real-audio=vlc.desktop
-audio/x-sbc=vlc.desktop
-audio/x-scpls=vlc.desktop
-audio/x-speex=vlc.desktop
-audio/x-tta=vlc.desktop
-audio/x-vorbis=audacious.desktop
-audio/x-vorbis+ogg=audacious.desktop
-audio/x-wav=audacious.desktop
-audio/x-wavpack=audacious.desktop
-audio/x-xm=audacious.desktop
-image/vnd.rn-realpix=vlc.desktop
-image/x-pict=vlc.desktop
-misc/ultravox=vlc.desktop
-text/google-video-pointer=vlc.desktop
-text/x-google-video-pointer=vlc.desktop
-video/3gpp=vlc.desktop
-video/dv=vlc.desktop
-video/fli=vlc.desktop
-video/flv=vlc.desktop
-video/mp2t=vlc.desktop
-video/mp4=vlc.desktop
-video/mp4v-es=vlc.desktop
-video/mpeg=vlc.desktop
-video/msvideo=vlc.desktop
-video/ogg=vlc.desktop
-video/quicktime=vlc.desktop
-video/vivo=vlc.desktop
-video/vnd.divx=vlc.desktop
-video/vnd.rn-realvideo=vlc.desktop
-video/vnd.vivo=vlc.desktop
-video/webm=vlc.desktop
-video/x-anim=vlc.desktop
-video/x-avi=vlc.desktop
-video/x-flc=vlc.desktop
-video/x-fli=vlc.desktop
-video/x-flic=vlc.desktop
-video/x-flv=vlc.desktop
-video/x-m4v=vlc.desktop
-video/x-matroska=vlc.desktop
-video/x-mpeg=vlc.desktop
-video/x-ms-asf=vlc.desktop
-video/x-ms-asx=vlc.desktop
-video/x-msvideo=vlc.desktop
-video/x-ms-wm=vlc.desktop
-video/x-ms-wmv=vlc.desktop
-video/x-ms-wmx=vlc.desktop
-video/x-ms-wvx=vlc.desktop
-video/x-nsv=vlc.desktop
-video/x-ogm+ogg=vlc.desktop
-video/x-theora+ogg=vlc.desktop
-video/x-totem-stream=vlc.desktop
-x-content/video-dvd=vlc.desktop
-x-content/video-vcd=vlc.desktop
-x-content/video-svcd=vlc.desktop
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;epiphany.desktop
-x-scheme-handler/https=firefox.desktop;epiphany.desktop
-x-scheme-handler/mailto=evolution.desktop
-application/x-bittorrent=transmission-gtk.desktop;deluge.desktop
-x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch
deleted file mode 100644
index 62a229e5..00000000
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mate-session/gs-idle-monitor.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gs-idle-monitor.c	2012-08-08 11:49:13.308281663 +0200
-@@ -448,6 +448,7 @@
-         attr.delta = delta;
-         attr.events = TRUE;
- 
-+        attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1);
-         attr.trigger.test_type = XSyncPositiveTransition;
-         if (watch->xalarm_positive != None) {
-                 g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld",
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch
deleted file mode 100644
index 8a57d44a..00000000
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
---- a/capplet/gsm-properties-dialog.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/capplet/gsm-properties-dialog.c	2012-08-08 12:16:37.527332034 +0200
-@@ -26,6 +26,8 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
- 
- #include <mateconf/mateconf-client.h>
- 
-@@ -36,6 +38,11 @@
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
- 
-+
-+#define GSM_SERVICE_DBUS   "org.mate.SessionManager"
-+#define GSM_PATH_DBUS      "/org/mate/SessionManager"
-+#define GSM_INTERFACE_DBUS "org.mate.SessionManager"
-+
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
- 
- #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-@@ -50,6 +57,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
- 
- #define STARTUP_APP_ICON     "system-run"
-@@ -493,10 +501,66 @@
- }
- 
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+                       const char *msg,
-+                       gboolean is_error)
-+{
-+        GtkLabel *label;
-+        gchar *markup;
-+        
-+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+        if (is_error)
-+                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+        else
-+                markup = g_markup_escape_text (msg, -1);
-+
-+        gtk_label_set_markup (label, markup);
-+        g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+                  DBusGProxyCall *call_id,
-+                  void *user_data)
-+{
-+        gboolean res;
-+        GsmPropertiesDialog *dialog = user_data;
-+
-+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+        if (res)
-+                session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+        else
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+        g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget           *widget,
-                          GsmPropertiesDialog *dialog)
- {
--        g_debug ("Session saving is not implemented yet!");
-+        DBusGConnection *conn;
-+        DBusGProxy *proxy;
-+        DBusGProxyCall *call;
-+
-+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+        if (conn == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+                return;
-+        }
-+
-+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+        if (proxy == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+                return;
-+        }
-+
-+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+        if (call == NULL) {
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+                g_object_unref (proxy);
-+                return;
-+        }
- }
- 
- static void
-diff -burN a/configure.ac b/configure.ac
---- a/configure.ac	2012-02-29 22:03:09.000000000 +0100
-+++ b/configure.ac	2012-08-08 12:18:58.740336360 +0200
-@@ -75,6 +75,7 @@
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SM, sm)
-diff -burN a/data/session-properties.ui b/data/session-properties.ui
---- a/data/session-properties.ui	2012-02-29 22:03:08.000000000 +0100
-+++ b/data/session-properties.ui	2012-08-08 12:22:36.619343035 +0200
-@@ -148,6 +148,7 @@
-             <property name="visible">True</property>
-             <child>
-               <object class="GtkButton" id="session_properties_save_button">
-+                <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">True</property>
-                 <child>
-@@ -191,6 +192,17 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkLabel" id="session_properties_session_saved_label">
-+            <property name="visible">True</property>
-+            <property name="wrap">True</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">False</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">1</property>
-diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c
---- a/mate-session/gsm-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-client.c	2012-08-08 12:24:20.120346205 +0200
-@@ -510,6 +510,17 @@
-         g_signal_emit (client, signals[DISCONNECTED], 0);
- }
- 
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+                         guint      flags,
-+                         GError   **error)
-+{
-+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
-                  GError   **error)
-diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h
---- a/mate-session/gsm-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-client.h	2012-08-08 12:26:38.848350455 +0200
-@@ -94,6 +94,9 @@
-                                                               GError   **error);
-         gboolean              (*impl_stop)                   (GsmClient *client,
-                                                               GError   **error);
-+        gboolean              (*impl_request_save)           (GsmClient *client,
-+                                                              guint      flags,
-+                                                              GError   **error);
-         GKeyFile *            (*impl_save)                   (GsmClient *client,
-                                                               GError   **error);
- };
-@@ -139,6 +142,10 @@
- 
- void                  gsm_client_disconnected               (GsmClient  *client);
- 
-+gboolean              gsm_client_request_save               (GsmClient  *client,
-+                                                             guint       flags,
-+                                                             GError    **error);
-+
- GKeyFile             *gsm_client_save                       (GsmClient  *client,
-                                                              GError    **error);
- /* exported to bus */
-diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
---- a/mate-session/gsm-dbus-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-dbus-client.c	2012-08-08 12:38:15.393371794 +0200
-@@ -413,6 +413,19 @@
-         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
- 
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+                          guint      flags,
-+                          GError   **error)
-+{
-+        g_debug ("GsmDBusClient: sending save request to client with id %s",
-+                 gsm_client_peek_id (client));
-+
-+        /* FIXME: The protocol does not support this */
-+
-+        return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
-                   GError   **error)
-@@ -665,6 +678,7 @@
-         object_class->set_property         = gsm_dbus_client_set_property;
-         object_class->dispose              = gsm_dbus_client_dispose;
- 
-+        client_class->impl_request_save           = dbus_client_request_save;
-         client_class->impl_save                   = dbus_client_save;
-         client_class->impl_stop                   = dbus_client_stop;
-         client_class->impl_query_end_session      = dbus_client_query_end_session;
-diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
---- a/mate-session/gsm-manager.c	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.c	2012-08-08 12:47:24.627388620 +0200
-@@ -68,6 +68,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
- 
- #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
- #define MDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1176,6 +1177,69 @@
- 
- }
- 
-+static gboolean
-+_client_request_save (GsmClient            *client,
-+                      ClientEndSessionData *data)
-+{
-+        gboolean ret;
-+        GError  *error;
-+
-+        error = NULL;
-+        ret = gsm_client_request_save (client, data->flags, &error);
-+        if (ret) {
-+                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+                                                                      client);
-+        } else if (error) {
-+                g_debug ("GsmManager: unable to query client: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char           *id,
-+                             GsmClient            *client,
-+                             ClientEndSessionData *data)
-+{
-+        return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+        GError *error = NULL;
-+
-+        if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+                ClientEndSessionData data;
-+
-+                data.manager = manager;
-+                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+                g_slist_foreach (manager->priv->next_query_clients,
-+                                 (GFunc)_client_request_save,
-+                                 &data);
-+
-+                g_slist_free (manager->priv->next_query_clients);
-+                manager->priv->next_query_clients = NULL;
-+
-+                return;
-+        }
-+
-+        if (manager->priv->query_timeout_id > 0) {
-+                g_source_remove (manager->priv->query_timeout_id);
-+                manager->priv->query_timeout_id = 0;
-+        }
-+
-+        gsm_session_save (manager->priv->clients, &error);
-+
-+        if (error) {
-+                g_warning ("Error saving session: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1250,6 +1314,21 @@
-         return FALSE;
- }
- 
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+        manager->priv->query_timeout_id = 0;
-+
-+        g_debug ("GsmManager: query to save session timed out");
-+
-+        g_slist_free (manager->priv->query_clients);
-+        manager->priv->query_clients = NULL;
-+
-+        query_save_session_complete (manager);
-+
-+        return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -1886,13 +1965,32 @@
-                                 const char *reason,
-                                 GsmManager *manager)
- {
--        /* just ignore if received outside of shutdown */
--        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        /* just ignore if we are not yet running */
-+        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
-                 return;
-         }
- 
-         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
- 
-+        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+                /* Ignore responses when no requests were sent */
-+                if (manager->priv->query_clients == NULL) {
-+                        return;
-+                }
-+
-+                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+                if (do_last) {
-+                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+                                                                             client);
-+                }
-+
-+                if (manager->priv->query_clients == NULL) {
-+                        query_save_session_complete (manager);
-+                }
-+                return;
-+        }
-+
-         if (cancel) {
-                 cancel_end_session (manager);
-                 return;
-@@ -1991,6 +2089,15 @@
- }
- 
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+                             gboolean       show_dialog,
-+                             GsmManager    *manager)
-+{
-+        g_debug ("GsmManager: save_request");
-+        gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore   *store,
-                        const char *id,
-                        GsmManager *manager)
-@@ -2011,6 +2118,10 @@
-                                   "logout-request",
-                                   G_CALLBACK (on_xsmp_client_logout_request),
-                                   manager);
-+		g_signal_connect (client,
-+				  "save-request",
-+				  G_CALLBACK (on_xsmp_client_save_request),
-+				  manager);
-         }
- 
-         g_signal_connect (client,
-@@ -2968,6 +3079,41 @@
- }
- 
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+                          GError     **error)
-+{
-+        ClientEndSessionData data;
-+
-+        g_debug ("GsmManager: SaveSession called");
-+
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+                g_set_error (error,
-+                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+                             "SaveSession interface is only available during the Running phase");
-+                return FALSE;
-+        }
-+
-+        data.manager = manager;
-+        data.flags = 0;
-+        gsm_store_foreach (manager->priv->clients,
-+                           (GsmStoreFunc)_client_request_save_helper,
-+                           &data);
-+
-+        if (manager->priv->query_clients) {
-+                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+                                                                         (GSourceFunc)_on_query_save_session_timeout,
-+                                                                         manager);
-+                return TRUE;
-+        } else {
-+                g_debug ("GsmManager: Nothing to save");
-+                return FALSE;
-+        }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
-                           gboolean   *shutdown_available,
-                           GError    **error)
-diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
---- a/mate-session/gsm-manager.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.h	2012-08-08 12:49:14.262391979 +0200
-@@ -154,6 +154,9 @@
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
- 
-+gboolean            gsm_manager_save_session                   (GsmManager     *manager,
-+                                                                GError        **error);
-+
- gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
-                                                                 gboolean       *shutdown_available,
-                                                                 GError        **error);
-diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
---- a/mate-session/gsm-xsmp-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.c	2012-08-08 12:52:27.719397905 +0200
-@@ -69,6 +69,7 @@
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+        SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -502,6 +503,31 @@
-         return TRUE;
- }
- 
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+                   guint      flags,
-+                   GError   **error)
-+{
-+        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-+
-+        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+                xsmp_save_yourself_phase2 (client);
-+        else
-+                do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+        return TRUE;
-+}
-+
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -976,6 +1002,8 @@
-         object_class->get_property         = gsm_xsmp_client_get_property;
-         object_class->set_property         = gsm_xsmp_client_set_property;
- 
-+
-+        client_class->impl_request_save           = xsmp_request_save;
-         client_class->impl_save                   = xsmp_save;
-         client_class->impl_stop                   = xsmp_stop;
-         client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1003,6 +1031,16 @@
-                               NULL,
-                               NULL,
-                               g_cclosure_marshal_VOID__BOOLEAN,
-+                              G_TYPE_NONE,
-+                              1, G_TYPE_BOOLEAN);
-+        signals[SAVE_REQUEST] =
-+		g_signal_new ("save-request",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+                              NULL,
-+                              NULL,
-+                              g_cclosure_marshal_VOID__BOOLEAN,
-                               G_TYPE_NONE,
-                               1, G_TYPE_BOOLEAN);
- 
-diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
---- a/mate-session/gsm-xsmp-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.h	2012-08-08 12:53:39.629400108 +0200
-@@ -57,6 +57,8 @@
-         gboolean (*logout_request)       (GsmXSMPClient  *client,
-                                           gboolean        prompt);
- 
-+        gboolean (*save_request)         (GsmXSMPClient  *client,
-+                                          gboolean        prompt);
- 
-         void     (*saved_state)          (GsmXSMPClient  *client);
- 
-diff -burN a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml
---- a/mate-session/org.mate.SessionManager.xml	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/org.mate.SessionManager.xml	2012-08-08 12:57:41.216407509 +0200
-@@ -256,6 +256,14 @@
-       </doc:doc>
-     </method>
- 
-+    <method name="SaveSession">
-+      <doc:doc>
-+	    <doc:description>
-+	      <doc:para>Request to save session</doc:para>
-+	    </doc:description>
-+      </doc:doc>
-+    </method>
-+
-     <method name="CanShutdown">
-       <arg name="is_available" direction="out" type="b">
-         <doc:doc>
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch b/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch
deleted file mode 100644
index 8c86a1c6..00000000
--- a/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 80be90bb422ef8cb5a28c7ff3fe2a337dce8c368 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Tue, 22 Apr 2014 16:44:37 +0000
-Subject: Allow to build with upower 0.99
-
----
-diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
-index da3d651..697b70d 100644
---- a/mate-session/gsm-logout-dialog.c
-+++ b/mate-session/gsm-logout-dialog.c
-@@ -211,10 +211,10 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
-         if (LOGIND_RUNNING())
-             ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         else
- #endif
--#ifdef HAVE_UPOWER
-+#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
- #endif
-         return ret;
-@@ -229,10 +229,10 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
-         if (LOGIND_RUNNING())
-             ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         else
- #endif
--#ifdef HAVE_UPOWER
-+#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
- #endif
-         return ret;
-diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
-index eda565b..638ef10 100644
---- a/mate-session/gsm-manager.c
-+++ b/mate-session/gsm-manager.c
-@@ -1163,10 +1163,10 @@ manager_attempt_hibernate (GsmManager *manager)
-                 gsm_systemd_attempt_hibernate (systemd);
-         }
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         else {
- #endif
--#ifdef HAVE_UPOWER
-+#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-         if (can_hibernate) {
- 
-@@ -1182,7 +1182,7 @@ manager_attempt_hibernate (GsmManager *manager)
-                 }
-         }
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         }
- #endif
- }
-@@ -1208,10 +1208,10 @@ manager_attempt_suspend (GsmManager *manager)
-                 gsm_systemd_attempt_suspend (systemd);
-         }
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         else {
- #endif
--#ifdef HAVE_UPOWER
-+#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
-         if (can_suspend) {
- 
-@@ -1227,7 +1227,7 @@ manager_attempt_suspend (GsmManager *manager)
-                 }
-         }
- #endif
--#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0)
-         }
- #endif
- }
---
-cgit 
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
deleted file mode 100644
index 9d848576..00000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.6 2014/09/19 17:25:19 ssuominen Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-
-inherit autotools gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-RDEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.25:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-apps/xdpyinfo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	systemd? ( sys-apps/systemd )
-	upower? ( >=sys-power/upower-0.9.23 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=mate-base/mate-common-1.6
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-src_prepare() {
-	# Add "session saving" button back,
-	# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
-	epatch "${FILESDIR}"/${PN}-1.5.2-save-session-ui.patch
-
-	# Fix race condition in idle monitor, GNOME bug applies to MATE too,
-	# see https://bugzilla.gnome.org/show_bug.cgi?id=627903
-	epatch "${FILESDIR}"/${PN}-1.2.0-idle-transition.patch
-    # allow to build with upower1
-	# cherry picked from http://git.mate-desktop.org/mate-session-manager/commit/?id=80be90bb422ef8cb5a28c7ff3fe2a337dce8c368
-	epatch "${FILESDIR}"/${PN}-upower1.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-default-wm=mate-wm \
-		--with-gtk=2.0 \
-		$(use_enable ipv6) \
-		$(use_with systemd) \
-		$(use_enable upower)
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-extra/mate-tweak/Manifest b/mate-extra/mate-tweak/Manifest
deleted file mode 100644
index f4faa509..00000000
--- a/mate-extra/mate-tweak/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mate-tweak-3.4.8.tar.gz 103013 SHA256 7c142484ec32e016a800a4fbbaa28199a3e5dc1c40ab2426596ff33339808827 SHA512 4db758c7300778af0a9586a8a481c68af67fa7c43c869d841ccf5f2a77f27423f07467598601b8dcc81878ff39786c056758bd07ba9b0e12223e36b13c73adcf WHIRLPOOL b9baddf9c017b2cb8074626ee93affcd1eb646cae55cabe31cf4d540e542c0111d6ab82a64205945b23ed57dc18140c769e1a86e1f0a9467730f1372dbede83a
-DIST mate-tweak-3.4.9.tar.gz 110129 SHA256 dc9e64a53ecda695b8406477534e81d717c9d70cedf259fae49cfa74634b8195 SHA512 900594e9639de59cbb0a2db30fec0f24df16133a192ce29ef78a3904fa385d3e8cc9c81fc18c2fcabacb67b95a330cf68711336ca57c2e6cdebd964974885e2b WHIRLPOOL 605dff94f517cdc49c6ac68081a0e09ad349f8a050b548f504fcd5e4cd7f29ad5e06fec6ab2c84d889ae53484e4bf119c6105b3e9853fbed3e229cf601ae9683
diff --git a/mate-extra/mate-tweak/mate-tweak-3.4.8.ebuild b/mate-extra/mate-tweak/mate-tweak-3.4.8.ebuild
deleted file mode 100644
index c9a40b47..00000000
--- a/mate-extra/mate-tweak/mate-tweak-3.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_SINGLE_TARGET="python2_7"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Tweak tool for the MATE Desktop. Fork of mintDesktop."
-HOMEPAGE="https://bitbucket.org/ubuntu-mate/${PN}"
-SRC_URI="${HOMEPAGE}/get/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~x86 ~amd64"
-COMMIT="9dcf744abc9e"
-S="${WORKDIR}/ubuntu-mate-${PN}-${COMMIT}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="mate-base/mate-desktop
-		dev-python/setuptools
-		dev-python/python-distutils-extra
-		x11-misc/wmctrl"
-RDEPEND="${DEPEND}"
-
-python_install(){
-	distutils-r1_python_install
-}
diff --git a/mate-extra/mate-tweak/mate-tweak-3.4.9.ebuild b/mate-extra/mate-tweak/mate-tweak-3.4.9.ebuild
deleted file mode 100644
index 3e5a54f4..00000000
--- a/mate-extra/mate-tweak/mate-tweak-3.4.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_SINGLE_TARGET="python2_7"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Tweak tool for the MATE Desktop. Fork of mintDesktop."
-HOMEPAGE="https://bitbucket.org/ubuntu-mate/${PN}"
-SRC_URI="${HOMEPAGE}/get/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~x86 ~amd64"
-COMMIT="7de2c0b5ee5f"
-S="${WORKDIR}/ubuntu-mate-${PN}-${COMMIT}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="mate-base/mate-desktop
-		dev-python/setuptools
-		dev-python/python-distutils-extra
-		x11-misc/wmctrl"
-RDEPEND="${DEPEND}"
-
-python_install(){
-	distutils-r1_python_install
-}
diff --git a/mate-extra/mate-tweak/mate-tweak-9999.ebuild b/mate-extra/mate-tweak/mate-tweak-9999.ebuild
deleted file mode 100644
index a28b6972..00000000
--- a/mate-extra/mate-tweak/mate-tweak-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_SINGLE_TARGET="python2_7"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit eutils distutils-r1 git-r3
-
-DESCRIPTION="Tweak tool for the MATE Desktop. Fork of mintDesktop."
-HOMEPAGE="https://bitbucket.org/ubuntu-mate/${PN}"
-EGIT_REPO_URI="${HOMEPAGE}.git"
-KEYWORDS=""
-S="${WORKDIR}"/"${P}"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="mate-base/mate-desktop
-		dev-python/setuptools
-		dev-python/python-distutils-extra
-		x11-misc/wmctrl"
-RDEPEND="${DEPEND}"
-
-python_install(){
-	distutils-r1_python_install
-}
diff --git a/mate-extra/mintmenu/mintmenu-5.6.0.ebuild b/mate-extra/mintmenu/mintmenu-5.6.0.ebuild
deleted file mode 100644
index 5ed53a6b..00000000
--- a/mate-extra/mintmenu/mintmenu-5.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils gnome2-utils git-2
-
-EGIT_BRANCH=kogaion
-EGIT_REPO_URI="https://github.com/Rogentos/mintmenu.git"
-
-DESCRIPTION="Advanced MATE menu"
-HOMEPAGE="http://linuxmint.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT=""
-
-DEPEND="
-	dev-lang/python:2.7
-	dev-python/pygtk:2
-	>=dev-python/pyxdg-0.25
-	>=dev-python/python-xlib-0.14"
-RDEPEND="
-	>=mate-base/mate-desktop-1.8.0
-	>=mate-base/mate-panel-1.8.0
-	>=mate-base/mate-menus-1.8.0[python]
-	>=x11-misc/mozo-1.8.0
-	dev-python/python-xlib"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	exeinto /usr/bin || die
-	doexe usr/bin/${PN} || die
-
-	insinto /usr/$(get_libdir) || die
-	doins -r usr/lib/* || die
-	fperms 755 /usr/$(get_libdir)/linuxmint/mintMenu/mintMenu.py || die
-	fperms 755 /usr/$(get_libdir)/linuxmint/mintMenu/mintMenuConfig.py || die
-	
-	insinto /usr/share || die
-	doins -r usr/share/* || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
-- 
cgit v1.2.3