Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/SoXt/, media-libs/SoXt/files/
Date: Wed, 11 Mar 2020 12:22:23
Message-Id: 1583929298.4658562489678824f4a7efdea14c972e678e75b7.amadio@gentoo
1 commit: 4658562489678824f4a7efdea14c972e678e75b7
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 11 12:18:21 2020 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 11 12:21:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46585624
7
8 media-libs/SoXt: bump to EAPI=7
9
10 Package-Manager: Portage-2.3.93, Repoman-2.3.20
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12
13 media-libs/SoXt/{SoXt-1.3.0.ebuild => SoXt-1.3.0-r1.ebuild} | 12 ++++--------
14 media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch | 4 ++--
15 2 files changed, 6 insertions(+), 10 deletions(-)
16
17 diff --git a/media-libs/SoXt/SoXt-1.3.0.ebuild b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
18 similarity index 78%
19 rename from media-libs/SoXt/SoXt-1.3.0.ebuild
20 rename to media-libs/SoXt/SoXt-1.3.0-r1.ebuild
21 index 449806a1369..9a19d767294 100644
22 --- a/media-libs/SoXt/SoXt-1.3.0.ebuild
23 +++ b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
24 @@ -1,9 +1,7 @@
25 # Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=5
29 -
30 -inherit autotools-utils
31 +EAPI=7
32
33 HOMEPAGE="http://www.coin3d.org/"
34 DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
35 @@ -41,11 +39,9 @@ src_configure() {
36 $(use_enable doc html)
37 $(use_enable doc man)
38 )
39 - autotools-utils_src_configure
40 + default
41 # Remove SoXt from Libs.private (patch installs it in Libs)
42 - sed -i -e '/Libs.private/s/ -lSoXt//' "${BUILD_DIR}"/SoXt.pc || die
43 + sed -i -e '/Libs.private/s/ -lSoXt//' SoXt.pc || die
44 # Strip the default libdir
45 - sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg
46 - # soxt-config is arch dependent
47 - sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" soxt-config
48 + sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg || die
49 }
50
51 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
52 index 397d223b615..d9f1ad25eef 100644
53 --- a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
54 +++ b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
55 @@ -1,5 +1,5 @@
56 ---- SoXt.pc.in.orig 2013-06-17 11:26:59.998321839 -0700
57 -+++ SoXt.pc.in 2013-06-17 11:28:01.603654611 -0700
58 +--- a/SoXt.pc.in 2013-06-17 11:26:59.998321839 -0700
59 ++++ b/SoXt.pc.in 2013-06-17 11:28:01.603654611 -0700
60 @@ -10,7 +10,8 @@
61 Version: @SOXT_VERSION@
62 Requires: Coin