gentoo resync : 29.01.2021

4 files changed, 34 insertions, 56 deletions

diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
index 32adebef1dc2..392bdef1d685 100644
--- a/media-sound/dcaenc/Manifest
+++ b/media-sound/dcaenc/Manifest
@@ -1,4 +1,3 @@
 DIST dcaenc-2.tar.gz 351199 BLAKE2B 28e0dae58650fcbd9f68823ca0aa2dde121b2376b488067c0977863a22fb83d5b60d04f907cd6b564824a25cb45f25180034d4f9fead12b57805b1c997133443 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910
-EBUILD dcaenc-2-r1.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
-EBUILD dcaenc-9999.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
+EBUILD dcaenc-2-r2.ebuild 746 BLAKE2B 9b04c1d1096decd658b3c73e3710363a9a65642b47659ce0f86e195306ebdfe2854559840e65168f524c7fb949725f843e0b4f48048fa2eeb40f0e902eb580bc SHA512 d2c5a326f3691165ef62ddf0112b8b4af4b381a173fdd360c85bcb3d8d7b5822b0c2fd7aabd1e72bab48e16528a3a92344499110e809b40abe263c5b1cb115d9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/dcaenc/dcaenc-2-r1.ebuild b/media-sound/dcaenc/dcaenc-2-r1.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/dcaenc-2-r2.ebuild b/media-sound/dcaenc/dcaenc-2-r2.ebuild
new file mode 100644
index 000000000000..03cb57ac54c9
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="https://aepatrakov.narod.ru/index/0-2
+https://gitlab.com/patrakov/dcaenc"
+SRC_URI="https://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable alsa)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-sound/dcaenc/dcaenc-9999.ebuild b/media-sound/dcaenc/dcaenc-9999.ebuild
deleted file mode 100644
index 18cb16497e2a..000000000000
--- a/media-sound/dcaenc/dcaenc-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
-else
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools autotools-multilib
-
-[[ ${PV} == 9999* ]] && inherit git-r3
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="alsa"
-
-RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"