summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin41759 -> 41944 bytes
-rw-r--r--media-gfx/cairosvg/Manifest4
-rw-r--r--media-gfx/cairosvg/cairosvg-1.0.22.ebuild4
-rw-r--r--media-gfx/cairosvg/cairosvg-2.0.3.ebuild4
-rw-r--r--media-gfx/cura/Manifest18
-rw-r--r--media-gfx/cura/cura-0.15.04.4.ebuild77
-rw-r--r--media-gfx/cura/cura-0.15.04.5_rc5.ebuild78
-rw-r--r--media-gfx/cura/cura-2.1.0_beta.ebuild69
-rw-r--r--media-gfx/cura/cura-2.3.1.ebuild70
-rw-r--r--media-gfx/cura/cura-3.3.1.ebuild (renamed from media-gfx/cura/cura-2.6.0.ebuild)42
-rw-r--r--media-gfx/cura/files/cura-0.15.04.4-nopower.patch90
-rw-r--r--media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch38
-rw-r--r--media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch38
-rw-r--r--media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch37
-rw-r--r--media-gfx/cura/metadata.xml19
-rw-r--r--media-gfx/curaengine/Manifest19
-rw-r--r--media-gfx/curaengine/curaengine-0.15.04.6.ebuild49
-rw-r--r--media-gfx/curaengine/curaengine-2.3.1-r1.ebuild45
-rw-r--r--media-gfx/curaengine/curaengine-2.3.1-r2.ebuild47
-rw-r--r--media-gfx/curaengine/curaengine-2.3.1.ebuild41
-rw-r--r--media-gfx/curaengine/curaengine-2.6.0-r1.ebuild44
-rw-r--r--media-gfx/curaengine/curaengine-2.6.0.ebuild41
-rw-r--r--media-gfx/curaengine/curaengine-3.3.0.ebuild (renamed from media-gfx/curaengine/curaengine-2.1.0_beta.ebuild)19
-rw-r--r--media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch27
-rw-r--r--media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch43
-rw-r--r--media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch13
-rw-r--r--media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch14
-rw-r--r--media-gfx/curaengine/metadata.xml19
-rw-r--r--media-gfx/darktable/Manifest2
-rw-r--r--media-gfx/darktable/darktable-2.4.3.ebuild2
-rw-r--r--media-gfx/engauge/Manifest2
-rw-r--r--media-gfx/engauge/engauge-5.2.ebuild48
-rw-r--r--media-gfx/fdm-materials/Manifest3
-rw-r--r--media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild18
-rw-r--r--media-gfx/fdm-materials/metadata.xml30
-rw-r--r--media-gfx/gifsicle/Manifest2
-rw-r--r--media-gfx/gifsicle/gifsicle-1.91.ebuild2
-rw-r--r--media-gfx/gimp/Manifest2
-rw-r--r--media-gfx/gimp/gimp-2.10.2.ebuild200
-rw-r--r--media-gfx/gliv/Manifest1
-rw-r--r--media-gfx/gliv/files/gliv-1.9.6-as-needed.patch99
-rw-r--r--media-gfx/graphicsmagick/Manifest2
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild134
-rw-r--r--media-gfx/graphite2/Manifest4
-rw-r--r--media-gfx/graphite2/graphite2-1.3.10.ebuild2
-rw-r--r--media-gfx/graphite2/graphite2-1.3.11.ebuild2
-rw-r--r--media-gfx/lximage-qt/Manifest2
-rw-r--r--media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild46
-rw-r--r--media-gfx/metapixel/Manifest2
-rw-r--r--media-gfx/metapixel/metapixel-1.0.2-r1.ebuild6
-rw-r--r--media-gfx/svg2rlg/Manifest2
-rw-r--r--media-gfx/svg2rlg/svg2rlg-0.3.ebuild2
-rw-r--r--media-gfx/tintii/Manifest2
-rw-r--r--media-gfx/tintii/tintii-2.10.0.ebuild6
54 files changed, 389 insertions, 1243 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 43d61bc86d75..f093ced64369 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 9ce9119a7910..8f50c7d9aae5 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,5 @@
DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d
-EBUILD cairosvg-1.0.22.ebuild 718 BLAKE2B 66406ac10235747f6d972682a174538302404f3bd2bdd8dfd7cbdf3b218242932a965a90643c54c11b73dc382c83c0af762d26f87834869ff2de9ed02949da52 SHA512 e07573ec7f609d8f3e043c724a9b18f6c51705854557761c66f18f0c118a0a9f71d1af5d3964323cea132e6c8d6b16fbfffa5829db1b943d871323fde6dd57eb
-EBUILD cairosvg-2.0.3.ebuild 712 BLAKE2B ba745cddf2231e0bdcf76791cd57a8a965453e7e75fd24ea2043bf844129bc7b512335c65e10ae1be91753254163cc9113068b62146bfc00b776be223b9e5e5e SHA512 d94d1329bc42e90a88a153998a411f296ef2107a141f686eaeb6b775b45120c799acf4e32169882b501734303c6a473d935a385d72d111f95d5f8f563dba36df
+EBUILD cairosvg-1.0.22.ebuild 719 BLAKE2B 82df1e5d393515d46a551416cfa85569953a8b5aecde6bc80830b7cdd3951b031f17e5fcae230dd5ab86c0a10f3d8cff063bd5beb1a4781cefbe2b704d6f269b SHA512 e845c377a29f22bf71e3bc448663dd2c010b4bcf3dc73b30b9c24cf053b5f4a85be76de4e994b0730963f2fbc7b3ecfaf4244161c46502bc996b6d0f2911e6df
+EBUILD cairosvg-2.0.3.ebuild 713 BLAKE2B 48bd3d5934087be502ad61d46d1d9763dd7a4670f88bc43a25b868251110285137adbfa681e7189af0a6fa506dab9504075cc139a7b512eb7c48a0d6f7b0d479 SHA512 645ed6f4fa59a24ed568dde7aac28e8fb0690c2dd195e5d4c1381c54747bf79796ed87cd2d6cb2f487bef088caa3fb25e6794175f8c5af67625a837e4962e655
MISC metadata.xml 340 BLAKE2B 98ccd93460bbb405ae591ba8d5d216fcf57d07247bd2f03698b158eadaabf79d510393b32e7827f2d4a2e859e64f0ff3262ba4b6086baf5a0d893d942d516915 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d
diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
index 04fd40af14a4..f898401de010 100644
--- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
+++ b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ MY_PN="CairoSVG"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="http://cairosvg.org/"
+HOMEPAGE="https://cairosvg.org/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
index 8939b9a8db31..89657ccefda8 100644
--- a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ MY_PN="CairoSVG"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="http://cairosvg.org/"
+HOMEPAGE="https://cairosvg.org/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 7a66db4bf728..90569858ab20 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,14 +1,4 @@
-AUX cura-0.15.04.4-nopower.patch 3209 BLAKE2B e3ad09030506861982058d0880e8f033ed2436da78a8f03eaa882ec840872ad7782787ec3d391935760c61816b7d935d54262f31278aaa3918b565e1230c3cbb SHA512 6cad0f33f87b8b5540a6ac2237ef8c734de36f86bea523e61de3f2d60c5e0beba93ed9535b06bb863a7270abf590e71d494c2a59ba898c41035478e5ac189d8f
-AUX cura-2.1.0_beta-fix-install-paths.patch 1592 BLAKE2B 3f82410a5c5787c1cf5d7e81e16b9e59492c47fd3759fb452fb0fbd99bcb5db24460cd341faf884a3248d595a6ebf60682aaf42d479f0efcef32ea24e4d99329 SHA512 b9e7c110b953a2ee233b34d0cb27d39bcd24516cef024b82bf6d0275684f8eebe1107e2e23135a72da6d03ca4dd9c0ffacab2c2d5fd88d0447235f1b99e5b432
-AUX cura-2.3.1-fix-install-paths.patch 1621 BLAKE2B a2e50e8b2b16eb7eadfdeece4c5150d72b9092661f8261314e005f9b0127dbda233cd704adb6fca4997839bd64681e29889f82dd0f95eab375d4db9c5bbaad56 SHA512 a83e8d59d6d6d283512e80388b002dcb9b83c180d369dc775b95c693e50261f687fe1894d2413d357995efaf3e40eb17dc7305afcf0f475adb689a336fbbd978
-DIST cura-0.15.04.4.tar.gz 7265105 BLAKE2B 8ea4979819180f3f8fec8900215c11db49dafbae71ff023aeb16b760ae5f88d271c0ad2628ab7f06f2a4962cc792573ac56cc63368ebb69e37a83ec092cd5d44 SHA512 6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
-DIST cura-0.15.04.5_rc5.tar.gz 7266640 BLAKE2B 3900d9c8b1627933b1f6432a75674396c79de993982afa93e6d435d0ebf20df25184eda3760ded566a6fa7c93b0e3b16d76b1bb47f093d281245fee8f799bcb1 SHA512 cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
-DIST cura-2.1.0_beta.tar.gz 19784684 BLAKE2B 30f908b8792fdbe512d1e9fbc98a8f90018db38fa92c286a209f4dfaded9af8c8c45f5ffca38d9c79ff82a18c9e906fc6141085368bf26cffb2ec15931869cc1 SHA512 9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
-DIST cura-2.3.1.tar.gz 8216743 BLAKE2B 33241eb825a2fde8c1932642dc20c24c50c744068dc2bd7c32d97c9e6b1cfa062ebe110670d9d2828093043ff6c147a1dfbcb5daf0e6ec2447bb9bed4a51c4bc SHA512 875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f
-DIST cura-2.6.0.tar.gz 10007980 BLAKE2B 7ed59c28402c2c99dcf8db4506d575159ce25d6e8c58bb2bef302cd662a28f124046e677fba754cc41dc087d94b30183e0896d935cd3ae7e896ba9736ec0a511 SHA512 c437b284292682821d3e7c6fe67dfbf9e397588a604d0608fcc89019d02529720a929881d1ad0531fedba2f4b3efc98c1890624a4261dcccacbcfa24246d6e54
-EBUILD cura-0.15.04.4.ebuild 1803 BLAKE2B f6ba45760a41fcc53d8a52ace11b70bcd40f29312fdb5e958e1c91d404c5e734c3817e664a0ee9bb13a4f01f433b59e50c81b526fbf39c6a2ff2c1596f441167 SHA512 9e73522c28c0b5f00d6a3c3cc1dba2d6d507bd5f051d532f7f077eff38c1491b07c83fcb2848d58d3c13b5db0269cefbb47da5fa5d3280c921ee936b8a9b1523
-EBUILD cura-0.15.04.5_rc5.ebuild 1826 BLAKE2B 36826a08bead34f0c378f5c83cbaa0498834fc9d42fdc8861c3d486db4037acefd317a77c42a56c80e67a661faebcbf6cd4e223ced549e166fa042b11830cf57 SHA512 ad9ab1bcefe5bfca62544d3042489e77c9cbe5341cea0291e4aa1ae4379dc10de693101d3123223afc3d9495aaaf38ac2d7943c28c69fcfc59ddf7ad6364edc4
-EBUILD cura-2.1.0_beta.ebuild 1407 BLAKE2B 2eb3c63eb2fc1adb8dd03b3244c4f92deda6ee3670d80e8aaae53916e6f3be4d47a615cf1f9f4295699a81151758e49cdd92cffba52f8be10c81c8900d1d7bfd SHA512 32cdef14ded1b5c6cec266479c85bf371cb99a7adb422b77c8f004f3103617a58a560f0d20961e2f16b8be6a2dc54acec8333ecba206029509348cff47c929cd
-EBUILD cura-2.3.1.ebuild 1430 BLAKE2B 0ade17d72853c85612847b56bb56258635e6260ceef06197fed50e437e64fb9eaaf4ddaa65f8d59763e509f89d74faae7cc23067c54fa32e00f64176befa2642 SHA512 21f06760d7134da29c58ead0194fa3af2481b5abfbefaf7b155d7aa2376b3089ce29b1581d5ea884f45bfb7da131ae2f952893e30f83f2b05b669a856056a863
-EBUILD cura-2.6.0.ebuild 1432 BLAKE2B 580fb7dba23ec1562b6cdf845288d65de03e0fa658aeb536dacd88d606c2a8f4ac491989b77162f55a5cc7521b744800acd607582bfc3f6cd7e4d08fbf059f01 SHA512 e09cfb1ed0ae47d38d946d8c75d24180366eb6e8f2321d70819c508bd33ba57ae1156d0b1a9246c77f1da02c3c6bcba131d1838d8c811c5e615878dbb9fab0e1
-MISC metadata.xml 407 BLAKE2B 37e71adabc7e7f6abddda35afd1b9a2b5fafa1f7fce9c7fe4be4451e128f3e1fba1147bca67839d66a7195febb30d48a7a633f914ccdfeed2752607a9b34e00a SHA512 0c5d12d6a69ffb2d2f6e6ed0c1a02a3d8e793d1befd23fd2e51e8108f708787605489c9864e72ddc99389f2f05ccd33d5f9bf4367d3ee2a1f1781db1bb5c5393
+AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
+DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a SHA512 7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63
+EBUILD cura-3.3.1.ebuild 1560 BLAKE2B e2f15c15c760602a8512020f830273d188c680d3521b210c5b88c91d9770ae11b7378cddd275f719b0333b9d1d94b866112e82444e6a2bdd143ec0e4679e1507 SHA512 c8422f406a785356c2ff06a5616a38874fcdcb726a25249b16f942eabbba5fe0cf6d1b6a511424adbad53727c526714dc39af898494e6abd46b0382dffd2b0b5
+MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild b/media-gfx/cura/cura-0.15.04.4.ebuild
deleted file mode 100644
index fa9ddb4d2518..000000000000
--- a/media-gfx/cura/cura-0.15.04.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils python-single-r1 xdg-utils
-
-MY_PV=${PV#0.}
-MY_PN=Cura
-
-DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
-HOMEPAGE="https://github.com/daid/Cura"
-SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/wxpython:3.0[opengl,${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
- >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
- >=media-gfx/curaengine-${PV}
-"
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
-)
-
-src_prepare() {
- cat > "${T}"/cura <<- CURAEOF || die
- #!/bin/sh
- PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" "${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
- CURAEOF
-
- default
-}
-
-src_install() {
- insinto /usr/share/cura
- doins -r Cura resources plugins scripts/linux/cura.py
- newicon "${S}/resources/images/c.png" "cura.png"
- echo ${PV} > "${ED}"usr/share/cura/version || die
- dobin "${T}"/cura
-
- python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-
- make_desktop_entry cura \
- Cura \
- "${EPREFIX}/usr/share/pixmaps/cura.png" \
- "Graphics;3DGraphics;Engineering;Development"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
deleted file mode 100644
index c35602d8d18b..000000000000
--- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils python-single-r1 xdg-utils
-
-MY_PV=${PV#0.}
-MY_PV=${MY_PV/_rc/-RC}
-MY_PN=Cura
-
-DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
-HOMEPAGE="https://github.com/daid/Cura"
-SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/wxpython:3.0[opengl,${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
- >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
- >=media-gfx/curaengine-${PV}
-"
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
-)
-
-src_prepare() {
- cat > "${T}"/cura <<- CURAEOF || die
- #!/bin/sh
- PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" "${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
- CURAEOF
-
- default
-}
-
-src_install() {
- insinto /usr/share/cura
- doins -r Cura resources plugins scripts/linux/cura.py
- newicon "${S}/resources/images/c.png" "cura.png"
- echo ${PV} > "${ED}"usr/share/cura/version || die
- dobin "${T}"/cura
-
- python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-
- make_desktop_entry cura \
- Cura \
- "${EPREFIX}/usr/share/pixmaps/cura.png" \
- "Graphics;3DGraphics;Engineering;Development"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild b/media-gfx/cura/cura-2.1.0_beta.ebuild
deleted file mode 100644
index db1610abbb6f..000000000000
--- a/media-gfx/cura/cura-2.1.0_beta.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-MY_PN=Cura
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
- dev-python/uranium[${PYTHON_USEDEP}]
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
- ~media-gfx/curaengine-${PV}"
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.1.0_beta-fix-install-paths.patch"
-)
-
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- doicon icons/*.png
- python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-2.3.1.ebuild b/media-gfx/cura/cura-2.3.1.ebuild
deleted file mode 100644
index 9af78aaedc32..000000000000
--- a/media-gfx/cura/cura-2.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-MY_PN=Cura
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
- dev-python/uranium[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
- ~media-gfx/curaengine-${PV}"
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch"
-)
-
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- doicon icons/*.png
- python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-2.6.0.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
index bf9f44699fb2..b2a58d65a582 100644
--- a/media-gfx/cura/cura-2.6.0.ebuild
+++ b/media-gfx/cura/cura-3.3.1.ebuild
@@ -3,43 +3,41 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
MY_PN=Cura
-MY_PV=${PV/_beta}
DESCRIPTION="A 3D model slicing application for 3D printing"
HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="AGPL-3+"
+LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
+IUSE="+usb zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
- dev-python/uranium[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
+ >=media-gfx/curaengine-${PV:0:3}
+ >=media-gfx/fdm-materials-${PV:0:3}
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
- ~media-gfx/curaengine-${PV}"
+ zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
DEPEND="${RDEPEND}
sys-devel/gettext"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch"
-)
-
+S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
DOCS=( README.md )
src_configure() {
local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+ -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+ )
cmake-utils_src_configure
}
@@ -58,13 +56,13 @@ pkg_preinst() {
}
pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
gnome2_icon_cache_update
}
diff --git a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
deleted file mode 100644
index 975d1c507b33..000000000000
--- a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur Cura-14.09/Cura/gui/printWindow.py Cura-14.09.new/Cura/gui/printWindow.py
---- Cura-14.09/Cura/gui/printWindow.py 2014-09-19 05:44:21.000000000 -0400
-+++ Cura-14.09.new/Cura/gui/printWindow.py 2014-12-08 16:36:18.410389600 -0500
-@@ -1,7 +1,6 @@
- __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
-
- import wx
--import power
- import time
- import sys
- import os
-@@ -319,18 +318,6 @@
- self.sizer = wx.GridBagSizer(2, 2)
- self.panel.SetSizer(self.sizer)
-
-- self.powerWarningText = wx.StaticText(parent=self.panel,
-- id=-1,
-- label=_("Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish."),
-- style=wx.ALIGN_CENTER)
-- self.powerWarningText.SetBackgroundColour('red')
-- self.powerWarningText.SetForegroundColour('white')
-- self.powerManagement = power.PowerManagement()
-- self.powerWarningTimer = wx.Timer(self)
-- self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer)
-- self.OnPowerWarningChange(None)
-- self.powerWarningTimer.Start(10000)
--
- self.statsText = wx.StaticText(self.panel, -1, _("InfoLine from printer connection\nInfoLine from dialog\nExtra line\nMore lines for layout\nMore lines for layout\nMore lines for layout"))
-
- self.connectButton = wx.Button(self.panel, -1, _("Connect"))
-@@ -341,7 +328,6 @@
- self.errorLogButton = wx.Button(self.panel, -1, _("Error log"))
- self.progress = wx.Gauge(self.panel, -1, range=1000)
-
-- self.sizer.Add(self.powerWarningText, pos=(0, 0), span=(1, 5), flag=wx.EXPAND|wx.BOTTOM, border=5)
- self.sizer.Add(self.statsText, pos=(1, 0), span=(1, 5), flag=wx.LEFT, border=5)
- self.sizer.Add(self.connectButton, pos=(2, 0))
- #self.sizer.Add(self.loadButton, pos=(2,1))
-@@ -373,21 +359,6 @@
- self._printerConnection.openActiveConnection()
- preventComputerFromSleeping(True)
-
-- def OnPowerWarningChange(self, e):
-- type = self.powerManagement.get_providing_power_source_type()
-- if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown():
-- self.powerWarningText.Hide()
-- self.panel.Layout()
-- self.Layout()
-- self.Fit()
-- self.Refresh()
-- elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown():
-- self.powerWarningText.Show()
-- self.panel.Layout()
-- self.Layout()
-- self.Fit()
-- self.Refresh()
--
- def OnClose(self, e):
- if self._printerConnection.hasActiveConnection():
- if self._printerConnection.isPrinting():
-diff -Naur Cura-14.09/scripts/linux/cura.py Cura-14.09.new/scripts/linux/cura.py
---- Cura-14.09/scripts/linux/cura.py 2014-09-19 05:44:21.000000000 -0400
-+++ Cura-14.09.new/scripts/linux/cura.py 2014-12-08 16:37:44.840391177 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
-
- import os, sys
-
-@@ -9,7 +9,6 @@
- import wx
- import serial
- import numpy
-- import power
- except ImportError as e:
- if e.message[0:16] == 'No module named ':
- module = e.message[16:]
-@@ -20,12 +19,6 @@
- module = 'pyserial'
- print 'Requires ' + module
-
-- if module == 'power':
-- print "Install from: https://github.com/GreatFruitOmsk/Power"
-- else:
-- print "Try sudo easy_install " + module
-- print e.message
--
- exit(1)
-
-
diff --git a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
deleted file mode 100644
index ec07c0014cce..000000000000
--- a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-04-12 17:39:03.000000000 +0200
-+++ b/CMakeLists.txt 2016-04-16 13:30:27.339900905 +0200
-@@ -55,20 +55,31 @@
-
- find_package(PythonInterp 3.4.0 REQUIRED)
-
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE
-+STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+STRING "Directory to install Python bindings to")
-+ endif()
-+endif()
-+
- install(DIRECTORY resources
- DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
-- DESTINATION lib/cura)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
-+
- if(NOT APPLE AND NOT WIN32)
- install(FILES cura_app.py
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- RENAME cura)
- install(DIRECTORY cura
-- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
- FILES_MATCHING PATTERN *.py)
- install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
- install(FILES cura.desktop
- DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
- install(FILES cura.sharedmimeinfo
diff --git a/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
deleted file mode 100644
index 8f503ce73488..000000000000
--- a/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN Cura-2.3.1.orig/CMakeLists.txt Cura-2.3.1/CMakeLists.txt
---- Cura-2.3.1.orig/CMakeLists.txt 2016-11-04 16:24:43.000000000 +0300
-+++ Cura-2.3.1/CMakeLists.txt 2016-12-05 12:20:23.126904644 +0300
-@@ -27,20 +27,31 @@
-
- find_package(PythonInterp 3.4.0 REQUIRED)
-
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ endif()
-+endif()
-+
-+
- install(DIRECTORY resources
- DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
-- DESTINATION lib/cura)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- if(NOT APPLE AND NOT WIN32)
- install(FILES cura_app.py
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- RENAME cura)
- install(DIRECTORY cura
-- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
- FILES_MATCHING PATTERN *.py)
- install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
- install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
- DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
- install(FILES cura.sharedmimeinfo
diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
new file mode 100644
index 000000000000..066f9148c4d9
--- /dev/null
+++ b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
@@ -0,0 +1,37 @@
+--- Cura-3.1.0-orig/CMakeLists.txt 2017-12-04 18:05:38.000000000 +0200
++++ Cura-3.1.0/CMakeLists.txt 2017-12-29 18:11:19.508034087 +0200
+@@ -36,10 +36,20 @@
+
+ find_package(PythonInterp 3.5.0 REQUIRED)
+
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++ if(APPLE OR WIN32)
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ CACHE STRING "Directory to install Python bindings to")
++ else()
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
++ CACHE STRING "Directory to install Python bindings to")
++ endif()
++endif()
++
+ install(DIRECTORY resources
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
+ install(DIRECTORY plugins
+- DESTINATION lib${LIB_SUFFIX}/cura)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
+ if(NOT APPLE AND NOT WIN32)
+ install(FILES cura_app.py
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -53,10 +63,10 @@
+ DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
+ else()
+ install(DIRECTORY cura
+- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+ FILES_MATCHING PATTERN *.py)
+ install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
+- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+ endif()
+ install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index e3e65a7508d0..19761d81848f 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -5,6 +5,25 @@
<email>3dprint@gentoo.org</email>
<name>Gentoo 3D Printer Project</name>
</maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
<use>
<flag name="usb">Access 3D printers via USB</flag>
</use>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index c3c9888c311b..f33d73a03703 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,16 +1,3 @@
-AUX curaengine-0.15.04.6-cflags.patch 750 BLAKE2B dfa1e1a0c855768387375ac3c0caa16de43a1b4009b68b4b54ca5cd5666818e863570ddebbeccf6a7c5f14dcabc1bd12c87738278cd78fa29b3409f7e85e11e6 SHA512 2109a1d1b07b97769347af7af58921b6d234c4a4bdc8ab8ab1aa0a0f3aac08b3f5e9f99fbb99001e1d505cee89fff30be40a20ba853ee6a3cdcdd98f5ad7058c
-AUX curaengine-2.3.1-fix-stringtest-int-types.patch 1440 BLAKE2B 1b82117e0d13bcd2c7f480bc2b8816cae8298faa3a026b955082a14adf795e41405adc88f8f08f990fc8fd2e04e072788718f9773ba3c9040bea1395c5896135 SHA512 88e5465a5dc04726c9646672d6781f2e78bdf3ab9786bad0fb7b9cb390b611aabc663328fd2724081587d3c0c568733295c22101e2f8224e7b4df332dd4f4e6c
-AUX curaengine-2.3.1-make-stringtest-64bit-safe.patch 645 BLAKE2B b36b556fb7d58ef771bbbf6f8314f61460e3bb436ec0178809992625cd96e71e006ec35995a209b46408d8c831e444f985f394fd2d90b99839509c28b79cb9de SHA512 364ae3575ff70bf6a1d2a12a3709b07b061e6c158ec3594d2ab8cb99dc059ef00036a79c2d6888ab91b001efc9004d3e26409cf7ea634561bbb4af84345f6fe3
-AUX curaengine-2.3.1-remove-gcodeplannertest.patch 370 BLAKE2B fbc5ed6858fe3e951a3eba93ecfef792d5f36e5e863793bff022a9591156c407ae4a1fff13042d9eee7dae3b4ab88b878d8a1904ad240bc7775114772d483b56 SHA512 f4a57be7e472b637635f035999d370c7bd09449f530d8f34d61c0a1fa353233b7f8c8578ebca582f5dbee8b714c7f67b09a8823da3d9360c6034acb1202c39f1
-DIST curaengine-0.15.04.6.tar.gz 107970 BLAKE2B cf72d74acbc5df4e46c066e27c36957380dee8a40301f0d489b23c0ab2f231bf4f3b7d953964fa7eb073c816a7f7aff755f25380d86bee37a61e1d0bd2ae3b68 SHA512 150e93dca08c57bc37af4c3232c0d18aed93347657d7261f89d7d8352d2774ac7a2a944c3b1efce432b507674f5e99981844823b792ec3fbe47799d2487e899d
-DIST curaengine-2.1.0_beta.tar.gz 33322580 BLAKE2B dac6b108caddb006348b184465727fba311ee6b35c992db44bef1a0a129c8b5daebc8315ac1654120404a30c4a4851ee37d0c12e17886539f8f57572a26fa520 SHA512 23b1e1116fad8e75354a92b8320a228a0b7acb03bcdffa175b8b6f47af0b8af099efdc3c75f840d172fc157d432a05c741a5028f3b8da1e7fc1dd8cf158115fb
-DIST curaengine-2.3.1.tar.gz 712429 BLAKE2B 9971468b9eb8aac12426a1483adf904825bc142e25010ba6ba989b94095ac92b10ad91a7fe5a486b823f9238813e986b58bb744e71209542c965cbd43486f56e SHA512 3d247048e51c7aca33b71d7d2382d673e7b4d547cb9fcbf639c9bbc801db067ea010c04a6fd4e88b87e00d9069f7a70019612148ae2b50095514b85078e71220
-DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a7250877568a4e93bb86393c777c368d22b73e85ad918b65d502670d2d483cb909b5fdae75b17081b04e2091d1498d9a6c8 SHA512 3991127ba3005b93f02ab72fd6c9208b153d5419145edb84f187e1fa32d03220001d8be958847360f7eaa75336ed44f3f7158cedea82d33450992145dfd0a0d9
-EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137ccb9c9234da1b0bfc800698585806917cbc8cdf9e598e3dbf9be4c6d283c30b6f39849bc6821342d78ca4d20b0539892cb SHA512 21dcd8a630df89c8c89e70fc21b3509b1e7972985ba72afcc961d90990e382fe9d07d63c8013315b6afe14650e8e58134d74123e5920a019cfd0293a4192485e
-EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
-EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbde55113e5248b8f6654c663628c9e8f07ce89ede7b815b5bfcaa13f2279bb8f8e6c353ef8dd172ec209bb5658af95e73 SHA512 db7d3bb6818af0d9c6121348cb6bfbc256135cb42b1677893b891d3970e20e1b0729f382ef3d7f3c5965efb86193fa8eb18d5b5f73023ca6cb35912e70da9765
-EBUILD curaengine-2.3.1-r2.ebuild 1123 BLAKE2B a63ee7dcea38d7b22009d4d27f0b9e119ea3c85fe1ab4468ba5436fba1d731866351b142d3e04174f00e165a8c64fb4ec419f5d086eb6a746d2b05e2398fd2bb SHA512 d8de8a03fa3b1b0281b5bcc40d6d37237cbe01a00348df44ea98dec7fda288085a53940c1ba8ab990e6dc3274ad26766343a7d328716c05e7291c6cdc8898f9e
-EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
-EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70
-EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623
-MISC metadata.xml 345 BLAKE2B 511f54aad8cd73aed32473b360cbec2147162bcd2c43eb4ebd221c17da563d90949dd0008e9bd47bc7cbd97a4ff2837da4054870a4714d8b271f5d4d6082b318 SHA512 eea1693928c47dd36f6ca76c7a7f3a5fdf6c49edd978f24be42d812b354ac6a8544036a9ae384e849d47cbe43a02ef0e1a2cbaff0f3929c344c49dc45fd49742
+DIST curaengine-3.3.0.tar.gz 935367 BLAKE2B c02fa8ac5d79f6506dad91967f46add0b22b585cfb9931d67e34a033a59ba828722782f7fcf590ef45aa645b3c5dcb92416dbb5ef321fd5bf19935b2b5f1d4e7 SHA512 14b1961c90ec8ecad6fadfb992b72a4e05f3fa6c9a7b580812f90410c655db9d5798d46aa17311c216631daae1c21f6255c6fc4a0d903a91091e0a7a63642f70
+EBUILD curaengine-3.3.0.ebuild 864 BLAKE2B 46798444b183df3a6ac8d849f21cde7eba678a0bac6469fb74eb7f65493413446ea8662b2b5de1c2938c14d60ddca660d5b7e53a3f4a5af01024c2712c67cbd1 SHA512 a8a1c307ac9575f0ffde948c8e33c1deb6f6cd0c4210a6772a7faf3d76761a16f93002238270dca8faaed413e1af8ae33774d24032fe4a67a6fcbda94a0e7c50
+MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild b/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
deleted file mode 100644
index b375b1bffa2e..000000000000
--- a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_PV=${PV#0.}
-MY_PN=CuraEngine
-
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
- tc-export CXX
- default
-}
-
-src_test() {
- pushd tests 2>&- || die
- einfo "Commencing test ..."
- local testbin=( "${S}/build/CuraEngine" "-c" "supportAngle=60" "-c" "supportEverywhere=1" )
- local testmdl="${S}/tests/testModel.stl"
- ${testbin[*]} "${testmdl}"
- if [[ $? -eq 0 && -f "${testbin[0]}" && -f "${testmdl}" ]]; then
- einfo "Test completed successfully."
- else
- ewarn "Test failed."
- fi
- popd 2>&- || die
-}
-
-src_install() {
- dobin build/CuraEngine
- dodoc README.md
-}
diff --git a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
deleted file mode 100644
index ee9efe32b82a..000000000000
--- a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen
- media-gfx/graphviz )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch" )
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_make
- if use doc; then
- doxygen || die
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- HTML_DOCS=( html/. )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
deleted file mode 100644
index caa04ad6c138..000000000000
--- a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen
- media-gfx/graphviz )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch"
- "${FILESDIR}/${P}-make-stringtest-64bit-safe.patch"
- "${FILESDIR}/${P}-fix-stringtest-int-types.patch" )
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_make
- if use doc; then
- doxygen || die
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- HTML_DOCS=( html/. )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.3.1.ebuild b/media-gfx/curaengine/curaengine-2.3.1.ebuild
deleted file mode 100644
index 10de130c3a96..000000000000
--- a/media-gfx/curaengine/curaengine-2.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_make
- if use doc; then
- doxygen
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- DOCS+=( html )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
deleted file mode 100644
index b6dbce74a56f..000000000000
--- a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen
- media-gfx/graphviz )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( "README.md" )
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_make
- if use doc; then
- doxygen || die
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- HTML_DOCS=( html/. )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.6.0.ebuild b/media-gfx/curaengine/curaengine-2.6.0.ebuild
deleted file mode 100644
index 814f01f58f9f..000000000000
--- a/media-gfx/curaengine/curaengine-2.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_make
- if use doc; then
- doxygen
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- DOCS+=( html )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild b/media-gfx/curaengine/curaengine-3.3.0.ebuild
index 10de130c3a96..2f945665c4a1 100644
--- a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild
+++ b/media-gfx/curaengine/curaengine-3.3.0.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
inherit cmake-utils
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
+MY_PN="CuraEngine"
DESCRIPTION="A 3D model slicing engine for 3D printing"
HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="${PYTHON_DEPS}
- dev-libs/libarcus:=
- >=dev-libs/protobuf-3"
+ ~dev-libs/libarcus-${PV}:*
+ dev-libs/protobuf"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
DOCS=( README.md )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
src_configure() {
local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
cmake-utils_src_configure
diff --git a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch b/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch
deleted file mode 100644
index 9807301e462c..000000000000
--- a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 32fa704..c426ef8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,9 +18,9 @@ endif
- ifeq ($(BUILD_TYPE),PROFILE)
- CFLAGS+= -pg
- endif
--ifeq ($(BUILD_TYPE),RELEASE)
-- CFLAGS+= -O3 -fomit-frame-pointer
--endif
-+#ifeq ($(BUILD_TYPE),RELEASE)
-+# CFLAGS+= -O3 -fomit-frame-pointer
-+#endif
-
- LDFLAGS += -Lbuild/ -lclipper
-
-# By courtesy of Whissi: this enforces use of our CXXFLAGS
-@@ -70,7 +70,7 @@ $(BUILD_DIR)/libclipper.a: $(LIBS_DIR)/clipper/clipper.cpp
- $(CXX) $(CFLAGS) -o $(BUILD_DIR)/libclipper.a $(LIBS_DIR)/clipper/clipper.cpp
-
- $(EXECUTABLE): $(OBJECTS) $(BUILD_DIR)/libclipper.a
-- $(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
-
- $(DIRS):
- -@$(MKDIR_PREFIX) $(DIRS)
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
deleted file mode 100644
index e30bde4de451..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fe45e504ace024d920fe18b4f55d6aa07b2f929b Mon Sep 17 00:00:00 2001
-From: Ghostkeeper <rubend@tutanota.com>
-Date: Mon, 20 Nov 2017 10:46:09 +0100
-Subject: [PATCH] Use ints instead of int64_t to test writing ints
-
-Because sprintf doesn't accept anything more.
----
- tests/utils/StringTest.cpp | 4 ++--
- tests/utils/StringTest.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
-index 5bd16c5d3..980d2145f 100644
---- a/tests/utils/StringTest.cpp
-+++ b/tests/utils/StringTest.cpp
-@@ -71,12 +71,12 @@ void StringTest::writeInt2mmTestMax()
- }
-
-
--void StringTest::writeInt2mmAssert(int64_t in)
-+void StringTest::writeInt2mmAssert(int in)
- {
- std::ostringstream ss;
- writeInt2mm(in, ss);
- std::string str = ss.str();
-- int64_t out = MM2INT(strtod(str.c_str(), nullptr));
-+ int out = MM2INT(strtod(str.c_str(), nullptr));
-
- char buffer[200];
- sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
-diff --git a/tests/utils/StringTest.h b/tests/utils/StringTest.h
-index 58be00642..da1da793a 100644
---- a/tests/utils/StringTest.h
-+++ b/tests/utils/StringTest.h
-@@ -68,7 +68,7 @@ class StringTest : public CppUnit::TestFixture
- *
- * \param in the integer to check
- */
-- void writeInt2mmAssert(int64_t in);
-+ void writeInt2mmAssert(int in);
- };
-
- }
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
deleted file mode 100644
index a9b447fe8528..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
-index aa369f3da..b1a084587 100644
---- a/tests/utils/StringTest.cpp
-+++ b/tests/utils/StringTest.cpp
-@@ -79,7 +79,7 @@ void StringTest::writeInt2mmAssert(int64_t in)
- int64_t out = MM2INT(strtod(str.c_str(), nullptr));
-
- char buffer[200];
-- sprintf(buffer, "The integer %ld was printed as '%s' which was interpreted as %ld rather than %ld!", in, str.c_str(), out, in);
-+ sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
- CPPUNIT_ASSERT_MESSAGE(std::string(buffer), in == out);
- }
-
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch
deleted file mode 100644
index 351cebde493f..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47dcd2d1..c2316d68 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,9 +125,6 @@ set(engine_SRCS # Except main.cpp.
- )
-
- # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h.
--set(engine_TEST
-- GCodePlannerTest
--)
- set(engine_TEST_INFILL
- )
- set(engine_TEST_UTILS
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 2b689686f817..58e8297dc744 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -5,6 +5,25 @@
<email>3dprint@gentoo.org</email>
<name>Gentoo 3D Printer Project</name>
</maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
<upstream>
<remote-id type="github">Ultimaker/CuraEngine</remote-id>
</upstream>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index d33adf05074a..566616303d76 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -5,7 +5,7 @@ DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4
DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
-EBUILD darktable-2.4.3.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.4.3.ebuild b/media-gfx/darktable/darktable-2.4.3.ebuild
index 76721f6a80a4..2d418fad028b 100644
--- a/media-gfx/darktable/darktable-2.4.3.ebuild
+++ b/media-gfx/darktable/darktable-2.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
# TODO add lua once dev-lang/lua-5.2 is unmasked
IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 9579a227e2f4..aee31a684ace 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,5 +1,3 @@
DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88
EBUILD engauge-10.6.ebuild 2285 BLAKE2B 458d2526784e58cb6299bea5e0b92616fb496361fdd28ae2bbfd865562a8c87aad73b765c4de0849edf7a5950f267ec14f4c009b102a07f4a5b79672658d9c4f SHA512 860f7cf94e180125c46c943b60f62278d16226a2bcba4a28a810cfc630de704bad701340df7f368d4c445f06e639c32380e42566d86cfbc266f635ef4ba9c9ee
-EBUILD engauge-5.2.ebuild 1293 BLAKE2B 2225bac7ed507d6922587e930bebfc47c3d944df5bd65141e472d1ca4ed83a38594f43e7233b9a82b7fe868ad90c78190f81ef882ae18248ecd95d61e94192e5 SHA512 935c106dad40e7c48255002c2d59c8db5524ceb3e818f554b4bbc660bc7e4f081aeba4fe3db21f3c38151cc66877eaf9730a825351236af690026996b3540e1c
MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-5.2.ebuild b/media-gfx/engauge/engauge-5.2.ebuild
deleted file mode 100644
index 95b112256c2f..000000000000
--- a/media-gfx/engauge/engauge-5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator qmake-utils eutils
-
-DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://digitizer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/digitizer/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-qt/qt3support:4
- dev-qt/qtgui:4[gif(+)]
- sci-libs/fftw:3.0
- x11-libs/libXft"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Some patching and using the DEBIAN_PACKAGE ifdef is necessary to make sure the
- # documentation is looked for in the proper directory
- sed -i -e "s:/usr/share/doc/engauge-digitizer-doc/html:${ROOT}/usr/share/doc/${PF}/usermanual:" \
- src/digitmain.cpp || die "sed failed"
- sed -i -e '/unix {/a DEFINES += DEBIAN_PACKAGE' \
- digitizer.pro || die "sed failed"
- eapply_user
-}
-
-src_configure() {
- eqmake4 digitizer.pro
-}
-
-src_install() {
- dobin bin/engauge
- newicon src/img/lo32-app-digitizer.png "${PN}.png"
- make_desktop_entry engauge "Engauge Digitizer" ${PN} Graphics
- insinto /usr/share/doc/${PF}
- if use doc; then
- doins -r usermanual || die "install documentation failed"
- fi
- if use examples; then
- doins -r samples || die "install examples failed"
- fi
-}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
new file mode 100644
index 000000000000..a7f9a57f4ce8
--- /dev/null
+++ b/media-gfx/fdm-materials/Manifest
@@ -0,0 +1,3 @@
+DIST fdm-materials-3.3.0.tar.gz 20460 BLAKE2B 31f8c65b702a414da7ce51bddb2d8523ef65bcdfa12caa6effbb6fadc11a90511b11a6844ae8ee679ff0fed3d3c6e3cf634245ab6c7489a8202f3c9799ecd655 SHA512 e66283616eec7de22c3e1e782683c15991e6def66d79aba0357c6dcafa7ee0b3bbf6aa24f685da68b7215d68ee90b5fac602ccae9027a651609ca5e423d429d6
+EBUILD fdm-materials-3.3.0.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
+MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild
new file mode 100644
index 000000000000..a11c9629a10d
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
new file mode 100644
index 000000000000..9db3a37e1c15
--- /dev/null
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
+ <upstream>
+ <remote-id type="github">Ultimaker/fdm_materials</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index ba120c1ecbd6..4270186eee18 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -3,5 +3,5 @@ DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c
DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f
EBUILD gifsicle-1.90.ebuild 626 BLAKE2B c10efe658d8b7bfe90d776ce3dd30e0d253812201a06479a387363d24c73ea915e4d7a161be1c45f1a63b6f996a44a140baa3b2fee3df2d15100d59df85157f0 SHA512 d4edb761f196afad242d81c50f963402248ec8a499fb867136be58fbfbe86556ae876bc5e07883fe010a99f5045e1b8f7707e13dc1a8e00a65f14107b383cecb
-EBUILD gifsicle-1.91.ebuild 667 BLAKE2B c1da2485a991fbae8c124d448da362cae8ee52fe40f0f51d0f99205a1a8719c3516d9aedfac6b6bcfb741a6a7a58d202a544b1b318721f8b89f4a6155edb7323 SHA512 847ad145ff72390ef55ae89af80f10a9757739da88650f01ce43dce635e1659c8058c496cfb5c86ff53b97ce4d2fcfa73042c797e786c80254cf90857bb05800
+EBUILD gifsicle-1.91.ebuild 666 BLAKE2B 6a68025dc18ed43bd278538b041df12316fdf7d329acc84b63c7005cf63493b639fc48464d2b245a1c7c9c6d49fd2c65a0a1a76223d1785e4d1b470c6f07dea2 SHA512 e7ba7a3e15c09649e1f1fb903c8fa517f163c69546a1303782cb287089d835ebbc23cfef0e52fcb5a176fc84184b79ab97c12dd6e858881f9d5c4b8c9ce01a32
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild
index 178513885a6f..ef6f6157726f 100644
--- a/media-gfx/gifsicle/gifsicle-1.91.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.91.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="X"
RDEPEND="
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f2570203987d..7e4b43044ab1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -9,8 +9,10 @@ AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef59
AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
+DIST gimp-2.10.2.tar.bz2 30863771 BLAKE2B a3525f7266ffe35be1daf973bee4ea107d9e7384e0c85a792f2fc69bd29fa8ee3d19409586b9b1e1bf36a1be4e30719c7ed945e5de9b7cb4be4f81be06ea1468 SHA512 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf
DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
+EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8490e660766b722e216cc956a03ff73f118c24bd8d356925a9a688f093da23b81cf0a9de62d4ca3b209715a3 SHA512 c9c70bc7f093dbe9cad2d9324c0ce2269cb0aaa6c022590cb01538fb14ada2a1885151e4d610596b39ea5fa556abb4872a68a389fa0496c0186ae906c5c22e2c
EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
diff --git a/media-gfx/gimp/gimp-2.10.2.ebuild b/media-gfx/gimp/gimp-2.10.2.ebuild
new file mode 100644
index 000000000000..bbc9b522552f
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+
+inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.54.2:2
+ >=dev-libs/atk-2.2.0
+ >=x11-libs/gtk+-2.24.10:2
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/pango-1.29.4
+ xpm? ( x11-libs/libXpm )
+ >=media-libs/freetype-2.1.7
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/libmypaint-1.3.0[gegl]
+ >=media-gfx/mypaint-brushes-1.3.0
+ >=media-libs/fontconfig-2.12.4
+ sys-libs/zlib
+ dev-libs/libxml2
+ dev-libs/libxslt
+ x11-themes/hicolor-icon-theme
+ >=media-libs/babl-0.1.50
+ >=media-libs/gegl-0.4.2:0.4[cairo]
+ >=dev-libs/glib-2.43
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ aqua? ( x11-libs/gtk-mac-integration )
+ gnome? ( gnome-base/gvfs )
+ virtual/jpeg:0
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ >=media-libs/lcms-2.8:2
+ mng? ( media-libs/libmng )
+ openexr? ( >=media-libs/openexr-1.6.1 )
+ >=app-text/poppler-0.44[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=media-libs/libpng-1.6.25:0=
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+ )
+ >=media-libs/tiff-3.5.7:0
+ >=gnome-base/librsvg-2.40.6:2
+ webp? ( >=media-libs/libwebp-0.6.0 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ net-libs/glib-networking[ssl]
+ x11-libs/libXcursor
+ sys-libs/zlib
+ app-arch/bzip2
+ >=app-arch/xz-utils-5.0.0
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
+ sys-apps/findutils
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ doc? ( >=dev-util/gtk-doc-1 )
+ >=sys-devel/libtool-2.2
+ >=sys-devel/automake-1.11
+ dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+ gnome2_src_prepare # calls eautoreconf
+
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+src_configure() {
+ local myconf=(
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+ --enable-default-binary
+ --disable-silent-rules
+
+ $(use_with !aqua x)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_enable altivec)
+ --with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
+ --without-webkit
+ $(use_with jpeg2k jpeg2000)
+ $(use_with postscript gs)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with webp)
+ --without-libheif
+ $(use_enable python)
+ $(use_enable smp mp)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_with udev gudev)
+ $(use_with wmf)
+ --with-xmc
+ $(use_with xpm libxpm)
+ $(use_enable vector-icons)
+ --without-xvfb-run
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+ addwrite /dev/dri/ # bug #574038
+ addwrite /dev/ati/ # bug 589198
+ addwrite /proc/mtrr # bug 589198
+
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+_clean_up_locales() {
+ [[ -z ${LINGUAS+set} ]] && return
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ has ${lang} ${LINGUAS} && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
+ done
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ prune_libtool_files --all
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
index 8f4638a3fc63..9f16af674ad1 100644
--- a/media-gfx/gliv/Manifest
+++ b/media-gfx/gliv/Manifest
@@ -1,4 +1,3 @@
-AUX gliv-1.9.6-as-needed.patch 2864 BLAKE2B c0d8ceb61fc961d6a8a3e4ac9eeb7dc5b9d5f1a4d67909a8dcf809632260a389089ea245b52a097db2eedf66caf184132aee7627ef3c8a269533e5b0029669a0 SHA512 594614f5190f9401d7759c26676a43d6a60cc81ca73e79536f5b4969252189d6a45293069f8426ed5e5ffb5d5c8a3f7e103a6243de6d6f182a20331802d16d01
AUX gliv-1.9.7-as-needed.patch 2374 BLAKE2B 2b8ee4ddd7c9c587ca7b592a8797dde3eea655e88367aadb03d4bcf0407a4d14008a09d79026d75d26d75c0eb079c786f1cdc7fd9e3511fb7b8561e05290eff0 SHA512 8923b579d87079cffec3db5e5f00cc35c3bd516f1a878bc4d0e916150617a4f06d5ba3604d44dd128110e4398de5ab26ee8eef1d85dac74b4122e589eb6ad19d
AUX gliv-1.9.7-destdir.patch 914 BLAKE2B 78f14a26e60282c2afa7e768affe442c9123c2b5860690b427067d732b46aed745a3ebb51ecf5bd424b3ff7c9dd186666843a88a0330fa10c57d58890a3aade7 SHA512 1d83c62b470889260365a5ac24de591a8e817dd9d0d10d68cbf1a7ca27b544f44940b37f316956b5a4d79ce33eafb7c41a8c6cd6d943e35fba8e9fbfd1f0c9ed
DIST gliv-1.9.7.tar.bz2 644305 BLAKE2B 9f31c9fbedff833966bf16366fc3ef73aae0dc190146fc42f67d9abfc426ebc0c496931f3c9ca14df0e9c4e18310d7d54603c13e4d4cc6d1cae93b84b8737235 SHA512 c2276bde4b13d0dc910062e8cdec8836d751ce25e5120f4fd7987c9ba5bd62844a71a5e92c1ccf766393b47f2ff95fc3298051d3729e38696fccc024be388c4e
diff --git a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
deleted file mode 100644
index 3128b99e4435..000000000000
--- a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- gliv-1.9.6.orig/configure.ac 2005-09-21 23:05:57.000000000 +0200
-+++ gliv-1.9.6/configure.ac 2010-01-03 15:51:41.464539460 +0100
-@@ -16,18 +16,17 @@
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
--
-+AC_USE_SYSTEM_EXTENSIONS
-
- # Default CFLAGS.
--if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-- CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
--fi
--CFLAGS="$CFLAGS -I${srcdir}/../lib"
-+#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-+# CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
-+#fi
-+#CFLAGS="$CFLAGS -I${srcdir}/../lib"
-
- # Checks for LFS flags, we may not handle big files, but it doesn't hurt.
- AC_SYS_LARGEFILE
-
--
- AC_DEFUN([CHECK_MATH],
- [OLD_CFLAGS="$CFLAGS"]
- [CFLAGS="$CFLAGS -w"]
-@@ -127,35 +126,22 @@
-
- # Checks for X.
- AC_PATH_XTRA
--CFLAGS="$X_CFLAGS $CFLAGS"
--LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
-
- # Checks for GtkGLExt.
- PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
--CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
--LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
- GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
-
- # Checks for OpenGL.
--AC_TRY_LINK([#include "GL/gl.h"],
-- [glBegin(GL_QUADS);],
-- [ogl="yes"],
-- [ogl="no"])
--
-+AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
- if test "x$ogl" = "xno"; then
- AC_MSG_NOTICE([maybe libGL requires libpthread...])
-- OLD_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS -lpthread"
-- AC_TRY_LINK([#include "GL/gl.h"],
-- [glBegin(GL_QUADS);],
-- [],
-- AC_MSG_ERROR([cannot use -lGL]))
-+ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
- fi
-
- # Checks for gtk.
- AM_PATH_GTK_2_0([2.6.0], [
- CFLAGS="$GTK_CFLAGS $CFLAGS"
-- LDFLAGS="$GTK_LIBS $LDFLAGS"
-+ LIBS="$LIBS $GTK_LIBS"
- GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
- ], [exit 1], [gthread])
-
-@@ -163,9 +149,6 @@
- ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
- AM_GNU_GETTEXT_VERSION
- AM_GNU_GETTEXT
--CFLAGS="$CFLAGS -I../${srcdir}/intl"
--LIBS="$LIBS $LIBINTL"
--
-
- AC_CONFIG_FILES([
- Makefile
---- gliv-1.9.6.orig/src/Makefile.am 2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/src/Makefile.am 2010-01-03 15:48:45.765539472 +0100
-@@ -64,6 +64,9 @@
- gliv_LDADD = -L../lib -lreplacements
- endif
-
-+gliv_CFLAGS = @GTKGLEXT_CFLAGS@
-+gliv_LDADD = @GTKGLEXT_LIBS@
-+
- AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-
---- gliv-1.9.6.orig/po/Makefile.in.in 2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/po/Makefile.in.in 2010-01-03 16:05:43.860539403 +0100
-@@ -29,7 +29,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
- GMSGFMT = @GMSGFMT@
-
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 2698cc930100..84d7009fd0d7 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,10 +1,8 @@
AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
AUX graphicsmagick-1.3.27-version.sh-fix.patch 310 BLAKE2B 0a9a0c97c675af889207393a5123ef3d4c8367a4f0ab9f9c20a9056a5ad6ab021a010f1519b9ed25cc4e0473bd43ce353c1513d843d0ed33f1d1ac0a11246b01 SHA512 e7b497506aa480bbb301a9adfc5ee4332ca6520e62c5e3636aa960d2f4da32b08e887969e7c9477d021c953b74616c82c9c8168a7896f4c6c33ad25d7848d5a3
-DIST GraphicsMagick-1.3.26.tar.xz 5400564 BLAKE2B bd7c5286f4ff0abe8fafee680f9bea5e96c23d1787b5dc5b1a33580b5b8fd2dc8c5932606e0c8f2d783c377104232e8efb6be83ea10e0105c83e9d1925314e0b SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22
DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
-EBUILD graphicsmagick-1.3.26.ebuild 3275 BLAKE2B 86e28c2249ac008c44142aa589e23e768a60d402853c5047daa09d761f4c541926a61b6b9b85fb62a56a6dd2dfddff30df09439b0bfd1c228e4aebec357158d5 SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696
EBUILD graphicsmagick-1.3.27.ebuild 3325 BLAKE2B 2dc3525d0cd95d103a6f78dbb098c63fb69d50528107306c48ea2cd378ced281b08ec6a006c0ae4216e8f7c15910334efce0f628ba396bad936db04f5dacd047 SHA512 5381ce87435c8e86e1a09de878dea8f71a3aca7aef212f1132b227786abcfa6fc883c4af28b9f603889731cd7ac4931a8f3c6cc9ba0da46027e6a003519accea
EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
deleted file mode 100644
index 1c81eee7da7f..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
- perl png postscript q16 q32 static-libs svg test threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl )
- png? ( media-libs/libpng:0 )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
- test? ( media-fonts/corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- econf \
- --${openmp}-openmp \
- --enable-largefile \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable debug prof) \
- $(use_enable debug gcov) \
- $(use_enable imagemagick magick-compat) \
- $(use_with threads) \
- $(use_with modules) \
- --with-quantum-depth=${depth} \
- --without-frozenpaths \
- $(use_with cxx magick-plus-plus) \
- $(use_with perl) \
- --with-perl-options=INSTALLDIRS=vendor \
- $(use_with bzip2 bzlib) \
- $(use_with postscript dps) \
- $(use_with fpx) \
- --without-gslib \
- $(use_with jbig) \
- $(use_with webp) \
- $(use_with jpeg) \
- $(use_with jpeg2k jp2) \
- $(use_with lcms lcms2) \
- $(use_with lzma) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with truetype ttf) \
- $(use_with wmf) \
- --with-fontpath="${EPREFIX}"/usr/share/fonts \
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
- $(use_with svg xml) \
- $(use_with zlib) \
- $(use_with X x)
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 5a01f1d10219..8300a1dfa33f 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,6 @@
AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
DIST graphite2-1.3.11.tgz 4236760 BLAKE2B d02c98cb387eec1d7b238de550554384f25c873e84d6e2a14dbe352c3f1f8420fa06130c5fd9083e442994b88c483a1a9ca8dcaa0a2c632314f1847e432a7f3b SHA512 fd5e997a30492a7668ad7afd78889e40cb37195cb8e11f42817ee00901b699d6a591e8230bf7a40abd1b218ae26588948a92b23e48c9fd03164fd5e2f4031afe
-EBUILD graphite2-1.3.10.ebuild 2505 BLAKE2B 301ec1ba55e2cd645e19907076e90f67e7c211625ff3af3ee87d789c4a386ffda434921cee8d18f7c51b7707c0ba01aaeb323e4d7c201e4f7f3cd5170706879b SHA512 f8e621fa3649dd1686349952792c09a718eb80c5caa4816330dda40b0ad4ed5e15228d472c180e4488cb17c7f1b0d31aae2fa9fd8abcdca487106c5aefef427c
-EBUILD graphite2-1.3.11.ebuild 2544 BLAKE2B 9f1ec9ee130ae9355ab0e2f0009ccd9f27f9e38029a9dd2ce2af6054f4727e8f355843587550aca974a98d7d9f5890ce6bf4c1a8a26ee097125715d8c2b128f1 SHA512 a464076813ed0409b40686f97c38b5a58dfa8199d42353ed7656abed3264026655577854c22c7c98e41aefbb68782b7af30fd48803e7602d2a1d86fc1286d9e9
+EBUILD graphite2-1.3.10.ebuild 2510 BLAKE2B 6116568754ea8d6017ddcfeb4b1b91040a22ab46a70a4d5e4225d535674f9ae73fee7d072e660ad35ccb5b2485031d5e9b2e706fe8432d54ec494a5757036158 SHA512 1e26e281abe31cd6efb25dd600563fff689c050a9698bdd687419eb53bdccedb2f2164bf1c2f8b5fa63d7c4f9b039c74e02d34fa89d617195b3e2f9f0b67c776
+EBUILD graphite2-1.3.11.ebuild 2550 BLAKE2B 2c304d16bee69f57d33f65ac9bc0a4aedbcbe7704e0658383f51d4396c488cb1f15ffafaea4e36da60d3385a3ff4faa46be479787d33d4305b34d6c6f48868cd SHA512 ac4fbfb4e99fbd49c76a0f36c8b1fd30182877be68c6996e387d1d71782a5e6e56baebe246e77aa225f5693faf4d35eeef43a68f5befa5b6ba83b37e9bdeb433
MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.10.ebuild b/media-gfx/graphite2/graphite2-1.3.10.ebuild
index 37be29285a32..795bd3f9566e 100644
--- a/media-gfx/graphite2/graphite2-1.3.10.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="perl test"
RDEPEND="
diff --git a/media-gfx/graphite2/graphite2-1.3.11.ebuild b/media-gfx/graphite2/graphite2-1.3.11.ebuild
index 7f550be8ec46..38ff5695b59f 100644
--- a/media-gfx/graphite2/graphite2-1.3.11.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="perl test"
RDEPEND="
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 8bfa7a9fa9ac..15b763d86b82 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.4.0.tar.xz 43716 BLAKE2B d166056e90d23effed765abab3131e11880566df3ca7a4fcf8cbd7db994cf2b7b9404b07fa5d611d9ee3665bb359b1f743cd7e98e41033d5b35202a3c087801a SHA512 6b07e16534b835da60f5845c801cad0bdd381b6deb79ad99fc44afb9b776deb3cf76c85c9e4b59ba4148d71e894f659743c002ea4baf5589e8d261eb1a19b1fa
DIST lximage-qt-0.5.0.tar.xz 36068 BLAKE2B 46cf157c1a48cfea8a3149e3177baa79ec493796843e7297371c1d5802df68bee1ac220aeb9d6110a4072ba588585f276be916f886e0d3f6010792a8800e54e1 SHA512 632399781614a9d62429ed1b31515c2a87cdf1c61ab26bfc8d566654a31eccfa66ae069cd18604f380a9fc8d8700aa73a2c71be16bc32775caeef211eb955b21
-EBUILD lximage-qt-0.4.0.ebuild 926 BLAKE2B 86c42b1af025918756c61f6489d91053cfe3de0b892f648829ba92500ea75dfd51fa0b7bfc0545edd59da17c3c1c5de80ec67b152576850159f09078a167941c SHA512 2573c7be5cb8acd94ee7b722f5140d6781829364b11c076d766e11a47b53d4f475d0e8e5910107ca78896f919897c92c75d24ef8a1487e16f0bec6b863d63d1f
EBUILD lximage-qt-0.5.0.ebuild 917 BLAKE2B 2a5c5950e1f448828f983235e499e39181735a12b62553182d0413df6ce1e1085ed9fde5c603749fcc23b94e50a3141118bb535018341f777ac9a183b7c8a5bd SHA512 f3b23acec23069d152067ca035fce26708db42495f334e886e3bc92885baa512e8d169f1f8c43f587b6eef540fc55c998e7f9b5d26a5c9660d4b512d6c64273a
MISC metadata.xml 240 BLAKE2B 8dd1dd10c1b3297bf08ebf11d2e047de07700e5233e26788943af60613a3faa71ff392f77a33f0065917eedc487b2f9be91bdc58635c3c51957e5be2738282c0 SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652
diff --git a/media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild
deleted file mode 100644
index 38d97b44ced1..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
- SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-libs/libexif
- >=x11-libs/libfm-1.2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-misc/pcmanfm-qt"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT5=ON
- )
- cmake-utils_src_configure
-}
diff --git a/media-gfx/metapixel/Manifest b/media-gfx/metapixel/Manifest
index b7e775848de7..0d4c62b8dbfb 100644
--- a/media-gfx/metapixel/Manifest
+++ b/media-gfx/metapixel/Manifest
@@ -1,5 +1,5 @@
AUX metapixel-1.0.2-giflib5.patch 529 BLAKE2B 760b6f3c846a48e64e57d650584f56b506bbe62f4c7b70ae74081e4256b042d961d58964f1b78033ec2a657a1bc5400b112cab7782e81318f71361bf7fa6baf6 SHA512 1e6636ae03f05b9b1ce3a766cae4b19503a1eddd85cb4a97dcd63511d1520bd11dde3e3d76d3ec6ff23839e49be62a8fa704e25323ed28232e27eaf625fe4b17
AUX metapixel-1.0.2-libpng15.patch 4395 BLAKE2B 37f1834c834bbcb2e5f21eb6ef76d9de2e216466c6fe4cc130d477cc44cf609f24067b39be705b732911e21767557b2517b63f230d7710e66e45462802df84db SHA512 5edf6adb335de038996589bbfa799df471aeb8aec41d46f639ff4165fe9574b8a103bfdbdf086ac48de29d11dd263166e0787aad8ebc1298a9865837cc2d3282
DIST metapixel-1.0.2.tar.gz 63197 BLAKE2B ba5efaed9c3a305b9659af6d910e0c9597637510ed9d1d03a27feaeb1687751609bd60f009761c599593c02904f0c583324fc4b392af100fc60560cb4be2be8d SHA512 88a718fc349b9063c61a8ac24fc41923c742b25fb7e84c6b565ac92a301a04b46870750d5c06f751b2104c3f36108365b45214b52a6ede98da83441e2e30e156
-EBUILD metapixel-1.0.2-r1.ebuild 906 BLAKE2B 12715377a30588a8fe9855b197d51295a1240786850909266eae98efb2741847c670996abc02b7face838ef6b5405950f80295153e29bf3ea78f469b2e887f31 SHA512 36cb8e252ac3cd90d168e9780b43d236fc9bd7afd80ed5034cfdc03db7264bf08fb79a063d0fe5ff94523363d418fa50b5a1c3f7c986d200ff586d70cac7b4e2
+EBUILD metapixel-1.0.2-r1.ebuild 908 BLAKE2B 6bc4c75bf67abba6cc23eadc4e699062682259c32848e10dd8d4783a6b6769bcc80cfdaf1c371a1cebcadbed1ccf811d9d0403196857124c3911888c87a31227 SHA512 17386b85ce7b0494b49e341217326060c23907896ee3d8d7d3b675705c3d7e983e71533414732139167e43b98534ffec51c553add89d55e08d1c82f167c645df
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild b/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
index ac2b134a26c8..ecea7810b980 100644
--- a/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
+++ b/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
DESCRIPTION="a program for generating photomosaics"
-HOMEPAGE="http://www.complang.tuwien.ac.at/schani/metapixel"
-SRC_URI="http://www.complang.tuwien.ac.at/schani/${PN}/files/${P}.tar.gz"
+HOMEPAGE="https://www.complang.tuwien.ac.at/schani/metapixel"
+SRC_URI="https://www.complang.tuwien.ac.at/schani/${PN}/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 98db8a6b0949..26ca42c2a1b8 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -2,5 +2,5 @@ AUX svg2rlg-issue-3.patch 507 BLAKE2B 801eb095c1e383a0e75c4f79e11e8063ae94290c99
AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b1376e0b7ca52d9aeed6a7c8e2cbb07e0c91b1342182e03c0646e86ef7d730062fe5539c4440094d4644675c47 SHA512 500b929de726cb728ea10f295c7e15845046d0d3d70067c2ef54cca1466f456cb682797ddf99e0ae62ec68ba125183900763e82a2889f8941b507490a197ed88
AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723
-EBUILD svg2rlg-0.3.ebuild 806 BLAKE2B eedbfdfd72a4090b52252bf85702225e89c0c84138198c425d18825041f073e40d3ef3086b4015615bcf629c8a247461003e90e454937ac9965b3d2589708a1f SHA512 b7e1b0662cdbc32b179daf16f62244c93d65ea356f2604c900517fbe55284fc2f8dd4a3e0e3da649a1a7841e7e9854d0950c9be8c262e2d3f753aa6be7691fea
+EBUILD svg2rlg-0.3.ebuild 813 BLAKE2B a5d3becc568025f810f0adf309c3267852d0c6a70838b9f97d7fe7c941c923db306707036cfd3fa745921647b49111ba5e8a961e383b014aa2d7015e65423ec0 SHA512 2acf12bcf15f8ff0afcc6bcb4c9d4dca6d0f866150b27e20e05e1cc762fbb2f4abfb9612de4d7a3be358ef63874ae3523f0963b67dee42cea69431799439eeb0
MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 5375f967966c..1f64cee52b86 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest
index 8663df3dfb16..fd312e56b0d5 100644
--- a/media-gfx/tintii/Manifest
+++ b/media-gfx/tintii/Manifest
@@ -1,3 +1,3 @@
DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3
-EBUILD tintii-2.10.0.ebuild 524 BLAKE2B 350df61bf5e531694b77f23122f5aa5a00fa2ccf1afa0eb77302bb1c34bdb6f66f4e88035941377befc6d578d270b1b392ea95bfa512e6b75a5bf3b87abbd6cf SHA512 67ce051b5825f24fca1105cbde82cfb87329a1a9ff4a30856dd75ad86c8572c5c537d96a0c075b5465d624d6e71dc3d233e69830d80999204f5a5bef2de698d3
+EBUILD tintii-2.10.0.ebuild 526 BLAKE2B e614a533c6d023328a5c54e570528f7ca358eb6a938bb6fd8196f1ead7ab3c183010c587afc100f35495476cf6d33d0928b96b425890402938ef47a271438866 SHA512 f4e0258502d19ca630df8b54cae11704c4aeff27bac1020407d790944d9112d50741e55295b1e81981e2e5963699408cb0cd67298bc6408df986b0788c7ef8fa
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/tintii/tintii-2.10.0.ebuild b/media-gfx/tintii/tintii-2.10.0.ebuild
index 2ba2f2da7a26..a063c35bd35e 100644
--- a/media-gfx/tintii/tintii-2.10.0.ebuild
+++ b/media-gfx/tintii/tintii-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,8 +7,8 @@ WX_GTK_VER="3.0"
inherit wxwidgets
DESCRIPTION="A photo editor for selective color, saturation, and hue shift adjustments"
-HOMEPAGE="http://www.indii.org/software/tintii"
-SRC_URI="http://www.indii.org/files/tint/releases/${P}.tar.gz"
+HOMEPAGE="https://www.indii.org/software/tintii"
+SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"