gentoo resync : 20.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-20 11:17:21 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-20 11:17:21 +0000
commit: 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch)
tree: f88035a58c20099cf45a576fb53b0330a4754f14 /media-gfx
parent: 0fb71e0215ed52863e462cccef73c01aff44d43d (diff)
20 files changed, 222 insertions, 347 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a9377bf34f79..30beb3fdaa8f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e2a17951876d..65909b3c01c9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,9 +1,11 @@
 AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19
+AUX digikam-5.7.0-kcalcore-1.patch 1489 BLAKE2B af340a573d5cff28ef6d7fe91564ff858d3f55d0a641e05cbaf2428b3bd6351f04fd09a69bfa27d1b6e17e6ba2576571914923ceef84c4920e549d254af03886 SHA512 da3b1bd9586757174333fcfba927ef6d91e0b45813eaf5e9cde5d1062f1154fc6449b1fb746dbac2ddc05ba5c92ca162198fb6a4e36789786d81179c56770e29
+AUX digikam-5.7.0-kcalcore-2.patch 3221 BLAKE2B 6bd179c65797444a4ddbc133c9a1e3204b8127acd360bdb18a766ecaecc0d8efd5284686c424379c8a80010135f0f1653c4efacd83500018da9724bcce1f1db3 SHA512 1f3b9434a53ac0d6111c8b3c306b30515684ab09eca2f8794cdcf21639af6e8148da881c4fb0fcf5aacb4531be35c1ecf51ee2ee7bb6fde9013736e04ec0f66d
 AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7865507414203f4a273114e1ece3e62983f36cac3b299c3d498a6118dd608719d18ad1c29d1d66bf4774151f530fcb08e01 SHA512 cc78a318f865a85c5a1b0a89734c6c320367c961313db1f8acac25a340c481aa79154ae0c21683f967e0042008235ccf5c9a28078d359c07aaa3e4244b543871
 AUX digikam-5.7.0-mariadb-10.2-1.patch 1949 BLAKE2B 5af708e8e6296031752acdb579cc20a502968deb791a1bcc305fe2fef72dd67ff8b7d78bc85a6311a301428167d985f1ccb67b322e80b61c2b22e9909d7324c2 SHA512 13b83b1b32d33955f140345a47dda2d8ef0eb9057e154962f382b415e0bc46ca34ccc9b2fa782b4660eb05c947c8555fae6f9e6828a904c41d66e9a032399f82
 AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf00dff2661d58877f514fbfbe6bb8c856cfcb72acc10c2f8661a19230b2a4ec92407c401b90af8482ff97fbcce87bd8c7e6d1 SHA512 c7865329b6387f5c4decfa750f3bfeba3d3b61df5c86b35147050d5fbf4c3585cb8ed5e8789b6dcab6f1887dc4322200920b432006d80457edf286cad594ef51
 AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61
 DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
-EBUILD digikam-5.7.0-r1.ebuild 4853 BLAKE2B 45d3b347df857eaf876f72b051aea5a331051853120f9ade856a64fe29e292b7cdca16b2693e490e1551b2ae7e0afddc86c741f6b959bb9b3030c1d13a3cd5f7 SHA512 7f4ec195506d628096c7dcb7428f21e1ef0294b7c6b0b9f1865b18d874579ae7d600efa867afc8022e4384f2147b802bb4a6c856842994bd4e7bb53247de0e54
-EBUILD digikam-5.7.0-r2.ebuild 4940 BLAKE2B 7a2ab69cadaf4183411df54924883c8401910b2ebf4825c07f1a73b8f98bdebd780da17d6da52074c1e19bf1dab71311d2a736617f284750428c8d78e0cac55e SHA512 81cba5421883f2f3ceffc0af3b0bb00cbff54f5ebfc2ee01833b10bf522b99f5088d25ce80cbb3698e574ea6bea90ad6e39ec9e9d1f1e11fabdf2a5131a0478c
+EBUILD digikam-5.7.0-r1.ebuild 4855 BLAKE2B 0f5e691cc41edcf6d31ec61e63e258186ff848229cf1a723a0adfd0dfed92a9523028dbdfd92a0118b34d494a16121d988071b75ba3ad03d38eb10275f3c9b41 SHA512 2b9fa5d31467d7a15c56b60f27c38744aaa1fb008f02c6541a8bff6029eb2ace5e125e588a6ad56dffc0d725985c0a67a5e1df9ebe187fea5ae6613ca57e3ba9
+EBUILD digikam-5.7.0-r3.ebuild 4981 BLAKE2B 1db2aaaf8793a6cd11973085876d5988edebb789d5256df834c5e33ac54c81daf98c44c49c5ce05b55dd5d64b149495c10969eb707f872b6c1bd07dd7655d6ce SHA512 cc986781eb5faca4ea8247a0840cc00ab7445f05043712425eb16b1e3d924c24fb196a3100ab69c803b9e2bb5ff3e8eb7386f2058db6498f36f4529a0d7b986a
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
index bb175b60e38c..71d112cc5d80 100644
--- a/media-gfx/digikam/digikam-5.7.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 		$(add_kdeapps_dep akonadi-contacts)
 		$(add_kdeapps_dep kcontacts)
 	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
+	calendar? ( <kde-apps/kcalcore-17.11.80:5 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	jpeg2k? ( media-libs/jasper:= )
 	kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
diff --git a/media-gfx/digikam/digikam-5.7.0-r2.ebuild b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
index 0b1c44fc5b4b..bedb0c1673db 100644
--- a/media-gfx/digikam/digikam-5.7.0-r2.ebuild
+++ b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
@@ -110,6 +110,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-qt-5.9.3.patch
 	"${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch
 	"${FILESDIR}"/${P}-kreadconfig5.patch
+	"${FILESDIR}"/${P}-kcalcore-{1,2}.patch
 )
 
 pkg_pretend() {
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch
new file mode 100644
index 000000000000..9a9574fc982b
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch
@@ -0,0 +1,44 @@
+From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001
+From: Simon Frei <freisim93@gmail.com>
+Date: Wed, 13 Sep 2017 15:43:49 +0200
+Subject: calendar: Adjust to new KCalCore API (fixes CI)
+
+---
+ utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
+index b0bed5a..46e995d 100644
+--- a/utilities/assistants/calendar/print/calsettings.cpp
++++ b/utilities/assistants/calendar/print/calsettings.cpp
+@@ -31,12 +31,17 @@
+ #include "digikam_debug.h"
+ #include "calsystem.h"
+ 
+-// KCalCore includes
+ 
+ #ifdef HAVE_KCALENDAR
++    // KCalCore includes
++
+ #   include <kcalcore/icalformat.h>
+ #   include <kcalcore/filestorage.h>
+ #   include <kcalcore/memorycalendar.h>
++
++    // Qt includes
++
++#   include <QTimeZone>
+ #endif // HAVE_KCALENDAR
+ 
+ namespace Digikam
+@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
+         return;
+     }
+ 
+-    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
++    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
+     KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
+ 
+     qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
+-- 
+cgit v0.11.2
+
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch
new file mode 100644
index 000000000000..7237b74a285f
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch
@@ -0,0 +1,79 @@
+From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Wed, 13 Sep 2017 16:51:14 +0200
+Subject: Adapt to KCalCore API changes
+
+This change supports both old (pre-QDateTime) and new version.
+
+Differential Revision: https://phabricator.kde.org/D7802
+
+* asturm: Incorporated fix from d204022e191d9377874689bfe4c89f7b83998188
+---
+ CMakeLists.txt                                      |  3 +++
+ app/utils/digikam_config.h.cmake.in                 |  3 +++
+ utilities/assistants/calendar/print/calsettings.cpp | 14 ++++++++++----
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ad686d..e2f28a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,6 +174,9 @@ find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
+              OPTIONAL_COMPONENTS
+              CalendarCore           # For Calendar tool.
+ )
++if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
++    set(HAVE_KCALENDAR_QDATETIME TRUE)
++endif()
+ 
+ if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND)
+     set(ENABLE_KFILEMETADATASUPPORT OFF)
+diff --git a/app/utils/digikam_config.h.cmake.in b/app/utils/digikam_config.h.cmake.in
+index 8a2e8e5..ffd3a22 100644
+--- a/app/utils/digikam_config.h.cmake.in
++++ b/app/utils/digikam_config.h.cmake.in
+@@ -75,6 +75,9 @@
+ /* Define to 1 if you have KCalendar core shared libraries installed */
+ #cmakedefine HAVE_KCALENDAR 1
+ 
++/* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */
++#cmakedefine HAVE_KCALENDAR_QDATETIME 1
++
+ /* Define to 1 if Panorama tool is supported */
+ #cmakedefine HAVE_PANORAMA 1
+ 
+diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
+index 46e995d..c6554ef 100644
+--- a/utilities/assistants/calendar/print/calsettings.cpp
++++ b/utilities/assistants/calendar/print/calsettings.cpp
+@@ -295,7 +295,13 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
+         return;
+     }
+ 
+-    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
++#ifdef HAVE_KCALENDAR_QDATETIME
++    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone::utc()));
++    using DateTime = QDateTime;
++#else
++    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
++    using DateTime = KDateTime;
++#endif
+     KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
+ 
+     qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
+@@ -313,9 +319,9 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
+         qLast  = calSys.date(params.year + 1, 1, 1);
+         qLast  = qLast.addDays(-1);
+ 
+-        KDateTime dtFirst(qFirst);
+-        KDateTime dtLast(qLast);
+-        KDateTime dtCurrent;
++        DateTime dtFirst(qFirst, QTime(0, 0));
++        DateTime dtLast(qLast, QTime(0, 0));
++        DateTime dtCurrent;
+ 
+         int counter                = 0;
+         KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);
+-- 
+cgit v0.11.2
+
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 352eb1f81b56..f85cfd8e2898 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-photos-3.22.6.tar.xz 962468 BLAKE2B ceb0e54801f42a681b26e95d670a7fbb0f62d9965e38452f8d5aab045c85bb0ee57558e90caa6a8090f978c5a02b6f327692460dfe5de92bf88079dd86fc8ba9 SHA512 4fb2a67b5acdbd63cf6f252d0116a4b759e0e6daae48d638ce96ec35f24deee44720c45cb0720a26b6a380e66bbde1619173de340375828bc2f4ef943606fe26
 DIST gnome-photos-3.24.2.tar.xz 984372 BLAKE2B 3fecc31730fb0a55c1c0336306e0785ba4537eb668b0582a796bc8a1e7fb7b39c79f3f66c5f02d8794ce9358816952b4c054ce39d45bd3565e950cbc554090c6 SHA512 6747d7f7b0fe8710f299a7cd72916a1abd2e6296d642f9d7bf027de731f0fa4e0f862cb6bcb5622bb2d69298b911433df2a31f37f1f7d02fd4e5582234fe0c9f
 DIST gnome-photos-3.24.3.tar.xz 984796 BLAKE2B b54190adbbfb1d4ca4cbd34a06e71f37fdcadfb89ee88de15082b17751e187f61352987bbf611eb82136eb80f458bb8fc50b1232c8ec50b08044f317a90e71d3 SHA512 254fc37cfdfcd1b2d854e1ddb5a71d28aab6da3caa6a8739dcbecdabc8a9cb449b2b4080319bb9b73d4b16464f7a7ab7060304fd1194f3bc8cacc67497567a2c
+DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
 EBUILD gnome-photos-3.22.6.ebuild 1735 BLAKE2B 95e990724288f0fe43926fd43431f860f3cad59ad28d3e6812c5c86a6d1e35bce895113243a708a536c49eef31c753be761904975f1a93b30b6340d36355dcaf SHA512 fe73b9b9a9cf368b41a06c8f4a33625a5684c9e41b376145c55aa51e990be34e8ef5066017d4d38ce7e0666fe587b3d90ec340f73837a6e0703978e94ff1a34a
 EBUILD gnome-photos-3.24.2.ebuild 1769 BLAKE2B 8c21a0a5f995c997df3f4c2247116c0256ee0b20bd880482051a54b9da423dec4027d19788ad9584675a61a27f6332b6ab0640ded250b2328ce903d5d40ecd2d SHA512 6dfe7169df882a7a22374aa12f4c82f2447d42e6b0ebc285d2c2a1c12aa4ab4211587b1b328728861e6185a8534ee831b3da5b0d43ba7d218b723bbb51589f77
 EBUILD gnome-photos-3.24.3.ebuild 1778 BLAKE2B 4fca75a4a677df6348b265ffdb0c403706aa932b3fb7f86e3617c6eb87be7f00c9825b2dc1817c0c9b32a1c07bace89919ad103b8ff7ad9bbf2e78c4e05529cd SHA512 6d581d5f2a383b9484bcd41d75268b00e141eeeeff39a2d1e657dfb66393d25e2a1e259b09501b801db7a9a35a658d91f7a5268f30b9b6ed28177874f902a6c5
+EBUILD gnome-photos-3.24.5.ebuild 1778 BLAKE2B 4fca75a4a677df6348b265ffdb0c403706aa932b3fb7f86e3617c6eb87be7f00c9825b2dc1817c0c9b32a1c07bace89919ad103b8ff7ad9bbf2e78c4e05529cd SHA512 6d581d5f2a383b9484bcd41d75268b00e141eeeeff39a2d1e657dfb66393d25e2a1e259b09501b801db7a9a35a658d91f7a5268f30b9b6ed28177874f902a6c5
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
new file mode 100644
index 000000000000..72c739cc8396
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flickr test upnp-av"
+
+COMMON_DEPEND="
+	>=app-misc/tracker-1:=[miner-fs]
+	>=dev-libs/glib-2.44:2
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+	media-libs/babl
+	>=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw]
+	media-libs/gexiv2
+	>=media-libs/grilo-0.3.0:0.3=
+	>=media-libs/libpng-1.6:0=
+	>=net-libs/gnome-online-accounts-3.8:=
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	sci-geosciences/geocode-glib
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22.15:3
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# XXX: how to deal with rdtscp support, x86intrin
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 4f0416fccf9f..d6c08d20c997 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,5 @@
 DIST gthumb-3.4.4.1.tar.xz 3420356 BLAKE2B 57f99ade5342aa3915276c42d49d4225809d123cbcdab9179068b1fe9dd5976a53336454e215662b9e842658749e99c418b3581506cfc3e4d1143de17efe19e3 SHA512 e70eb1d27af3fa9320d556f56c2b283d26115eb145188811e4ece5b9599f2abb21c95be40b33c88defef9d4678ba84faa5a1c988240e532c8c055ff30c054c00
 DIST gthumb-3.4.5.tar.xz 3391492 BLAKE2B 62b3cd9be6954f734f3ae6d9e2d06364350a78b7415945d44526d35100b18617ef83359eb794a6b7d16fcb226b3c42aee0afb2a6a517b8c0b8055287b1879a29 SHA512 a709e9af9626578a6121fc6d60aa8ec2ee9f1758e9078f2e77498cbfc28cd0f1c8631aeb5c9312496b344ff889f4545935871409af5e3cd625c9a62df5d22d85
 EBUILD gthumb-3.4.4.1.ebuild 2354 BLAKE2B c9309cd87762bf1450a0ce4979b078e2559ed0e4d7da0907c991f0e24c88d7533b8338a93fb6fb59fbd396b311d3b84c13ea4c3fe241241b07a7202d41499894 SHA512 e345bb36baf53b509a3ea879c71ae668df28adcc1e695cb939ee933848c1379dc4dcac4b6086afc3a7cfd94ab868917eb85e4ecfb2687c9f9475ab1a2923f79e
-EBUILD gthumb-3.4.5.ebuild 2290 BLAKE2B 4afcefefdf0e837607f3fbfefec37b941ae873681335aa124b9fddec129e5715e9aaf7fe7955c73c41368c340e3aff34b5b0c913a5bd7feb81d01c9cc3d7b201 SHA512 9d2941dd751209696de8bdaa1fc69a176bb04021b34c82e7c16d06161c82b29bb1dbdf53278150b0fd2c86fe6668016752e017eecf4f41def6c873ed1c9dd7f7
+EBUILD gthumb-3.4.5.ebuild 2289 BLAKE2B 8c98f4b9d534a11cdf789d823626a52e92fb949aaf867ab2caf7a776c2b545bcdb4bab4086911990cb11d2eda8feb2d26f19a81a36856dfb7a1b42ff4238cb91 SHA512 be7f25a32c4f313769a93964e5dbf06c2327ea23bfa755e74a9e9fb7cca3957375ab34f183587f22d7b9df8031fda7ef2a321e88deb8cac4cc8c0cc2de4d30aa
 MISC metadata.xml 556 BLAKE2B 74024079deff060412c8f987f3ab5365b9eff217abacc24c62aed3ee93214f5bc9f9894614fe8373ee488dbc893ea7c0d158742fa5df0d7c09e6400ca44b83b7 SHA512 93979d481efa334ef94d23abc755ac4a333d327154c110da091d213a73f0c4d0ab216e73af0085b0842af7a782c25e4d69e4b9bd76fffc610272c043f37bad4b
diff --git a/media-gfx/gthumb/gthumb-3.4.5.ebuild b/media-gfx/gthumb/gthumb-3.4.5.ebuild
index c02dfea361d3..e2b90746de92 100644
--- a/media-gfx/gthumb/gthumb-3.4.5.ebuild
+++ b/media-gfx/gthumb/gthumb-3.4.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
diff --git a/media-gfx/hp2xx/Manifest b/media-gfx/hp2xx/Manifest
index 9584a0768003..19b5b226b8fd 100644
--- a/media-gfx/hp2xx/Manifest
+++ b/media-gfx/hp2xx/Manifest
@@ -1,6 +1,6 @@
 AUX hp2xx-3.4.4-docbuild.patch 474 BLAKE2B 2e790843db84da1cbc0aebde13bcb3762cae3d727c6999f45ef9a1b8598d9a47fb786a032b051540410cc1f2ade6c94394a4fd5b4f319a4cae35acb03ef36227 SHA512 48e103f3f6d71f31fa4734a500d173afa33564eebe56ded5edf42c30b6a6c52b22f7742293661328bf26111e4b7fa68c6f47fec7e9ab387d49551b49147ebc70
 AUX hp2xx-3.4.4-r1.patch 3824 BLAKE2B a5318bc7e848210f0b8b4b916ba9af62910fcdec605253421062ddf4c0b7a5e9ca46a1c6760eded382a71729003bdd74e4e57865e05e84323dd21ddf690e0f1a SHA512 49a98dc29f820bf43550bec589045e81eaaed991681625bce1a192fee967e28663f053503644663cdb0e57709ba67000dc7f6922054a4ec3969f1555a63df0a3
 DIST hp2xx-3.4.4.tar.gz 610330 BLAKE2B c1e374d53fe36710bef6802347829fe9dce67c73c6ca2f2ea6120a1afd343bbdcbd870b6005001d934d9803b91597ebcaceccafdb5cc29d26ad3aed108016abc SHA512 ccfe4a23ca482471506e59d6d459ce3ed56d9d775613e3238bd82d11cf4ea0595bf57ff95b3bd22a674865ec7f07dc63c1bcf0deb2a430b7ae241734c7e57ccd
-EBUILD hp2xx-3.4.4-r1.ebuild 1608 BLAKE2B d172bb47b0a6ec2a8b94e34b9d96442881a78008cc24ba5d72c9791ecbd357070c9a26e5c55a62d279377d9b7603e8b47b3af19ceec0ae2306800510b9c7d842 SHA512 564dc7efb794a295afda77d82dded7b2c82c3f76ef072ac74ea739b7b84f9fcff5c42923daa1075f9ee57bce11d96f79dfd8cf256c8174bbbc19dbe82abd10ac
-EBUILD hp2xx-3.4.4.ebuild 852 BLAKE2B cbad2bec2d54c8bfc0964111ae8d631832af893240beba556123c6bce41faf6e9584be4b57626b54f354208e64567e73102085891c77664f56bfb87990a5f9eb SHA512 0fb2ca8a2f88889878acef6fb6e4f11063383a07802e4ed657f3179fd8d6638d231b1534f225077a42d0e4f34b47298ff9e3e89af1e73fc62c1b00fc25ed1e3f
+EBUILD hp2xx-3.4.4-r1.ebuild 1588 BLAKE2B e3b7f3b79861cf632b4eb1e3f04d1b12a2e4fcc94f44c166ed014ec9748fce0418f221d4ed4f3ecff5f926f9b8f7dc6643d9c58b8bcd17d1a4243f5db057aaa7 SHA512 e4ca1b98406d9ff20ed03bfe2c160690b2391d2e3bb8a8419ee1a1e4d4bb1add2ca61c248d045940cb30fc1a090774015ccf431dde1276432ea9e43ffccab257
+EBUILD hp2xx-3.4.4.ebuild 832 BLAKE2B 2c97f2962b16a648f79e6505a96389516ee9543d96dae5c74ddc9a15d17bec779c0fc1d1d8caa1c98ff8cc7c2ae1fc3a69758efb0f87f5ca62bbcff3fae86a86 SHA512 39fd7979daa0b47ff0c4269dadd7fffd5a5c51a6e14a03096d1ba0cc4e3e218cdae575c1de5ba958880e3392326df16aa50fef50ea746d0da09de0f8071624b8
 MISC metadata.xml 496 BLAKE2B 83f7ad11bdf8ffcb238c78cc6b381610d875a101e12fa500a29af4ca138bb7d940b80267230dd3da6fa7142613c11db40d30bbbc23fd346249dac1c454ab5631 SHA512 301342c36942f65692c763b055abacd9d927760a9fab3640713d39983a69c49fc2adf321f2fa03ff2229970515b0ae2dc6ac87c34e3fe24a81840944d2d2fbf2
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
index 81f8977412f5..9bdc0204255d 100644
--- a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
+++ b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 inherit eutils base
 
-DESCRIPTION="Versatile tool to convert Hewlett-Packard's HP-GL plotter language into other graphics formats"
+DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
 HOMEPAGE="https://www.gnu.org/software/hp2xx/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="X jpeg png tiff"
 
 RDEPEND="
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
index 387ff013c002..268801ee97d6 100644
--- a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
+++ b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 inherit eutils base
 
-DESCRIPTION="Versatile tool to convert Hewlett-Packard's HP-GL plotter language into other graphics formats"
+DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
 HOMEPAGE="https://www.gnu.org/software/hp2xx/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index 0824581bb0ca..2c3b862117b9 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -1,7 +1,6 @@
-AUX printrun-gtk3.patch 21526 BLAKE2B 57661fd670077d20147c428459e5d460c1bc8db2b8a8c733253326df6976e24e5c22da003c69433b3a71ab4b454ca4352469b0d7a162b33c9ee5d79ba2dcba74 SHA512 78b30b491891633da8efa5d515e7ec5d0f95fc369d1a707a421f72da9ab34de0b9ee188753a4baef1675f2bb278b0e2858f8feec1fc95ca835c7872550248cd5
 AUX printrun-x11.patch 1075 BLAKE2B 171019c49324dbf8618152abdd409b2e8105f8f9d3d9435a1fa7d08a4f65c2551138f8068f65d0a9a518bcedef4ab9a8df366079d034d9ff0fca842383c3d071 SHA512 8e3924fe0b77e361bedc52cc91a827abb0f72c45df42d243e3762e0759b59715cf0687b4ea1991a8567b5bdcb5e12f3c3b218d1cec2dfc434f81a1c479689203
 DIST printrun-20150310.tar.gz 906153 BLAKE2B 60671cab6661deb4f4d127f276b4ce545df161023e57e6ef8ca857c0fd8a41ccdfc1f1811fe854dc156fa8b328b4e3d12038f07bb43aa1b20f03ed612c15aaa4 SHA512 359a4a6128b274a6709fb5c35a2d6c510bb57e010cfb12ddefa39cdb371f2141e2cab394be7d9d2f1dbc0175cc24deba61941d73b6c19fb299083afbf1141f1e
-EBUILD printrun-20150310-r1.ebuild 756 BLAKE2B 4cca8978f7cd6c05453dbd70ac09d7244ae7ffbbf1f41cff7d940568d51936f1951dcd1322984c04c9057648252fea46e15f477a0bce9718dd9ff6b0fe4578e3 SHA512 c002e13d5d6ba4018135ccf0f50745246ea5e4e747d43b4a64a4b10c71551cee9ff263b89e68d87ae42349bb0ef71da7f27b89b823204f73c3da9f4d4a814626
-EBUILD printrun-20150310-r2.ebuild 941 BLAKE2B c5790772b5082e9e9da436144f04328b28aa61a0cf299f95b223932cb2f1f6c2c596b5f86f915e34ff1887d09d4c722f4f92cefe182ad4b36a9e5e0897800e71 SHA512 12c118df5c164b9c360589c174e3f4332104995becfa544e8639688bf64b8f9fc639a39145a448dd1238f821ee6bf7dea75a0c78c733c2e84a9ec6a161722035
-EBUILD printrun-99999999.ebuild 817 BLAKE2B 8bfafded94054c6ce9300992c8bbc26f09d18ea154249ad38b3af560458e1b36755f0e84885d0f8a82366084c610d5fde06a8f6d21bf2f2bdf7816cdfb965481 SHA512 d8454c7f5b0431dfc6ff8cb79c6ecbea46b600f087bcc3f096c73f32b93cef0be5db092290ca5445ed920d54c235fcc0c22d00285cd815c4f4cf017f27dbd0df
+DIST printrun-gtk3.tar.xz 3824 BLAKE2B cc45bcc7f7ddc8a961e86b83d731a9860285206d06f3a2b2bf70327b88d1e496f6bda3756182d99d85ae237d20188959e0efa94002371c0ffaa3a185fbe32c4e SHA512 8eece239ac40fe293709117b42111a5bc31e95edd0cbdfc52ae38c5d91dded777a365fdd52d996c159fe83ecbd9fb6b3318a7622eb524db316771756a684cc9e
+EBUILD printrun-20150310-r3.ebuild 996 BLAKE2B 3608aabe24b7a18bae4cfcfd9d035f68ff16708ee7e9384b9f95138c13e4fd77278a9cfd1fc8ab8b60decd038cc65c8c2cd1472aa85995c5991d2c7fc2cf45ef SHA512 8c822a29b9a9385e9c5c32a2786eb968673a55753ce7faa29b74083666bd9cd2fff7e6d95c329bdcd2460076b6f9e21415b2ca3a76361363627eb97664666f42
+EBUILD printrun-99999999.ebuild 936 BLAKE2B 9f0379ec46b3fa6c5e644ddf05c94ad795dcc6066d8ea63388c4c747a9da6ac385906bb66c3512ea2b88cc07a00af7a712ac86b66e662e19bc67ec0769b6536f SHA512 a0b72feea91375f631ffd9641a62b0c46c03dc8fd079dbe7bb8c3a8034303699e77f25ceb2736f5f7cff363d8ff80fbd905c6ab9f41c3d2b355a76be99b3264a
 MISC metadata.xml 733 BLAKE2B 974af1352e4ea808c0160859b515c005fca1c18f1324f248eae861570f37a55aa38c85425e6dc0e754a1d82bb86a3d891f3fc8fd4c9452cc0850f0bfdacf1ce2 SHA512 93eb29b57b903a06fddc055e0699782265dc7e1603872954ac6581fae061089f0368d7b46c6c37811bbc197ce2edf8395090e1ada742920eec0e20c5be6176f8
diff --git a/media-gfx/printrun/files/printrun-gtk3.patch b/media-gfx/printrun/files/printrun-gtk3.patch
deleted file mode 100644
index a31bcd15580d..000000000000
--- a/media-gfx/printrun/files/printrun-gtk3.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-diff -up a/printrun/gui/controls.py.gtk3 a/printrun/gui/controls.py
---- a/printrun/gui/controls.py.gtk3	2015-03-09 07:22:14.000000000 -0400
-+++ a/printrun/gui/controls.py	2015-08-11 23:43:27.444624125 -0400
-@@ -136,7 +136,7 @@ def add_extra_controls(self, root, paren
-     if root.settings.last_temperature not in map(float, root.temps.values()):
-         htemp_choices = [str(root.settings.last_temperature)] + htemp_choices
-     root.htemp = wx.ComboBox(parentpanel, -1, choices = htemp_choices,
--                             style = wx.CB_DROPDOWN, size = (80, -1))
-+                             style = wx.CB_DROPDOWN, size = (115, -1))
-     root.htemp.SetToolTip(wx.ToolTip(_("Select Temperature for Hotend")))
-     root.htemp.Bind(wx.EVT_COMBOBOX, root.htemp_change)
- 
-@@ -156,7 +156,7 @@ def add_extra_controls(self, root, paren
-     if root.settings.last_bed_temperature not in map(float, root.bedtemps.values()):
-         btemp_choices = [str(root.settings.last_bed_temperature)] + btemp_choices
-     root.btemp = wx.ComboBox(parentpanel, -1, choices = btemp_choices,
--                             style = wx.CB_DROPDOWN, size = (80, -1))
-+                             style = wx.CB_DROPDOWN, size = (115, -1))
-     root.btemp.SetToolTip(wx.ToolTip(_("Select Temperature for Heated Bed")))
-     root.btemp.Bind(wx.EVT_COMBOBOX, root.btemp_change)
-     add("btemp_val", root.btemp)
-@@ -192,7 +192,11 @@ def add_extra_controls(self, root, paren
-     root.speed_slider = wx.Slider(speedpanel, -1, 100, 1, 300)
-     speedsizer.Add(root.speed_slider, 1, flag = wx.EXPAND)
- 
--    root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
-+    if wx.VERSION < (3, 0):
-+        root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
-+    else:
-+        root.speed_spin = wx.SpinCtrlDouble(speedpanel, -1, initial = 100, min = 1, max = 300, style = wx.ALIGN_LEFT, size = (115, -1))
-+        root.speed_spin.SetDigits(0)
-     speedsizer.Add(root.speed_spin, 0, flag = wx.ALIGN_CENTER_VERTICAL)
-     root.speed_label = wx.StaticText(speedpanel, -1, _("%"))
-     speedsizer.Add(root.speed_label, flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT)
-@@ -210,7 +214,10 @@ def add_extra_controls(self, root, paren
-         value = root.speed_spin.GetValue()
-         root.speed_setbtn.SetBackgroundColour("red")
-         root.speed_slider.SetValue(value)
--    root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
-+    if wx.VERSION < (3, 0):
-+        root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
-+    else:
-+        root.speed_spin.Bind(wx.EVT_SPINCTRLDOUBLE, speedslider_spin)
- 
-     def speedslider_scroll(event):
-         value = root.speed_slider.GetValue()
-@@ -269,10 +276,15 @@ def add_extra_controls(self, root, paren
-     esettingspanel = root.newPanel(parentpanel)
-     esettingssizer = wx.GridBagSizer()
-     esettingssizer.SetEmptyCellSize((0, 0))
--    root.edist = FloatSpin(esettingspanel, -1, value = root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), digits = 1)
-+    if wx.VERSION < (3, 0):
-+        root.edist = FloatSpin(esettingspanel, -1, value = root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), digits = 1)
-+        root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)    
-+    else:
-+        root.edist = wx.SpinCtrlDouble(esettingspanel, -1, initial = root.settings.last_extrusion, min = 0, max = 1000, size = (135, -1))
-+        root.edist.SetDigits(1)
-+        root.edist.Bind(wx.EVT_SPINCTRLDOUBLE, root.setfeeds)
-     root.edist.SetBackgroundColour((225, 200, 200))
-     root.edist.SetForegroundColour("black")
--    root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)
-     root.edist.Bind(wx.EVT_TEXT, root.setfeeds)
-     add("edist_label", wx.StaticText(esettingspanel, -1, _("Length:")), container = esettingssizer, flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_LEFT | wx.RIGHT | wx.LEFT, border = 5)
-     add("edist_val", root.edist, container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
-@@ -280,11 +292,16 @@ def add_extra_controls(self, root, paren
-     add("edist_unit", wx.StaticText(esettingspanel, -1, unit_label), container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
-     root.edist.SetToolTip(wx.ToolTip(_("Amount to Extrude or Retract (mm)")))
-     if not mini_mode:
--        root.efeedc = FloatSpin(esettingspanel, -1, value = root.settings.e_feedrate, min_val = 0, max_val = 50000, size = (90, -1), digits = 1)
-+        if wx.VERSION < (3, 0):
-+            root.efeedc = FloatSpin(esettingspanel, -1, value = root.settings.e_feedrate, min_val = 0, max_val = 50000, size = (90, -1), digits = 1)
-+            root.efeedc.Bind(wx.EVT_SPINCTRL, root.setfeeds)
-+        else:
-+            root.efeedc = wx.SpinCtrlDouble(esettingspanel, -1, initial = root.settings.e_feedrate, min = 0, max = 50000, size = (145, -1))
-+            root.efeedc.SetDigits(1)
-+            root.efeedc.Bind(wx.EVT_SPINCTRLDOUBLE, root.setfeeds)
-         root.efeedc.SetToolTip(wx.ToolTip(_("Extrude / Retract speed (mm/min)")))
-         root.efeedc.SetBackgroundColour((225, 200, 200))
-         root.efeedc.SetForegroundColour("black")
--        root.efeedc.Bind(wx.EVT_SPINCTRL, root.setfeeds)
-         root.efeedc.Bind(wx.EVT_TEXT, root.setfeeds)
-         add("efeed_val", root.efeedc, container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
-         add("efeed_label", wx.StaticText(esettingspanel, -1, _("Speed:")), container = esettingssizer, flag = wx.ALIGN_LEFT)
-@@ -379,12 +396,12 @@ class ControlsSizer(wx.GridBagSizer):
-             else:
-                 self.extra_buttons[key] = btn
- 
--        root.xyfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.xy_feedrate), min = 0, max = 50000, size = (97, -1))
-+        root.xyfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.xy_feedrate), min = 0, max = 50000, size = (130, -1))
-         root.xyfeedc.SetToolTip(wx.ToolTip(_("Set Maximum Speed for X & Y axes (mm/min)")))
-         llts.Add(wx.StaticText(lltspanel, -1, _("XY:")), flag = wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL)
-         llts.Add(root.xyfeedc)
-         llts.Add(wx.StaticText(lltspanel, -1, _("mm/min Z:")), flag = wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL)
--        root.zfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.z_feedrate), min = 0, max = 50000, size = (90, -1))
-+        root.zfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.z_feedrate), min = 0, max = 50000, size = (130, -1))
-         root.zfeedc.SetToolTip(wx.ToolTip(_("Set Maximum Speed for Z axis (mm/min)")))
-         llts.Add(root.zfeedc,)
- 
-diff -up a/printrun/gui/toolbar.py.gtk3 a/printrun/gui/toolbar.py
---- a/printrun/gui/toolbar.py.gtk3	2015-03-09 07:22:14.000000000 -0400
-+++ a/printrun/gui/toolbar.py	2015-06-29 23:43:30.700768952 -0400
-@@ -42,7 +42,7 @@ def MainToolbar(root, parentpanel = None
-     root.baud = wx.ComboBox(parentpanel, -1,
-                             choices = ["2400", "9600", "19200", "38400",
-                                        "57600", "115200", "250000"],
--                            style = wx.CB_DROPDOWN, size = (100, -1))
-+                            style = wx.CB_DROPDOWN, size = (110, -1))
-     root.baud.SetToolTip(wx.ToolTip(_("Select Baud rate for printer communication")))
-     try:
-         root.baud.SetValue("115200")
-diff -up a/printrun/projectlayer.py.gtk3 a/printrun/projectlayer.py
---- a/printrun/projectlayer.py.gtk3	2015-03-09 07:22:14.000000000 -0400
-+++ a/printrun/projectlayer.py	2015-08-11 23:24:05.729359412 -0400
-@@ -278,38 +278,48 @@ class SettingsFrame(wx.Frame):
-         # Left Column
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Layer (mm):"), pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size = (80, -1))
-+        self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size = (125, -1))
-         self.thickness.Bind(wx.EVT_TEXT, self.update_thickness)
-         self.thickness.SetHelpText("The thickness of each slice. Should match the value used to slice the model.  SVG files update this value automatically, 3dlp.zip files have to be manually entered.")
-         fieldsizer.Add(self.thickness, pos = (0, 1))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Exposure (s):"), pos = (1, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size = (80, -1))
-+        self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size = (125, -1))
-         self.interval.Bind(wx.EVT_TEXT, self.update_interval)
-         self.interval.SetHelpText("How long each slice should be displayed.")
-         fieldsizer.Add(self.interval, pos = (1, 1))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Blank (s):"), pos = (2, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size = (80, -1))
-+        self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size = (125, -1))
-         self.pause.Bind(wx.EVT_TEXT, self.update_pause)
-         self.pause.SetHelpText("The pause length between slices. This should take into account any movement of the Z axis, plus time to prepare the resin surface (sliding, tilting, sweeping, etc).")
-         fieldsizer.Add(self.pause, pos = (2, 1))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Scale:"), pos = (3, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.scale = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_scale', 1.0), increment = 0.1, digits = 3, size = (80, -1))
--        self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
-+        if wx.VERSION < (3, 0):
-+            self.scale = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_scale', 1.0), increment = 0.1, digits = 3, size = (80, -1))
-+            self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
-+        else:
-+            self.scale = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting('project_scale', 1.0), inc = 0.1, size = (125, -1))
-+            self.scale.SetDigits(3)
-+            self.scale.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_scale)
-         self.scale.SetHelpText("The additional scaling of each slice.")
-         fieldsizer.Add(self.scale, pos = (3, 1))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Direction:"), pos = (4, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.direction = wx.ComboBox(self.panel, -1, choices = ["Top Down", "Bottom Up"], value = self._get_setting('project_direction', "Top Down"), size = (80, -1))
-+        self.direction = wx.ComboBox(self.panel, -1, choices = ["Top Down", "Bottom Up"], value = self._get_setting('project_direction', "Top Down"), size = (125, -1))
-         self.direction.Bind(wx.EVT_COMBOBOX, self.update_direction)
-         self.direction.SetHelpText("The direction the Z axis should move. Top Down is where the projector is above the model, Bottom up is where the projector is below the model.")
-         fieldsizer.Add(self.direction, pos = (4, 1), flag = wx.ALIGN_CENTER_VERTICAL)
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Overshoot (mm):"), pos = (5, 0), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.overshoot = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_overshoot', 3.0), increment = 0.1, digits = 1, min_val = 0, size = (80, -1))
--        self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
-+        if wx.VERSION < (3, 0):
-+            self.overshoot = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_overshoot', 3.0), increment = 0.1, digits = 1, min_val = 0, size = (80, -1))
-+            self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
-+        else:
-+            self.overshoot = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting('project_overshoot', 3.0), inc = 0.1, min = 0, size = (125, -1))
-+            self.overshoot.SetDigits(1)
-+            self.overshoot.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_overshoot)
-         self.overshoot.SetHelpText("How far the axis should move beyond the next slice position for each slice. For Top Down printers this would dunk the model under the resi and then return. For Bottom Up printers this would raise the base away from the vat and then return.")
-         fieldsizer.Add(self.overshoot, pos = (5, 1))
- 
-@@ -329,38 +339,53 @@ class SettingsFrame(wx.Frame):
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "X (px):"), pos = (0, 2), flag = wx.ALIGN_CENTER_VERTICAL)
-         projectX = int(math.floor(float(self._get_setting("project_x", 1920))))
--        self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max = 999999, size = (80, -1))
-+        self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max = 999999, size = (125, -1))
-         self.X.Bind(wx.EVT_SPINCTRL, self.update_resolution)
-         self.X.SetHelpText("The projector resolution in the X axis.")
-         fieldsizer.Add(self.X, pos = (0, 3))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Y (px):"), pos = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL)
-         projectY = int(math.floor(float(self._get_setting("project_y", 1200))))
--        self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max = 999999, size = (80, -1))
-+        self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max = 999999, size = (125, -1))
-         self.Y.Bind(wx.EVT_SPINCTRL, self.update_resolution)
-         self.Y.SetHelpText("The projector resolution in the Y axis.")
-         fieldsizer.Add(self.Y, pos = (1, 3))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetX (mm):"), pos = (2, 2), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.offset_X = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_x", 0.0), increment = 1, digits = 1, size = (80, -1))
--        self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
-+        if wx.VERSION < (3, 0):
-+            self.offset_X = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_x", 0.0), increment = 1, digits = 1, size = (80, -1))
-+            self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
-+        else:
-+            self.offset_X = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_offset_x", 0.0), inc = 1, size = (125, -1))
-+            self.offset_X.SetDigits(1)
-+            self.offset_X.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_offset)
-         self.offset_X.SetHelpText("How far the slice should be offset from the edge in the X axis.")
-         fieldsizer.Add(self.offset_X, pos = (2, 3))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetY (mm):"), pos = (3, 2), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.offset_Y = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_y", 0.0), increment = 1, digits = 1, size = (80, -1))
--        self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
-+        if wx.VERSION < (3, 0):
-+            self.offset_Y = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_y", 0.0), increment = 1, digits = 1, size = (80, -1))
-+            self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
-+        else:
-+            self.offset_Y = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_offset_y", 0.0), inc = 1, size = (125, -1))
-+            self.offset_Y.SetDigits(1)
-+            self.offset_Y.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_offset)
-         self.offset_Y.SetHelpText("How far the slice should be offset from the edge in the Y axis.")
-         fieldsizer.Add(self.offset_Y, pos = (3, 3))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "ProjectedX (mm):"), pos = (4, 2), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_projected_x", 505.0), increment = 1, digits = 1, size = (80, -1))
--        self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
-+        if wx.VERSION < (3, 0):
-+            self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_projected_x", 505.0), increment = 1, digits = 1, size = (80, -1))
-+            self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
-+        else:
-+            self.projected_X_mm = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_projected_x", 505.0), inc = 1, size = (125, -1))
-+            self.projected_X_mm.SetDigits(1)
-+            self.projected_X_mm.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_projected_Xmm)
-         self.projected_X_mm.SetHelpText("The actual width of the entire projected image. Use the Calibrate grid to show the full size of the projected image, and measure the width at the same level where the slice will be projected onto the resin.")
-         fieldsizer.Add(self.projected_X_mm, pos = (4, 3))
- 
-         fieldsizer.Add(wx.StaticText(self.panel, -1, "Z Axis Speed (mm/min):"), pos = (5, 2), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max = 9999, size = (80, -1))
-+        self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max = 9999, size = (125, -1))
-         self.z_axis_rate.Bind(wx.EVT_SPINCTRL, self.update_z_axis_rate)
-         self.z_axis_rate.SetHelpText("Speed of the Z axis in mm/minute. Take into account that slower rates may require a longer pause value.")
-         fieldsizer.Add(self.z_axis_rate, pos = (5, 3))
-@@ -394,7 +419,11 @@ class SettingsFrame(wx.Frame):
-         first_layer_boxer.Add(self.first_layer, flag = wx.ALIGN_CENTER_VERTICAL)
- 
-         first_layer_boxer.Add(wx.StaticText(self.panel, -1, " (s):"), flag = wx.ALIGN_CENTER_VERTICAL)
--        self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment = 1, digits = 1, size = (55, -1))
-+        if wx.VERSION < (3, 0):
-+            self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment = 1, digits = 1, size = (55, -1))
-+        else:
-+            self.show_first_layer_timer = wx.SpinCtrlDouble(self.panel, -1, initial = -1, inc = 1, size = (125, -1))
-+            self.show_first_layer_timer.SetDigits(1)
-         self.show_first_layer_timer.SetHelpText("How long to display the first layer for. -1 = unlimited.")
-         first_layer_boxer.Add(self.show_first_layer_timer, flag = wx.ALIGN_CENTER_VERTICAL)
-         displaysizer.Add(first_layer_boxer, pos = (0, 6), flag = wx.ALIGN_CENTER_VERTICAL)
-diff -up a/printrun/settings.py.gtk3 a/printrun/settings.py
---- a/printrun/settings.py.gtk3	2015-06-19 05:47:24.000000000 -0400
-+++ a/printrun/settings.py	2015-08-11 23:32:05.603437536 -0400
-@@ -145,7 +145,12 @@ class SpinSetting(wxSetting):
- 
-     def get_specific_widget(self, parent):
-         from wx.lib.agw.floatspin import FloatSpin
--        self.widget = FloatSpin(parent, -1, min_val = self.min, max_val = self.max, digits = 0)
-+        import wx
-+        if wx.VERSION < (3, 0):
-+            self.widget = FloatSpin(parent, -1, min_val = self.min, max_val = self.max, digits = 0)
-+        else:
-+            self.widget = wx.SpinCtrlDouble(parent, -1, min = self.min, max = self.max)
-+            self.widget.SetDigits(0)
-         self.widget.SetValue(self.value)
-         orig = self.widget.GetValue
-         self.widget.GetValue = lambda: int(orig())
-@@ -155,7 +160,12 @@ class FloatSpinSetting(SpinSetting):
- 
-     def get_specific_widget(self, parent):
-         from wx.lib.agw.floatspin import FloatSpin
--        self.widget = FloatSpin(parent, -1, value = self.value, min_val = self.min, max_val = self.max, increment = self.increment, digits = 2)
-+        import wx
-+        if wx.VERSION < (3, 0):
-+            self.widget = FloatSpin(parent, -1, value = self.value, min_val = self.min, max_val = self.max, increment = self.increment, digits = 2)
-+        else:
-+            self.widget = wx.SpinCtrlDouble(parent, -1, initial = self.value, min = self.min, max = self.max, inc = self.increment)
-+            self.widget.SetDigits(2)
-         return self.widget
- 
- class BooleanSetting(wxSetting):
-@@ -216,7 +226,12 @@ class BuildDimensionsSetting(wxSetting):
-         import wx
-         build_dimensions = parse_build_dimensions(self.value)
-         self.widgets = []
--        w = lambda val, m, M: self.widgets.append(FloatSpin(parent, -1, value = val, min_val = m, max_val = M, digits = 2))
-+        def w(val, m, M):
-+            if wx.VERSION < (3, 0):
-+                self.widgets.append(FloatSpin(parent, -1, value = val, min_val = m, max_val = M, digits = 2))
-+            else:
-+                self.widgets.append(wx.SpinCtrlDouble(parent, -1, initial = val, min = m, max = M))
-+                self.widgets[-1].SetDigits(2)
-         addlabel = lambda name, pos: self.widget.Add(wx.StaticText(parent, -1, name), pos = pos, flag = wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, border = 5)
-         addwidget = lambda *pos: self.widget.Add(self.widgets[-1], pos = pos, flag = wx.RIGHT, border = 5)
-         self.widget = wx.GridBagSizer()
diff --git a/media-gfx/printrun/printrun-20150310-r1.ebuild b/media-gfx/printrun/printrun-20150310-r1.ebuild
deleted file mode 100644
index 3185dcf2a6d7..000000000000
--- a/media-gfx/printrun/printrun-20150310-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
-HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pyserial
-	dev-python/wxpython:*
-	dev-python/pyglet
-	dev-python/dbus-python
-	media-gfx/cairosvg"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Printrun-${P}"
-
-PATCHES=(
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
-	"${FILESDIR}"/${PN}-gtk3.patch
-
-	# https://github.com/kliment/Printrun/pull/790
-	"${FILESDIR}"/${PN}-x11.patch
-)
diff --git a/media-gfx/printrun/printrun-20150310-r2.ebuild b/media-gfx/printrun/printrun-20150310-r3.ebuild
index 72839c7ab4e8..9159486852d5 100644
--- a/media-gfx/printrun/printrun-20150310-r2.ebuild
+++ b/media-gfx/printrun/printrun-20150310-r3.ebuild
@@ -9,7 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
 HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz"
+SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz
+	 https://dev.gentoo.org/~amynka/snap/${PN}-gtk3.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -32,8 +33,8 @@ S="${WORKDIR}/Printrun-${P}"
 
 PATCHES=(
 	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
-	"${FILESDIR}"/${PN}-gtk3.patch
+	"${WORKDIR}/${PN}-gtk3.patch"
 
 	# https://github.com/kliment/Printrun/pull/790
-	"${FILESDIR}"/${PN}-x11.patch
+	"${FILESDIR}/${PN}-x11.patch"
 )
diff --git a/media-gfx/printrun/printrun-99999999.ebuild b/media-gfx/printrun/printrun-99999999.ebuild
index d12fe530c379..6143c13b9177 100644
--- a/media-gfx/printrun/printrun-99999999.ebuild
+++ b/media-gfx/printrun/printrun-99999999.ebuild
@@ -9,6 +9,7 @@ inherit distutils-r1 git-r3
 
 DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
 HOMEPAGE="https://github.com/kliment/Printrun"
+SRC_URI="https://dev.gentoo.org/~amynka/snap/${PN}-gtk3.tar.xz"
 EGIT_REPO_URI="https://github.com/kliment/Printrun.git"
 
 LICENSE="GPL-3"
@@ -30,5 +31,10 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
-	"${FILESDIR}"/${PN}-gtk3.patch
+	"${WORKDIR}/${PN}-gtk3.patch"
 )
+
+src_unpack(){
+	default_src_unpack
+	git-r3_src_unpack
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index c7fdc6ae9664..b570daefd3f0 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -7,5 +7,5 @@ DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae0
 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
 EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897
 EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55
-EBUILD zbar-0.10_p20121015-r2.ebuild 3646 BLAKE2B 4ae7fd9a1927dfae76efbadcbb7ab9529f1f0378ac96b086112d09d7562bddff2dee8e4016840cf70bc9441dc3dbbde50a1520454be4dc3345c51b1a2172215c SHA512 7d914e641de1f63ecf9fa5a4e6f5d0fb830fa92fdf2e013a4cd7c3c39525d309f274c7219a3c9634ccf2b47d01484f014d80d942a34e031c29afc5527de27576
+EBUILD zbar-0.10_p20121015-r2.ebuild 3645 BLAKE2B 48d4d4e8259f6031e42e60b9731e399bcdb94bf82193f05ed1f7fd776fe00aa4dd7d18701680e0ff568cbd69c38b9ad7acd88b85ef7c620cacad9c64c5930c4b SHA512 0c9a99326378cb8846d33f97120ac6e430200759c1628abb2bd03a06b07b5c179239486a8962347874d867bb403e5665feaa692844a5a682bb44a03d775a2b2c
 MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 186a80e32ccd..3e5f42adf8ab 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( X ${PYTHON_REQUIRED_USE} )"
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-20 11:17:21 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-20 11:17:21 +0000
commit	48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch)
tree	f88035a58c20099cf45a576fb53b0330a4754f14 /media-gfx
parent	0fb71e0215ed52863e462cccef73c01aff44d43d (diff)