media-libs/libvisual: Port to EAPI 7

Closes: https://bugs.gentoo.org/517578
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: David Seifert <soap@gentoo.org>

4 files changed, 51 insertions, 31 deletions

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
 }