gentoo resync : 28.04.2019

8 files changed, 59 insertions, 55 deletions

diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index b07ac584a6a5..dd7a1113f603 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,9 +1,9 @@
-AUX mt-daapd-0.2.3-sparc.patch 927 BLAKE2B 637cb70b9382155a05f2e7ffa10da320185946acf593e00a6a3f3ded9e921a5dcd0cf636e65a820e5e32ac2355e1d31d078ee81eae4c4b432cd5ee8f54091389 SHA512 8f263a1a1905f9dde592dc321dc0a2ef5c4a8d9ae1e80eb7d9f04810fadca3cce38628282a0c7c27b4745a3fbce46893d834bf315013a1d5c200d64218371cce
-AUX mt-daapd-0.2.4.1-libsorder.patch 5361 BLAKE2B 4b240fc992113fa73c6f77089c39996954a161c4627b4f6af58f3a527305e81a13c8df40a44ac7f88a00e7e4cce2d2dd2e5edd650fc743e317ee45fd77ef9340 SHA512 6333215ff44c4df2e87664b4262c733b1aa9334a0659ffc7deb1cdfe694eded6387f74fe30bb5709d38a9309b928d97c156a3ec4d165c7c3446eb428413403a9
-AUX mt-daapd-0.2.4.1-pidfile.patch 1908 BLAKE2B d0300a4d59429d01ddecd73b5c022e30b20b0238e7da7943ac6ed23e2b2b807e3648775d86ca0614eb54cf3e6e3145ffe9e0096205af315b7a451cec35fe6b5d SHA512 8dbf79b4ebe890a398b1b14b7a85d2f40fbffd8c0cabc21ee6271ca4f1c062f580fc113a8628eecff091d31fd6af54d3c408dacaa2e7433d191f31f26ad54dad
-AUX mt-daapd-0.2.4.2-maintainer-mode.patch 405 BLAKE2B b3ee1774bcc2b61ad54e1182793be5cc3394b835fc54747efed5aa3da8732ee5015de4683dee1c0ced6d00805729e21900d594907d143fd0fdc55869d25ee7fc SHA512 a7fcabca95370395ba344c4f8273def2a401889e112bbe6163db324f72639a073be4406f1b812ae67d2a99fb8159c2296ee1b9a4f18a8492dcdeea0e3b4e52c7
-AUX mt-daapd-0.2.4.2-oggvorbis.patch 663 BLAKE2B d6556ebc43c606ce17680eee0bd5ed758b47c7ffcd082ac512931aee4b49a880fd6341e29ec5491417587cad5e137e63f31ecd651a005777a2fb16990215bd68 SHA512 0ec74b9cdf4fde912944c95f148fc0f232249c978954e4a4ed052ca60c7ec4cfb7ae88f791bf2d8b895ce69bbd6580bfbd5e88439e09ce33a3e32de34dd47533
-AUX mt-daapd.init.2 1238 BLAKE2B 816cb83d67f6bfbe797ed5ccac260b9c368d29085bcf8b53b69eebaccca3f0eef4cb0a446008d310ca7434c6cbda38bea5fd613c794bd0ebd763418d317d9188 SHA512 8e4649a8fcc1d3de94c872644ff0bee62cb32efc5e5f1bb2c25c1ad42e2b675524f76417b0ccff30f0574fda126b4316c512508bbe7283973ee1020d84e95df7
+AUX mt-daapd-0.2.3-sparc.patch 740 BLAKE2B 3dda0247a83790a97bd2b3d7a6f5fa72b20dd4ea71ee95b72d381272f5c97604d45116d03aa64c7eccedf109aa334d464a619558ba4ba42353034f9ae5d36bef SHA512 69a187f4557901f8cf0a2854297a3f80cdb451719eab835feb1a3ac37ca1fef8750b2f573f710c6b490c27de1ad41901db19196b17a7309ee585c25188feb0c5
+AUX mt-daapd-0.2.4.1-libsorder.patch 5073 BLAKE2B 46fc079420368466c5aa6e9efabcdea0e06194b9c36c22623e7f1930fcfcdf21de7a200e5874096ed88a1cc059de02e0086157f190a89186f0cfadcd5636e3ac SHA512 f3765589ae7eeb5b342a7eb3fe8e6cd38e92c5584b304d153ee369b95890ce98c1a6ac5096cfa05b91f5e971a0ab86c83b1b99307d73bbca6ce0b95f82ed6c16
+AUX mt-daapd-0.2.4.1-pidfile.patch 1731 BLAKE2B 49f59edee6756e814da79e9fbc15422e8f95dd84f6723f6996370e794e7189e5164f8b881863d338d1a8437cf9ec06f80c4eca276e817a80475a543550cba093 SHA512 86340f84e20d847267dd1e46ca9a0d209f16d7fd0bd6936b0dd1f830c8c7c0572a6e49a664371780d71c9ca930aaba1ddc4cac2b0f0fdb64c2833b2202d4b458
+AUX mt-daapd-0.2.4.2-maintainer-mode.patch 332 BLAKE2B 94083b6a8847b0f6a1f8c060842ce7496ae61ebd92e669a8ee58d558974f078d739500c25c87d9e572ad1da85fb75c1ebdb7b04549157df4b553a3a33e363c0f SHA512 631a844c2bd0a07d1c793ab0ffe839d4b75e34f2268915b6451f44aeee7fc0d4597bbabe3c8f09b12fc432f76a38fec9593f5721ee76c5c7e761634926b7a9f3
+AUX mt-daapd-0.2.4.2-oggvorbis.patch 590 BLAKE2B be372f1dc4aa4541b35782064c0dfccc40d62e704d2ac3041fda8d719af52f5692dd8a0ba351c8fed3b5ef35be0ca604242e2a9cc588c890862ff710c4762c96 SHA512 51785b2e89fe20d71a3bfaaf75ccbf6b8369af8e5b76f2c8fb63b76fbb0a3249b9119be7c63256b507ce4f39cdfd08982ccf9e398d3d3fd13b24628b2c8f2280
+AUX mt-daapd.init.2 1220 BLAKE2B 483f41aeab5ab3de0ab6c268f8263317a26b6c647e5e02c52c1636bfd4f4b2efb3cf9f8745e4da90b8f19d809509fcebe721fe94fef8140fb65da3152bd26549 SHA512 32a24aa6c027df24a959f908bfac5be24638975fd98a7470dd0e5e9e4590c9918810f646eb9a4497405563c1dfdd139a974cc6db8b7066684af8d9701c703b42
 DIST mt-daapd-0.2.4.2.tar.gz 436513 BLAKE2B bca01805bbdc96d3aed1499a1295c48761d83f2ab876e15ea546d30b164bd86eab9e8278db39bedad356b4c018bec96f2086a98113562dfa09a496c6c0ce60de SHA512 1a944f31cc63355d33c7fd821d4509b8b69805ae29aa23f1307bf7602f6a62beba1f5ab5f4005387177f17c5fdf8db91b338f010b4be4ab0cd783dc72c6df60f
-EBUILD mt-daapd-0.2.4.2.ebuild 1913 BLAKE2B 21efa73abfde9d98df4d67bb0b99fca4626fbb3e8d9138d9a7d2308c0c08590302a5b7f6daf73fbb0e3d35aa0b979bafe242335704fd4568b5a4ddd2dee86ade SHA512 41fda1f05096e9bc11f7a6d53e5f7b06de9b2fe9f72001090a2ca915be58f0548bb52cb49793f19d686ca8951b0aa3606c8df448b3fdaf4a61896a2ed4dfcf73
+EBUILD mt-daapd-0.2.4.2.ebuild 1852 BLAKE2B 99f4ce30c8c35767b695f698839acb027906942bb54cb6981ae9bee7b90544f00d27d2af7326f8eb4da20e51ba2b62abf0781afd1f968307ce176bd9d5f06f76 SHA512 65897ce763065f4f00717bb882bdd9e5876b0dd81183daafc9fc7dc0668ffcdcea1dfbabd36756afd6e9d7c8dd2c3ca87bcde84240e5b1bfbec2663efa09a969
 MISC metadata.xml 331 BLAKE2B f7842e1c5183217f3496de60b60bad916ff47ff7419dc9e6c72116a030ca36d9508a8b2d01c3350374be8e2513b982e7c59d18325934f9814eb1ceb09e8d3ff0 SHA512 75a2feebcc5b6226a059c79d8519bbf79de8ff4025c43389a39cb287ff220176e99f2fa2abdcdb371ebf9d988cc8bea4ca018ed347c98e9aedfc4ef7cbead941
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
index 482b25c13779..71d3009c8aca 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
@@ -1,6 +1,5 @@
-diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c
---- mt-daapd-0.2.3/src/mp3-scanner.c	2005-02-05 18:22:47.000000000 -0300
-+++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c	2006-01-03 16:39:50.000000000 -0300
+--- a/src/mp3-scanner.c
++++ b/src/mp3-scanner.c
 @@ -1663,14 +1663,14 @@
      /* now check for an XING header */
      if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) {
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
index a4c5a176ada4..91d9e848c124 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
---- mt-daapd-0.2.4.1.orig/configure.in	2007-10-22 02:50:24.000000000 +0300
-+++ mt-daapd-0.2.4.1/configure.in	2007-10-28 23:31:43.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -20,8 +20,9 @@
  CPPFLAGS="${CPPFLAGS} -g"
  
@@ -126,8 +125,8 @@ diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
    fi
  fi
 diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
---- mt-daapd-0.2.4.1.orig/src/Makefile.am	2007-10-22 03:32:27.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/Makefile.am	2007-10-28 23:31:33.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -34,6 +34,9 @@
  	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
  	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
index 5976316e5bf2..71178f678118 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
---- mt-daapd-0.2.4.1.orig/src/main.c	2007-10-22 02:27:57.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/main.c	2007-10-28 23:54:29.000000000 +0200
+--- a/src/main.c
++++ b/src/main.c
 @@ -551,6 +551,7 @@
      printf("  -m             Disable mDNS\n");
      printf("  -c <file>      Use configfile specified\n");
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
index a81483db6a11..7fc127fa6957 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2008-07-06 23:57:08.000000000 +0200
-+++ configure.in	2008-07-06 23:57:46.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -17,10 +17,12 @@
  rend_posix=true
  
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
index 714f34142ac2..b0352587a965 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-03-11 08:15:14.000000000 -0500
-+++ configure.in	2009-03-11 08:25:36.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -63,9 +63,14 @@
  AC_SUBST(AVAHI_LIBS)
  
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index eacc6ea7b7e1..c77b7dd2bb5d 100644
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # Somehow based on init.d file shipped with mt-daapd itself.
 #
@@ -26,7 +26,7 @@ fi
 
 depend() {
 	need net
-	#USEHOWL need mDNSResponderPosix
+	need avahi-daemon
 }
 
 start() {
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
index a36e59993f8e..572b7c217878 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
-HOMEPAGE="http://www.mt-daapd.org"
+HOMEPAGE="https://sourceforge.net/projects/mt-daapd/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,63 +14,69 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="vorbis"
 
-RDEPEND="media-libs/libid3tag
-	sys-libs/gdbm
-	net-dns/avahi[dbus]
-	vorbis? ( media-libs/libvorbis )"
+RDEPEND="
+	media-libs/libid3tag:=
+	net-dns/avahi:=[dbus]
+	sys-libs/gdbm:=
+	sys-libs/zlib:=
+	vorbis? (
+		media-libs/libvorbis:=
+		media-libs/libogg:=
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	cp "${FILESDIR}"/${PN}.init.2 initd
-
-	sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch
+	"${FILESDIR}"/${P}-maintainer-mode.patch
+	"${FILESDIR}"/${P}-oggvorbis.patch
+)
 
-	epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \
-		"${FILESDIR}"/${P}-maintainer-mode.patch \
-		"${FILESDIR}"/${P}-oggvorbis.patch
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable vorbis oggvorbis) \
+	econf \
+		$(use_enable vorbis oggvorbis) \
 		--disable-maintainer-mode \
 		--enable-avahi \
 		--disable-mdns
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	default
 
 	insinto /etc
 	newins contrib/mt-daapd.conf mt-daapd.conf.example
 	doins contrib/mt-daapd.playlist
 
-	newinitd initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
 
 	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
 }
 
 pkg_postinst() {
-	einfo
+	elog
 	elog "You have to configure your mt-daapd.conf following"
-	elog "/etc/mt-daapd.conf.example file."
-	einfo
+	elog "${EROOT}/etc/mt-daapd.conf.example file."
+	elog
 
 	if use vorbis; then
-		einfo
-		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
+		elog
+		elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf"
 		elog "if you want your mt-daapd to serve ogg files."
-		einfo
+		elog
 	fi
 
-	einfo
+	elog
 	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 "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf."
 	elog "Make sure that you have different cache directories for them."
-	einfo
+	elog
 }