gentoo resync : 15.06.2021

5 files changed, 30 insertions, 11 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index f23510264441..2f4fefedd09f 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,9 +5,9 @@ AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-DIST alsa-lib-1.2.5.tar.bz2 1068496 BLAKE2B 84fe4e22d4316bfc84f15f2493f40f113eb3db7722f230550586533e80daf214140164e8ddc1a399b82a3fd0fb21125ff225cfeb45eaa19320c2e2aa3997c662 SHA512 d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
-EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
-EBUILD alsa-lib-1.2.4.ebuild 2171 BLAKE2B f6bb453b17e2f8e0bbdf955c361f61d485eaffba4b62363ce0454fb3c915f1721bdc03e946660d4b790d7991d3e625772b85f7622aef5d26374ebd639938864d SHA512 d56d4ec475ad8f400a96aa06e82b029c85162e5b68f4806a835d6f05d5bb8b5c1854719b98f9cff6f26ac53f4323757c8e33c6c2b005be5a5330fe1f89a08c2c
-EBUILD alsa-lib-1.2.5.ebuild 2125 BLAKE2B 30d8d6573061912979ebe2f8e8b4b2c64e01de20d52e1e8a54d02e17d2dac7ed23ff12ef86c44adb6b047c876eea37ac7ad24ede14ea4a1bfd4fd0babc650d35 SHA512 c9b53f2a8da72d1255ce967447773f52f8f3ce8c33ccf13604f2dec4da9adcc6f0d028e1cb23c46eb648f57511f6126e6114268bef0f70a9bfb2894fd686d60f
+DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
+EBUILD alsa-lib-1.2.2-r1.ebuild 2180 BLAKE2B aa741e7e53d443b27d520ccf0a525384085844c64d5289ed22067b65ec0ee4cc9a4a75d68891fc6c830513b95de0ad6cac8280aa6cf7a5d37c9c6acc6aa27c82 SHA512 37fcd87e520494e1f0797cd5b023d9eac4dd78ed894588f85d223bb2a4b49da824381254cfd79905bb686a2751d22299d199df4eca5989b09ca8ac08786f4c8b
+EBUILD alsa-lib-1.2.3.2-r1.ebuild 2117 BLAKE2B 9e6c389cd0915a78ab9b6b6ddb6ae82a1bef79f5f316c3bc26481ab38ee1eb88f32f059cec764e0e127eba7978322c516aece84bf784250e958df7d93fe98dc0 SHA512 12f9735f278467a883b189c74d03cf8c78940dc18d21175a5938565db3acc7b2a17a7aca927055728dbd965510387fdbcf4b2158a1f8f1af6542d54258fec8cf
+EBUILD alsa-lib-1.2.4.ebuild 2184 BLAKE2B ec54b9d6096709fffee836715f2eda6539091ee7dca58a9b131fff6301c54e5069204569082f1ef8d99f5c832eed7e216233e7add1bf8050cb029431940f3018 SHA512 9267b26b819bc407c21986c60086d0503b108395c1ef238302956ea7a55fdd41ec72963e4fb30617f79a9981e3232be51517913fe0158bf91027b551d6cdcc4c
+EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 05f90764647c..1a2b04a4cebf 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
index 726c108f049b..af903f22501a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index b784b7409239..4932c2e1dc7b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
index 8183119b95e5..88c9ad860cf8 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
@@ -6,9 +6,20 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
+# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
+COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
+SNAPSHOT_PV="1.2.5_p20210604"
+
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ -n ${COMMIT} ]]; then
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -28,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
 )
 
+pkg_pretend() {
+	if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
+		eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
+	elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
+		eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
+	fi
+}
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }