media-sound/alsa-tools: version bump to 1.1.0

Bump version to 1.1.0. Epatch from 1.0.29 appears to be needed-- and
applies cleanly-- so carrying it forward to 1.1.0. Masking all archs
until the gentoo-sound team deems it "stable".

This appears to be a "bugfix" release. No new features, bells, or
whistles to account for.

Rudimentary testing performed on amd64.

ALSA Project release notes at:
    http://www.alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0

Package-Manager: Portage 2.2.20.1

v2: rebased on 6d4b41d7904e ("app-emulation/docker-compose: move enum34
    dependence")

Signed-off-by: Joe Konno <joe.konno@intel.com>

2 files changed, 144 insertions, 0 deletions

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 820437fe8809..7412348c24dd 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,3 +1,4 @@
 DIST alsa-tools-1.0.27.tar.bz2 1650746 SHA256 6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2 SHA512 aad985329e5649b5bd7c142e95c5d1c415f28bac1afb81ad21fedac76e736d18abe4aa129e798650d91b2dd14fb18f3960ed5218768c689319c2360c432b4589 WHIRLPOOL 0d827aee4219e393c61a55920e3d66eb4e208e9d3d93ac9c1bf208c5c0c8cdf2d58f63d70b534458f3542cd3cbd5478129d73aecc57ce6654bc43f0bc73c0f25
 DIST alsa-tools-1.0.28.tar.bz2 1675680 SHA256 76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761 SHA512 b5150edb5f5124d5ec256b7c3348207da1bb9847ab2f10297171d6a43f559a31429ef96608a2c670db75d269dd940ebf2b6e3cbfafde530de25cbd95dce31af2 WHIRLPOOL 20f8acf8edf3fa82f19e4098c520c155a87966272d769f29a6208b25fc80a831a6cfdb3c748406ced643b5de7fa4cfb43f3a62d634fd90512369b1f57ea9cb92
 DIST alsa-tools-1.0.29.tar.bz2 1715439 SHA256 94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1 SHA512 c236e105106e65b9f02e5baed536fa33f8efcff21a75470127e2edacf0bbb3ec555131e146d9dbfc8da307355b372e7c2acaf8edaa98dc7880abd484fbdb2813 WHIRLPOOL 19d34f425ad45d540a0ccd2ae2c77bae810ee6039250f57296c280156c6e6ed8d3788f306975f6b06b8b3f377e714d644aed08c177bd9d83acf352ccb939a47d
+DIST alsa-tools-1.1.0.tar.bz2 1715113 SHA256 7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87 WHIRLPOOL daf731da17c172275b484da37962d85569d70066392bb65f6b462a5f9f17784d204deec203d2466cbc08cb691689b7fc8cd664b370b39e233f1e8afb43c9d0ff
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
new file mode 100644
index 000000000000..319851c64dd1
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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"
+
+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() {
+	epatch "${FILESDIR}"/envy24control-config-dir.patch
+
+	epatch_user
+
+	# 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
+}