gentoo resync : 18.03.2018

3 files changed, 67 insertions, 2 deletions

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
+}