gentoo resync : 24.12.2018

5 files changed, 132 insertions, 19 deletions

diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index e66274be32b5..62b9e7ef1d09 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -5,6 +5,7 @@ AUX minidlna-1.2.1-buildsystem.patch 758 BLAKE2B e9fd6e2ad4dbeee65b73c65a5537990
 DIST minidlna-1.1.5.tar.gz 488191 BLAKE2B bda7d9099a11578919387f6d4f0e04c162556fb3557352446f0e7c69ee7dfe8f2c19d002b3fde1af2e6ff9c8b1436177f0b47dcc5c86a96e4dfd35de57610d60 SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.1.5-r1.ebuild 2428 BLAKE2B 83702751f29a3134ee2819da57671b46d5a8e707d79dddb61c78100d9d1352b62f4b0764c4f6956a59884ee62ebbb87ad2577cf5f217009e2a9baa00b5acaa48 SHA512 a8feb71af3593a8840ad3071e3f789089030a9378ec7ee8d8c5a178fab99a93da82beda7c0f73f126dd550205e66652db1b861f2ac63315bd83db6540960281c
-EBUILD minidlna-1.2.1.ebuild 2550 BLAKE2B 9b803a6f8bb88d0c76e88cfb544f70bd323e7e03d95fd4dd3c1f089a77113b216d8262d9a4f1ca33ba950180995d9379cf5824a67e04a6a677a782e6004ed153 SHA512 b3991371eafd355d1e8a8ef739a3aae978384517a123d0b8a812c01c8972384310e37213909e137d64f10026686d9b6e8f7631a46585fd30f407d752525a9f63
-MISC metadata.xml 496 BLAKE2B c1627b8430dabfeb9a6cdf51ba2f40f8630c5a79433ad115be8ea1c2ee174812a7d776211111d525b0b1496c13b03e63578130d3422dc63afc9fa3f34debd1b2 SHA512 1edb55fe26127d2728177ae91cea1346c9318ccf60f68f11e198d818e203238c9fda85dd85c61f406bcc9985bd1586ccf73bc83a8b0b353e2ef7057a54df6ab4
+EBUILD minidlna-1.1.5-r1.ebuild 2438 BLAKE2B 6d6207e1fd6b38f9153f82ea99c790bd481d5ffe396dd651d5b8264f8ce5905bf07aadca43bb63388d98c48aa12c32eb3caa9b45ed444d08368821d9acdd469a SHA512 55b9aa3ce385f56ef0047af899bd3eb3029553ea9b1c33e9bd354a8f55169e9ccb34f1cb0fca78a14b76f887ce93388d334237f2e6bc765338db7363e6466b4d
+EBUILD minidlna-1.2.1-r1.ebuild 2722 BLAKE2B 9d91b45b32013a97a16f077d9cfa9b5f64ae21a690fae2f7480b6cd08dc107edaaff37beebdea7d4852563bc5a44315600f7f3ddf1d9c2a207a7b229ae194257 SHA512 6efb9f6a829725549b09dadbc03aa71e13ebfff8a7861573509281e80e75eb72a4ac7c994d5647598d3fc6ed656d1194f1cc17bc5e493d94e51f69450bece4e3
+EBUILD minidlna-1.2.1.ebuild 2560 BLAKE2B 0c519c5c1e41df2391385d1b94228d208a9d82697bdc3198392c1167fc0bd0174ae0b1c02750641cf07e822a9e3b1576bf9fc3fae2c94da28c2550f76e22d3d4 SHA512 4b0d0b171c48b2854f8819402b6e87e47ba76fe2a496bf3acd57f4220d1fed551c5eac0e65a62c6cbe9ced1863ed5422c852a4492854ffe08a41c1132396fdb9
+MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 8dd2bc50e047..168984bee22d 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
-<upstream>
-	<bugs-to>https://sourceforge.net/p/minidlna/bugs/</bugs-to>
-	<remote-id type="sourceforge">minidlna</remote-id>
-</upstream>
-<use>
-	<flag name="netgear">Enable netgear branding</flag>
-	<flag name="readynas">Enable readynas branding</flag>
-</use>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/minidlna/bugs/</bugs-to>
+		<remote-id type="sourceforge">minidlna</remote-id>
+	</upstream>
+	<use>
+		<flag name="netgear">Enable netgear branding</flag>
+		<flag name="readynas">Enable readynas branding</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
index a0ca7b231fc6..c964214a45e0 100644
--- a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils linux-info systemd toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
 	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
 
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..ccc53883c3b5
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
+SRC_URI="mirror://sourceforge/minidlna/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libav netgear readynas zeroconf"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac:=
+	media-libs/libexif:=
+	media-libs/libid3tag:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	virtual/jpeg:0=
+	libav? ( media-video/libav:0= )
+	!libav? ( media-video/ffmpeg:0= )
+	zeroconf? ( net-dns/avahi:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${WORKDIR}"/minidlna-gentoo-artwork.patch
+)
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i minidlna.conf || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--with-db-path=/var/lib/minidlna
+		--with-log-path=/var/log/minidlna
+		--enable-tivo
+		$(use_enable netgear)
+		$(use_enable readynas)
+	)
+	use zeroconf || myconf+=(
+		ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym ../sbin/minidlnad /usr/bin/minidlna
+
+	insinto /etc
+	doins minidlna.conf
+
+	newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
+	newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
+	systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
+	newtmpfiles - minidlna.conf <<-EOF
+		d /run/minidlna 0755 minidlna minidlna -
+	EOF
+
+	keepdir /var/{lib,log}/minidlna
+
+	doman minidlnad.8 minidlna.conf.5
+}
+
+pkg_preinst() {
+	local my_is_new=yes
+	[[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
+
+	enewgroup minidlna
+	enewuser minidlna -1 -1 /var/lib/minidlna minidlna
+
+	fowners minidlna:minidlna /var/{lib,log}/minidlna
+	fperms 0750 /var/{lib,log}/minidlna
+
+	if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then
+		# created by above enewuser command w/ wrong group
+		# and permissions
+		chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die
+		chmod 0750 "${EROOT}"/var/lib/minidlna || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+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/minidlna and file ownerships to suit your needs."
+
+	tmpfiles_process minidlna.conf
+}
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
index 6b5a1be8ebe8..40ee4bd7a8c7 100644
--- a/net-misc/minidlna/minidlna-1.2.1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils linux-info systemd toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
 	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"