From fea476e131312a9cbbbc1a1bad87ada9e22209ce Mon Sep 17 00:00:00 2001 From: Stephan Hartmann Date: Mon, 12 Oct 2020 20:07:10 +0200 Subject: media-gfx/transfig: fix files installed with u-w Closes: https://bugs.gentoo.org/554356 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Stephan Hartmann --- media-gfx/transfig/transfig-3.2.5e-r1.ebuild | 111 +++++++++++++++++++++++++++ media-gfx/transfig/transfig-3.2.5e.ebuild | 109 -------------------------- 2 files changed, 111 insertions(+), 109 deletions(-) create mode 100644 media-gfx/transfig/transfig-3.2.5e-r1.ebuild delete mode 100644 media-gfx/transfig/transfig-3.2.5e.ebuild (limited to 'media-gfx') diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild new file mode 100644 index 000000000000..b45a700dffdb --- /dev/null +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +MY_P=${PN}.${PV} + +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/~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" + +RDEPEND="x11-libs/libXpm + virtual/jpeg + media-libs/libpng + x11-apps/rgb" +DEPEND="${RDEPEND} + x11-misc/imake + app-text/rman" + +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 + MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\) + XFIGLIBDIR=${EPREFIX}/usr/share/xfig + PNGINC=-I${EPREFIX}/usr/include/X11 + XPMINC=-I${EPREFIX}/usr/include/X11 + USEINLINE=-DUSE_INLINE + RGB=${EPREFIX}/usr/share/X11/rgb.txt + FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev" + + for variable in ${vars2subs} ; do + varname=${variable%%=*} + varval=${variable##*=} + sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die + done +} + +src_prepare() { + 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::' \ + -i fig2dev/Imakefile || die + sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile +} + +src_compile() { + xmkmf || die "xmkmf failed" + emake Makefiles + + 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}" \ + INSTDATFLAGS="-m 644" \ + INSTMANFLAGS="-m 644" \ + install install.man + + dobin "${WORKDIR}/fig2mpdf/fig2mpdf" + doman "${WORKDIR}/fig2mpdf/fig2mpdf.1" + + insinto /usr/share/fig2dev/ + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps + 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 + + einstalldocs + + rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die + + mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 +} + +pkg_postinst() { + elog "Note, that defaults are changed and now if you don't want to ship" + elog "personal information into output files, use fig2dev with -a option." +} diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild deleted file mode 100644 index 490c5e08c4b4..000000000000 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -MY_P=${PN}.${PV} - -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/~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" - -RDEPEND="x11-libs/libXpm - virtual/jpeg - media-libs/libpng - x11-apps/rgb" -DEPEND="${RDEPEND} - x11-misc/imake - app-text/rman" - -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 - MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\) - XFIGLIBDIR=${EPREFIX}/usr/share/xfig - PNGINC=-I${EPREFIX}/usr/include/X11 - XPMINC=-I${EPREFIX}/usr/include/X11 - USEINLINE=-DUSE_INLINE - RGB=${EPREFIX}/usr/share/X11/rgb.txt - FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev" - - for variable in ${vars2subs} ; do - varname=${variable%%=*} - varval=${variable##*=} - sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die - done -} - -src_prepare() { - 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::' \ - -i fig2dev/Imakefile || die - sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile -} - -src_compile() { - xmkmf || die "xmkmf failed" - emake Makefiles - - 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 - - dobin "${WORKDIR}/fig2mpdf/fig2mpdf" - doman "${WORKDIR}/fig2mpdf/fig2mpdf.1" - - insinto /usr/share/fig2dev/ - newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps - 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 - - einstalldocs - - rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die - - mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 -} - -pkg_postinst() { - elog "Note, that defaults are changed and now if you don't want to ship" - elog "personal information into output files, use fig2dev with -a option." -} -- cgit v1.2.3-65-gdbad