gentoo resync : 20.10.2021

3 files changed, 39 insertions, 22 deletions

diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 9c3b2c58abeb..cd4503cedcaf 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,4 +1,5 @@
+AUX tremor-0_pre20130223-autoconf.patch 829 BLAKE2B 8a1577f8a9350dab208ed9ea051b52fa9f30f0080504b6a3477ad3e6d3506fe7b2ded25d34d164a0b04385e5e010144f1c4136c5fffeec19247feb795c2fd309 SHA512 5e0d4efa7193bf7f3cd4a381616032f8e42d6b26ec85399eb406a0a753b0f6a321e968fe16d96645e3a52832279663362587b0bb93e28dd911b535a2dd496f30
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r2.ebuild 1113 BLAKE2B f7c80c12c8947a239f92a875ca809f0d6d9ee14cfbc35c7f3b56afc4cc47c3d5e6fbc3854aaf8210a72c8128ea061719dc32de2f43fcfae61c864fc1bc4355c8 SHA512 8f61d94aa6054781662493206023b0c197e11d0eb49c4c2412970f72f47e4f802f94e60d6365f0e120141bc6b1830af349c87b8cab76348186d7a7710a51a2c5
+EBUILD tremor-0_pre20130223-r2.ebuild 891 BLAKE2B 5408a682a3e3923f353eac39a77a3fb0d55c15792cb8ba6440f27a005b2af7d819e783da3665c9fc776816f3b92d266f56999718d9b5561c8209cf002c14c081 SHA512 4b1756cc81271618cf113f22b46ba8576153c1cbdb532e4f6c5f9e2cd70782d3e402bbd81da88730469265ddc0f9f4316445dc39cd98f943714887d6d5780c35
 MISC metadata.xml 342 BLAKE2B 5f8cb1f46d849f476969a68aa612cb89eac3b7d3b3de918cc6b472c7847b19cc703f16d4784f1931a57f5c64d0edfc80abf3b7c37d20562e03c5798b869d9c9e SHA512 39920a8902f374459188e7981b0930ee2d108ac944c24cfc6cb577e8a0e310753620996a51d3882d9550dbbdec768b2927f4a7aca4f858dae26e9ceef11c6ba9
diff --git a/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
new file mode 100644
index 000000000000..97dda9ffac9e
--- /dev/null
+++ b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -9,7 +9,7 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE(libvorbisidec,1.2.1)
+ 
+@@ -62,12 +62,12 @@
+         case $host in 
+         arm-*-*)
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -D_ARM_ASSEM_"
+-                CFLAGS="-O2 -D_ARM_ASSEM_ -fsigned-char"
++                CFLAGS=" -D_ARM_ASSEM_ -fsigned-char"
+                 PROFILE="-W -pg -g -O2 -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
+ 
+         *)
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-                CFLAGS="-O2 -Wall -fsigned-char"
++                CFLAGS=" -Wall -fsigned-char"
+                 PROFILE="-Wall -pg -g -O2 -fsigned-char -fno-inline-functions";;
+         esac
+ fi
diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
index dd8a83316d28..1fa4c476ded3 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# svn export http://svn.xiph.org/trunk/Tremor tremor-${PV}
-
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
 HOMEPAGE="https://wiki.xiph.org/Tremor"
@@ -14,37 +12,29 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="low-accuracy static-libs"
+IUSE="low-accuracy"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "CHANGELOG" "README" )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-out-of-bounds-write.patch
+	"${FILESDIR}"/${P}-autoconf.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -i \
-		-e '/CFLAGS/s:-O2::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die
-
+	default
 	eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable low-accuracy)
+	ECONF_SOURCE="${S}" econf $(use_enable low-accuracy)
 }
 
 multilib_src_install_all() {
+	HTML_DOCS=( doc/. )
 	einstalldocs
-	dohtml -r doc/*
-	find "${D}" -name '*.la' -type f -delete || die
+
+	find "${ED}" -name '*.la' -type f -delete || die
 }