1 |
commit: 9c5b4234f9a3880763a11c47407bf8fe947da1d9 |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 12 17:27:23 2020 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 12 17:27:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5b4234 |
7 |
|
8 |
media-gfx/transfig: EAPI 7, respect CC/AR/RANLIB |
9 |
|
10 |
Closes: https://bugs.gentoo.org/746020 |
11 |
Closes: https://bugs.gentoo.org/740006 |
12 |
Closes: https://bugs.gentoo.org/730926 |
13 |
Closes: https://bugs.gentoo.org/720820 |
14 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
15 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
16 |
|
17 |
media-gfx/transfig/Manifest | 2 +- |
18 |
.../transfig/files/transfig-3.2.5e-clang.patch | 12 ++++++ |
19 |
media-gfx/transfig/transfig-3.2.5e.ebuild | 50 ++++++++++++++-------- |
20 |
3 files changed, 45 insertions(+), 19 deletions(-) |
21 |
|
22 |
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest |
23 |
index 703dc9c1088..5fd1de7e62f 100644 |
24 |
--- a/media-gfx/transfig/Manifest |
25 |
+++ b/media-gfx/transfig/Manifest |
26 |
@@ -1,3 +1,3 @@ |
27 |
DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 |
28 |
-DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97 |
29 |
+DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff |
30 |
DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e |
31 |
|
32 |
diff --git a/media-gfx/transfig/files/transfig-3.2.5e-clang.patch b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..f75b649ff26 |
35 |
--- /dev/null |
36 |
+++ b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch |
37 |
@@ -0,0 +1,12 @@ |
38 |
+index 6a622f1..a14b96f 100644 |
39 |
+--- a/fig2dev/dev/genibmgl.c |
40 |
++++ b/fig2dev/dev/genibmgl.c |
41 |
+@@ -572,7 +572,7 @@ static set_width(w) |
42 |
+ { |
43 |
+ static int current_width=-1; |
44 |
+ |
45 |
+- if (w == current_width) return; |
46 |
++ if (w == current_width) return 0; |
47 |
+ |
48 |
+ /* Default line width is 0.3 mm; back off to original xfig pen |
49 |
+ thickness number, and re-size. |
50 |
|
51 |
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild |
52 |
index da2af8a5f30..490c5e08c4b 100644 |
53 |
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild |
54 |
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild |
55 |
@@ -1,8 +1,8 @@ |
56 |
# Copyright 1999-2020 Gentoo Authors |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
-EAPI="4" |
60 |
-inherit toolchain-funcs eutils flag-o-matic multilib |
61 |
+EAPI=7 |
62 |
+inherit flag-o-matic toolchain-funcs |
63 |
|
64 |
MY_P=${PN}.${PV} |
65 |
|
66 |
@@ -10,12 +10,11 @@ DESCRIPTION="A set of tools for creating TeX documents with graphics" |
67 |
HOMEPAGE="https://www.xfig.org/" |
68 |
SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz |
69 |
mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 |
70 |
- https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" |
71 |
+ https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/${P}-gentoo-patchset-r1.tar.bz2" |
72 |
|
73 |
LICENSE="BSD" |
74 |
SLOT="0" |
75 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
76 |
-IUSE="" |
77 |
|
78 |
RDEPEND="x11-libs/libXpm |
79 |
virtual/jpeg |
80 |
@@ -27,6 +26,20 @@ DEPEND="${RDEPEND} |
81 |
|
82 |
S=${WORKDIR}/${MY_P} |
83 |
|
84 |
+PATCHES=( |
85 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5d-fig2mpdf-r1.patch" |
86 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5c-maxfontsize.patch" |
87 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5-solaris.patch" |
88 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-typos.patch" |
89 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-man-hyphen.patch" |
90 |
+ "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-fprintf_format_warnings.patch" |
91 |
+ "${FILESDIR}/${PN}-3.2.5e-gcc10-fno-common.patch" |
92 |
+ "${FILESDIR}/${PN}-3.2.5e-clang.patch" |
93 |
+) |
94 |
+ |
95 |
+DOCS=( README CHANGES LATEX.AND.XFIG NOTES ) |
96 |
+HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." ) |
97 |
+ |
98 |
sed_Imakefile() { |
99 |
# see fig2dev/Imakefile for details |
100 |
vars2subs="BINDIR=${EPREFIX}/usr/bin |
101 |
@@ -41,20 +54,20 @@ sed_Imakefile() { |
102 |
for variable in ${vars2subs} ; do |
103 |
varname=${variable%%=*} |
104 |
varval=${variable##*=} |
105 |
- sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" |
106 |
+ sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die |
107 |
done |
108 |
} |
109 |
|
110 |
src_prepare() { |
111 |
- find . -type f -exec chmod a-x '{}' \; |
112 |
- find . -name Makefile -delete |
113 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5d-fig2mpdf-r1.patch |
114 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5c-maxfontsize.patch |
115 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5-solaris.patch |
116 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch |
117 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch |
118 |
- epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch |
119 |
- epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch |
120 |
+ default |
121 |
+ |
122 |
+ # Create wrapper for gcc, bug #720820 |
123 |
+ printf '#!/bin/sh\n%s ${*}\n' "$(tc-getCC)" > "${T}"/gcc |
124 |
+ chmod +x "${T}"/gcc |
125 |
+ export PATH="${T}:${PATH}" |
126 |
+ |
127 |
+ find . -type f -exec chmod a-x '{}' \; || die |
128 |
+ find . -name Makefile -delete || die |
129 |
|
130 |
sed -e 's:-L$(ZLIBDIR) -lz::' \ |
131 |
-e 's: -lX11::' \ |
132 |
@@ -66,7 +79,8 @@ src_compile() { |
133 |
xmkmf || die "xmkmf failed" |
134 |
emake Makefiles |
135 |
|
136 |
- emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ |
137 |
+ emake CC="$(tc-getCC)" AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \ |
138 |
+ LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ |
139 |
USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" |
140 |
} |
141 |
|
142 |
@@ -82,11 +96,11 @@ src_install() { |
143 |
newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps |
144 |
newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps |
145 |
|
146 |
- dohtml "${WORKDIR}/fig2mpdf/doc/"* |
147 |
+ einstalldocs |
148 |
|
149 |
- mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 |
150 |
+ rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die |
151 |
|
152 |
- dodoc README CHANGES LATEX.AND.XFIG NOTES |
153 |
+ mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 |
154 |
} |
155 |
|
156 |
pkg_postinst() { |