gentoo resync : 16.11.2017

2 files changed, 146 insertions, 0 deletions

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 8d0d3b17954e..477f4941b07e 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,8 +1,10 @@
 AUX envy24control-config-dir.patch 593 SHA256 6cc8c284109839102a12a11de0e834865aa860460d3e387d71a9ae013ba8e1f9 SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef WHIRLPOOL abcc73750027f595b70fa9471334d5bc3b0f326e7847d6fd12ef0ad1107435af8f3236ad5e9b4ab89a9091cd97e1c87258f635137959d3136c3e7780e12394eb
 DIST alsa-tools-1.1.0.tar.bz2 1715113 SHA256 7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87 WHIRLPOOL daf731da17c172275b484da37962d85569d70066392bb65f6b462a5f9f17784d204deec203d2466cbc08cb691689b7fc8cd664b370b39e233f1e8afb43c9d0ff
 DIST alsa-tools-1.1.3.tar.bz2 1715759 SHA256 d88f1dcd6872121383eded5fa24e328e68c54e527db4547e1435d5eabc2b6709 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50 WHIRLPOOL a07cc691b30df7da209abc2028b747ac8ebc7cf34a0c54b57ba70c35d546e64cf5f12a7b4c83637834c53c035c9d4710764869b9dc2a92648c733913b5fc9293
+DIST alsa-tools-1.1.5.tar.bz2 1715977 SHA256 bc3c6567de835223ee7d69487b8c22fb395a2e8c613341b0c96e6a5f6a2bd534 SHA512 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d WHIRLPOOL fbed798a808055e6bf7b53d81bc4a6a3b59e009b5409747c45afc67d8013dd6469447da7f7a0707eb7ecb4445d1c9f99a5ca5b8b7277cae00026bb398c1770d2
 EBUILD alsa-tools-1.1.0.ebuild 3494 SHA256 6091351f741b60e0fe5a8a5952ddfac9b21fd41aefae625281287e46a6eb6617 SHA512 de303225bc4025bf28a1adb7b0994b2c10e81ecd8281e272ee6a4d66c1c226fabbd22df3fa27b739dec539c19228ea635378e18ebf49fec857c06afa9d215884 WHIRLPOOL d0f6d731740e2be15f9920d14ae4e8ca4cdaab94329c500eed22d9feb19ce7f91694afb4d00082fa1aa3dbd2e81c4e4367cf9dba114bb155c3f82ed47ba57bf2
 EBUILD alsa-tools-1.1.3.ebuild 3500 SHA256 feed936ede8dbbca117afcd12109a53d3ec3d059d515050e2672b905737734c5 SHA512 a34983b53de21d18ffa577507cf4ef91f63d71e3e7167cc8206abf93a2eed4f6401ee06e2fec227a27c23d253b6edc5c9354b6536985757afe5438bc5cff4631 WHIRLPOOL d9414f0beb3c9ffa4cbc573afdd79d9cc7816e9cbe870404b8bd4703d644b8adf9bc2c7b8a74ca617611bb60fc46a0bad10c5e001ef3d8a83108101f95ce2cf7
+EBUILD alsa-tools-1.1.5.ebuild 3500 SHA256 b38c82c64a1b9eab9350fb935b15a354c8d9cb530db20857619f0081abee5dad SHA512 232d2eeff2323ef9a0ba91e7f868f74f7c2ff56fb90a929a915c7ab1b6402fe4821b613fe80bd993cdc5b853f60e8f5d0f19c6ac29d07ab4b89fa625e7b4d2d0 WHIRLPOOL 06eb4c34eadf2257d757fc4c29d8dfdfed51f504dbe2263c9e9c1d5de09fabb1ef8186b1dd1758d52697f454b019ec3e37e2e33f517383522678701418aa27ff
 MISC ChangeLog 4018 SHA256 b86a2c312dcb43898bbdc6a5cbbbffd8fe7ed520e5e66f486b6f4922c5097e9b SHA512 84e3b65796be1a33e8d1bd1490d6221382ecc5a72aaa8ab8ee5af30f1700d9ffebcda66a4cd51b461188ef1d8df812b9a1d1b02c4bc932a2a0b45823a2fbeab0 WHIRLPOOL 876e91a80f58b160db101ebf05ebc08ffebaaa0b460af986cd535bc2f531013f22bd08055fe70fd02ffb00a34e805bde6f6af53d973e244811662bcb6edae834
 MISC ChangeLog-2015 34078 SHA256 06dbf00670f9540ed6710bd75f6a8a79701a359e63f3f238e61e0ee0cd7d4866 SHA512 0c2ae8181ac8252a0e4deeeca8f6331b0b08f9d2b350ca97eba273d23daf8a1808d2477a9c278a12942ae4d8ecb21699b8ecf157005e05cc1b9dbe4d3ebf6d85 WHIRLPOOL 3e94047d1ea69d67da7d54d89642a2b8e36b10e16df28374c6f47476118078702687ad920af583e5790499c55bc45dc8023802a7b7b335125e3c0248534f5bd2
 MISC metadata.xml 225 SHA256 f9a411a533af14459b87a800c3204d62a7d2cddb89431873023ebba08557ae84 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f WHIRLPOOL c24b1787a4dc3936e1e0121e7fe2ef253cd9f33cba04260b79138655b70c543082b00f6fa27dc0ddc14042fc228640f9d524fef06147c55571d66dfc9c576170
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
new file mode 100644
index 000000000000..9e80bd439216
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		>=dev-python/pygtk-2
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+		)" #468294
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+
+	if use gtk; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
+		use alsa_cards_ice1712 && \
+			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
+		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
+		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	fi
+
+	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
+	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
+	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
+	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
+	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
+
+	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
+		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+	fi
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+				;;
+			* )
+				econf
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	prune_libtool_files
+}