diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
deleted file mode 100644
index 7aa3f34..0000000
--- a/dev-libs/antlr-c/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX antlr-c-3.1.4-doxygen.patch 638 RMD160 e78089956c297069f72dd523e8e7d4212dd79ee2 SHA1 27527b6494ea13b479ab08c80b4ba3e21fc61abe SHA256 bdec1623a16c5c3ff2773ff083849fd4ef641c3019cbb44c424b45fa42147a65
-DIST libantlr3c-3.2.tar.gz 544194 RMD160 86649f0a5702688d0cd486916a8203a232d22b8b SHA1 89bfa4fbed8af7e089bff065a1ac8834a8deb493 SHA256 2ccfb8a8bdd3d6c1d60742ff3a5a954af6d5a8d7f8901c87229fc6fa540ac99a
-EBUILD antlr-c-3.2.ebuild 1319 RMD160 0275f74153c9c368e5e9d78cdfca474d34b3fe1f SHA1 4e279f151a7b471d91516534e35910d38e3248e3 SHA256 83e0f7740c314083e280dee1b995049566fec83b64c193dfbfdf20781aebc878
diff --git a/dev-libs/antlr-c/antlr-c-3.2.ebuild b/dev-libs/antlr-c/antlr-c-3.2.ebuild
deleted file mode 100644
index 84d6d75..0000000
--- a/dev-libs/antlr-c/antlr-c-3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 2009/10/07 florent.teichteil@gmail.com Exp $
-
-EAPI="2"
-MY_P="libantlr3c-${PV}"
-inherit eutils
-
-DESCRIPTION="The ANTLR3 C Runtime"
-HOMEPAGE="http://fisheye2.atlassian.com/browse/antlr/runtime/C/dist/"
-SRC_URI="http://www.antlr.org/download/C/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug debugger doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.4-doxygen.patch"
-}
-src_configure() {
-	local myconf
-
-	if ((use amd64) || (use ia64)); then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf="${myconf} --disable-64bit"
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug debuginfo ) \
-		$(use_enable debugger antlrdebug ) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Generating documentation API ..."
-		doxygen -u doxyfile
-		doxygen doxyfile || die "doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed."
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete
-
-	dodoc AUTHORS ChangeLog NEWS README
-	if use doc; then
-		dohtml api/* || die "installing doxygen documentation"
-	fi
-}
diff --git a/dev-libs/antlr-c/files/antlr-c-3.1.4-doxygen.patch b/dev-libs/antlr-c/files/antlr-c-3.1.4-doxygen.patch
deleted file mode 100644
index 6267a4f..0000000
--- a/dev-libs/antlr-c/files/antlr-c-3.1.4-doxygen.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- doxyfile
-+++ doxyfile
-@@ -30,7 +30,6 @@
- SHORT_NAMES            = NO
- JAVADOC_AUTOBRIEF      = YES
- MULTILINE_CPP_IS_BRIEF = NO
--DETAILS_AT_TOP         = YES
- INHERIT_DOCS           = YES
- SEPARATE_MEMBER_PAGES  = NO
- TAB_SIZE               = 4
-@@ -73,7 +72,7 @@
- #---------------------------------------------------------------------------
- # configuration options related to warning and progress messages
- #---------------------------------------------------------------------------
--QUIET                  = NO
-+QUIET                  = YES
- WARNINGS               = YES
- WARN_IF_UNDOCUMENTED   = YES
- WARN_IF_DOC_ERROR      = YES
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
new file mode 100644
index 0000000..986aa47
--- /dev/null
+++ b/media-sound/forked-daapd/Manifest
@@ -0,0 +1,4 @@
+AUX forked-daapd.init.d 1351 SHA256 8b4f60158ad1ffe6f096bed1a789c823c66726839077eb3cbcf108978593699a SHA512 098cada760a6e9bdd89b37227834716689df96197a9421d988d6121f739959b7b96862f07aa5e1c8a71aad114d751bdc00577a15bf454b3f06b1e11519d65734 WHIRLPOOL c2d17e40dcb9d7a8dac4c6f7961e7865332e2e55c897850961c746c7aaa3c63b683ef2f4cc6a19f93bda771521ce582163f1d9f44a79ed57746421bee4353e07
+AUX forked-daapd.logrotate 168 SHA256 807fdf9c25c848703ed8b7397d498827fa5314e8204054e559291f7a04852109 SHA512 f9dda2ae599646b07f3200e9966ecae4cb1d71e9871444cba3f3a73e77995cee2d1780b0bb4f3f0861e361b95fe23c99dbea9b55237f2459d1fbfdb8b3a224bf WHIRLPOOL e0589e977d3603e398e35878f491181eb197bb76c8e6ecf0c83f79538fadae221a679fb802aa2b4dee6f49f61a268dc0d55cd2562a64ee1138de1c9e6cc36fec
+DIST ejurgensen-forked-daapd-23.2.tar.gz 325895 SHA256 8a85dfc479cfb3aeb01f5cec7f782b9eee749121f2d8a2b30932de9fbb31d19c SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511 WHIRLPOOL 05fd527a3ae57bb3ff3bf11b455bd926ee76d4358a569da674745a6e2b30343a35bc40cc44c90aaa10b70f496ddbf99e0975910b8ab3f759cc43929a0d19119f
+EBUILD forked-daapd-23.2.ebuild 2079 SHA256 6cedc53e7895252617d477643b55007afb33ebc09f701eb7c2592122911de6ce SHA512 2dc819f5d09cb29a61417933de8ceecca3a9b34d609b24aae0e58188f590d4ada71dffc08c5319824ae3611f42850eac6a90bbc164a35dcce891610f89bf0c8c WHIRLPOOL 2234271f7a05443c7d7fa06fc562523ae7dc99d4584cd9850c7b16791869dbfb84f51ae765d4b17619561857833c4240fec2b552c82a614b7a0755a6d09b0005
diff --git a/media-sound/forked-daapd/files/forked-daapd.init.d b/media-sound/forked-daapd/files/forked-daapd.init.d
new file mode 100644
index 0000000..44b2fca
--- /dev/null
+++ b/media-sound/forked-daapd/files/forked-daapd.init.d
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Based on mt-daapd init.d file created for gentoo 
+#
+# You can run multiple copies of this service just symlinking them to
+# forked-daapd.<name>, then it will load /etc/forked-daapd.d/<name>.conf as config
+# file.
+# Remember to give them different logs and cache directories.
+#
+# The main instance (with no <name>) uses /etc/forked-daapd.conf
+
+# Check for OpenRC/Baselayout 2 -- see bug #230917
+if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then
+	myservice=$RC_SVCNAME
+fi
+
+CONF="${myservice##*.}"
+if [[ -n ${CONF} && ${myservice} != "forked-daapd" ]]; then
+	PIDFILE="/var/run/forked-daapd.${CONF}.pid"
+	CONFFILE="/etc/forked-daapd.d/${CONF}.conf"
+	LOGFILE="/var/log/forked-daapd.${CONF}.log"
+else
+	PIDFILE="/var/run/forked-daapd.pid"
+	CONFFILE="/etc/forked-daapd.d/forked-daapd.conf"
+	LOGFILE="/var/log/forked-daapd.log"
+fi
+
+depend() {
+	need net avahi-daemon
+}
+
+start() {
+	ebegin "Starting forked-daapd DAAP server"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--exec /usr/sbin/forked-daapd -- -P ${PIDFILE} -c ${CONFFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping forked-daapd DAAP server"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2
+	eend $?
+
+	rm -f ${PIDFILE}
+
+}
diff --git a/media-sound/forked-daapd/files/forked-daapd.logrotate b/media-sound/forked-daapd/files/forked-daapd.logrotate
new file mode 100644
index 0000000..f8753a4
--- /dev/null
+++ b/media-sound/forked-daapd/files/forked-daapd.logrotate
@@ -0,0 +1,13 @@
+/var/log/forked-daapd.log {
+	weekly
+	missingok
+	notifempty
+	rotate 3
+	create
+	compress
+	delaycompress
+	noolddir
+	postrotate
+		killall -q -HUP forked-daapd
+	endscript
+}
diff --git a/media-sound/forked-daapd/forked-daapd-23.2.ebuild b/media-sound/forked-daapd/forked-daapd-23.2.ebuild
new file mode 100644
index 0000000..70d02ef
--- /dev/null
+++ b/media-sound/forked-daapd/forked-daapd-23.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit user eutils autotools
+
+DESCRIPTION="DAAP and RSP media server. It is a complete rewrite of mt-daapd (Firefly Media Server)."
+GITHUB_USER="ejurgensen"
+GITHUB_TAG="${PV}"
+HOMEPAGE="https://github.com/ejurgensen/forked-daapd"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/${GITHUB_TAG}.tar.gz -> ${GITHUB_USER}-${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_TAG}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac itunes musepack lastfm mpd spotify"
+
+RDEPEND="itunes? ( >=app-pda/libplist-0.16 )
+	dev-db/sqlite:3
+	>dev-libs/antlr-c-3.0
+	>=dev-libs/avl-0.3.5
+	dev-libs/confuse
+	dev-libs/libgcrypt
+	>=net-dns/avahi-0.6.24[dbus]
+	>=dev-libs/libunistring-0.9.3
+	dev-libs/mini-xml[threads]
+	media-libs/alsa-lib
+	flac? ( media-libs/flac )
+	media-libs/taglib
+	app-pda/libplist
+	>=sys-libs/zlib-1.2.5-r2
+	virtual/ffmpeg"
+DEPEND="${RDEPEND}
+	>dev-java/antlr-3.0
+	dev-util/gperf
+	dev-util/pkgconfig"
+
+RESTRICT="primaryuri"
+
+src_prepare() { 
+	eautoreconf -i
+}
+
+src_configure() {
+	econf \
+		$(use_enable flac ) \
+		$(use_enable itunes ) \
+		$(use_enable mpd ) \
+		$(use_enable lastfm ) \
+		$(use_enable musepack )
+}
+
+src_install() {
+	emake DESTDIR="${D}" localstatedir="${EPREFIX}/var" install
+
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	keepdir /etc/forked-daapd.d
+	mv "${D}etc/forked-daapd.conf" "${D}etc/forked-daapd.d/"
+	fperms 0600 /etc/forked-daapd.d/forked-daapd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/forked-daapd.logrotate" forked-daapd
+
+	dodoc AUTHORS ChangeLog README.md NEWS
+}
+
+pkg_preinst() {
+	enewgroup daapd
+	enewuser daapd -1 -1 -1 daapd
+	fowners -R daapd:daapd /etc/forked-daapd.d
+	fperms -R 0700 /etc/forked-daapd.d
+}
+
+pkg_postinst() {
+	einfo
+	elog "If you want to start more than one ${PN} service, symlink"
+	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from /etc/${PN}.d/<name>.conf."
+	elog "Make sure that you have different cache directories for them."
+	einfo
+}
+