gentoo resync : 18.03.2018

15 files changed, 73 insertions, 234 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cf1a90cd6ffc..0bcc97747fe1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 4f7fa17498ed..d076ac365893 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,6 +5,6 @@ AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad
 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 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983
-EBUILD graphviz-2.40.1-r1.ebuild 7922 BLAKE2B d7e46dc7b7cc479023d4ac1321d04405ebcf5258fef12547c352b2e969622c0ddcfa6e378e7385758fb03b1dd54df9e826f35c3b9d2415e1d37c4f08a9472270 SHA512 98bf2c0cba4130cb50369cece643182d35bb7cc3cf0dea021b1e8bce62594937f61ff066fbb1b84f077456f8a73e20e463c9b37db505fac28ac67fc93cf3d823
+EBUILD graphviz-2.40.1-r1.ebuild 7964 BLAKE2B 86ccdfe5320c4222eca9150e3db3fd1c9bcb5c47c51d9782aab637ade7fd07f28a5c8c701fd430848532fe03ed86680fbe3d2b1674779bbb202138981577b0a6 SHA512 d5327a4a2f8d659352fdcecbb4d9981d8181d3706a4098218b146b37706227006a2c687056ce49689ca12d24dd895fcdc6deb8cff6502a9c152d38b4162b620b
 EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index ce400f8fcbfc..8121a9a6b952 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="
@@ -182,6 +182,8 @@ src_prepare() {
 
 	use java && append-cppflags $(java-pkg_get-jni-cflags)
 
+	append-cxxflags -std=c++11  # bug 648764
+
 	eautoreconf
 }
 
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 02d8df31560e..fb69996b2775 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,4 @@
-DIST qimgv-0.6.tar.gz 232586 BLAKE2B 077210c16906dbc746f18295f80ac8ea5f948b4abba366659826ebd0ebad1876da53be26a3855c58a2f25e2cfc02fb2ef030a74e17e89f92b2aef572e58a8e0c SHA512 50156a6bdf08e8cc82d30ad23d1deef7f0c119c970c8e577d8b0de65f6b11827e0cf57593834ae7e8887dce5d83215cbd98e9c5b8905d6a3580943e432bdb6cb
-EBUILD qimgv-0.6.ebuild 875 BLAKE2B 15fc000112e324c04b2aa8fdda92e0754a34287898a71a28dfa8efc2d26cfdfac89474394bb7e331f9a0398eda93d050ff00757d96400b58cb7bb844f369f2ef SHA512 52ce5f9104480f29b89d68132b70080f7fddefee48bbe4e8a88656475616703273a2f2bc0dc57336204612e7539b5638608a1d57629fff8fa725fabd4bb22992
+DIST qimgv-0.6.2.tar.gz 233608 BLAKE2B 563a5a88cd870fa0f0a7ab3c426f31f889c3faf2463ad1d8404ed410d75bfcd1d89b76bc94b617246e3a42c26ccc84c7e2721278c83afde20c45f74fc47456f5 SHA512 ea553f646943b86268beaeb26116b4fad97f5462363babf6339f1e0f854140e8c9f71b957e73bfe73a9eb3e30e1b2338d21def753f63e088e9742a56550335e8
+EBUILD qimgv-0.6.2.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358
diff --git a/media-gfx/qimgv/qimgv-0.6.ebuild b/media-gfx/qimgv/qimgv-0.6.2.ebuild
index 1d1623a2470c..9226ed2e10a9 100644
--- a/media-gfx/qimgv/qimgv-0.6.ebuild
+++ b/media-gfx/qimgv/qimgv-0.6.2.ebuild
@@ -26,13 +26,6 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# so cmake can find binaries
-	sed -i 's/build\/qimgv/${CMAKE_BINARY_DIR}\/qimgv/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
diff --git a/media-gfx/qiviewer/Manifest b/media-gfx/qiviewer/Manifest
deleted file mode 100644
index 0c53cbd15fbc..000000000000
--- a/media-gfx/qiviewer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qiviewer-use-system-webp.patch 1510 BLAKE2B 1e32a26261e28ade3d7ebc6b6f7c799764379f3e1daff1e1fb421f6d43c399bad931df8f08592d362d7d699ac1aff235eb8f36a091f9944e15176314de6862f8 SHA512 71d5e1c51aed1a9b576e30913bf9841151cc3755b7fc12a07ee5f4dfc213427d4e6a0c193f657780b364a37ab51dc4bb0c186589e18c685db870992b1dfddb9a
-DIST qiviewer-0.5.0.tar.bz2 177201 BLAKE2B 80d247829767a68560a9808387eaf12e2130d8dbd2ad97a41c0ae74cbb7f2873ac565d730b17bc17fb9c6a36c60ec1ce1c4e0ffe23b2e703bf78cca96af0449d SHA512 f9a75020085576f28b1e38e12a0e69d4b5efbedca5602ad1b47583a220eb50f6967f87764658b1d38ac696ed45134d580d3971c1d791a3156f28c55dceaa7fc7
-EBUILD qiviewer-0.5.0-r1.ebuild 1532 BLAKE2B d28f6df84096736be2f0512bd4bd0d07382e3e16723d66bfeb4339befe3a858763c7311557a992beed443ae77a412c9f078b8d366aa4d42a42e0f8a8cb7eb355 SHA512 59470e04325c4141472480eeec4651d23363f85323bc4ba7464f4d4ab00201da33a49b56a37d819f792e73e72b1b0fa80b5f73c5ef2eabd582dce5ec03856d83
-MISC metadata.xml 405 BLAKE2B 7fc9737b0cbfaf4d231148209a8486f51243a18302759fbe98dce76d6d304affb80363aa86859ec619134255bc6ebf7f400c2e0d5255841f5551faf10b5d0d23 SHA512 2306632b70bc7344eff02381475c4d1218820449752a116aefd5df4642290134b9c91d91f49cb4c625dd415237b92c16a7f33f5291e27993970a4c8b4bbbe111
diff --git a/media-gfx/qiviewer/files/qiviewer-use-system-webp.patch b/media-gfx/qiviewer/files/qiviewer-use-system-webp.patch
deleted file mode 100644
index 252477f7d84a..000000000000
--- a/media-gfx/qiviewer/files/qiviewer-use-system-webp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- qiviewer.pro.orig	2012-08-27 15:29:24.435612352 +0400
-+++ qiviewer.pro	2012-08-27 15:30:12.286611983 +0400
-@@ -58,24 +58,9 @@
-     message(This feature isn't ready yet, use it carefully!)
-     # rules to execute when myfeature IS defined:
-     DEFINES += WEBP_SUPPORT
--    INCLUDEPATH += . ./3rdparty/webp
--    HEADERS += webpdecoder.h \
--               3rdparty/webp/dec/bits.h \
--               3rdparty/webp/dec/vp8i.h \
--               3rdparty/webp/dec/yuv.h \
--               3rdparty/webp/webp/decode.h \
--               3rdparty/webp/webp/decode_vp8.h \
--               3rdparty/webp/webp/encode.h \
--               3rdparty/webp/webp/types.h
--    SOURCES += webpdecoder.cpp \
--               3rdparty/webp/dec/bits.c \
--               3rdparty/webp/dec/dsp.c \
--               3rdparty/webp/dec/frame.c \
--               3rdparty/webp/dec/quant.c \
--               3rdparty/webp/dec/tree.c \
--               3rdparty/webp/dec/vp8.c \
--               3rdparty/webp/dec/webp.c \
--               3rdparty/webp/dec/yuv.c
-+    HEADERS += webpdecoder.h
-+    SOURCES += webpdecoder.cpp
-+    LIBS += -lwebp
- }
- 
- # Tell Qt Linguist that we use UTF-8 strings in our sources
---- webpdecoder.cpp.orig	2012-08-27 15:29:30.110612309 +0400
-+++ webpdecoder.cpp	2012-08-27 15:29:49.919612154 +0400
-@@ -2,7 +2,7 @@
- #include <QPainter>
- #include <QPixmap>
- #include "webpdecoder.h"
--#include "3rdparty/webp/webp/decode.h"
-+#include <webp/decode.h>
- 
- WebpDecoder::WebpDecoder(QWidget *parent) : QWidget(parent)
- {
diff --git a/media-gfx/qiviewer/metadata.xml b/media-gfx/qiviewer/metadata.xml
deleted file mode 100644
index a712eb06f83c..000000000000
--- a/media-gfx/qiviewer/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<use>
-		<flag name="webp">Build support for WEBP image format</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">samkpo/qiviewer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild b/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild
deleted file mode 100644
index d75250f855a0..000000000000
--- a/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="el es_AR es_ES"
-
-inherit l10n qt4-r2 readme.gentoo
-
-DESCRIPTION="Lightweight image viewer, similar to eog or viewnior for Gnome"
-HOMEPAGE="https://github.com/samkpo/qiviewer"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="webp"
-
-DEPEND="dev-qt/qtgui:4
-	webp? ( media-libs/libwebp )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}/src"
-
-DOC_CONTENTS="If you want support for gif and tiff images
-make sure that you build dev-qt/qtgui:4
-with apropriate USE flags"
-
-src_prepare() {
-	local LOCALE_FILES=""
-	add_locale() {
-		LOCALE_FILES="${LOCALE_FILES} ${1}.ts"
-	}
-
-	# Check for locales added/removed from previous version
-	l10n_find_plocales_changes "${S}/translations" "" '.ts'
-	# Fill list of available locale files
-	l10n_for_each_locale_do add_locale
-	sed -i -e "s:TRANSLATIONS += .\+:TRANSLATIONS = ${LOCALE_FILES}:" translations/locale.pri || die 'locale sed failed'
-	# Fix mime types in desktop file
-	sed -i -e "s:^MimeType=\(.\+\)imaqe/x-xpixrnap;\(.\+\):MimeType=\1\2:" qiviewer.desktop || die 'desktop file sed failed'
-	# Use system libwebp
-	epatch "${FILESDIR}"/${PN}-use-system-webp.patch
-
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local _webp=
-	use webp && _webp="CONFIG+=enable-webp"
-	eqmake4 ${PN}.pro $_webp
-}
-
-src_install() {
-	qt4-r2_src_install
-	cd "${WORKDIR}"/"${PN}"
-	dodoc AUTHORS ChangeLog README
-	readme.gentoo_create_doc
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index a7bbcae9a7f2..a25165178563 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,6 +2,8 @@ AUX wings.sh 182 BLAKE2B e9facdbcd7520af19045bab0ef89e835c1e2f1d7b4e8c8d45d64f18
 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df
 DIST wings-1.1.1.tar.bz2 1932572 BLAKE2B 9899d17355983c3b9c7beea87b1a94e665f194f5e0935d992389f8ea29a511a4682b4b1953316ea41ba1d09a9a474ebf5fd757fe4bf3638ebecf9c7faf1403aa SHA512 e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
-EBUILD wings-1.1.1.ebuild 1046 BLAKE2B 06fa075ac4056a2e59ec88b95c8dec0a323df4854069b34032c19140c9115bddcdd531811261b32e0a1624b83e49d752b27495acf7b94ff226ea50ab028f4a66 SHA512 8c2595e176d6f4bcc87b538c8738d5f6f10a0ce6d0d9c52401b958d41a8b04db6b31d7b41bd248517b4a9016efdf00d4dd8e694f10863516f34bdb38f198cb6e
+DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
+EBUILD wings-1.1.1.ebuild 1036 BLAKE2B 9cf7e1155dbdd5e3f3b746a6d474bd2c092f2ad142ed495dfedc6cd9d5781c954c47a204ffea0b230a119dc094a00e73a8741046671bb31766a58a4d4ebb7bdd SHA512 e04661bcff16dac78f439e31597ff9f644fb9f1bd6fea52d01c36938c1ef56b4b4fd13fc5ca8dba39db92bbfec8bbaa0b40394a3ce4f2e392412c487c95721cb
 EBUILD wings-2.1.5.ebuild 1190 BLAKE2B 0099d6f003a286d3a13c63a6aea374b373869d683798c2d6e7513d9d103964a8fbe67b1dab880090c671f7738de8c7443adb85b7b6e77931ee83175369e56bae SHA512 387ae28ae4a7c06335fcf2bb4f891c1497029ae02d4f18b05819932ff17208fcd8dd6f41b2022b8dd1cc24fdc2004c64132705f555ab5a27bd95812d9ca12964
+EBUILD wings-2.1.6.ebuild 1192 BLAKE2B 399b138a6c495b20ee8d4a3591d82e12487f3b7f150d88fcd7a21f95ecf1875677dbc912d7c2275a6eeebc4a5fdfb9b95ceb0dc992aad10403c406938e686df2 SHA512 90a78aa8008951f1c3f6ccfa00486acde5a457c2b378741a68299757e754b1a61f064e9b0b1ee710bffd88bc3d936108508c2d7ea46711c35f3940dd2cdb8eae
 MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
diff --git a/media-gfx/wings/wings-1.1.1.ebuild b/media-gfx/wings/wings-1.1.1.ebuild
index 7e6492f3af44..3497dec8ebaa 100644
--- a/media-gfx/wings/wings-1.1.1.ebuild
+++ b/media-gfx/wings/wings-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/erlang-13.0
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
new file mode 100644
index 000000000000..bc645abc4232
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/erlang-18.1[smp,wxwidgets]
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/include_lib/s|"wings/|"../|' \
+		$(find . -name '*'.erl) \
+		|| die
+
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|-Werror||g' \
+		-e 's|CFLAGS = |CFLAGS += |g' \
+		$(find . -name Makefile) \
+		|| die
+}
+
+src_configure() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+	# Work around parallel make issues
+	emake vsn.mk
+	for subdir in intl_tools src e3d icons plugins_src; do
+		emake -C ${subdir}
+	done
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
deleted file mode 100644
index cce807c549e6..000000000000
--- a/media-gfx/yafaray/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST YafaRay-blender.0.1.1.zip 37965 BLAKE2B 7a17460b9b4e4abfd17c4e692e5686d02cdefd8fd5c941088c2af91659970ac88b183ef677a89b4be90eb9f1515283e9f41bb1c1f92b249a1131b51f2f63eb78 SHA512 0c424ec43fdd172a4e4729983807cff57ec9db335d5a4b48721c9790dbda2306e5d156a7b150b8565fe7ecebb840beb77bf6b29d8a836a8faef97c0ba5077b86
-DIST YafaRay.0.1.1.zip 542063 BLAKE2B 94827b83e27427a1e05377a3be3698c18f7a2ba3a6d25b662c6be432cedc683454b056bb33d490ba039a95977bbc024002c66c5389e25e191b395c9f67494934 SHA512 ba4deb56c20a67fe408b1797c518e12cccdb8f3d12fbfc6734bec40dc4d9d2ebfd2551762ed9064ed562d04d212b2154a9cd0011962fac28381b0d2ab2433ba0
-EBUILD yafaray-0.1.1.ebuild 2072 BLAKE2B cd9f775c649e8677ba30e62875e704ea07b97bfe8b7224842fae409025522638ecc3cea38868ddaa78449b7ce2aa59c18834810573ff90ccaa214341804bf4a5 SHA512 4a2c2382ed4161b9081710191f3fba7cb707a8a932fa1667288e1c9940d9f057b76b886ba9e2df14ee0aa9fc22b3c5975ab4f1db133ba1764ea590556fbc3a2c
-MISC metadata.xml 766 BLAKE2B 9978601d618e60cc1f994da9386a75ca4f60e26098ff8f5ad188a08069975c595ff82c9a264f6b59538f852a68adecdb952f984f227ef47e7ea8656d2b68d884 SHA512 814a598323a07ec0797842e0ca1d400cd66af9dd55f3e8a2383ddff9f266886d71e3420467301cc0205e4d37cd7e800c5861f6538a9e81a27205db4031f946e7
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
deleted file mode 100644
index f9d6744b6b54..000000000000
--- a/media-gfx/yafaray/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-<longdescription lang="en">
-YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
-An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
-</longdescription>
-<use>
-	<flag name="blender">install <pkg>media-gfx/blender</pkg> scripts</flag>
-</use>
-</pkgmetadata>
diff --git a/media-gfx/yafaray/yafaray-0.1.1.ebuild b/media-gfx/yafaray/yafaray-0.1.1.ebuild
deleted file mode 100644
index a3f95827e71d..000000000000
--- a/media-gfx/yafaray/yafaray-0.1.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-MY_PN="YafaRay"
-
-inherit multilib
-
-DESCRIPTION="YafaRay is a raytracing open source render engine"
-HOMEPAGE="http://www.yafaray.org/"
-SRC_URI="http://static.yafaray.org/sources/${MY_PN}.${PV}.zip
-	blender? (
-	http://static.yafaray.org/sources/${MY_PN}-blender.${PV}.zip
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blender debug qt4"
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/freetype
-	media-libs/libpng
-	media-libs/openexr
-	sys-libs/zlib
-	virtual/jpeg
-	blender? ( >=media-gfx/blender-2.49 )
-	qt4? ( dev-qt/qtcore:4
-		dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-lang/swig
-	>=dev-util/scons-1.0"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i \
-		-e 's:-Wall::g' \
-		-e 's:-O3 -ffast-math::g' \
-		"${S}"/config/linux2-config.py || die "sed failed"
-	sed -i \
-	    -e "s:env.subst('\$YF_PLUGINPATH'):\"/usr/$(get_libdir)/yafaray\":"\
-		"${S}"/tools/writeconfig.py || die "sed failed"
-	# add correct paths for qt-libs
-	echo 'gui_env.Append(CPPPATH = ["/usr/include/qt4"])' >> "${S}"/src/gui/SConscript
-	echo "gui_env.Append(LIBPATH = [\"/usr/$(get_libdir)/qt4\"])" >> "${S}"/src/gui/SConscript
-}
-
-user_config() {
-	echo $@ >> "${S}"/user-config.py
-}
-
-src_configure() {
-	user_config "CCFLAGS=\"${CXXFLAGS}\""
-	user_config "PREFIX=\"${D}/usr\""
-	user_config "BASE_LPATH=\"/usr/$(get_libdir)/\""
-	user_config "YF_LIBOUT=\"\${PREFIX}/$(get_libdir)/\""
-	user_config "YF_PLUGINPATH=\"\${PREFIX}/$(get_libdir)/yafaray/\""
-	if use qt4; then
-		user_config "WITH_YF_QT='true'"
-		user_config "YF_QTDIR='/usr'"
-	fi
-	use debug && user_config "YF_DEBUG='true'"
-}
-
-src_compile() {
-	scons ${MAKEOPTS} || die "scons failed"
-	scons swig || die "scons swig failed"
-}
-
-src_install() {
-	scons install || die "scons install failed"
-	scons swig_install || die "scons swig_install failed"
-
-	if use blender; then
-		cd ../yafaray-blender
-		insinto /usr/share/blender/scripts
-		doins yafaray_ui.py
-		insinto /usr/share/yafaray/blender
-		doins yaf_*.py
-	fi
-}