gentoo resync : 25.08.2020

4 files changed, 41 insertions, 23 deletions

diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 86507a3e77cd..803e86e7f54f 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -1,6 +1,7 @@
-AUX toolame-02l-gentoo.diff 2188 BLAKE2B 5129ce926e4ee55a6f5baa73bf164eda41e273882392bb151338035d0cb5017ae05acc8000a583961cfed195eba92fc7cac27ae4bca6b781975b0f3fd88fabd6 SHA512 1d2c19fa4607f67f2fc8b6384d80fdf52e21438ecfecc6b2e2a0cbb84abd7019b340196324f1e43f81f698be96a2cccf970890908d8c05415b82ecb516da2484
+AUX toolame-02l-Makefile.patch 1986 BLAKE2B b08cd26cb0aa77372693eb2cf8cb850c4d0bbc6897b8f048d683c36c416922fc6ee118f45265f1d7b7e8be33b3adf96e1fcc107565cf6e7341f033a02f555cc1 SHA512 9b186a4245a8c445506796e5a646a9a74edfaeb7027dcf6c874363cae1175792a260e0b55c9fbe19b2d20b43627ec1a6d18a033ee4b45096cc97f4e83047daf2
+AUX toolame-02l-fno-common.patch 389 BLAKE2B 2dc0b94bb4fcd1b7692d6922dd62b7a43535bd336e8b156107b2adde4a9bd63a047b4d324d2fd9119f7c038f877696a7ed9e54747813c8ec922ad2ed8f0a71a3 SHA512 e5bddcb1407a3885dc5e2f9afdfaafe05c3b117434331b18e37b13e4e6f68573eedd63c763b2e666fa7839b6aacbbc24d87b492798f7289e245cd0a6e0a22e53
 AUX toolame-02l-uint.patch 950 BLAKE2B 6f689e4ff7eb5aa8b6f9f5603813882e2a2fe80b4b37b2a88876b770f6d25c40437b378c7a5df03a57e2f49ba9f7460e7268c90af33a878104edff26be14c2b9 SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d
 AUX toolame-02l-uint32_t.patch 624 BLAKE2B 9a07c69bc91f4a90c6169d5c820ceda37dcbad90cb964025c786e8b8d4081434f76f8d0fdf2532abba6ab0a88ee07e07266a9fb0eab8617a0f76bc3c753566aa SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05
 DIST toolame-02l.tgz 127493 BLAKE2B eaa20e1bdc966003401b6fe720bcb6d81aa1c9bf3f8a7aa4f05732ca3c43a71cc55f979a65536197e236e536ada445cfb0c31e3296307100f6d43f64cfb5d16a SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e
-EBUILD toolame-02l-r4.ebuild 734 BLAKE2B 084e45c06732b84c3d5c2c1d4d913316886baff7e5a448a44a78685ce8c0ce8dced65eed492e3c3b11f07609da3607fbc8cac39c4b904b8cbb66efbb6ff4354e SHA512 bb1e867a87d1839ebffa6586370ba8e81f957d6b31e3ee8814c3cb4107598072066bafb481c8f83693164595573d360d119c7d4283ce825f6d2cd9e9bfa327a2
+EBUILD toolame-02l-r4.ebuild 674 BLAKE2B 253ac81fbdfff8181240703f8da5e30e46cc59b72cf0fd8ed941e8db88d60a7b197e2a2620556c8ccefa0980f3255711cfcef7196b33ce02be729fe33983b099 SHA512 001419e4bf9e973c072e9eabb067346ce5c1cb5fd12e829fbec33ef211661c5cae570b12a2535951b1b41965601be0013cd1d2e87f57bdfffcb75cefda175bbf
 MISC metadata.xml 330 BLAKE2B 632691c8ef2f3340e3d9f7e55ee85d64d73aed0286c654e60b3abf674fe79231b85b7d606f36d6c799fb2206ba1074eb1b15960c72124b2d589fe471eb793976 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e
diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-Makefile.patch
index f96020f0a815..28009555d858 100644
--- a/media-sound/toolame/files/toolame-02l-gentoo.diff
+++ b/media-sound/toolame/files/toolame-02l-Makefile.patch
@@ -1,5 +1,5 @@
---- toolame-02l/Makefile	2003-03-02 08:07:02.000000000 +0100
-+++ toolame-02l/Makefile.new	2003-04-14 14:00:10.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,6 +1,3 @@
 -
 -CC = gcc
@@ -7,7 +7,7 @@
  c_sources = \
  	common.c \
  	encode.c \
-@@ -26,37 +23,16 @@
+@@ -26,29 +23,8 @@
  
  OBJ = $(c_sources:.c=.o)
  
@@ -19,8 +19,8 @@
 -OPTIM = -O3
 -
  # These flags are pretty much mandatory
- REQUIRED = -DNDEBUG -DINLINE=inline
- 
+-REQUIRED = -DNDEBUG -DINLINE=inline
+-
 -#pick your architecture
 -ARCH = -march=pentium
 -#Possible x86 architectures
@@ -34,15 +34,16 @@
 -#	-malign-double \
 -#	-mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \
 -#	-fschedule-insns2 -fno-strength-reduce
--
++REQUIRED = -DNDEBUG -DINLINE=
+ 
  #Set a stack of warnings to overcome my atrocious coding style . MFC.
  WARNINGS = -Wall
- WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
+@@ -56,7 +32,7 @@
  
  NEW_02L_FIXES = -DNEWENCODE -DNEWATAN
  
 -CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(WARNINGS) $(NEW_02L_FIXES)
-+CC_SWITCHES = $(CFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES)
++CC_SWITCHES = $(CFLAGS) $(CPPFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES)
  
  PGM = toolame
  
diff --git a/media-sound/toolame/files/toolame-02l-fno-common.patch b/media-sound/toolame/files/toolame-02l-fno-common.patch
new file mode 100644
index 000000000000..c414324785bb
--- /dev/null
+++ b/media-sound/toolame/files/toolame-02l-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/common.c
++++ b/common.c
+@@ -19,6 +19,8 @@
+ *
+ ***********************************************************************/
+ 
++options glopts;
++
+ char *mode_names[4] = { "stereo", "j-stereo", "dual-ch", "single-ch" };
+ char *version_names[2] = { "MPEG-2 LSF", "MPEG-1" };
+ 
+--- a/options.h
++++ b/options.h
+@@ -19,5 +19,5 @@
+ }
+ options;
+ 
+-options glopts;
++extern options glopts;
+ #endif
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index fea144e8c601..659ebf40b047 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
 HOMEPAGE="http://www.planckenergy.com"
@@ -11,25 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.diff"
-	"${FILESDIR}/${P}-uint.patch"
-	"${FILESDIR}/${P}-uint32_t.patch"
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-uint.patch
+	"${FILESDIR}"/${P}-uint32_t.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
-src_prepare() {
-	# fix #571774 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
+src_configure() {
 	append-lfs-flags
 	tc-export CC
-
-	default
 }
 
 src_install() {
 	dobin ${PN}
-	dodoc README HISTORY FUTURE html/* text/*
+	dodoc -r README HISTORY FUTURE html/. text/.
 }