From 811d59e0f43714d3cea1eaaa0347307434015011 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 10 Nov 2020 12:42:57 -0500 Subject: media-libs/libwmf: Remove unnecessary [X?] from gdk-pixbuf dep Signed-off-by: Matt Turner --- media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 104 ----------------------------- media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 104 +++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 104 deletions(-) delete mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild create mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild (limited to 'media-libs/libwmf') diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild deleted file mode 100644 index 63ddb5e7ef52..000000000000 --- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils - -DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="https://wvware.sourceforge.net/" -SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc expat X" - -RDEPEND="app-text/ghostscript-gpl - media-fonts/urw-fonts - media-libs/freetype:2= - media-libs/libpng:0= - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2[X?] - virtual/jpeg:0= - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2:2= ) - X? ( x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch - "${FILESDIR}"/${P}-CVE-2015-4695.patch - "${FILESDIR}"/${P}-CVE-2015-4696.patch - "${FILESDIR}"/${P}-gdk-pixbuf.patch - "${FILESDIR}"/${P}-intoverflow.patch - "${FILESDIR}"/${P}-libpng-1.5.patch - "${FILESDIR}"/${P}-pngfix.patch - "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch - "${FILESDIR}"/${P}-use-system-fonts.patch - ) - -src_prepare() { - default - - # Fixes QA warning "This package has a configure.in file which has long been deprecated" - # Since there is already a configure.ac, we don't need the deprecated configure.in - rm configure.in || die - - if ! use doc ; then - sed -i -e 's:doc::' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - # Support for GD is disabled, since it's never linked, even, when enabled - # See https://bugs.gentoo.org/268161 - local myeconfargs=( - --disable-gd - --disable-static - $(use_enable debug) - $(use_with expat) - $(use_with !expat libxml2) - $(use_with X x) - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-freetype - --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap - --with-jpeg - --with-layers - --with-png - --with-sys-gd - --with-zlib - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # address parallel build issue, bug 677566 - MAKEOPTS=-j1 - - default -} - -pkg_preinst() { - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild new file mode 100644 index 000000000000..c26a907b2c09 --- /dev/null +++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils + +DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" +HOMEPAGE="https://wvware.sourceforge.net/" +SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc expat X" + +RDEPEND="app-text/ghostscript-gpl + media-fonts/urw-fonts + media-libs/freetype:2= + media-libs/libpng:0= + sys-libs/zlib:= + x11-libs/gdk-pixbuf:2 + virtual/jpeg:0= + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2= ) + X? ( x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch + "${FILESDIR}"/${P}-CVE-2015-4695.patch + "${FILESDIR}"/${P}-CVE-2015-4696.patch + "${FILESDIR}"/${P}-gdk-pixbuf.patch + "${FILESDIR}"/${P}-intoverflow.patch + "${FILESDIR}"/${P}-libpng-1.5.patch + "${FILESDIR}"/${P}-pngfix.patch + "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch + "${FILESDIR}"/${P}-use-system-fonts.patch + ) + +src_prepare() { + default + + # Fixes QA warning "This package has a configure.in file which has long been deprecated" + # Since there is already a configure.ac, we don't need the deprecated configure.in + rm configure.in || die + + if ! use doc ; then + sed -i -e 's:doc::' Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + # Support for GD is disabled, since it's never linked, even, when enabled + # See https://bugs.gentoo.org/268161 + local myeconfargs=( + --disable-gd + --disable-static + $(use_enable debug) + $(use_with expat) + $(use_with !expat libxml2) + $(use_with X x) + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-freetype + --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap + --with-jpeg + --with-layers + --with-png + --with-sys-gd + --with-zlib + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # address parallel build issue, bug 677566 + MAKEOPTS=-j1 + + default +} + +pkg_preinst() { + gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + gnome2_gdk_pixbuf_update +} -- cgit v1.2.3-65-gdbad