From d5a838f6fe3f752e576019079a891cd0488c8a67 Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Wed, 4 Sep 2013 21:29:05 +0000 Subject: New snapshot svn path=/trunk/overlay/; revision=156 --- media-gfx/inkscape/Manifest | 4 +- .../files/inkscape-0.49_alpha12387-python2.patch | 11 -- .../files/inkscape-0.49_alpha12500-python2.patch | 11 ++ media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild | 117 --------------------- media-gfx/inkscape/inkscape-0.49_alpha12500.ebuild | 117 +++++++++++++++++++++ 5 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch create mode 100644 media-gfx/inkscape/files/inkscape-0.49_alpha12500-python2.patch delete mode 100644 media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild create mode 100644 media-gfx/inkscape/inkscape-0.49_alpha12500.ebuild diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 566a7dc..604c1f4 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,6 +1,6 @@ AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a AUX inkscape-0.49.0-libwpg.patch 1008 SHA256 d6af5c82036df4617ecd9112c15ff77682e73859e71560d24cca3a4dbcea1a7c SHA512 8f1ab8d37016e0381faba11e5242e8f645293fdc88a9d6d72200f6075960737fba263295c216aca398f556b03f4275ebd56947346d4f90c8167031186dcce3c2 WHIRLPOOL 667958639cbe4e0636e0575c6ff88f1102b67a2d936023a607a525581a7390d04d3fc09f8785c6ac295aa8c02588e41fca2fe8cf0616cc0636558319b00c4111 AUX inkscape-0.49.0-spell.patch 2370 SHA256 892ad287cf6a7def5440cf69b4dcb671e43b9868b6e0aa82a72a283a57526ded SHA512 6cc46c0780e4978494c6b756b8767730bd59e3f793175ce1447e85b989d2d27637f3a72cbd4065a5f089fdae3b347aea8187581dc1ba3c72332756b70992137a WHIRLPOOL f526088ed59ca646a78c8cfa7ca48345ed0e3af914267d5686686dacb5c74741b5ac5be77e2ad4caa855c1beeb3e97010d4a29d5641fb5c468994e4bf1cec381 -AUX inkscape-0.49_alpha12387-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1 -EBUILD inkscape-0.49_alpha12387.ebuild 2840 SHA256 5428f65b44947493f2b78d4f1f496ae9fa0a860710039e1dde68d3498fe2ec12 SHA512 ddf7debda1957caaec22fb9c32ecae4d563b7c39450a20b7362279ec92f84de3ed7e54ac07d83d48cb42e077ed1819aacf1e094063b9764a06d81f9009bfac86 WHIRLPOOL 05e73c028ca8a62558cec359644b09e3fb3b83a25b430e2859968a0de7a1b0d6eef5fef54bab64587ef0a7df4684b4b121fa2a2d664de691b4ad17cf2c5172c6 +AUX inkscape-0.49_alpha12500-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1 +EBUILD inkscape-0.49_alpha12500.ebuild 2840 SHA256 5428f65b44947493f2b78d4f1f496ae9fa0a860710039e1dde68d3498fe2ec12 SHA512 ddf7debda1957caaec22fb9c32ecae4d563b7c39450a20b7362279ec92f84de3ed7e54ac07d83d48cb42e077ed1819aacf1e094063b9764a06d81f9009bfac86 WHIRLPOOL 05e73c028ca8a62558cec359644b09e3fb3b83a25b430e2859968a0de7a1b0d6eef5fef54bab64587ef0a7df4684b4b121fa2a2d664de691b4ad17cf2c5172c6 MISC NOTES 56 SHA256 c630b8873c8eafc186770124e61c71f71428440c6a2e95dc86c158fd4a49d778 SHA512 1884da6de155458667b3ca8b22d35f1e7229dd5a3bc8d7063c1d630813ea1b6fc60ebef25bdab882647b7f57548b34abee297990c7115340a1acc471f122239f WHIRLPOOL de9feae1ac0e9b6c5eff7c5626df799ab63b2928cf397c48e272fe5e0896bbf5b3c19a932efbcb84baff8f9a2980b2c7638add94f50d94e546461b2e4fd86519 diff --git a/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch b/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch deleted file mode 100644 index a586053..0000000 --- a/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inkscape-0.48.4/src/extension/implementation/script.cpp -+++ inkscape-0.48.4/src/extension/implementation/script.cpp -@@ -89,7 +89,7 @@ - #ifdef WIN32 - {"python", "python-interpreter", "pythonw" }, - #else -- {"python", "python-interpreter", "python" }, -+ {"python", "python-interpreter", "python2" }, - #endif - {"ruby", "ruby-interpreter", "ruby" }, - {"shell", "shell-interpreter", "sh" }, diff --git a/media-gfx/inkscape/files/inkscape-0.49_alpha12500-python2.patch b/media-gfx/inkscape/files/inkscape-0.49_alpha12500-python2.patch new file mode 100644 index 0000000..a586053 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.49_alpha12500-python2.patch @@ -0,0 +1,11 @@ +--- inkscape-0.48.4/src/extension/implementation/script.cpp ++++ inkscape-0.48.4/src/extension/implementation/script.cpp +@@ -89,7 +89,7 @@ + #ifdef WIN32 + {"python", "python-interpreter", "pythonw" }, + #else +- {"python", "python-interpreter", "python" }, ++ {"python", "python-interpreter", "python2" }, + #endif + {"ruby", "ruby-interpreter", "ruby" }, + {"shell", "shell-interpreter", "sh" }, diff --git a/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild b/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild deleted file mode 100644 index c2cd5ab..0000000 --- a/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.7 2012/12/27 17:24:48 ago Exp $ - -EAPI=5 - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="xml" - -GCONF_DEBUG=no - -inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs bzr - -PREVER="${PV/*_alpha/}" -PREVER="${PREVER/*_pre/}" -PREVER="${PREVER/*_p/}" -#MY_V="${PV/_p*/}" -#MY_P="$PN-$MY_V" - -S="${WORKDIR}/${P}" - -#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" -SRC_URI="" - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="http://www.inkscape.org/" -EBZR_REPO_URI="https://code.launchpad.net/~inkscape.dev/inkscape/trunk" -EBZR_BRANCH="lp:inkscape" -EBZR_REVISION="${PREVER}" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="dia gnome postscript inkjar lcms nls spell wmf" - -RESTRICT="nomirror test" - -COMMON_DEPEND=" - >=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 - media-gfx/imagemagick[cxx] - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/libpng-1.2 - app-text/libwpd:0.9 - app-text/libwpg:0.2 - 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 - media-gfx/uniconvertor - dia? ( app-office/dia ) - postscript? ( app-text/ghostscript-gpl ) - wmf? ( media-libs/libwmf )" - -DEPEND="${COMMON_DEPEND} - dev-libs/boost - sys-devel/gettext - virtual/pkgconfig - >=dev-util/intltool-0.29" - -DOCS="AUTHORS ChangeLog NEWS README*" - -src_prepare() { - sed -i -e "s,\(AC_INIT.*[0-9.]\++devel\),\1-r${PREVER}," configure.ac - gnome2_src_prepare - epatch "${FILESDIR}"/${PN}-0.49.0-spell.patch \ - "${FILESDIR}"/${PN}-0.49.0-libwpg.patch \ - "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \ - "${FILESDIR}"/${P}-python2.patch - eautoreconf - - # bug 421111 - python_convert_shebangs -r 2 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)" -} diff --git a/media-gfx/inkscape/inkscape-0.49_alpha12500.ebuild b/media-gfx/inkscape/inkscape-0.49_alpha12500.ebuild new file mode 100644 index 0000000..c2cd5ab --- /dev/null +++ b/media-gfx/inkscape/inkscape-0.49_alpha12500.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.7 2012/12/27 17:24:48 ago Exp $ + +EAPI=5 + +PYTHON_DEPEND="2" +PYTHON_USE_WITH="xml" + +GCONF_DEBUG=no + +inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs bzr + +PREVER="${PV/*_alpha/}" +PREVER="${PREVER/*_pre/}" +PREVER="${PREVER/*_p/}" +#MY_V="${PV/_p*/}" +#MY_P="$PN-$MY_V" + +S="${WORKDIR}/${P}" + +#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="" + +DESCRIPTION="A SVG based generic vector-drawing program" +HOMEPAGE="http://www.inkscape.org/" +EBZR_REPO_URI="https://code.launchpad.net/~inkscape.dev/inkscape/trunk" +EBZR_BRANCH="lp:inkscape" +EBZR_REVISION="${PREVER}" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="dia gnome postscript inkjar lcms nls spell wmf" + +RESTRICT="nomirror test" + +COMMON_DEPEND=" + >=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 + media-gfx/imagemagick[cxx] + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/libpng-1.2 + app-text/libwpd:0.9 + app-text/libwpg:0.2 + 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 + media-gfx/uniconvertor + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) + wmf? ( media-libs/libwmf )" + +DEPEND="${COMMON_DEPEND} + dev-libs/boost + sys-devel/gettext + virtual/pkgconfig + >=dev-util/intltool-0.29" + +DOCS="AUTHORS ChangeLog NEWS README*" + +src_prepare() { + sed -i -e "s,\(AC_INIT.*[0-9.]\++devel\),\1-r${PREVER}," configure.ac + gnome2_src_prepare + epatch "${FILESDIR}"/${PN}-0.49.0-spell.patch \ + "${FILESDIR}"/${PN}-0.49.0-libwpg.patch \ + "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \ + "${FILESDIR}"/${P}-python2.patch + eautoreconf + + # bug 421111 + python_convert_shebangs -r 2 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)" +} -- cgit v1.2.3-65-gdbad