net-misc/minidlna: version bump w/ USE=avahi (bug 619322, thanks for the hint).

Package-Manager: Portage-2.3.10, Repoman-2.3.3

3 files changed, 121 insertions, 0 deletions

diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 03aab3c3ce46..99f1253b4558 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,2 +1,3 @@
 DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
+DIST minidlna-1.2.1.tar.gz 459549 SHA256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b WHIRLPOOL 9ecbe04b367af7b670a1e2be3effcb6666aae5fa9edabe340c05ddb55d894cdee137a783aec98dd8dadfcae4924a24ea408abb0409b4abedec1f6e53e3a998e3
 DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
new file mode 100644
index 000000000000..10154dd5165e
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
@@ -0,0 +1,20 @@
+--- minidlna-1.2.1/configure.ac
++++ minidlna-1.2.1/configure.ac
+@@ -477,6 +477,9 @@
+         AM_CONDITIONAL(NEED_VORBIS, true),
+         -logg)
+ 
++AC_ARG_ENABLE([avahi], AS_HELP_STRING([--enable-avahi], [Enable search for avahi]))
++
++AS_IF([test "x$enable_avahi" = "xyes"], [
+ AC_CHECK_LIB(avahi-client, avahi_threaded_poll_new,
+         [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
+          AM_CONDITIONAL(HAVE_AVAHI, true)
+@@ -484,6 +487,7 @@
+          AM_CONDITIONAL(HAVE_AVAHI, false))],
+          AM_CONDITIONAL(HAVE_AVAHI, false),
+         -lavahi-client -lavahi-common)
++], [AM_CONDITIONAL(HAVE_AVAHI, false)])
+ 
+ ################################################################################################################
+ ### Header checks
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
new file mode 100644
index 000000000000..6b5a1be8ebe8
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info 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
+	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="avahi netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg:0
+	avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=( "${WORKDIR}"/${PN}-gentoo-artwork.patch
+	"${FILESDIR}"/${P}-buildsystem.patch )
+
+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
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable avahi ) \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+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."
+}