From: Guilherme Amadio <amadio@gentoo.org>
Date: Wed, 11 Mar 2020 12:18:21 +0000 (+0100)
Subject: media-libs/SoXt: bump to EAPI=7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4658562489678824f4a7efdea14c972e678e75b7;p=gentoo.git

media-libs/SoXt: bump to EAPI=7

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
---

diff --git a/media-libs/SoXt/SoXt-1.3.0.ebuild b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
similarity index 78%
rename from media-libs/SoXt/SoXt-1.3.0.ebuild
rename to media-libs/SoXt/SoXt-1.3.0-r1.ebuild
index 449806a13697..9a19d7672949 100644
--- a/media-libs/SoXt/SoXt-1.3.0.ebuild
+++ b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=7
 
 HOMEPAGE="http://www.coin3d.org/"
 DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
@@ -41,11 +39,9 @@ src_configure() {
 		$(use_enable doc html)
 		$(use_enable doc man)
 	)
-	autotools-utils_src_configure
+	default
 	# Remove SoXt from Libs.private (patch installs it in Libs)
-	sed -i -e '/Libs.private/s/ -lSoXt//' "${BUILD_DIR}"/SoXt.pc || die
+	sed -i -e '/Libs.private/s/ -lSoXt//' SoXt.pc || die
 	# Strip the default libdir
-	sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg
-	# soxt-config is arch dependent
-	sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" soxt-config
+	sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg || die
 }
diff --git a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
index 397d223b6157..d9f1ad25eeff 100644
--- a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
+++ b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
@@ -1,5 +1,5 @@
---- SoXt.pc.in.orig	2013-06-17 11:26:59.998321839 -0700
-+++ SoXt.pc.in	2013-06-17 11:28:01.603654611 -0700
+--- a/SoXt.pc.in	2013-06-17 11:26:59.998321839 -0700
++++ b/SoXt.pc.in	2013-06-17 11:28:01.603654611 -0700
 @@ -10,7 +10,8 @@
  Version: @SOXT_VERSION@
  Requires: Coin