gentoo resync : 14.12.2020

4 files changed, 2 insertions, 164 deletions

diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 02e8f8400a44..a012cc9e7e43 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,11 +1,8 @@
 AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
-AUX minidlna-1.2.1-fno-common.patch 1209 BLAKE2B 51994c0cfafd354745ddf83fa3a134a661459bdbc9661007f1ed3e056e6b9b89a44649496f83841ee83e454b1664594d34bae3757f2af582811e2ca2c8c4a77a SHA512 67ee0b86dc639b65d912cef96c617652d349d49e32a89538c2dd7a340e58a657b471cd6155aca8656cca44599d75ca96016d29a9a8107501870e511251782384
 AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8
-DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
-EBUILD minidlna-1.3.0.ebuild 2096 BLAKE2B 9d6f7ba17228d9e7938feced57fd436798d751015c1ab1583862d49813df801551c0532281a1636e15f8fbfee1376272825709957f6377d704b74e9f1a61f264 SHA512 c61018f7d289af8604e61f5d15cf136140796add1c831ff99bf3de497765612a1f7a2bc24d14fd5e8ae05c02256c6f0eb657250b3116fb1d266a8c1380b0bd46
+EBUILD minidlna-1.3.0.ebuild 2094 BLAKE2B ba308dfb550d7dc3ec8a12caf956d2588f8dc4a132860c5d14aeeba81b45d1dbb51bb1f0101a57786f93c6d0d32e3d75b69177efa273a1a66b592b7544d3e54d SHA512 9ad2a164f5f0734c19952ca78b68ccce5b8e32026132003d2ed2277d864ee927def4e9cd8d64ae8704ada88ff88e54ab410a8d3fb072fdc5d9be2554f414a19f
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
deleted file mode 100644
index 5cca89b52db2..000000000000
--- a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/image_utils.c
-+++ b/image_utils.c
-@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
- 	src->pub.bytes_in_buffer = bufsize;
- }
- 
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- /* Don't exit on error like libjpeg likes to do */
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
---- a/metadata.c
-+++ b/metadata.c
-@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
- }
- 
- /* For libjpeg error handling */
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
- {
---- a/tivo_utils.c
-+++ b/tivo_utils.c
-@@ -27,6 +27,7 @@
- #include <sqlite3.h>
- #include "tivo_utils.h"
- 
-+struct sqlite3PrngType sqlite3Prng;
- /* This function based on byRequest */
- char *
- decodeString(char *string, int inplace)
---- a/tivo_utils.h
-+++ b/tivo_utils.h
-@@ -30,7 +30,9 @@ struct sqlite3PrngType {
-   unsigned char isInit;          /* True if initialized */
-   unsigned char i, j;            /* State variables */
-   unsigned char s[256];          /* State variables */
--} sqlite3Prng;
-+};
-+
-+extern struct sqlite3PrngType sqlite3Prng;
- 
- char *
- decodeString(char *string, int inplace);
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
deleted file mode 100644
index 9d6ba5c94f4b..000000000000
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="
-	https://downloads.sourceforge.net/project/minidlna/${PN}/${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="elibc_musl netgear readynas zeroconf"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/flac:=
-	media-libs/libexif:=
-	media-libs/libid3tag:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	media-video/ffmpeg:0=
-	virtual/jpeg:0=
-	elibc_musl? ( sys-libs/queue-standalone )
-	zeroconf? ( net-dns/avahi:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=(
-	"${WORKDIR}"/minidlna-gentoo-artwork.patch
-	"${FILESDIR}"/${P}-fno-common.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.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
index c5e9ef5fa6b4..06bcef995db2 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="