gentoo resync : 29.01.2021

5 files changed, 55 insertions, 34 deletions

diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 067024cf9188..130c7e187faa 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -1,8 +1,9 @@
-AUX libvisual-0.4.0-better-altivec-detection.patch 1551 BLAKE2B a7c9c722ef508dc1895928ed1b62e392b31db0c860db7227cb30c2150027f502927d7011905881476456a3595f70484c6aab13d3d0a370d3a505d03341a7ceb9 SHA512 c78b136adf384d22ed6e918e30f6f42a97a087a4c1bb88799a9b299eb50c41ea7a98dd405ddb0360e9cf0ace83998744a9428a4e18954dade7ca75bbc54b4b16
+AUX libvisual-0.4.0-better-altivec-detection.patch 1555 BLAKE2B 8516652c13c365bab2e7027f64dc02e62e7ae499b077e6e6d65c2e9c4e84b2276c26ed07785d984696dfcbffc104f1f9d2c12a6a5d6cb0dd4b8eaf587f710e37 SHA512 ac7be2f83b1edef03ee82add11eb97e22dd7d90c53f858838e0616d5eda54505afa7cd86e35c30b5e44191ff31e754f65d2eb449e2e480cd5e2ee6ad5e34a833
 AUX libvisual-0.4.0-cond.patch 549 BLAKE2B 05526c32f22451d851d0dcef380257c31d459360771e75061ffe2fe1c7a87e84f87033ff2831d53e0bd0271f920b3ecb025ddf4ca94ebbb398b69962028f3c51 SHA512 57989250f0cfdd12ebcd0eb89cabca71091a0ad378369d654870a103c633a01bd1a1bbbb7d48d9995c2dfe80fe34b1c44a0a151be4a86c5e5455806a1b14ed94
 AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681d1bc99ef81d9556c1aa3f5cd0a0fd633f3468fb20691b1657ede58afe3313c01874f78f2e39bc52398b25b7318ceebac9 SHA512 e1cf6fb10a912e3117bf866a92d0b4c8de61fe1e35946a21f00f005efe2a48c3596ff087d9dc16807b9049a542410e24efadc9343208512b2e14974e0b01f018
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
-AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
+AUX libvisual-0.4.0-format-security.patch 542 BLAKE2B 12ebf90d87646e5a1bf2c6b9491c763c24aec6715b98a126302076a3b1fc23e281b77e66f2be3284e5be48885e8bd739ac4de4a20495dd0ffe97b1419859c123 SHA512 8102b36be4045496bee66d52d403ebcd916c88fd1743f946be0ca766d4feb533b2890076ebce1a19800d446bcb586fbadeeebf2d36b98da851342f1d46120d64
+AUX libvisual-0.4.0-inlinedefineconflict.patch 1882 BLAKE2B ad36c592e057f56e1a954caed674a7876eed43966d16769222ab0f3e7eed9e14ce7e43c60c03463519f658eccd3c0628c0a4ca04f413af05be81e01efbb3ed40 SHA512 eec5a6b5ec94c796dc89db891f7b2fcc3c6f8a8153192e270b14deaa8543c8e53e7f3c748803a5efc5e055475c673e3ed8a04327090f6b62a73f2c0c9bbf052f
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1243 BLAKE2B a051f52f5e024a969c9510681931b802c4da13e8863b8f015eebb0f0c5417468ea74dbf124223f8da68d93f797eadbd77cb8ed56de712a0dc084702ad07faca4 SHA512 73c142f1b1d60fb0c3af64f02885420b73ade90c71a62df4cc257246f8d507aa06cd2fc31fecb1b5948c6dfa174fae7fb3638679c75f75015666b0ede1731803
+EBUILD libvisual-0.4.0-r3.ebuild 1238 BLAKE2B 9f8b108e133cf8c12a23f973cb1541eda2225a38cbb5dc239c2260c73474f44394b1ce32fa53e3bf3cbf9e9b13b56cb301280b001530c71749e8007c5c01bea9 SHA512 ba537339663628060d9bf8fe0dbed4b8276429ce5f45a40a2884bddc8aa50b609cd248299c55d4e2bb8e8339c9dbbc6be87804235eed1ca0949c1941018497ee
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
index 19aa579aa110..ca34558549d4 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
 
---- libvisual/lv_cpu.c
-+++ libvisual/lv_cpu.c
+--- a/libvisual/lv_cpu.c
++++ b/libvisual/lv_cpu.c
 @@ -50,8 +50,19 @@
  #endif
  
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
new file mode 100644
index 000000000000..91ff1c727335
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
@@ -0,0 +1,16 @@
+--- a/libvisual/lv_plugin.c
++++ b/libvisual/lv_plugin.c
+@@ -442,11 +442,11 @@
+ 				
+ 				visual_list_add (list, ref);
+ 			} else if (ret != FALSE) {
+-				visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++				visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ 			}
+ 		}
+ 		else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */
+-			visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++			visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ 		}
+ 	}
+ 
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
index 5d04f30335a4..9267c5a954c5 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
 
---- libvisual/lv_cache.c
-+++ libvisual/lv_cache.c
+--- a/libvisual/lv_cache.c
++++ b/libvisual/lv_cache.c
 @@ -32,7 +32,7 @@
  static int cache_dtor (VisObject *object);
  static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
@@ -20,8 +20,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
  {
  	VisCacheEntry *centry;
  
---- libvisual/lv_defines.h
-+++ libvisual/lv_defines.h
+--- a/libvisual/lv_defines.h
++++ b/libvisual/lv_defines.h
 @@ -63,13 +63,13 @@
  
  /* Compiler specific optimalization macros */
@@ -38,8 +38,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
  # define __malloc		/* no malloc */
  # define __packed		/* no packed */
  # define VIS_LIKELY(x)		(x)
---- libvisual/lv_time.h
-+++ libvisual/lv_time.h
+--- a/libvisual/lv_time.h
++++ b/libvisual/lv_time.h
 @@ -101,7 +101,7 @@
   *
   * @return Nothing.
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index 50f3ac50b8e7..f6880e33b6ce 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,27 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-AUTOTOOLS_AUTORECONF=1
+inherit autotools multilib-minimal
 
-inherit autotools-multilib
-
-DESCRIPTION="Libvisual is an abstraction library that comes between applications and audio visualisation plugins"
+DESCRIPTION="Abstraction library between applications and audio visualisation plugins"
 HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug nls static-libs threads"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+IUSE="debug nls threads"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-better-altivec-detection.patch
@@ -29,24 +24,33 @@ PATCHES=(
 	"${FILESDIR}"/${P}-conditions.patch
 	"${FILESDIR}"/${P}-detect_amd64.patch
 	"${FILESDIR}"/${P}-cond.patch
-	)
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libvisual-0.4/libvisual/lvconfig.h
 )
 
 src_prepare() {
-	autotools-multilib_src_prepare
+	default
+
 	# autogenerated, causes problems for out of tree builds
-	rm -f libvisual/lvconfig.h || die
+	rm libvisual/lvconfig.h || die
+
+	eautoreconf
 }
 
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable nls)
-		$(use_enable threads)
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable nls) \
+		$(use_enable threads) \
 		$(use_enable debug)
-	)
-	autotools-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }