4 files changed, 127 insertions, 1 deletions
diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index da7bf245620b..17ca94deda9b 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.29 2013/05/08 07:29:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.30 2013/05/08 20:56:01 xmw Exp $
+
+*minidlna-1.0.26 (08 May 2013)
+
+  08 May 2013; Michael Weber <xmw@gentoo.org>
+  +files/minidlna-1.0.26-Makefile.patch, +files/minidlna-1.0.26-locale.patch,
+  +minidlna-1.0.26.ebuild, minidlna-1.0.25-r1.ebuild:
+  Version bump
 
 *minidlna-1.0.25-r2 (08 May 2013)
 
diff --git a/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch
new file mode 100644
index 000000000000..52a5ee3c08c5
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch
@@ -0,0 +1,23 @@
+--- minidlna-1.0.26/Makefile
++++ minidlna-1.0.26/Makefile
+@@ -12,10 +12,10 @@
+ #
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS += -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+-CC = gcc
++CC ?= gcc
+ RM = rm -f
+ INSTALL = install
+ 
+@@ -125,6 +125,4 @@
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	@echo Compiling $*.c
+-	@$(CC) $(CFLAGS) -o $@ -c $< && exit 0; \
+-		echo "The following command failed:  $(CC) $(CFLAGS) -o $@ -c $<" && false
++	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/net-misc/minidlna/files/minidlna-1.0.26-locale.patch b/net-misc/minidlna/files/minidlna-1.0.26-locale.patch
new file mode 100644
index 000000000000..40d07c3626d1
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.26-locale.patch
@@ -0,0 +1,12 @@
+Index: minidlna-1.0.25/minidlna.c
+===================================================================
+--- minidlna-1.0.25.orig/minidlna.c
++++ minidlna-1.0.25/minidlna.c
+@@ -69,6 +69,7 @@
+ 
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
++#include <locale.h>
+ #endif
+ 
+ #include "upnpglobalvars.h"
diff --git a/net-misc/minidlna/minidlna-1.0.26.ebuild b/net-misc/minidlna/minidlna-1.0.26.ebuild
new file mode 100644
index 000000000000..8e5e424c716b
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.0.26.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.26.ebuild,v 1.1 2013/05/08 20:56:01 xmw Exp $
+
+EAPI=4
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-locale.patch
+
+	sed -e "/^DB_PATH=/s:\".*\":\"${EPREFIX}/var/lib/${PN}\":" \
+		-e "/^LOG_PATH=/s:\".*\":\"${EPREFIX}/var/log/${PN}\":" \
+		-i ./genconfig.sh || die
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-i ${PN}.conf || die
+
+	sed -e 's:@$(CC):$(CC):' \
+		-i Makefile || die
+
+	epatch_user
+}
+
+src_configure() {
+	./genconfig.sh || die
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.0.25-r2.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.0.25.service ${PN}.service
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc NEWS README TODO
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}