Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openctm/
Date: Sat, 09 Jan 2021 10:36:19
Message-Id: 1610188564.eaa0fa38fa69b12f6a7330a085fe6d745c19ec83.sam@gentoo
1 commit: eaa0fa38fa69b12f6a7330a085fe6d745c19ec83
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 9 10:06:34 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 9 10:36:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa0fa38
7
8 media-libs/openctm: misc fixes
9
10 * Drop leading whitespace
11 * Modernise inherits (eutils -> edos2unix, no multilib needed for get_libdir)
12
13 Package-Manager: Portage-3.0.12, Repoman-3.0.2
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 media-libs/openctm/openctm-1.0.3-r1.ebuild | 14 +++++++-------
17 1 file changed, 7 insertions(+), 7 deletions(-)
18
19 diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
20 index 60585930f8e..e4014df8c99 100644
21 --- a/media-libs/openctm/openctm-1.0.3-r1.ebuild
22 +++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
23 @@ -1,15 +1,16 @@
24 -# Copyright 1999-2020 Gentoo Authors
25 +# Copyright 1999-2021 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29
30 -inherit eutils multilib flag-o-matic toolchain-funcs
31 +inherit edos2unix flag-o-matic toolchain-funcs
32
33 MY_P=OpenCTM-${PV}
34
35 DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
36 HOMEPAGE="http://openctm.sourceforge.net"
37 SRC_URI="https://downloads.sourceforge.net/project/openctm/${MY_P}/${MY_P}-src.tar.bz2 -> ${P}-src.tar.bz2"
38 +S="${WORKDIR}/${MY_P}"
39
40 LICENSE="GPL-2"
41 SLOT="0/1"
42 @@ -18,17 +19,16 @@ KEYWORDS="~amd64 ~x86"
43 IUSE=""
44 DEPEND="
45 dev-libs/tinyxml
46 + media-libs/freeglut
47 media-libs/glew:0=
48 media-libs/pnglite
49 sys-libs/zlib
50 virtual/jpeg:0
51 - media-libs/freeglut
52 virtual/opengl
53 - x11-libs/gtk+:2"
54 + x11-libs/gtk+:2
55 +"
56 RDEPEND="${DEPEND}"
57
58 -S="${WORKDIR}/${MY_P}"
59 -
60 PATCHES=(
61 "${FILESDIR}/${P}-escape-hyphens-in-ctmconv-man-page.patch"
62 "${FILESDIR}/${P}-link-ctmviewer-with-libGLU.patch"
63 @@ -53,5 +53,5 @@ src_compile() {
64 }
65
66 src_install() {
67 - emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" -f Makefile.linux install
68 + emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" -f Makefile.linux install
69 }