diff options
Diffstat (limited to 'media-gfx/transfig')
-rw-r--r-- | media-gfx/transfig/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/transfig/files/transfig-3.2.5e-clang.patch | 12 | ||||
-rw-r--r-- | media-gfx/transfig/transfig-3.2.5e-r1.ebuild (renamed from media-gfx/transfig/transfig-3.2.5e.ebuild) | 54 |
3 files changed, 50 insertions, 21 deletions
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index ecca7e396314..2c27dcb0d717 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -1,6 +1,7 @@ +AUX transfig-3.2.5e-clang.patch 352 BLAKE2B 4fd67be2edad08f410b846bc57701d4e3eaa88eb6eda65500ed2cf530d1e8a7772f4618e83d0440c4429ebbf0c14f08f8424896057eb5ebc230e1f1c5f12e982 SHA512 72ccf2ef21f7d90e688cd0bcc7e6aa91b0a460e34b6484ae0dc1e6d059ffc0f921af9c7637bf38aecbd66116583d4a13aee16d5643f6c4f771b480fa75828511 AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5ae11369476bbc60594da9bd766aa1d752020171b82e0d35e0d57ce1499f69e13b5a5f5274c9c530a2d7fa0f9deabda55462f0a0 SHA512 7b4b5dd4da00180f2eb34a7dcdc407e958df69ba843c371c496dc488977aa8045c31e1007f05e9dcb96765bfa83df75caabd92c99114555b252846892292e465 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 -EBUILD transfig-3.2.5e.ebuild 2995 BLAKE2B a50fa8614a2326e7a427c538d41dd0e589e2129544045919042a0ca8821fa4b29322c23606b143bb2f51e95ee7c6b2e89e8abb4e3c0c2536d926cf1d355d39f1 SHA512 652a8b602eca4c66b26e5bdb4bac9b3c390d0b71be482b18230db5c5561e4ca56d2b842e1867fec368a891b200a365e167a0ba9808c0e246c9be24c610c10ff1 +EBUILD transfig-3.2.5e-r1.ebuild 3363 BLAKE2B f0aae4180c95c5db7d6e74098d500cbe217c1bd82d790943ad850fb24f7c5e41fd7d6777f58d3a2c69ebfe16ebc689f06d711aa5659b57427095d42cbbb4a73d SHA512 9e55173b88e516c4ebd5727ac48dd28c01b8cc733d26d84e667385d758774f1d37cf20cc97ad624db378ca5d0f9a64c11f549c5417ab1b5ec1ac22351eb5253e MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c 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 000000000000..f75b649ff26f --- /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-r1.ebuild index da2af8a5f308..b45a700dffdb 100644 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r1.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,13 +79,16 @@ 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)" } src_install() { emake DESTDIR="${D}" \ - ${transfig_conf} install install.man + INSTDATFLAGS="-m 644" \ + INSTMANFLAGS="-m 644" \ + install install.man dobin "${WORKDIR}/fig2mpdf/fig2mpdf" doman "${WORKDIR}/fig2mpdf/fig2mpdf.1" @@ -82,11 +98,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() { |