jlec 15/01/06 09:57:11 Modified: metadata.xml ChangeLog Added: inkscape-0.48.5-r1.ebuild Log: media-gfx/inkscape: Backport fix for API changes in app-text/poppler-0.29.0, #534392 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.10 media-gfx/inkscape/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/metadata.xml?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/metadata.xml?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/metadata.xml?r1=1.9&r2=1.10 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/inkscape/metadata.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- metadata.xml 14 Dec 2014 20:08:56 -0000 1.9 +++ metadata.xml 6 Jan 2015 09:57:11 -0000 1.10 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>graphics</herd> - <use> - <flag name='cdr'>Enable support for CorelDRAW Diagrams</flag> - <flag name='dia'>pull in <pkg>app-office/dia</pkg> for dia import extension</flag> - <flag name='inkjar'>Enable support for OpenOffice.org SVG jar files</flag> - <flag name='visio'>Enable support for Microsoft Visio Diagrams</flag> - <flag name='wpg'>Enable support for WordPerfect Graphics</flag> - </use> + <herd>graphics</herd> + <use> + <flag name="cdr">Enable support for CorelDRAW Diagrams</flag> + <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag> + <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> + <flag name="visio">Enable support for Microsoft Visio Diagrams</flag> + <flag name="wpg">Enable support for WordPerfect Graphics</flag> + </use> </pkgmetadata> 1.220 media-gfx/inkscape/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?rev=1.220&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?rev=1.220&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?r1=1.219&r2=1.220 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- ChangeLog 3 Jan 2015 17:14:41 -0000 1.219 +++ ChangeLog 6 Jan 2015 09:57:11 -0000 1.220 @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/inkscape # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.219 2015/01/03 17:14:41 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.220 2015/01/06 09:57:11 jlec Exp $ + +*inkscape-0.48.5-r1 (06 Jan 2015) + + 06 Jan 2015; Justin Lecher <[email protected]> +inkscape-0.48.5-r1.ebuild, + +files/inkscape-0.48.4-poppler-0.29.0.patch, metadata.xml: + Backport fix for API changes in app-text/poppler-0.29.0, #534392 *inkscape-0.91_pre3-r2 (03 Jan 2015) 1.1 media-gfx/inkscape/inkscape-0.48.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild?rev=1.1&content-type=text/plain Index: inkscape-0.48.5-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild,v 1.1 2015/01/06 09:57:11 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" GCONF_DEBUG=no inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1 MY_P=${P/_/} DESCRIPTION="A SVG based generic vector-drawing program" HOMEPAGE="http://www.inkscape.org/"; SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="dia gnome postscript inkjar lcms nls spell wmf" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" ${PYTHON_DEPS} app-text/libwpd:0.9 app-text/libwpg:0.2 >=app-text/poppler-0.12.3-r3:=[cairo,xpdf-headers(+)] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[${PYTHON_USEDEP}] media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 )" # These only use executables provided by these packages # See share/extensions for more details. inkscape can tell you to # install these so we could of course just not depend on those and rely # on that. RDEPEND="${COMMON_DEPEND} dev-python/numpy[${PYTHON_USEDEP}] media-gfx/uniconvertor dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl ) wmf? ( media-libs/libwmf )" DEPEND="${COMMON_DEPEND} dev-libs/boost >=dev-util/intltool-0.29 sys-devel/gettext virtual/pkgconfig" S=${WORKDIR}/${MY_P} RESTRICT="test" src_prepare() { gnome2_src_prepare epatch \ "${FILESDIR}"/${PN}-0.48.0-spell.patch \ "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \ "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \ "${FILESDIR}"/${PN}-0.48.4-epython.patch \ "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \ "${FILESDIR}"/${PN}-0.48.4-gc74-configure.patch \ "${FILESDIR}"/${PN}-0.48.4-poppler-0.29.0.patch sed -i \ -e "s#@EPYTHON@#${EPYTHON}#" \ src/extension/implementation/script.cpp || die eautoreconf # bug 421111 python_fix_shebang share/extensions } src_configure() { G2CONF="${G2CONF} --without-perl --enable-poppler-cairo $(use_with gnome gnome-vfs) $(use_with inkjar) $(use_enable lcms) $(use_enable nls) $(use_with spell aspell) $(use_with spell gtkspell)" # aliasing unsafe wrt #310393 append-flags -fno-strict-aliasing gnome2_src_configure } src_compile() { emake AR="$(tc-getAR)" } src_install() { gnome2_src_install python_optimize "${ED}"/usr/share/${PN}/extensions }
