commit: 9c5b4234f9a3880763a11c47407bf8fe947da1d9 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Mon Oct 12 17:27:23 2020 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Mon Oct 12 17:27:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5b4234
media-gfx/transfig: EAPI 7, respect CC/AR/RANLIB Closes: https://bugs.gentoo.org/746020 Closes: https://bugs.gentoo.org/740006 Closes: https://bugs.gentoo.org/730926 Closes: https://bugs.gentoo.org/720820 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> media-gfx/transfig/Manifest | 2 +- .../transfig/files/transfig-3.2.5e-clang.patch | 12 ++++++ media-gfx/transfig/transfig-3.2.5e.ebuild | 50 ++++++++++++++-------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index 703dc9c1088..5fd1de7e62f 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -1,3 +1,3 @@ DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 -DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97 +DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e diff --git a/media-gfx/transfig/files/transfig-3.2.5e-clang.patch b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch new file mode 100644 index 00000000000..f75b649ff26 --- /dev/null +++ b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch @@ -0,0 +1,12 @@ +index 6a622f1..a14b96f 100644 +--- a/fig2dev/dev/genibmgl.c ++++ b/fig2dev/dev/genibmgl.c +@@ -572,7 +572,7 @@ static set_width(w) + { + static int current_width=-1; + +- if (w == current_width) return; ++ if (w == current_width) return 0; + + /* Default line width is 0.3 mm; back off to original xfig pen + thickness number, and re-size. diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild index da2af8a5f30..490c5e08c4b 100644 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" -inherit toolchain-funcs eutils flag-o-matic multilib +EAPI=7 +inherit flag-o-matic toolchain-funcs MY_P=${PN}.${PV} @@ -10,12 +10,11 @@ DESCRIPTION="A set of tools for creating TeX documents with graphics" HOMEPAGE="https://www.xfig.org/"; SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"; + https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/${P}-gentoo-patchset-r1.tar.bz2"; LICENSE="BSD" SLOT="0" 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" -IUSE="" RDEPEND="x11-libs/libXpm virtual/jpeg @@ -27,6 +26,20 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} +PATCHES=( + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5d-fig2mpdf-r1.patch" + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5c-maxfontsize.patch" + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5-solaris.patch" + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-typos.patch" + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-man-hyphen.patch" + "${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-fprintf_format_warnings.patch" + "${FILESDIR}/${PN}-3.2.5e-gcc10-fno-common.patch" + "${FILESDIR}/${PN}-3.2.5e-clang.patch" +) + +DOCS=( README CHANGES LATEX.AND.XFIG NOTES ) +HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." ) + sed_Imakefile() { # see fig2dev/Imakefile for details vars2subs="BINDIR=${EPREFIX}/usr/bin @@ -41,20 +54,20 @@ sed_Imakefile() { for variable in ${vars2subs} ; do varname=${variable%%=*} varval=${variable##*=} - sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" + sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die done } src_prepare() { - find . -type f -exec chmod a-x '{}' \; - find . -name Makefile -delete - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5d-fig2mpdf-r1.patch - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5c-maxfontsize.patch - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5-solaris.patch - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch - epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch - epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch + default + + # Create wrapper for gcc, bug #720820 + printf '#!/bin/sh\n%s ${*}\n' "$(tc-getCC)" > "${T}"/gcc + chmod +x "${T}"/gcc + export PATH="${T}:${PATH}" + + find . -type f -exec chmod a-x '{}' \; || die + find . -name Makefile -delete || die sed -e 's:-L$(ZLIBDIR) -lz::' \ -e 's: -lX11::' \ @@ -66,7 +79,8 @@ src_compile() { xmkmf || die "xmkmf failed" emake Makefiles - emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ + emake CC="$(tc-getCC)" AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \ + LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" } @@ -82,11 +96,11 @@ src_install() { newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps - dohtml "${WORKDIR}/fig2mpdf/doc/"* + einstalldocs - mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 + rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die - dodoc README CHANGES LATEX.AND.XFIG NOTES + mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 } pkg_postinst() {
