perfect pulseaudio cfg, handle auto-magic optional deps

4 files changed, 57 insertions, 4 deletions

diff --git a/media-sound/shairport/Manifest b/media-sound/shairport/Manifest
index 4d943d1..e044546 100644
--- a/media-sound/shairport/Manifest
+++ b/media-sound/shairport/Manifest
@@ -1,4 +1,5 @@
-AUX shairport.confd 183 SHA256 c2dded8537bed308cd7c104b2711074bb187c20b663bda6575fe4b28942fce55 SHA512 0552bedc641ad66f29ef8670f9c6ac53f3721166e3a363d59625aab3cb87843077b23d39f135dbbe25df42b7444bf0adef7ac9de292fb6dfe64e1f93a637facd WHIRLPOOL 5d591fbaf2b6bcf6b05cd2bb1d7678a553b33d7e14517eb18274e57e02a33a38f073dd418c9dfb9b1a1d3622f6c9a50f50e80929d88c6e702dee7afa4b66ffed
-AUX shairport.initd 602 SHA256 819557093a9b5a4df3ffcb2590c3952b0782d083b46b2280799226d002c9034b SHA512 54dc7744424dab9a353201b1ae859bd96ef2d3022ba55b6f61d90a4181cb62e7d782dd321e13811fecf6bde90e93c3398aa3a0e5b48116f2c152f77911266821 WHIRLPOOL fd59b6b0607d5352e7b95fa385c34f1acb6dbf9ac4cff2d53e71e4e7e68b71b06e2c64252bda9ff3f0437e7448715fb9e762aa8d5ed83fa3defd7b8061f9f79e
+AUX shairport.confd 228 SHA256 bff627f27854cd4f3b76b6e29784da387071eddc600269753b4a44a837b7da66 SHA512 d9515e842399f1b65823511c0a86a1c104f0ca1966d083d47cff762915de5eb3a23b6c607150c3b91ce39193aabb69e6c57b679d3c6fb0427a04e6ed7c3271bf WHIRLPOOL c17a0a6121ca35d9a41ac0e77e2cdc0f11a4b60abeb0c51029a6a88dece282d327c2a88fd77f573f49a8289c6a15513b994957964fc4f53d31c178cdf75c7c49
+AUX shairport.initd 606 SHA256 5eae2d826b9f61a8d41cf3a655fb8e59382ff3d549a8ef7faae9049625d62c24 SHA512 3efe30df27eb822637c3837e450b0e4e44ab0f1e8d4676aa136f470322113ada5fce6b10cd004f21bd08de3492bf017207a6ed718b08ab690472a2cb5d9a7d80 WHIRLPOOL d042f7d44f6d6fd7d75bff826847f28177add483b861b7d96d17c86356a396daed940b99c0032f05aa1dbb82ed273419bc382f125c38acb6908c3af63c21de99
+EBUILD shairport-20141210-r1.ebuild 1190 SHA256 c66c2097e3ebe1a24b82be0814276d4effff8db2fbe55b3c2ecbddb8c55c26c0 SHA512 e062321f2829d85157bf06c109e88ccb59466bd24ca26e37bdb2e0f4dca57fd12a8a6315d3f9889e0999ede6358a4b4956131f5661205a23bf9348ede12f32b4 WHIRLPOOL 1bfbf15cd031ee90c281865a370c2cb245c254aaa519c31dd32e5cc8f67c7c8694ba4e699daaef6b5a98f7d6e9590bf85b6c4799ad3a7986f6619c66e502f110
 EBUILD shairport-20141210.ebuild 696 SHA256 72ce90def6a5c3b91d5812a5a4de70254d602c5576d4a918475e873da08e9ca5 SHA512 65966f00d57738d2dcbf9002c545072579cb838e82c5074e21d27e68ee94b8fccf0909919da35243fbe8350bc3686860ea50a25e6d4d9cfa39964f39af640d1c WHIRLPOOL c6c2906cb3377b211df11a69b2ab29cb2d52c096ed1b115a4023d17d9b18e0a2ec974b43cec67e6ec406a754ab58499d1544717340908a6b3e79fe44c428058b
 EBUILD shairport-9999.ebuild 640 SHA256 61776669cb98bd6fa3ea83c8a5978fc1af40dd4355cf85d36534419eda946cb3 SHA512 c3b6591c52e345303a03f1e4fb34b321764440c54c2d3ca9ba0cd5b8c9a8730085a5ea1d72755b4f58c44f82e616207b94747ca524dffc199dc4ce6c058101ad WHIRLPOOL d5a1ae645add09ba0fd80aa97645abb6bf59f033cda77c4a8914d1ab720c41ba48670bb27f876661474a31f764afa41680a40f3675b2428475420fcf02d22fc4
diff --git a/media-sound/shairport/files/shairport.confd b/media-sound/shairport/files/shairport.confd
index 37d5aec..e8a630c 100644
--- a/media-sound/shairport/files/shairport.confd
+++ b/media-sound/shairport/files/shairport.confd
@@ -3,3 +3,4 @@
 # 'shairport --help' for available options - default shairport options:
 #shairport_opts="--output=alsa --mdns=avahi"
 #
+shairport_opts="--output=pulse --mdns=avahi"
diff --git a/media-sound/shairport/files/shairport.initd b/media-sound/shairport/files/shairport.initd
index e40ec71..3ad9794 100755
--- a/media-sound/shairport/files/shairport.initd
+++ b/media-sound/shairport/files/shairport.initd
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-user="shairport:audio"
+user="shairport:shairport"
 
 description="emulates an AirPort Express to stream music from i-devices"
 start_stop_daemon_args="--user $user"
diff --git a/media-sound/shairport/shairport-20141210-r1.ebuild b/media-sound/shairport/shairport-20141210-r1.ebuild
new file mode 100644
index 0000000..653f5b0
--- /dev/null
+++ b/media-sound/shairport/shairport-20141210-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils user git-r3
+
+DESCRIPTION="Emulates an AirPort Express to stream music from i-devices"
+HOMEPAGE="http://www.mafipulation.org"
+
+EGIT_REPO_URI="https://github.com/abrasive/shairport.git"
+EGIT_COMMIT="d65b8e86e3048181d7c002bada4d879ee49f3f84"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ao +alsa +avahi +pulseaudio"
+
+DEPEND="
+	dev-libs/openssl
+	ao? ( media-libs/libao )
+	pulseaudio? ( media-sound/pulseaudio )
+	alsa? ( media-libs/alsa-lib )
+	avahi? ( net-dns/avahi )
+"
+RDEPEND="${DEPEND}
+"
+
+pkg_setup() {
+	enewgroup shairport
+	if use pulseaudio ; then
+		enewuser shairport -1 -1 -1 "shairport"
+	else
+		enewuser shairport -1 -1 -1 "shairport,audio"
+	fi
+}
+
+src_prepare () {
+	use ao         || sed -i '/CONFIG_AO/d' configure
+	use pulseaudio || sed -i '/CONFIG_PULSE/d' configure
+	use alsa       || sed -i '/CONFIG_ALSA/d' configure
+	use avahi      || sed -i '/do_pkg_config.*CONFIG_AVAHI/d' configure
+	eapply_user
+}
+
+src_install() {
+	dobin shairport
+	dodoc README.md
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}