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-gfx/transfig/
Date: Fri, 16 Apr 2021 04:47:40
Message-Id: 1618548412.9fccab1d40c0647edd86d58470839b6cc3429ab2.sam@gentoo
1 commit: 9fccab1d40c0647edd86d58470839b6cc3429ab2
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 15 16:56:51 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 04:46:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fccab1d
7
8 media-gfx/transfig: drop unused flag-o-matic, tidy
9
10 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 media-gfx/transfig/transfig-3.2.5e-r1.ebuild | 40 +++++++++++++++++-----------
14 1 file changed, 25 insertions(+), 15 deletions(-)
15
16 diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
17 index dd86242cd42..39ce8231f7e 100644
18 --- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
19 +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
20 @@ -2,31 +2,32 @@
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=7
24 -inherit flag-o-matic toolchain-funcs
25
26 -MY_P=${PN}.${PV}
27 +inherit toolchain-funcs
28
29 -DESCRIPTION="A set of tools for creating TeX documents with graphics"
30 +MY_P="${PN}.${PV}"
31 +
32 +DESCRIPTION="Set of tools for creating TeX documents with graphics"
33 HOMEPAGE="https://www.xfig.org/"
34 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
35 mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
36 https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/${P}-gentoo-patchset-r1.tar.bz2"
37 +S="${WORKDIR}/${MY_P}"
38
39 LICENSE="BSD"
40 SLOT="0"
41 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
42
43 -RDEPEND="x11-libs/libXpm
44 - virtual/jpeg
45 +RDEPEND="
46 media-libs/libpng
47 - x11-apps/rgb"
48 + virtual/jpeg
49 + x11-apps/rgb
50 + x11-libs/libXpm"
51 DEPEND="${RDEPEND}"
52 BDEPEND="
53 app-text/rman
54 >=x11-misc/imake-1.0.8-r1"
55
56 -S=${WORKDIR}/${MY_P}
57 -
58 PATCHES=(
59 "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5d-fig2mpdf-r1.patch"
60 "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5c-maxfontsize.patch"
61 @@ -78,16 +79,25 @@ src_configure() {
62
63 src_compile() {
64 emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles
65 - emake CC="$(tc-getCC)" AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" \
66 - LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
67 +
68 + local myemakeargs=(
69 + CC="$(tc-getCC)"
70 + AR="$(tc-getAR) cq"
71 + RANLIB="$(tc-getRANLIB)"
72 + CDEBUGFLAGS="${CFLAGS}"
73 + LOCAL_LDFLAGS="${LDFLAGS}"
74 USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
75 + )
76 + emake "${myemakeargs[@]}"
77 }
78
79 src_install() {
80 - emake DESTDIR="${D}" \
81 - INSTDATFLAGS="-m 644" \
82 - INSTMANFLAGS="-m 644" \
83 - install install.man
84 + local myemakeargs=(
85 + DESTDIR="${D}"
86 + INSTDATFLAGS="-m 644"
87 + INSTMANFLAGS="-m 644"
88 + )
89 + emake "${myemakeargs[@]}" install install.man
90
91 dobin "${WORKDIR}/fig2mpdf/fig2mpdf"
92 doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
93 @@ -99,7 +109,7 @@ src_install() {
94
95 einstalldocs
96
97 - rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
98 + rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
99
100 mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295
101 }