From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- media-gfx/inkscape/Manifest | 3 +- media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 22 ++-- media-gfx/inkscape/inkscape-0.92.3.ebuild | 179 --------------------------- 3 files changed, 9 insertions(+), 195 deletions(-) delete mode 100644 media-gfx/inkscape/inkscape-0.92.3.ebuild (limited to 'media-gfx/inkscape') diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 4726fe6211a4..51373471c3f9 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -12,6 +12,5 @@ DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500 -EBUILD inkscape-0.92.3-r1.ebuild 4007 BLAKE2B ade435eae89e3aed84e0c5d1f87bb9af5e93da5c3fb4affda53f7105ffdd8a543c019835e04041af771187d0fff7ae3584b4d3330feab0cd6446e23958257ef1 SHA512 5369a4f50cab735c5af3143f9aa4aa896d2e2d00b894c33833a4984357a9059f3f10026608f11fc28fe53edf810cd30b16091b6b3a0cfc443709199bbe11ccb2 -EBUILD inkscape-0.92.3.ebuild 3958 BLAKE2B 301b320e79f50648df33780705180fbb0b781d7b1e65cbe755c56aa6178ae2cc6962922a2cef62b5e663ac7197a8ef9c8676b5631099646238663de618cacf1b SHA512 bac3b875f935d5a64a85058b33571693ad394b0fb7a14f0b0ae7d20d33d1e1df52c7b3c55396822c7bd9fcfed739cb0064b1cd9d2aad54d3836d6237f163eb57 +EBUILD inkscape-0.92.3-r1.ebuild 3980 BLAKE2B cea0a705ca29033a5bedd87547a54565281854e3a7847d1d09f1272109e0b84662085f011971467923778e26cbfdf62e43632030dfa332463efe38deb9c6e89f SHA512 d130279688318e0a35647a8fbe341a12dedf3e101ba2f87196a04f57dad0dd61712365fb16a7195a4a987d56adca7ae474f5a4459fcb1ac0b8490945b755db07 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild index 36a68a10d4e9..c022c704d3a7 100644 --- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" - inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 MY_P="${P/_/}" -DESCRIPTION="A SVG based generic vector-drawing program" +DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" @@ -21,10 +21,9 @@ IUSE+=" lcms nls spell static-libs visio wpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" - ${PYTHON_DEPS} +COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 + >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= @@ -44,9 +43,9 @@ COMMON_DEPEND=" >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( - media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge + media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) @@ -59,16 +58,15 @@ COMMON_DEPEND=" app-text/gtkspell:2 ) visio? ( - media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge + media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) " - # 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 @@ -84,9 +82,9 @@ RDEPEND="${COMMON_DEPEND} ) postscript? ( app-text/ghostscript-gpl ) " - DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.36 + dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig @@ -163,10 +161,6 @@ src_install() { python_optimize "${ED%/}"/usr/share/${PN}/extensions } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { gnome2_icon_cache_update xdg_mimeinfo_database_update diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild deleted file mode 100644 index 89ad5363774c..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=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/potrace - media-gfx/scour[${PYTHON_USEDEP}] - 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.24 - cdr? ( - media-libs/libcdr - app-text/libwpg:0.3 - dev-libs/librevenge - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( media-gfx/imagemagick:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - media-libs/libvisio - app-text/libwpg:0.3 - dev-libs/librevenge - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" - -# 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 ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" - -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" - "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch" - "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} -- cgit v1.2.3