gentoo resync : 07.01.2018

15 files changed, 542 insertions, 51 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 72016903a4a2..1e44401b1ad7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 32c444d19e83..ae777cd467e4 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -3,5 +3,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.27.0.tar.gz 191803 BLAKE2B 85f2954ebe7d9ba5c30f1ad971c53f87b4b10094084837a361f1975bb78ca07edb8a535ef524374b8644434d43fc515523c08c2336dd460d543756a1819caf5f SHA512 2b2faed3f1889ef82a50721f7d3f22b081104b586d644d369fa849ad08604c10898e9dfccf8935828cf432db74352161fe6d1f9bde5fbfa4dd8435188767a17a
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.27.0.ebuild 2955 BLAKE2B 4d4ad56175fde84333870a2aed574f1c342f5f4b77ff92eccfdcc467ebf4ece6ebbc5dbafbcd30254e095e4eae321854ce6ca4a4a36c57ddfe0106a52d29f9f0 SHA512 ec2dd6741539760db1a1748037874d85b815b05edbe586e4bbc28c5c42e0e5ee1f00d09d60fe5cec027686d56549ba3df97ce5b03b8ebf0e76500e52bb6be960
+EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.27.0.ebuild b/media-gfx/dcraw/dcraw-9.27.0.ebuild
index 75b8edc043dd..7ff23c20d06b 100644
--- a/media-gfx/dcraw/dcraw-9.27.0.ebuild
+++ b/media-gfx/dcraw/dcraw-9.27.0.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg jpeg2k lcms ${LANGS// / linguas_}"
+IUSE="nls gimp jpeg jpeg2k lcms"
 
 COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0 )
@@ -76,7 +76,8 @@ src_compile() {
 
 	if use nls; then
 		for lang in ${LANGS}; do
-			use linguas_${lang} && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+			has ${lang} ${LINGUAS-${lang}} \
+				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
 		done
 	fi
 }
@@ -96,7 +97,7 @@ src_install() {
 
 	if use nls; then
 		for lang in ${LANGS}; do
-			if use linguas_${lang}; then
+			if has ${lang} ${LINGUAS-${lang}}; then
 				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
 				insinto /usr/share/locale/${lang}/LC_MESSAGES
 				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 11b948c73938..41130462057d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,8 +1,10 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.34.0-dot-pangocairo-link.patch 882 BLAKE2B 633760e2049f035eeb1b79aedc040da71ca9707acd1ccdba7531c894a1909ebb9e8483319871f2db5e6d4e0ff275449ce682badfa33de232177474111203a62d SHA512 8e40b35d8d1ec6a9e683e4f4f39fd5e6c253015727172ba0ed1cf6d9a3b4cc20e3d4169a11bbed29c3cf3dc8ff6d14508ea6459dd62e53e7d69b62ee39ef9f26
 AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c9ed759468b72c4394d1c96a0ef5f668bd9e8657ae09e54200149bb033845138eaa2587dc783f1e61c2496ccd926cc2aa6bc81aa SHA512 19327b3fbfecdad1990fd4d9668c3f318da5907c1a8c7e3abd1f1f5a0703c474975b7f08425eb2c0f5c32522ebea614d02b4db9e83cce7fb975458fb87cafc62
+AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 EBUILD graphviz-2.38.0-r1.ebuild 7875 BLAKE2B c6db8f9f8fe5ad4f824e5d4a7f2fe97bed36a955ef63988969ba04e1ffa062845610a8a38c1d841ca5218750f3cd2c4f553e809fa18a6d27b6491b9d0180f19f SHA512 2f149be71d6b6713b554ed345c4b792e5af143413efe5d66893545cbbc62b83e427ae458a81ee2567f1001e8c3a4ad2efff644d4174a873411daf4cf7cce34fc
+EBUILD graphviz-2.40.1-r1.ebuild 7942 BLAKE2B 239e6bbb0f60b7f57e425fba8277e0105fa7ef436e504af8970ec89194aa29577446b75b2819d3e8fb5e70813a89dd563386cf0471abd94b79c692195b5aa02e SHA512 be6bc43f1df559f484492647f4e268f08a2e71dcb2c7e161a7393b55b982adaa6f62cb0da7c5edecd132cbc201eeb59acfe91a3bf3d7f27ab4b06d19c177d9c4
 EBUILD graphviz-2.40.1.ebuild 7792 BLAKE2B aa1a463791808a989f06a044d88c0f68f4bab6a6072d50114d59c35e39b083445898b6b8b086661ff32c84acf549014a06796ef279aa9090b23a132ca2a28c8d SHA512 25c9d1358f48f8ef0fea4040ca36d450b4ff7e29083407aa7b117a6792a330d7d0b2f2da1271eafcbeb16b2b1cd1d651a6d96898b2ae7c2e9abf3f712aa7ecfc
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
new file mode 100644
index 000000000000..02e81fac1d25
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
@@ -0,0 +1,127 @@
+Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date:                    2017-08-27
+Initial Package Version: 2.40.1
+Upstream Status:         Unknown
+Origin:                  https://github.com/elkrejzi/pacman/blob/master/pkgbuild/graphviz/graphviz-qt5.patch
+                         Addition of patch for cmd/gvedit/Makefile.am by P. Labastie
+Description:             Fixes use of Qt5
+
+diff -Naur a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
+--- a/cmd/gvedit/csettings.cpp	2016-09-08 06:45:03.000000000 +0200
++++ b/cmd/gvedit/csettings.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -16,7 +16,7 @@
+ #include "csettings.h"
+ #include "qmessagebox.h"
+ #include "qfiledialog.h"
+-#include <QtGui>
++#include <QtWidgets>
+ #include <qfile.h>
+ #include "mdichild.h"
+ #include "string.h"
+diff -Naur a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
+--- a/cmd/gvedit/imageviewer.h	2016-08-09 23:02:09.000000000 +0200
++++ b/cmd/gvedit/imageviewer.h	2017-08-28 17:05:32.226578375 +0200
+@@ -15,7 +15,7 @@
+ 
+ #ifndef IMAGEVIEWER_H
+ #define IMAGEVIEWER_H
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QMainWindow>
+ #include <QPrinter>
+ 
+diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
+--- a/cmd/gvedit/mainwindow.cpp	2016-09-20 06:45:02.000000000 +0200
++++ b/cmd/gvedit/mainwindow.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -11,7 +11,7 @@
+  * Contributors: See CVS logs. Details at http://www.graphviz.org/
+  *************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <qframe.h>
+ #include "mainwindow.h"
+ #include "mdichild.h"
+diff -Naur a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
+--- a/cmd/gvedit/Makefile.am	2016-09-20 06:45:02.000000000 +0200
++++ b/cmd/gvedit/Makefile.am	2017-08-28 17:06:21.012476088 +0200
+@@ -30,6 +30,8 @@
+ 	-DDEMAND_LOADING=1 \
+ 	-DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
+ 
++gvedit_CXXFLAGS = -fPIC
++
+ gvedit_LDADD = \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+ 	$(top_builddir)/lib/cgraph/libcgraph.la \
+diff -Naur a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
+--- a/cmd/gvedit/mdichild.cpp	2016-08-09 23:02:09.000000000 +0200
++++ b/cmd/gvedit/mdichild.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -12,7 +12,7 @@
+  *************************************************************************/
+ 
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include "mdichild.h"
+ #include "mainwindow.h"
+diff -Naur a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
+--- a/cmd/gvedit/ui_settings.h	2016-09-08 06:45:03.000000000 +0200
++++ b/cmd/gvedit/ui_settings.h	2017-08-28 17:05:32.226578375 +0200
+@@ -10,22 +10,22 @@
+ #ifndef UI_SETTINGS_H
+ #define UI_SETTINGS_H
+ 
+-#include <QtCore/QVariant>
+-#include <QtGui/QAction>
+-#include <QtGui/QApplication>
+-#include <QtGui/QButtonGroup>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QDialog>
+-#include <QtGui/QFrame>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QHeaderView>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpacerItem>
+-#include <QtGui/QTextEdit>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QWidget>
++#include <QVariant>
++#include <QAction>
++#include <QApplication>
++#include <QButtonGroup>
++#include <QComboBox>
++#include <QDialog>
++#include <QFrame>
++#include <QHBoxLayout>
++#include <QHeaderView>
++#include <QLabel>
++#include <QLineEdit>
++#include <QPushButton>
++#include <QSpacerItem>
++#include <QTextEdit>
++#include <QVBoxLayout>
++#include <QWidget>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2016-12-22 06:44:41.000000000 +0100
++++ b/configure.ac	2017-08-28 17:05:32.227578435 +0200
+@@ -2561,10 +2561,10 @@
+   use_qt="No (disabled)"
+ else
+ 
+-  AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
++  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
+   if test "$QMAKE" != "false"; then
+-    PKG_CHECK_MODULES(QTCORE, [QtCore],[
+-      PKG_CHECK_MODULES(QTGUI, [QtGui],[
++    PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
++      PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
+ 	use_qt="Yes"
+       ],[
+         use_qt="No (QtGui not available)"
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
new file mode 100644
index 000000000000..edc5a11b4af8
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl:0
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/libpng-1.2:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libiconv
+	cairo?	(
+		>=x11-libs/cairo-1.1.10[svg]
+		>=x11-libs/pango-1.12
+	)
+	devil?	( media-libs/devil[png,jpeg] )
+	gtk?	( x11-libs/gtk+:2 )
+	gts?	( sci-libs/gts )
+	lasi?	( media-libs/lasi )
+	pdf?	( app-text/poppler )
+	perl?	( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python?	( ${PYTHON_DEPS} )
+	qt5?	(
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby?	( dev-lang/ruby:* )
+	svg?	( gnome-base/librsvg )
+	tcl?	( >=dev-lang/tcl-8.3:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	guile?	( dev-lang/swig dev-scheme/guile )
+	java?	( dev-lang/swig >=virtual/jdk-1.5 )
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( dev-lang/swig )
+	python?	( dev-lang/swig )
+	ruby?	( dev-lang/swig )
+	tcl?	( dev-lang/swig )"
+RDEPEND="${COMMON_DEPEND}
+	!<=sci-chemistry/cluster-1.3.081231"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	"${FILESDIR}"/${P}-qt5.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
+	rm -r libltdl || die
+
+	# no nls, no gettext, no iconv macro, so disable it
+	if ! use nls ; then
+		sed -i -e '/^AM_ICONV/d' configure.ac || die
+	fi
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
+
+	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-ltdl
+		--disable-silent-rules
+		$(use_enable static-libs static)
+	)
+
+	# libtool file collision, bug 276609
+	myconf+=( --without-included-ltdl --disable-ltdl-install )
+
+	myconf+=(
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with X x)
+		$(use_with X xaw)
+		$(use_with X lefty)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		$(use_enable gdk-pixbuf)
+		--without-ming
+	)
+
+	# new/experimental features, to be tested, disable for now
+	myconf+=(
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+	)
+
+	# Bindings:
+	myconf+=(
+		$(use_enable guile)
+		--disable-io
+		$(use_enable java)
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		--disable-r
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)
+	)
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/graphviz/demo || die
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	use python && python_optimize \
+		"${D}$(python_get_sitedir)" \
+		"${D}/usr/$(get_libdir)/graphviz/python"
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"usr/lib/graphviz/config{,6} || die
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ba39c3f0c4f9..5d01fab592fa 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -16,12 +16,12 @@ EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
 EBUILD imagemagick-6.9.9.23.ebuild 5122 BLAKE2B 16f53dfb31f82f636b577bb12069741b81c2fa91e5d0db9cf8e04d4f1056a6327cb465dd2206d3ea817a0b5a0a1f42ba14d05b82736a3b98cc1ccabbd8db4c3b SHA512 65388e8d87b190ef90fbd009794442778d4faf242f9589d988db156417d769e6f7239fb0b1bcaf972952796c438431860567c3b6c64e41d72759d03770014113
 EBUILD imagemagick-6.9.9.26.ebuild 5120 BLAKE2B d326a9da7f04cdaa555fceb7bfc8d2abaa491444cbf6617158ebdb967ac8cd834159d8f34827b939cc5f62109a5c294216b986149600fc47ce022145aa0cc402 SHA512 fa9f6c396f3c40d061a69e99380af48b5c5f377c1621a9835304112bd9f0f00f0cf02ba265c03f5d19696c9a5fccacb1f4a0ef6b0b02998966145557468fdcb7
-EBUILD imagemagick-6.9.9.31.ebuild 5123 BLAKE2B d640866948e34971bd4329a06e19afbbd2a69fec22992de17a5eb143be3391a7cc74dc287c1e599d5953d6e7040ccf5766cd4af2ca8fdc93fdad9cc358def0ec SHA512 19b072b6bcbd4fc7d51e07b060e1ec3f8980d6a31b84cfef428a7089c968faa60735ec09bfa49a441124ffa3ef682d233860b77432c8927ec30619768fa5b92a
+EBUILD imagemagick-6.9.9.31.ebuild 5122 BLAKE2B a28e1a67b75fa49d84f87b462c8ee0aa9d87d894eb8a667e59500b5ac7fbf4f4b3bc747013090b43aac651cdd50fd9e1db364836c49885f9df635e5362f4d08f SHA512 c0d95e39b63fab0e5126480ddf5ac6ab976bba2938797cfb9de159e2b3a39b6aba12371d3f3e1a2052413b2dd4a39eb7dbe7071f8fcdc67424875c9fd88bb61b
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.11.ebuild 5128 BLAKE2B 283c66b5aadd9c405bb9fea2a51d4fb952793a8834ae0f55fe049c73633835c5de1f2acbe9d82a5e78218bad6b54240c113d408eda547c09fa6ce2f80cd2fe36 SHA512 e404fa7e419da2c4b191b5a348e6dc6dc843d4543742f60328ebc7dfe93f4fd487915223ae90a408c3a0c298ffc48cf4775718e61eb7c7298f2da79fdc611023
 EBUILD imagemagick-7.0.7.14.ebuild 5126 BLAKE2B eb993578fe4760505ee23640be3d2ce5a22a8b98f907b8d95af31ca8be0c86e0dc73839e95714d319803b526e8552e0cabeea109cfded0380c3e826861be12ba SHA512 48fb072c9315511b07f3787c972df301cdbf62a04b7a40ae7f23228ec96ecb8070f0c83e2ba4a6b93777ba9af2536b6a2640929ca9323539a5b2bd056c850b99
-EBUILD imagemagick-7.0.7.19.ebuild 5129 BLAKE2B 72846deeba463bdccb9d776b033ecfed9dc8f7f3863f79826064c760a4ce5b2cac11f3c486b1d99762c6de4031ab357f287c65304f03e70a9ac5d71f74061669 SHA512 eac788200338808bc1783281757fdc2891689826163e994ecb1e3bb9ef0d8200b60914d1a32a6070f23aee0baf32d58cea79adb856ddc2b26d229fb2555d881c
+EBUILD imagemagick-7.0.7.19.ebuild 5128 BLAKE2B 8700b5ee6fd27f87f1e5f5094f1c51b3ff66335485eed711dbbe966dc71162f77f2c5d59334cf321292c435c9976da770f22ce2dcd18e1bf4acdc70824c89f9d SHA512 73a59131ae98e2ce08905fe43e9c1918c824ce81c7f9dc1cecb6e269a0e374131af7cf8d2d355066647a10ef2c72c603d64f475893f82ebf2361f27f98bf0b60
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index a88993b68f23..2fcb43f85563 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 5103125fcd21..5fb833caf4ca 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/iscan-plugin-gt-f720/Manifest b/media-gfx/iscan-plugin-gt-f720/Manifest
index dc650b1ea766..42b4271b8816 100644
--- a/media-gfx/iscan-plugin-gt-f720/Manifest
+++ b/media-gfx/iscan-plugin-gt-f720/Manifest
@@ -1,5 +1,5 @@
 DIST esci-interpreter-gt-f720-0.0.1-2.i386.rpm 381387 BLAKE2B 1852f0f89e7181d8adad209d146e41f1a122e95256c073ef77b96338585520c25e287bff86a0eda8fd09733328a2c67c22bddffabfc37f5de7aef1726f5c997b SHA512 6ccc6f48d8c00614346a0faee798b876497ba5ac1b35e3fd558a6e01711b944dc713e654d53fff09daff00b91251150665932564fea4fc60ec1a0a7ec95fa1f5
 DIST esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm 170040 BLAKE2B e46bc0841a872883b85b2d91cadcc1007e3639d0f1c6d64948b91a3fd65c66bf295102bd898b9a5b1fe671d0746023ed95ab1325418501f2176be17af88e1f67 SHA512 457fcfa3ae8291336a127e95dc81e24a2125ae8f861bf74d2006e4d019c54bd351c2480254b9173e52dfe489962dffea2819963596f280e1dc05c527fbf6b625
-EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1796 BLAKE2B 043066f45aebbf14b8854972b768136882c88074d54513190786143b05f482749c52294ae125606516a59f1a04ede8da285184dea1db41c88aefc81c0b6ab64a SHA512 f7e55bc3e4860c160b910e2c43c5b0fa42a8135da87ac733af10926edf6a43450e0b0f49470f57aaf1cd7817d9088d252bdfe272a9dc5cf93e434b70d49ac361
-EBUILD iscan-plugin-gt-f720-0.0.1.ebuild 1714 BLAKE2B f5f2103c5aab89c6762204e77472f4e68fd98f2ca7b9d510eec2fdc983d5e10ea511dd97848428f5eeea8dfffa6735fee15af887aff316619e11543c9e81c576 SHA512 a97b614e4315947f23fbac62c508c34784c1f39016e040a0280264497dcc5e9609bb58aa18bb2fb290aee0d59656ae3e45fbda11477a33ba9d770434835ef93f
+EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1572 BLAKE2B b4559ff53034389c89ce8c488aaf23773b758e329fbffaba0bf773c292bfc4e493d8881e9a8925e42f6f07351da1f57e668bd9c030d12bda10ea4c6341539d6e SHA512 3de21ed5ecf6c80465aefe88c7188ee8d83ff385304a68efc4fb84ceaf768cbbf6274f26c9fa303d012ce86bf428fb9f4001cc1c1dd3d304121bf53cf49899e4
+EBUILD iscan-plugin-gt-f720-0.0.1.ebuild 1474 BLAKE2B cb0e874d6f5dc2219a2452bf81e288a3375cdb06218b978787a6267f1c6215db5836886e35060b3fbb2e8089b12fe3c0b98d2d06332565fbe423b219d3a8d7cb SHA512 e32b2f4ffd7f61d4a615bcd7261464ea678aa7d6bb51eef63824ac018c936b6b7066c37dd55d94c2da463a2c110cefa4b949148d7d5bd086935a49a86adcbdff
 MISC metadata.xml 445 BLAKE2B b4b62d7f86b0897cac8ce562b27c0cffd16ed8f067f8095d4f1cb2315dc6740dacca43403085832063c3b0babfc74d326a4f2e139c1c571fc8aad832e4c8f9f5 SHA512 ed7c058931f20c758d70f6751841acfafdf388d98d17e80e700d69613e841cf883f02a3a134fb37e24c834012dfa0d8ec67b976ff866a90880b9b561f9c15164
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
index 369ca44f7cfa..a09a64ceb97d 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.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="4"
@@ -18,11 +18,6 @@ LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 
-IUSE=""
-IUSE_LINGUAS="ja"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
@@ -37,13 +32,6 @@ src_install() {
 	insinto /usr/share/esci
 	doins "${WORKDIR}/usr/share/esci/"*
 
-	# install docs
-	if use linguas_ja; then
-		dodoc usr/share/doc/*/AVASYSPL.ja.txt
-	 else
-		dodoc usr/share/doc/*/AVASYSPL.en.txt
-	fi
-
 	# install scanner plugins
 	insinto "${MY_LIB}/esci"
 	insopts -m0755
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
index 949f41b34450..be5793af5636 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.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="2"
@@ -20,11 +20,6 @@ LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE=""
-IUSE_LINGUAS="ja"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
@@ -35,13 +30,6 @@ src_install() {
 	insinto /usr/share/esci
 	doins "${WORKDIR}/usr/share/esci/"*
 
-	# install docs
-	if use linguas_ja; then
-		dodoc "usr/share/doc/${MY_P}/AVASYSPL.ja.txt"
-	 else
-		dodoc "usr/share/doc/${MY_P}/AVASYSPL.en.txt"
-	fi
-
 	# install scanner plugins
 	insinto "${MY_LIB}/esci"
 	insopts -m0755
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 99af9ac75391..b26fa5b67768 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-EBUILD valentina-0.5.0-r2.ebuild 1895 BLAKE2B 2ed6fe888c35590809a91f34a14c93cd1c48dd69a17aa0d3c23cf6b7717fe4011d47a2fd4c3d30d4130fff7c187b996a681ec895209a1df6f4239c484b6af0cf SHA512 a099c0f97f93dbfda53db352babb77ca7c3edb9f12b2cbc1a0ea19d388d817aa5eb41cd65a0c9e8f9e417cca223128e40f119322a892c51a51ddb7fb01e78cb0
-EBUILD valentina-9999.ebuild 1506 BLAKE2B 73258a0bc81ede8c2f29f77653e241f4d281df2dd0006b93dc4a6795f569a3ec7703ac4b843fd313723086c17437281365340c0510c83f9af526db0e982570c2 SHA512 579149341dc7c3003a7d8ff3758df7247f50d8cfeba02f0882a9fa0ee37451d7fa4dc6cf0a1f3fb61582c4a73e8c37028558d12787f8a68bdce54a68b6cd9ba7
+EBUILD valentina-0.5.0-r2.ebuild 2416 BLAKE2B 6ee92fb4cd2519d6ec2ced5f21377a89142c83f6e4e9f064c0e0bfc88119cf3d191e5d9f4558228fd6ab30ab3ea9c8ca793b42e2cef2cc249a651fb61ac6b810 SHA512 af345b22a261444419c41dda8815be026952861fdbac348a2cdb17ef9dd558b654b376f3d11afb1d9649b478f42f12f0c5b1b26911b07217c037fd79d8323346
+EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 3ba76fa3cd6b..9b5a7f5ea11e 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.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
@@ -16,11 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -48,10 +47,62 @@ src_prepare() {
 
 src_configure() {
 	local locales=""
+	local locale
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done
 
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 3c119be7617c..7e393108cc1a 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.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
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -39,8 +38,59 @@ src_configure() {
 	local locales=""
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done