gentoo (leap year) resync : 29.02.2020

3 files changed, 11 insertions, 164 deletions

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 9fb45bbf5b97..b2144f67422f 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,8 +1,6 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
-DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
-DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
-EBUILD alsa-tools-1.1.0.ebuild 3514 BLAKE2B d09bcfda8c4e23b3b6d2173b6746c7ea365bc3fba71041e951d4ea7fbbf93fa351575fcc8a36536e902d11b133bed105b3759ddda2d1fbc3bedfc7d5297604d6 SHA512 7a546874ee434f2e1dd5f3081c85f1b520f5ac4ee831eff5dfc9e06f0a2e127bbad50dc76fbcf2b6b7061e669967bf015084bcd1404663e2143cde4342d8b275
-EBUILD alsa-tools-1.1.6.ebuild 3570 BLAKE2B 37af853b08488ec46c2a37e85f141b7d075f95e7760a52ca963f976ab287d674b0e3c68669bf51c0b4e6a11cee5ca08e97cd4a789057e24b196aaa3c412666f7 SHA512 4cec10ed150d1173af1ef02282956b24d0956c6348d8f874c16ad57512e17284934f3e2eec0f4247aa2a902b0a0153ca6fda931a47047573d0237e23b1588185
+DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
 EBUILD alsa-tools-1.1.7.ebuild 3581 BLAKE2B 035b54207bb68d596a46839a88c4a98917b5608b00c8d339f3b3bd33bafb8367fbfe3c9d54e36ee7de7255edb3bb578346755cbc36ca29f8db8eac2eeb51cf13 SHA512 656dda1b0ae6557f288403d8fef28b5d9b726b4d1c4d925fdeba30915f10a982e1215b0e60de4e16d0912f2eba8bc24586b22eae1e7127ef69f013a5ef48c9ea
+EBUILD alsa-tools-1.2.2.ebuild 3400 BLAKE2B 23ac8aa2d756d4dbb742e155c136629cdb94433bf5638a29277c3c255b75bc6d828e074731ea5cd46b062910f5bf62a9ed86d716823d127bdb098fda1e49844f SHA512 cc7fc7f29fda79e94ad86f0e7491a5d3054cd6340ffd04efb056bbc2bbee052e132165e9c84124b4b2664c0024287030af145fe8f54d1697b7e1178299467015
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
deleted file mode 100644
index 3d691d2667b0..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/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
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild
index da3b3042ca05..2bed3f3f96d6 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+EAPI=7
+inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
@@ -10,14 +10,14 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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}
+DEPEND=">=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.26
 	fltk? ( >=x11-libs/fltk-1.3.0:1 )
 	gtk? (
@@ -25,10 +25,11 @@ COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
 	)" #468294
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/envy24control-config-dir.patch
@@ -146,15 +147,5 @@ src_install() {
 	done
 
 	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	find "${ED}" -type f -name '*.la' -delete || die
 }