From bebe25c35ece43571ba11784e8a83e4e95f1ecfb Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sat, 15 Aug 2020 00:57:47 +0200 Subject: app-text/ghostscript-gpl: do not install custom fontmaps anymore Shouldn't be needed anymore since we replaced 0002-Fix-error-when-using-ImageMagick-s-convert.patch with Enumerate all fonts patch. Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann --- app-text/ghostscript-gpl/Manifest | 1 - .../ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild | 192 +++++++++++++++++++ .../ghostscript-gpl/ghostscript-gpl-9.52.ebuild | 204 --------------------- 3 files changed, 192 insertions(+), 205 deletions(-) create mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild delete mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-9.52.ebuild (limited to 'app-text') diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index de62ddee2768..1b745c9090b5 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,5 +1,4 @@ DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d4dcb8cd22fd67dc26dd542840259cef0c1438b85274f1d9c192784ecc5d36cb47a3d4482ebbe19ea8843404f9d0ad2 SHA512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67 DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1 -DIST ghostscript-gpl-9.52-fontmaps-01.tar.xz 896 BLAKE2B 7c3ae30788b376c1bb021e2b7d098eaa5bdda45d0daee6296797ee374d0b5fc4163dc6703d3a8e0773d382cce8bc06b84861c5f03307f6dbf9ca341ede2fa0c6 SHA512 cfdf631a9a37b2bc369c0c09ae7a5eb8fb5fc58f6beaf5cf3a71c5e13b084a2c5bd083087c691d394a2e29fab46939b9c90a673d182b40776d52245625f1c3ac DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild new file mode 100644 index 000000000000..b4d0e8bf849a --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Interpreter for the PostScript language and PDF" +HOMEPAGE="https://ghostscript.com/" + +MY_PN=${PN/-gpl} +MY_P="${MY_PN}-${PV/_}" +PVM=$(ver_cut 1-2) +PVM_S=$(ver_rs 1-2 "") + +MY_PATCHSET="ghostscript-gpl-9.52-patchset-01.tar.xz" + +SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz" + +if [[ -n "${MY_PATCHSET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" +fi + +LICENSE="AGPL-3 CPL-1.0" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86" +IUSE="cups dbus gtk l10n_de static-libs tiff unicode X" + +LANGS="ja ko zh-CN zh-TW" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +DEPEND=" + app-text/libpaper + media-libs/fontconfig + >=media-libs/freetype-2.4.9:2= + >=media-libs/jbig2dec-0.16:= + >=media-libs/lcms-2.6:2 + >=media-libs/libpng-1.6.2:0= + >=media-libs/openjpeg-2.1.0:2= + >=sys-libs/zlib-1.2.7 + virtual/jpeg:0 + cups? ( >=net-print/cups-1.3.8 ) + dbus? ( sys-apps/dbus ) + gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) + unicode? ( net-dns/libidn:0= ) + tiff? ( >=media-libs/tiff-4.0.1:0= ) + X? ( x11-libs/libXt x11-libs/libXext ) +" +BDEPEND="virtual/pkgconfig" +RDEPEND="${DEPEND} + app-text/poppler-data + >=media-fonts/urw-fonts-2.4.9 + l10n_ja? ( media-fonts/kochi-substitute ) + l10n_ko? ( media-fonts/baekmuk-fonts ) + l10n_zh-CN? ( media-fonts/arphicfonts ) + l10n_zh-TW? ( media-fonts/arphicfonts ) +" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if [[ -n "${MY_PATCHSET}" ]] ; then + # apply various patches, many borrowed from Fedora + # https://src.fedoraproject.org/rpms/ghostscript + # and Debian + # https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches + eapply "${WORKDIR}/patches/"*.patch + fi + + default + + # remove internal copies of various libraries + rm -r cups/libs || die + rm -r freetype || die + rm -r jbig2dec || die + rm -r jpeg || die + rm -r lcms2mt || die + rm -r libpng || die + rm -r tiff || die + rm -r zlib || die + rm -r openjpeg || die + # remove internal CMaps (CMaps from poppler-data are used instead) + rm -r Resource/CMap || die + + if ! use gtk ; then + sed -e "s:\$(GSSOX)::" \ + -e "s:.*\$(GSSOX_XENAME)$::" \ + -i base/unix-dll.mak || die "sed failed" + fi + + # Force the include dirs to a neutral location. + sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + -i configure.ac || die + # Some files depend on zlib.h directly. Redirect them. #573248 + # Also make sure to not define OPJ_STATIC to avoid linker errors due to + # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) + sed -e '/^zlib_h/s:=.*:=:' \ + -e 's|-DOPJ_STATIC ||' \ + -i base/lib.mak || die + + # search path fix + # put LDFLAGS after BINDIR, bug #383447 + sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \ + -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ + -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ + -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ + -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ + -i Makefile.in base/*.mak || die "sed failed" + + # remove incorrect symlink, bug 590384 + rm ijs/ltmain.sh || die + eautoreconf + + cd ijs || die + eautoreconf +} + +src_configure() { + local FONTPATH + for path in \ + "${EPREFIX}"/usr/share/fonts/urw-fonts \ + "${EPREFIX}"/usr/share/fonts/Type1 \ + "${EPREFIX}"/usr/share/fonts \ + "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ + "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ + "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ + "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ + "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 + do + FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" + done + + PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ + econf \ + --enable-dynamic \ + --enable-freetype \ + --enable-fontconfig \ + --enable-openjpeg \ + --disable-compile-inits \ + --with-drivers=ALL \ + --with-fontpath="$FONTPATH" \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper \ + --without-luratech \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable gtk) \ + $(use_with cups pdftoraster) \ + $(use_with unicode libidn) \ + $(use_with tiff system-libtiff) \ + $(use_with X x) + + cd "${S}/ijs" || die + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake so all + + cd ijs || die + emake +} + +src_install() { + emake DESTDIR="${D}" install-so install + + # move gsc to gs, bug #343447 + # gsc collides with gambit, bug #253064 + mv -f "${ED}"/usr/bin/{gsc,gs} || die + + cd "${S}/ijs" || die + emake DESTDIR="${D}" install + + # rename the original cidfmap to cidfmap.GS + mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die + + # install the CMaps from poppler-data properly, bug #409361 + dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap" + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + if ! use l10n_de; then + rm -r "${ED}"/usr/share/man/de || die + fi +} diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52.ebuild deleted file mode 100644 index 5b0a418911b1..000000000000 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" - -MY_PN=${PN/-gpl} -MY_P="${MY_PN}-${PV/_}" -PVM=$(ver_cut 1-2) -PVM_S=$(ver_rs 1-2 "") - -MY_PATCHSET="ghostscript-gpl-9.52-patchset-01.tar.xz" - -SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz - https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.52-fontmaps-01.tar.xz" - -if [[ -n "${MY_PATCHSET}" ]] ; then - SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" -fi - -LICENSE="AGPL-3 CPL-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86" -IUSE="cups dbus gtk l10n_de static-libs tiff unicode X" - -LANGS="ja ko zh-CN zh-TW" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -DEPEND=" - app-text/libpaper - media-libs/fontconfig - >=media-libs/freetype-2.4.9:2= - >=media-libs/jbig2dec-0.16:= - >=media-libs/lcms-2.6:2 - >=media-libs/libpng-1.6.2:0= - >=media-libs/openjpeg-2.1.0:2= - >=sys-libs/zlib-1.2.7 - virtual/jpeg:0 - cups? ( >=net-print/cups-1.3.8 ) - dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - unicode? ( net-dns/libidn:0= ) - tiff? ( >=media-libs/tiff-4.0.1:0= ) - X? ( x11-libs/libXt x11-libs/libXext ) -" -BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data - >=media-fonts/urw-fonts-2.4.9 - l10n_ja? ( media-fonts/kochi-substitute ) - l10n_ko? ( media-fonts/baekmuk-fonts ) - l10n_zh-CN? ( media-fonts/arphicfonts ) - l10n_zh-TW? ( media-fonts/arphicfonts ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if [[ -n "${MY_PATCHSET}" ]] ; then - # apply various patches, many borrowed from Fedora - # https://src.fedoraproject.org/rpms/ghostscript - # and Debian - # https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches - eapply "${WORKDIR}/patches/"*.patch - fi - - default - - # remove internal copies of various libraries - rm -r cups/libs || die - rm -r freetype || die - rm -r jbig2dec || die - rm -r jpeg || die - rm -r lcms2mt || die - rm -r libpng || die - rm -r tiff || die - rm -r zlib || die - rm -r openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) - rm -r Resource/CMap || die - - if ! use gtk ; then - sed -e "s:\$(GSSOX)::" \ - -e "s:.*\$(GSSOX_XENAME)$::" \ - -i base/unix-dll.mak || die "sed failed" - fi - - # Force the include dirs to a neutral location. - sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ - -i configure.ac || die - # Some files depend on zlib.h directly. Redirect them. #573248 - # Also make sure to not define OPJ_STATIC to avoid linker errors due to - # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) - sed -e '/^zlib_h/s:=.*:=:' \ - -e 's|-DOPJ_STATIC ||' \ - -i base/lib.mak || die - - # search path fix - # put LDFLAGS after BINDIR, bug #383447 - sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \ - -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ - -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ - -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ - -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ - -i Makefile.in base/*.mak || die "sed failed" - - # remove incorrect symlink, bug 590384 - rm ijs/ltmain.sh || die - eautoreconf - - cd ijs || die - eautoreconf -} - -src_configure() { - local FONTPATH - for path in \ - "${EPREFIX}"/usr/share/fonts/urw-fonts \ - "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 - do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" - done - - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ - --enable-freetype \ - --enable-fontconfig \ - --enable-openjpeg \ - --disable-compile-inits \ - --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ - --with-ijs \ - --with-jbig2dec \ - --with-libpaper \ - --without-luratech \ - $(use_enable cups) \ - $(use_enable dbus) \ - $(use_enable gtk) \ - $(use_with cups pdftoraster) \ - $(use_with unicode libidn) \ - $(use_with tiff system-libtiff) \ - $(use_with X x) - - cd "${S}/ijs" || die - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - emake so all - - cd ijs || die - emake -} - -src_install() { - emake DESTDIR="${D}" install-so install - - # move gsc to gs, bug #343447 - # gsc collides with gambit, bug #253064 - mv -f "${ED}"/usr/bin/{gsc,gs} || die - - cd "${S}/ijs" || die - emake DESTDIR="${D}" install - - # rename the original cidfmap to cidfmap.GS - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die - - # install our own cidfmap to handle CJK fonts - insinto /usr/share/ghostscript/${PVM}/Resource/Init - doins \ - "${WORKDIR}/fontmaps/CIDFnmap" \ - "${WORKDIR}/fontmaps/cidfmap" - for X in ${LANGS} ; do - if use l10n_${X} ; then - doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}" - fi - done - - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap" - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi -} -- cgit v1.2.3-65-gdbad