From 9537deb073178c7a997e4810a6e499b74963089d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 4 Dec 2017 16:55:02 +0000
Subject: lower revisions

---
 .../splashutils/splashutils-1.5.4.4-r1710.ebuild   | 240 ---------------------
 .../splashutils/splashutils-1.5.4.4-r8.ebuild      | 240 +++++++++++++++++++++
 media-sound/cantata/cantata-2.2.0-r1.ebuild        | 118 ++++++++++
 media-sound/cantata/cantata-2.2.0-r1710.ebuild     | 118 ----------
 net-im/franz/franz-4.0.4-r1.ebuild                 |  42 ++++
 net-im/franz/franz-4.0.4-r1710.ebuild              |  42 ----
 .../messengerfordesktop-2.0.9-r1.ebuild            |  36 ++++
 .../messengerfordesktop-2.0.9-r1710.ebuild         |  36 ----
 net-im/telegram/telegram-0.10.1-r1.ebuild          |  33 +++
 net-im/telegram/telegram-0.10.1-r1710.ebuild       |  33 ---
 net-im/viber/viber-6.5.5-r1.ebuild                 |  27 +++
 net-im/viber/viber-6.5.5-r1710.ebuild              |  27 ---
 sys-boot/plymouth/plymouth-0.8.8-r1.ebuild         |  91 ++++++++
 sys-boot/plymouth/plymouth-0.8.8-r1710.ebuild      |  91 --------
 .../unetbootin-static-625-r1.ebuild                |  33 +++
 .../unetbootin-static-625-r1710.ebuild             |  33 ---
 .../profile-sync-daemon-5.45.1-r1.ebuild           |  39 ++++
 .../profile-sync-daemon-5.45.1-r1710.ebuild        |  39 ----
 18 files changed, 659 insertions(+), 659 deletions(-)
 delete mode 100644 media-gfx/splashutils/splashutils-1.5.4.4-r1710.ebuild
 create mode 100644 media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
 create mode 100644 media-sound/cantata/cantata-2.2.0-r1.ebuild
 delete mode 100644 media-sound/cantata/cantata-2.2.0-r1710.ebuild
 create mode 100644 net-im/franz/franz-4.0.4-r1.ebuild
 delete mode 100644 net-im/franz/franz-4.0.4-r1710.ebuild
 create mode 100644 net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1.ebuild
 delete mode 100644 net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1710.ebuild
 create mode 100644 net-im/telegram/telegram-0.10.1-r1.ebuild
 delete mode 100644 net-im/telegram/telegram-0.10.1-r1710.ebuild
 create mode 100644 net-im/viber/viber-6.5.5-r1.ebuild
 delete mode 100644 net-im/viber/viber-6.5.5-r1710.ebuild
 create mode 100644 sys-boot/plymouth/plymouth-0.8.8-r1.ebuild
 delete mode 100644 sys-boot/plymouth/plymouth-0.8.8-r1710.ebuild
 create mode 100644 sys-boot/unetbootin-static/unetbootin-static-625-r1.ebuild
 delete mode 100644 sys-boot/unetbootin-static/unetbootin-static-625-r1710.ebuild
 create mode 100644 www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1.ebuild
 delete mode 100644 www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1710.ebuild

diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r1710.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r1710.ebuild
deleted file mode 100644
index a0e0c7b8..00000000
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r1710.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.8"
-GENTOOSPLASH="splashutils-gentoo-1.0.17"
-V_JPEG="8a"
-V_PNG="1.4.3"
-V_ZLIB="1.2.3"
-V_FT="2.3.12"
-
-ZLIBSRC="libs/zlib-${V_ZLIB}"
-LPNGSRC="libs/libpng-${V_PNG}"
-JPEGSRC="libs/jpeg-${V_JPEG}"
-FT2SRC="libs/freetype-${V_FT}"
-
-RESTRICT="test"
-IUSE="hardened +png +truetype gpm fbcondecor"
-
-DESCRIPTION="Framebuffer splash utilities"
-HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/"
-SRC_URI="
-	mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
-	mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
-	mirror://gentoo/${MISCSPLASH}.tar.bz2
-	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
-	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
-	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
-	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	gpm? ( sys-libs/gpm[static-libs(+)] )
-	truetype? (
-		>=media-libs/freetype-2[static-libs]
-		app-arch/bzip2[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-	)
-	png? (
-		>=media-libs/libpng-1.4.3[static-libs]
-		sys-libs/zlib[static-libs(+)]
-	)
-	virtual/jpeg:0[static-libs]
-	app-arch/cpio
-	media-gfx/fbgrab
-	!sys-apps/lcdsplash
-	sys-apps/openrc"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/klibc-1.5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-SM="${WORKDIR}/${MISCSPLASH}"
-
-pkg_setup() {
-	if use hardened; then
-		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
-		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
-		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
-		ewarn "the splash kernel helper."
-	fi
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
-
-	# We need to delete the Makefile and let it be rebuilt when splashutils
-	# is being configured. Either that, or we end up with a segfaulting kernel
-	# helper.
-	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
-
-	cd "${SG}"
-	epatch "${FILESDIR}/${P}-gentoo-typo-fix.patch"
-	epatch "${FILESDIR}/${P}-sys-queue.patch"
-	epatch "${FILESDIR}/${P}-openrc-run.patch"
-
-	if use truetype ; then
-		cd "${SM}"
-		epatch "${FILESDIR}/${P}-freetype-bz2.patch"
-		cd "${WORKDIR}"
-		epatch "${FILESDIR}/${P}-ft25.patch"
-	fi
-
-	cd "${S}"
-	ln -sf "${S}/src" "${WORKDIR}/core"
-
-	#epatch "${FILESDIR}/${P}-bzip2.patch"
-	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
-	# Bug #557126
-	epatch "${FILESDIR}/${P}-no-la.patch"
-
-	if ! tc-is-cross-compiler && \
-	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
-		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
-		ewarn "splashutils, you're on your own, as this configuration is not supported."
-	else
-		# This should make splashutils compile on systems with hardened GCC.
-		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
-	fi
-
-	if ! use truetype ; then
-		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
-	fi
-
-	# Latest version of klibc defined its own version of ferror, so there is
-	# not need for the hack in klibc_compat.h
-	if has_version ">=dev-libs/klibc-1.5.20"; then
-		echo > "libs/klibc_compat.h"
-	fi
-
-	rm -f m4/*
-	epatch_user
-	export PKG_CONFIG="pkg-config --static"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	cd "${SM}"
-	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
-
-	cd "${S}"
-	econf \
-		$(use_with png) \
-		--without-mng \
-		$(use_with gpm) \
-		$(use_with truetype ttf) \
-		$(use_with truetype ttf-kernel) \
-		$(use_enable fbcondecor) \
-		--docdir=/usr/share/doc/${PF} \
-		--with-freetype2-src=${FT2SRC} \
-		--with-jpeg-src=${JPEGSRC} \
-		--with-lpng-src=${LPNGSRC} \
-		--with-zlib-src=${ZLIBSRC} \
-		--with-essential-libdir=/$(get_libdir)
-}
-
-src_compile() {
-	emake CC="${CC}" STRIP="true"
-
-	cd "${SG}"
-	emake LIB=$(get_libdir)
-}
-
-src_install() {
-	local LIB=$(get_libdir)
-
-	cd "${SM}"
-	emake DESTDIR="${D}" LIB=${LIB} install
-
-	cd "${S}"
-	emake DESTDIR="${D}" STRIP="true" install
-
-	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
-	gen_usr_ldscript libfbsplash.so
-
-	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
-	doenvd 99splash
-
-	if use fbcondecor ; then
-		newinitd "${SG}"/init-fbcondecor fbcondecor
-		newconfd "${SG}"/fbcondecor.conf fbcondecor
-	fi
-	newconfd "${SG}"/splash.conf splash
-
-	insinto /usr/share/${PN}
-	doins "${SG}"/initrd.splash
-
-	insinto /etc/splash
-	doins "${SM}"/fbtruetype/luxisri.ttf
-
-	cd "${SG}"
-	make DESTDIR="${D}" LIB=${LIB} install
-	prune_libtool_files
-
-	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
-	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
-	dosym /${LIB}/splash/bin/fbres /sbin/fbres
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.0"
-	previous_less_than_1_0=$?
-
-	has_version "<${CATEGORY}/${PN}-1.5.3"
-	previous_less_than_1_5_3=$?
-}
-
-pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
-		elog "This package has been designed with udev in mind. Other solutions, such as"
-		elog "devfs or a static /dev tree might work, but are generally discouraged and"
-		elog "not supported. If you decide to switch to udev, you might want to have a"
-		elog "look at 'The Gentoo udev Guide', which can be found at"
-		elog "  https://wiki.gentoo.org/wiki/Udev"
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_0 = 0 ]] ; then
-		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
-		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
-		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
-		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
-		elog "to use fbcondecor, run:"
-		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
-		elog "and re-emerge splashutils."
-	fi
-
-	if ! test -f /proc/cmdline ||
-		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
-		elog "It is required that you add 'console=tty1' to your kernel"
-		elog "command line parameters."
-		elog ""
-		elog "After these modifications, the relevant part of the kernel command"
-		elog "line might look like:"
-		elog "  splash=silent,fadein,theme:emergence console=tty1"
-		elog ""
-	fi
-
-	if ! has_version 'media-gfx/splash-themes-livecd' &&
-		! has_version 'media-gfx/splash-themes-gentoo'; then
-		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
-		elog "core splashutils package. To get some themes you might want to emerge:"
-		elog "  media-gfx/splash-themes-livecd"
-		elog "  media-gfx/splash-themes-gentoo"
-	fi
-}
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
new file mode 100644
index 00000000..a0e0c7b8
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.17"
+V_JPEG="8a"
+V_PNG="1.4.3"
+V_ZLIB="1.2.3"
+V_FT="2.3.12"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+RESTRICT="test"
+IUSE="hardened +png +truetype gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities"
+HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/"
+SRC_URI="
+	mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
+	mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
+	mirror://gentoo/${MISCSPLASH}.tar.bz2
+	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
+	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
+	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
+	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+	gpm? ( sys-libs/gpm[static-libs(+)] )
+	truetype? (
+		>=media-libs/freetype-2[static-libs]
+		app-arch/bzip2[static-libs(+)]
+		sys-libs/zlib[static-libs(+)]
+	)
+	png? (
+		>=media-libs/libpng-1.4.3[static-libs]
+		sys-libs/zlib[static-libs(+)]
+	)
+	virtual/jpeg:0[static-libs]
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash
+	sys-apps/openrc"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+SG="${WORKDIR}/${GENTOOSPLASH}"
+SM="${WORKDIR}/${MISCSPLASH}"
+
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the splash kernel helper."
+	fi
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
+
+	# We need to delete the Makefile and let it be rebuilt when splashutils
+	# is being configured. Either that, or we end up with a segfaulting kernel
+	# helper.
+	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
+
+	cd "${SG}"
+	epatch "${FILESDIR}/${P}-gentoo-typo-fix.patch"
+	epatch "${FILESDIR}/${P}-sys-queue.patch"
+	epatch "${FILESDIR}/${P}-openrc-run.patch"
+
+	if use truetype ; then
+		cd "${SM}"
+		epatch "${FILESDIR}/${P}-freetype-bz2.patch"
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}/${P}-ft25.patch"
+	fi
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	#epatch "${FILESDIR}/${P}-bzip2.patch"
+	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
+	# Bug #557126
+	epatch "${FILESDIR}/${P}-no-la.patch"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+
+	# Latest version of klibc defined its own version of ferror, so there is
+	# not need for the hack in klibc_compat.h
+	if has_version ">=dev-libs/klibc-1.5.20"; then
+		echo > "libs/klibc_compat.h"
+	fi
+
+	rm -f m4/*
+	epatch_user
+	export PKG_CONFIG="pkg-config --static"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		--without-mng \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir)
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true"
+
+	cd "${SG}"
+	emake LIB=$(get_libdir)
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd "${SM}"
+	emake DESTDIR="${D}" LIB=${LIB} install
+
+	cd "${S}"
+	emake DESTDIR="${D}" STRIP="true" install
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	cd "${SG}"
+	make DESTDIR="${D}" LIB=${LIB} install
+	prune_libtool_files
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+pkg_postinst() {
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  https://wiki.gentoo.org/wiki/Udev"
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+}
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r1.ebuild
new file mode 100644
index 00000000..c19fe4b8
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	app-misc/media-player-info
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-sound/mpd
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	streaming? ( media-video/vlc:0= )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		media-libs/taglib-extras
+		udisks? ( sys-fs/udisks:2 )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/cantata/cantata-2.2.0-r1710.ebuild b/media-sound/cantata/cantata-2.2.0-r1710.ebuild
deleted file mode 100644
index c19fe4b8..00000000
--- a/media-sound/cantata/cantata-2.2.0-r1710.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
-REQUIRED_USE="
-	?? ( cdda cdio )
-	cdda? ( udisks || ( cddb musicbrainz ) )
-	cddb? ( || ( cdio cdda ) taglib )
-	cdio? ( udisks || ( cddb musicbrainz ) )
-	mtp? ( taglib udisks )
-	musicbrainz? ( || ( cdio cdda ) taglib )
-	replaygain? ( taglib )
-"
-
-RDEPEND="
-	app-misc/media-player-info
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-sound/mpd
-	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-	sys-libs/zlib
-	virtual/libudev:=
-	cdda? ( media-sound/cdparanoia )
-	cdio? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5= )
-	replaygain? (
-		media-libs/libebur128
-		media-sound/mpg123
-		virtual/ffmpeg
-	)
-	streaming? ( media-video/vlc:0= )
-	taglib? (
-		media-libs/taglib[asf(+),mp4(+)]
-		media-libs/taglib-extras
-		udisks? ( sys-fs/udisks:2 )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake-utils_src_prepare
-
-	# Unbundle 3rd party libs
-	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-		-DENABLE_CDPARANOIA=$(usex cdda)
-		-DENABLE_CDIOPARANOIA=$(usex cdio)
-		-DENABLE_CDDB=$(usex cddb)
-		-DENABLE_HTTP_SERVER=$(usex http-server)
-		-DENABLE_MTP=$(usex mtp)
-		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		-DENABLE_FFMPEG=$(usex replaygain)
-		-DENABLE_MPG123=$(usex replaygain)
-		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-		-DENABLE_TAGLIB=$(usex taglib)
-		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
-		-DENABLE_REMOTE_DEVICES=OFF
-		-DENABLE_UDISKS2=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/franz/franz-4.0.4-r1.ebuild b/net-im/franz/franz-4.0.4-r1.ebuild
new file mode 100644
index 00000000..d4c9edaa
--- /dev/null
+++ b/net-im/franz/franz-4.0.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Franz is a free messaging app / former Emperor of Austria and combines chat & messaging services into one application. He currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more."
+HOMEPAGE="http://meetfranz.com/"
+
+SRC_URI_AMD64="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-x64-${PV}.tgz"
+SRC_URI_X86="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-ia32-${PV}.tgz"
+SRC_URI="
+        amd64? ( ${SRC_URI_AMD64} )
+        x86? ( ${SRC_URI_X86} )
+"
+
+SRC_URI="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-x64-${PV}.tgz"
+
+SLOT='0'
+
+KEYWORDS="amd64 x86"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+    unpack ${A}
+}
+
+src_install() {
+    dodir /usr/share/Franz/
+    cp -R ${WORKDIR}/* ${D}/usr/share/Franz || die "Install failed!"
+    dolib ${WORKDIR}/libnode.so
+    dolib ${WORKDIR}/libffmpeg.so
+    domenu ${FILESDIR}/franz.desktop
+    doicon ${WORKDIR}/resources/app.asar.unpacked/assets/franz.png
+    dodir /usr/bin
+    dosym /usr/share/Franz/Franz /usr/bin/Franz
+}
diff --git a/net-im/franz/franz-4.0.4-r1710.ebuild b/net-im/franz/franz-4.0.4-r1710.ebuild
deleted file mode 100644
index d4c9edaa..00000000
--- a/net-im/franz/franz-4.0.4-r1710.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="Franz is a free messaging app / former Emperor of Austria and combines chat & messaging services into one application. He currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more."
-HOMEPAGE="http://meetfranz.com/"
-
-SRC_URI_AMD64="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-x64-${PV}.tgz"
-SRC_URI_X86="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-ia32-${PV}.tgz"
-SRC_URI="
-        amd64? ( ${SRC_URI_AMD64} )
-        x86? ( ${SRC_URI_X86} )
-"
-
-SRC_URI="https://github.com/imprecision/franz-app/releases/download/${PV}/Franz-linux-x64-${PV}.tgz"
-
-SLOT='0'
-
-KEYWORDS="amd64 x86"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    unpack ${A}
-}
-
-src_install() {
-    dodir /usr/share/Franz/
-    cp -R ${WORKDIR}/* ${D}/usr/share/Franz || die "Install failed!"
-    dolib ${WORKDIR}/libnode.so
-    dolib ${WORKDIR}/libffmpeg.so
-    domenu ${FILESDIR}/franz.desktop
-    doicon ${WORKDIR}/resources/app.asar.unpacked/assets/franz.png
-    dodir /usr/bin
-    dosym /usr/share/Franz/Franz /usr/bin/Franz
-}
diff --git a/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1.ebuild b/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1.ebuild
new file mode 100644
index 00000000..4166c430
--- /dev/null
+++ b/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils unpacker autotools
+
+DESCRIPTION="A simple & beautiful app for Facebook Messenger."
+HOMEPAGE="https://messengerfordesktop.com/"
+SRC_URI="https://github.com/aluxian/Messenger-for-Desktop/releases/download/v${PV}/${P}-linux-amd64.deb"
+
+SLOT='0'
+KEYWORDS="amd64"
+
+DEPEND="dev-libs/nss
+        gnome-base/gconf
+        media-libs/alsa-lib
+        sys-apps/lsb-release
+        x11-libs/gtk+:2
+        x11-libs/libXtst
+        x11-libs/libnotify"
+RDEPEND="${DEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+    unpack_deb ${A}
+}
+
+src_install() {
+	mv * "${D}" || die
+	fperms 0755 /opt/${PN}/${PN} || die
+}
diff --git a/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1710.ebuild b/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1710.ebuild
deleted file mode 100644
index 4166c430..00000000
--- a/net-im/messengerfordesktop/messengerfordesktop-2.0.9-r1710.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils unpacker autotools
-
-DESCRIPTION="A simple & beautiful app for Facebook Messenger."
-HOMEPAGE="https://messengerfordesktop.com/"
-SRC_URI="https://github.com/aluxian/Messenger-for-Desktop/releases/download/v${PV}/${P}-linux-amd64.deb"
-
-SLOT='0'
-KEYWORDS="amd64"
-
-DEPEND="dev-libs/nss
-        gnome-base/gconf
-        media-libs/alsa-lib
-        sys-apps/lsb-release
-        x11-libs/gtk+:2
-        x11-libs/libXtst
-        x11-libs/libnotify"
-RDEPEND="${DEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    unpack_deb ${A}
-}
-
-src_install() {
-	mv * "${D}" || die
-	fperms 0755 /opt/${PN}/${PN} || die
-}
diff --git a/net-im/telegram/telegram-0.10.1-r1.ebuild b/net-im/telegram/telegram-0.10.1-r1.ebuild
new file mode 100644
index 00000000..eb2540d3
--- /dev/null
+++ b/net-im/telegram/telegram-0.10.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_PN="Telegram"
+inherit eutils
+DESCRIPTION="Unofficial telegram protocol client"
+HOMEPAGE="https://telegram.org/"
+SRC_URI="
+	amd64?	( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz -> ${P}.tar.xz )
+	x86?	( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz -> ${PN}32-${PV}.tar.xz )"
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="x11-libs/libxcb:=
+	dev-libs/glib:2
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_PN}"
+
+src_install() {
+	exeinto "/opt/${PN}"
+	doexe "${MY_PN}"
+	make_wrapper "${PN}" "/opt/${PN}/${MY_PN}"
+	make_desktop_entry "${PN}" "${MY_PN} Desktop" "/usr/share/pixmaps/${PN}.png" "" "MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg;"
+	newicon "${FILESDIR}/${PN}.png" "${PN}.png"
+}
diff --git a/net-im/telegram/telegram-0.10.1-r1710.ebuild b/net-im/telegram/telegram-0.10.1-r1710.ebuild
deleted file mode 100644
index eb2540d3..00000000
--- a/net-im/telegram/telegram-0.10.1-r1710.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="Telegram"
-inherit eutils
-DESCRIPTION="Unofficial telegram protocol client"
-HOMEPAGE="https://telegram.org/"
-SRC_URI="
-	amd64?	( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz -> ${P}.tar.xz )
-	x86?	( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz -> ${PN}32-${PV}.tar.xz )"
-
-RESTRICT="mirror"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="x11-libs/libxcb:=
-	dev-libs/glib:2
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_PN}"
-
-src_install() {
-	exeinto "/opt/${PN}"
-	doexe "${MY_PN}"
-	make_wrapper "${PN}" "/opt/${PN}/${MY_PN}"
-	make_desktop_entry "${PN}" "${MY_PN} Desktop" "/usr/share/pixmaps/${PN}.png" "" "MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg;"
-	newicon "${FILESDIR}/${PN}.png" "${PN}.png"
-}
diff --git a/net-im/viber/viber-6.5.5-r1.ebuild b/net-im/viber/viber-6.5.5-r1.ebuild
new file mode 100644
index 00000000..3fc21f4b
--- /dev/null
+++ b/net-im/viber/viber-6.5.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit eutils
+DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!"
+HOMEPAGE="http://www.viber.com"
+SRC_URI="http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"
+
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+RESTRICT="strip"
+S="${WORKDIR}"
+
+src_unpack() {
+	default_src_unpack
+	unpack ./data.tar.xz
+}
+
+src_install(){
+	doins -r opt usr
+	fperms 755 /opt/viber/Viber
+}
+
diff --git a/net-im/viber/viber-6.5.5-r1710.ebuild b/net-im/viber/viber-6.5.5-r1710.ebuild
deleted file mode 100644
index 3fc21f4b..00000000
--- a/net-im/viber/viber-6.5.5-r1710.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils
-DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!"
-HOMEPAGE="http://www.viber.com"
-SRC_URI="http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"
-
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="strip"
-S="${WORKDIR}"
-
-src_unpack() {
-	default_src_unpack
-	unpack ./data.tar.xz
-}
-
-src_install(){
-	doins -r opt usr
-	fperms 755 /opt/viber/Viber
-}
-
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r1.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r1.ebuild
new file mode 100644
index 00000000..3e120497
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.8.8-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit autotools-utils readme.gentoo systemd toolchain-funcs
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
+SRC_URI="http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon"
+IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +pango static-libs"
+
+CDEPEND="
+	>=media-libs/libpng-1.2.16
+	gtk? (
+		dev-libs/glib:2
+		>=x11-libs/gtk+-2.12:2 )
+	libkms? ( x11-libs/libdrm[libkms] )
+	pango? ( >=x11-libs/pango-1.21 )
+	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
+	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+# Block due bug #383067
+RDEPEND="${CDEPEND}
+	virtual/udev
+	x11-themes/redcore-artwork-core
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-redcore-defaults.patch"
+
+	sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
+		systemd-units/systemd-ask-password-plymouth.service.in || die \
+		'ask-password sed failed'
+	sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \
+		systemd-units/plymouth-start.service.in || die 'udevadm sed failed'
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-system-root-install=no
+		--localstatedir=/var
+		--without-rhgb-compat-link
+		--disable-systemd-integration
+		$(use_enable debug tracing)
+		$(use_enable gtk gtk)
+		$(use_enable libkms)
+		$(use_enable pango)
+		$(use_enable gdm gdm-transition)
+		$(use_enable video_cards_intel libdrm_intel)
+		$(use_enable video_cards_radeon libdrm_radeon)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# Provided by redcore-artwork-core
+	rm "${D}/usr/share/plymouth/bizcom.png"
+
+	# Install compatibility symlinks as some rdeps hardcode the paths
+	dosym /usr/bin/plymouth /bin/plymouth
+	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+	dosym /usr/sbin/plymouthd /sbin/plymouthd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
+		ewarn "If you want initramfs builder with plymouth support, please emerge"
+		ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]."
+	fi
+}
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r1710.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r1710.ebuild
deleted file mode 100644
index 3e120497..00000000
--- a/sys-boot/plymouth/plymouth-0.8.8-r1710.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
-	>=media-libs/libpng-1.2.16
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gtk+-2.12:2 )
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
-	virtual/udev
-	x11-themes/redcore-artwork-core
-"
-
-DOC_CONTENTS="
-	Follow the following instructions to set up Plymouth:\n
-	http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-redcore-defaults.patch"
-
-	sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
-		systemd-units/systemd-ask-password-plymouth.service.in || die \
-		'ask-password sed failed'
-	sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \
-		systemd-units/plymouth-start.service.in || die 'udevadm sed failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install=no
-		--localstatedir=/var
-		--without-rhgb-compat-link
-		--disable-systemd-integration
-		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# Provided by redcore-artwork-core
-	rm "${D}/usr/share/plymouth/bizcom.png"
-
-	# Install compatibility symlinks as some rdeps hardcode the paths
-	dosym /usr/bin/plymouth /bin/plymouth
-	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
-	dosym /usr/sbin/plymouthd /sbin/plymouthd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
-		ewarn "If you want initramfs builder with plymouth support, please emerge"
-		ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]."
-	fi
-}
diff --git a/sys-boot/unetbootin-static/unetbootin-static-625-r1.ebuild b/sys-boot/unetbootin-static/unetbootin-static-625-r1.ebuild
new file mode 100644
index 00000000..4eaa2af5
--- /dev/null
+++ b/sys-boot/unetbootin-static/unetbootin-static-625-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS distributions"
+HOMEPAGE="http://unetbootin.sourceforge.net"
+SRC_URI="http://redcorelinux.org/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/p7zip
+	media-libs/libpng:1.2"
+
+src_install() {
+	insopts -m 755
+	dobin ${P}
+	dobin ${FILESDIR}/${PN}-pkexec
+	dodir /usr/share/applications
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+	dodir /usr/share/polkit-1/actions
+	insinto /usr/share/polkit-1/actions
+	doins ${FILESDIR}/ro.redcore.${PN}.policy
+}
diff --git a/sys-boot/unetbootin-static/unetbootin-static-625-r1710.ebuild b/sys-boot/unetbootin-static/unetbootin-static-625-r1710.ebuild
deleted file mode 100644
index 4eaa2af5..00000000
--- a/sys-boot/unetbootin-static/unetbootin-static-625-r1710.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS distributions"
-HOMEPAGE="http://unetbootin.sourceforge.net"
-SRC_URI="http://redcorelinux.org/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/p7zip
-	media-libs/libpng:1.2"
-
-src_install() {
-	insopts -m 755
-	dobin ${P}
-	dobin ${FILESDIR}/${PN}-pkexec
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-	dodir /usr/share/polkit-1/actions
-	insinto /usr/share/polkit-1/actions
-	doins ${FILESDIR}/ro.redcore.${PN}.policy
-}
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1.ebuild
new file mode 100644
index 00000000..6df724c0
--- /dev/null
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Symlinks and syncs browser profile dirs to RAM."
+HOMEPAGE="https://wiki.archlinux.org/index.php/Profile-sync-daemon"
+SRC_URI="https://github.com/graysky2/profile-sync-daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="systemd"
+
+RDEPEND="
+	app-shells/bash
+	net-misc/rsync
+	systemd? ( sys-apps/systemd )"
+
+src_prepare() {
+	default
+	epatch ${FILESDIR}/${P}-openrc-run.patch
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" \
+		install-openrc-all \
+		$(usex systemd "install-systemd" "")
+
+	fperms -x /etc/cron.hourly/psd-update
+}
+
+pkg_postinst() {
+	elog "The cronjob is -x by default."
+	elog "You might want to set it +x if you don't use"
+	elog "the systemd provided \"psd-resync.timer\"."
+}
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1710.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1710.ebuild
deleted file mode 100644
index 6df724c0..00000000
--- a/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1-r1710.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Symlinks and syncs browser profile dirs to RAM."
-HOMEPAGE="https://wiki.archlinux.org/index.php/Profile-sync-daemon"
-SRC_URI="https://github.com/graysky2/profile-sync-daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-RDEPEND="
-	app-shells/bash
-	net-misc/rsync
-	systemd? ( sys-apps/systemd )"
-
-src_prepare() {
-	default
-	epatch ${FILESDIR}/${P}-openrc-run.patch
-}
-
-src_install() {
-	emake -j1 DESTDIR="${ED}" \
-		install-openrc-all \
-		$(usex systemd "install-systemd" "")
-
-	fperms -x /etc/cron.hourly/psd-update
-}
-
-pkg_postinst() {
-	elog "The cronjob is -x by default."
-	elog "You might want to set it +x if you don't use"
-	elog "the systemd provided \"psd-resync.timer\"."
-}
-- 
cgit v1.2.3