[gentoo-commits] repo/gentoo:master commit in: media-libs/resid/files/, media-libs/resid/

[gentoo-commits] repo/gentoo:master commit in: media-libs/resid/files/, media-libs/resid/

[Sam James]

commit:     c5f139342e7f865b7b34c73208475cfca491603a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 18:25:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:13:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f13934

media-libs/resid: port to EAPI 7, drop ltpune, drop static-libs, etc

* Port to EAPI 7
* Drop ltprune.eclass
* Drop static-libs
* Respect CXXFLAGS (couldn't reproduce but the problem was obvious)
* Fix out of source builds (just turn it back on!)

Closes: https://bugs.gentoo.org/775767
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../resid-0.16_p2-drop-CXXFLAGS-override.patch     | 24 +++++++++++++++++++
 media-libs/resid/resid-0.16_p2-r1.ebuild           | 27 +++++++++++-----------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch
new file mode 100644
index 00000000000..f116c1d6f8b
--- /dev/null
+++ b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch
@@ -0,0 +1,24 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,20 +26,6 @@ AC_SUBST(RESID_INLINE)
+ dnl Checks for programs.
+ AC_PROG_CXX
+ 
+-dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported.
+-if test "$GXX" = yes; then
+-  if test "$ac_test_CXXFLAGS" != set; then
+-    CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions"
+-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+-    AC_TRY_COMPILE([],
+-                   [int test;],
+-                   [ AC_MSG_RESULT(yes) ],
+-                   [ AC_MSG_RESULT(no)
+-                     CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer"
+-                     ])
+-  fi
+-fi
+-
+ AC_PATH_PROG(PERL, perl)
+ 
+ dnl Checks for libraries.
+-- 

diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild
index eeb9c6d81ad..6959ad0f820 100644
--- a/media-libs/resid/resid-0.16_p2-r1.ebuild
+++ b/media-libs/resid/resid-0.16_p2-r1.ebuild
@@ -1,39 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune multilib-minimal versionator
+EAPI=7
 
-MY_MAJ=$(get_version_component_range 1-2)
+inherit autotools multilib-minimal
+
+MY_MAJ=$(ver_cut 1-2)
 
 DESCRIPTION="C++ library to emulate the C64 SID chip"
 HOMEPAGE="http://sidplay2.sourceforge.net"
 SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz"
+S="${WORKDIR}"/${PN}-${MY_MAJ}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="static-libs"
-
-S=${WORKDIR}/${PN}-${MY_MAJ}
 
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO VC_CC_SUPPORT.txt
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16_p2-drop-CXXFLAGS-override.patch
 )
 
 src_prepare() {
 	default
 
+	mv configure.{in,ac} || die
+
 	# This is required, otherwise the shared libraries get installed as
 	# libresid.0.0.0 instead of libresid.so.0.0.0.
 	eautoreconf
-
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		--enable-resid-install \
 		--enable-shared
 }
@@ -41,5 +40,7 @@ multilib_src_configure() {
 multilib_src_install() {
 	default
 
-	prune_libtool_files
+	dodoc "${S}"/VC_CC_SUPPORT.txt
+
+	find "${ED}" -name '*.la' -delete || die
 }