gentoo resync : 29.03.2018

15 files changed, 88 insertions, 85 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f82bebd0185d..beeda51ab673 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index a963ec23e28a..309aa2921fd7 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,5 +2,5 @@ AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cf
 AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r3.ebuild 2786 BLAKE2B 4286b3d304972b814fc8892bb2158e00ba51bd9b8c75f8e0e3893f12713472c250e2ccd8a5cb73658ec352bad724a8f45f8b1a557f1e0d4769daa23a5653a4be SHA512 4e564ee469131679ee5a22507a376c7b93bd97318208564e924013192181b12d45c0a25c00d4e76b6117da304bf9522fe233f9369f035241b99829edcc735c23
+EBUILD fontforge-20170731-r3.ebuild 2792 BLAKE2B 96b466901cfee98f5aa54f89eb69f48e5755a57383e5348accae8748af964466b5d4a097e9bcde573b7ad9bd82210ca3cbf4144ab69701ac8fff3d80ed17c7e2 SHA512 3f59e70c12c7bc2df70578b14c0c7a9018d46e2daecc5fe9f7c4fff81317a4998164549007789eafaacad6355a0db8091f2f4ed9eb3a67eea7a8a3564cbc7702
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
index 41df600e7df5..3461e5fc1b1a 100644
--- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index fecd76c7c647..5e114267c194 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,6 +2,6 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 885 BLAKE2B 298a9715afdf357855f60da51ad6679831ae97753ae59afae99c7a8448cc88fbcd7511bfa24e1c323041ab2b4eb9745ef9890f44d3d7cf4e6cc43fbc5a4aaac0 SHA512 e32fd4e562b4e6d877f2d80513b40c40151fe0d9b2fb9e631fea19377785d6bdaa5aa8eaff40633c6860c155579e725b187744aa0b6034710b9b52875b53f5ef
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 891 BLAKE2B d694b4ab4dd5928137b12552c66ea674cb092f820559df66b15651fbeb70e6a6aa1c4d72dcb41928e90391310ea832597c79c840f8aa88609cce8af722944db0 SHA512 7bade2926a93fb5684d2f6c22a869fd603a8d46a453737890616c689544af4c9b68f6be7272fd25255ad419cbdfdd4119e0f9d581e4972362f9be332de74a52a
 EBUILD gnome-raw-thumbnailer-3.0.0.ebuild 648 BLAKE2B 60b014ff0392ef596738db5a9abd2bbd434f03b8389cedd0cefaf08c874eda4525e80ca84cf89b81c150937ecf00282ab79bbb5600c1a6dcda0fd815adf90577 SHA512 c129fee26c644d9f1577aa53c0bca841047cf93a0c5d65442ae141b21bd82ce4097e932969a745df528a1703ceee65a0d9c667c7888321e3347997fd156787b8
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index 50e3acf3cec6..0c143ee418ef 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 066ba74589c4..d350f0e62b7a 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,4 +1,3 @@
-AUX pencil-0.4.4_beta-gcc461.patch 819 BLAKE2B e13306455cdd812c5124b287f430486ae9c1e9475abd464795fa12e6223782bd169b4d70262ecfb1dfd15408da3d8c66ebb9a29445b6d6c03b08c47a6be5db97 SHA512 2d775516265d844cf72d85015111321e487cad8094cb0bd55166654a06b913b63f55c87623374e4fafc8927169224235ff2b759f57ef5515bd9684faf8e4d84f
-DIST pencil-0.4.4b-src.zip 1147003 BLAKE2B 178f25c716b392505862ed4f56c5683428a7c36cf99d5e1c959be4e2c0fa1d4262ef50234d83c8a4591eaaa4ebaebaa62fcce8484ba4bf45a87ec74784401c25 SHA512 5ed5bad3d2a1ac993539c2c510bcc5a1df3e33f37187c069d21f3c784eb8a290c69cfccbba8645ebab58b0feafb3c229d882dcade72fca3110846c7b1629331b
-EBUILD pencil-0.4.4_beta.ebuild 987 BLAKE2B 6a4db75de28621ce8272a926c71342e558b1e186680a1bd38397d384205dc6640dcf889f66dda686ff59f8fcb98a0f742f4699a9bbe05c664bf3633acc8d1306 SHA512 369f57c73ec3f1e2a3eaab6cf04334c07f1224dd1a33fbdd62688e7f86d0479e44f37e2d12d4131bb72a9b1fe153e7d2cf1274199966ecdd8aa858108bd00007
+DIST pencil-0.6.1_rc1.tar.gz 2515450 BLAKE2B 7852368397f51cf8f6d51d8a16aafa148ab5f7d3286d593ae9f610322379a84e0b5473ccdb065b2c0d175fb5faf04b908cb129feafeff75f756858b8cf8f6e48 SHA512 242a226d5ef9cdb5c886ff5e452f0aab22689ad787bbb6ce649b5ad4939959dc5245d3fdf50402438b8f62598f59e166f739af4b37f6092e7a10e26b4e02febb
+EBUILD pencil-0.6.1_rc1.ebuild 1020 BLAKE2B 64e8e29a52c75f723cec7f0fc7582628bbee667adf2774ff9d8022bdcc4e0399820656fdafda1610c7a429166e8fa280156e81ffeed80c0a913cfa82dd138937 SHA512 e6831caf2caebc27d54a3a406e7775c01483e37c64ab732d569414264a1ceade6d6083fac85d0025a37723aebc8ae4eb787deb291172bd30e071a9811f73a77a
 MISC metadata.xml 251 BLAKE2B 014f8e7a6a13c0ed2ba147bc1ecb8768c9cea185f10b74923d2e2157b3bdf0771a8300a4d88d2492ff9e7daaa5d0bb5c5e04f6c70273a4a0afe85869087d201c SHA512 d515519588ccedd03f6b4d0b653e957c8f26c922098a5408e9962fe9dbbb9105001a9ea1b08b73ce6e5fa41fabdc86081f6fe24f8394e2a44d036d01a01da0ed
diff --git a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch b/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
deleted file mode 100644
index d0aa8936b8fd..000000000000
--- a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/graphics/vector/beziercurve.cpp	2007-07-14 21:41:33.000000000 +0200
-+++ src/graphics/vector/beziercurve.cpp	2011-08-29 16:19:08.930675072 +0200
-@@ -700,9 +700,9 @@ 
- 	R1.setTopLeft(P1); R1.setBottomRight(Q1);
- 	R2.setTopLeft(P2); R2.setBottomRight(Q2);
- 	
--	//QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
-+	QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
- 	//QPointF* intersection = &intersectionPoint;
--	QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
-+	QPointF* cubicIntersection = &intersectionPoint; // bogus point
- 	if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) {
- 	//if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) {
- 		//qDebug() << "                   FOUND rectangle intersection ";
diff --git a/media-gfx/pencil/pencil-0.4.4_beta.ebuild b/media-gfx/pencil/pencil-0.4.4_beta.ebuild
deleted file mode 100644
index 700f6494d1cc..000000000000
--- a/media-gfx/pencil/pencil-0.4.4_beta.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils qt4-r2
-
-MY_P=${P/_beta/b}
-
-DESCRIPTION="A Qt4 based animation and drawing program"
-HOMEPAGE="http://www.pencil-animation.org/"
-SRC_URI="mirror://sourceforge/pencil-planner/${MY_P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	>=media-libs/ming-0.4.3"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}-source
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc461.patch
-	sed -i s:SWFSprite:SWFMovieClip:g src/external/flash/flash.{cpp,h} || die
-}
-
-src_install() {
-	# install target not yet provided
-	#emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	newbin Pencil ${PN} || die "dobin failed"
-
-	dodoc README TODO || die
-
-	mv "${S}"/icons/icon.png "${S}"/icons/${PN}.png
-	doicon "${S}"/icons/${PN}.png || die "doicon failed"
-	make_desktop_entry ${PN} Pencil ${PN} Graphics
-}
diff --git a/media-gfx/pencil/pencil-0.6.1_rc1.ebuild b/media-gfx/pencil/pencil-0.6.1_rc1.ebuild
new file mode 100644
index 000000000000..ae567e8d0058
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.1_rc1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+
+	# install target not yet provided
+	# emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	newbin bin/pencil2d ${PN}
+
+	newicon app/data/icons/icon.png ${PN}.png
+	make_desktop_entry ${PN} pencil2d ${PN} Graphics
+
+	insinto /usr/share/mime/packages/
+	doins app/data/pencil2d.xml
+
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 46be2ac23422..dc9c1e14efe3 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -2,5 +2,5 @@ AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57f
 DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
-EBUILD qrencode-4.0.0.ebuild 878 BLAKE2B 6128b011cf6cc401038cb568e0cf35024c40e01b8898513b296a88ac0a88c46bf4c04d5e9f8bbed719490d8a6bddd19d3e3e4d0bde63d399e342aed7bda5ca58 SHA512 41b35cbf75b0da794ce977fcd676a9c677410fe103833d9a7bdb92b205b1877504279422c120aaf85b097fbc04593187cfa8bebba8fbc7f6187966f20f488fef
+EBUILD qrencode-4.0.0.ebuild 884 BLAKE2B 5ecd8b00e533621f4b3f2c61d4a2a04f946c1a81f294bc5a9bd851e01bedd6a1c98841217402ee12888542e7c20519912b26c0fc749752bf5d719c5581cb40d0 SHA512 014a1462e30e06b56460f5d9a5d0fc7173a59761f507616550a5eaa85cb9bda2e9c94287e4cb2b88908cb05efe96f90d3a00a0571c02aea4b95e6d4c46f39875
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
index 76deeee294d2..2a64ffeaa65b 100644
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 755de3d2104a..76c417b6d6c2 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,5 +1,5 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 666 BLAKE2B 69206b8a4f4e37fc24a4740ce221b4fb07366a407bec9793a788bb45e2e3d2452615ae2e2d7c35ccab5c76a6bbbbd9d2f0c4b7eeaf46b10e33a209907a7fa039 SHA512 542f64a627f800b26de8b5503b0489106976457c15eec52c09ce50fcfb78de3487b9f9a7e240bfeef1912cb036f12a07703ea58ce0114a24ad2cf802bd8caacc
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 665 BLAKE2B c4959322b430f6d3399765ec55c0e0612974c398e355a677f0ec57fd083125204747d6e062db3cd54b2788ad0d0ac95289810c8317ce086c14d7053fd2a1cfd5 SHA512 c0c58237a63610e0c0a94c72d13608e3445d7cc9b20b0b4815f0d90b7830adc025795b62c1923fe5cbc8ffd9d13b271087f2889ce22a592c3405feed7faa211e
 EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index d14b02cd628f..d186964a5563 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 7a9b2365e974..69f9d9791081 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,7 @@
-DIST rawtherapee-5.1.tar.xz 10785516 BLAKE2B 5c8ae3f90c4ef4bc352b95761a5a2fd94e1541f6c7cec749c0985c95b85a7fd7cd5e96d439639513715b463c318d0f7b000cf48582b5391b944fc7a6ecaa3be8 SHA512 6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19
 DIST rawtherapee-5.2.tar.xz 10819936 BLAKE2B 6f4474fdf86efe177861a1a4da2178f75c3589b9d5649d43f7b70a13e51c9658af74fbaea4528e5dc34287b8109cc30608028ca348eb2186d7a2452322139169 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d
 DIST rawtherapee-5.3.tar.xz 11042548 BLAKE2B 7e0697fc0c0e8b3078ccf1f9079a4adebf7c12e8e91e1d5499f304e93bda1d025540d3744b719535133f249941e2b4dcee98189d20e3009eceeb8531252bfd1a SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284
-EBUILD rawtherapee-5.1.ebuild 1607 BLAKE2B 66a9b39d8d6ea289cf641bbc10646d8e3618b2b5255588cf1fb3cf36c03e9166893676335ca1df06c12aa2cdcf2d6bc9ede350d7245bdd46d0a466a388bd79af SHA512 77658a33529b11d2369505aae9de5d56cc49069121087fefeec75aada1e87f2b211649b449633d6f00f709ff08ec409628ebfe55c6ab244a8cc524585e05b7c8
+DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
 EBUILD rawtherapee-5.2.ebuild 1645 BLAKE2B 1de2629c455de8965ad83b68a0f32f40fb40e6c9d65dea1c6b1f5b0da9862530f11d35475bc4e0412df943fd602a9fbda6ff5cbeb0a185ac95bd07db06ba2079 SHA512 3f06920c09a7b487bc2779ca665bab242469129af57f6bebdee9169eacddedb01cc68e81971406632557b3ce75452fc314fb3a3539b11b6fcf878d334cd4fbc1
 EBUILD rawtherapee-5.3.ebuild 1667 BLAKE2B c6ba0b5a19be035fca4cfefbf466e029b8eccf8ed677eed0adf3a0d251935836dc533762f52aee0cfed285b0f0c612e376aa2e162fbdf575e6e613ca7f19830e SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a
+EBUILD rawtherapee-5.4.ebuild 1631 BLAKE2B 56dba6e1a132b80fc5101b4eb4f59b66eadcb81b1ddc78aeb523c6fcfe8aaa9d610b42ebc18c561e3943767c4956d2498d49f52e767c0e8298e828c9c31fa4a7 SHA512 13eec785796a00e92f770fafc76d6308a0ea8ab9554b9b2e4d7c7efc6ee53de9a54b59fb02ab4d3d9fae2059e75bf016e5ef99fd59d221cc202eb6e53473a1b3
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
index 543edfb71014..443bc8c4378f 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs flag-o-matic
+inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils xdg-utils
 
+MY_P=${P/_rc/-rc}
 DESCRIPTION="A powerful cross-platform raw image processing program"
 HOMEPAGE="http://www.rawtherapee.com/"
-
-MY_P=${P/_rc/-rc}
 SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 openmp"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	x11-libs/gtk+:3
+IUSE="openmp"
+
+RDEPEND="x11-libs/gtk+:3
 	dev-libs/expat
 	dev-libs/libsigc++:2
 	media-libs/libcanberra[gtk3]
@@ -25,6 +24,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	media-libs/libpng:0
 	media-libs/libiptcdata
 	media-libs/lcms:2
+	media-libs/lensfun
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	virtual/jpeg:0"
@@ -39,26 +39,33 @@ pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	# https://github.com/vivo75/vivovl/issues/2
-	if [[ $(get-flag -O3) != "-O3" ]] ; then
-		ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
-		ewarn "see bug#606896#c2"
-		ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		ewarn "for suggestion on how to change environment for a single package"
-	fi
 }
 
 src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
 	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
 	local mycmakeargs=(
 		-DOPTION_OMP=$(usex openmp)
-		-DBZIP=$(usex bzip2)
 		-DDOCDIR=/usr/share/doc/${PF}
 		-DCREDITSDIR=/usr/share/${PN}
 		-DLICENCEDIR=/usr/share/${PN}
 		-DCACHE_NAME_SUFFIX=""
-		-DCMAKE_CXX_FLAGS="-std=c++11"
+		-DWITH_SYSTEM_KLT="off"
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}