gentoo resync : 18.11.2018

4 files changed, 69 insertions, 8 deletions

diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index 5fd6f8bc4f09..016fb02f7a55 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,4 +1,6 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
+DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
-EBUILD shairplay-9999.ebuild 962 BLAKE2B 02d8567f2ecb09398ceefda38ac58bb09fa756effdc0904d12bdbb5003e3a13b05a29b8bc0bac4d96d2c7f9986465522caed6b65986bdc285df168ecc05b1683 SHA512 e03e7ada6986d16e1d890074926a79998323be00fa51713887617ac9ef0299f98866a4f7eb076d9485c7d0eaa7781692fb2c59b97a8e7b4b38f6c39b3ed9be3f
-MISC metadata.xml 686 BLAKE2B f0577825c70fcf0af9e304fa694d7d5ffe7ec8d2f681c74e1ee569d36b300ce195d1a4398faece1a69e66b42ebf7bf6372cadcfdcb97877295a79896a75bb2ba SHA512 4bb4d66a8f01c1b433402bc13f86f49a26db2ee02eaecd8ebbc8498f9f17350f36d6f57b0e7dd53f3977a9f20c30184c1b2f61f57c99b733f52895fb181b9d53
+EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
+EBUILD shairplay-9999.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
+MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
diff --git a/net-libs/shairplay/metadata.xml b/net-libs/shairplay/metadata.xml
index 96259cc68f99..4c3bf6e9c763 100644
--- a/net-libs/shairplay/metadata.xml
+++ b/net-libs/shairplay/metadata.xml
@@ -4,6 +4,7 @@
     <longdescription>Apple airplay and raop protocol server</longdescription>
     <use>
         <flag name='alac'>Add support for Apple Lossless Audio Codec files</flag>
+        <flag name='playfair'>Add support for handling fairplay handshake (used in for example screen mirroring)</flag>
         <flag name='tools'>Build and install a binary shairplay in /usr/bin</flag>
     </use>
     <maintainer type="person">
diff --git a/net-libs/shairplay/shairplay-0_pre20180824.ebuild b/net-libs/shairplay/shairplay-0_pre20180824.ebuild
new file mode 100644
index 000000000000..f4af8a0449c9
--- /dev/null
+++ b/net-libs/shairplay/shairplay-0_pre20180824.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
+else
+	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
+	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Apple airplay and raop protocol server"
+HOMEPAGE="https://github.com/juhovh/shairplay"
+LICENSE="BSD LGPL-2.1 MIT
+	playfair? ( GPL-3+ )"
+
+SLOT="0"
+IUSE="alac +playfair static-libs tools"
+
+DEPEND="
+	tools? ( media-libs/libao )
+"
+
+RDEPEND="
+	alac? (
+		media-sound/alac_decoder
+		net-libs/shairplay[tools]
+	)
+	tools? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with playfair) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/shairplay/shairplay-9999.ebuild b/net-libs/shairplay/shairplay-9999.ebuild
index 76a24ddd83bc..f4af8a0449c9 100644
--- a/net-libs/shairplay/shairplay-9999.ebuild
+++ b/net-libs/shairplay/shairplay-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools vcs-snapshot
+inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
 else
-	EGIT_COMMIT="498bc5bcdd305e04721f94a04b9f26a7da72673f"
+	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
 	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Apple airplay and raop protocol server"
 HOMEPAGE="https://github.com/juhovh/shairplay"
-LICENSE="BSD LGPL-2.1 MIT"
+LICENSE="BSD LGPL-2.1 MIT
+	playfair? ( GPL-3+ )"
 
 SLOT="0"
-IUSE="alac static-libs tools"
+IUSE="alac +playfair static-libs tools"
 
 DEPEND="
 	tools? ( media-libs/libao )
@@ -43,6 +45,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_with playfair) \
 		$(use_enable static-libs static)
 }