14 files changed, 287 insertions, 15 deletions
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 30ea811eecd5..19e9578c95e3 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,18 +6,22 @@ DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c
 DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
 DIST otp_doc_html_20.0.tar.gz 33948386 SHA256 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628 WHIRLPOOL 953bf75da7f6aa46e26e4fb6f12d22834d2a41a43e5449e3bbefbe7359f67b7a0affbb0dd6dbfebdecae9294f080a69c0637741ddcf5dbcd0db488ab5a6ddd1a
+DIST otp_doc_html_20.1.tar.gz 33059931 SHA256 442c9b75a33be685a1af67414cc8758a4ef40e27cdcab9e432d4d9c6f3254dcf SHA512 c2eb6cb63f71727ada79ea14a1b8f0b7291bc1d3cdb43bf8978b7b8948d466b9492571d3a45adc96de0eebf46eee213d27c0502ee4d9963ec7c5c0d976f257d9 WHIRLPOOL f03eff4df31352534b49b2bf8d577d16467784ed14cc9c760e4156b486caef5922a32f8676346ed38b6825507395e0e871f89ad82993e3fb59015dad9ac43da7
 DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
 DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
 DIST otp_doc_man_20.0.tar.gz 1430939 SHA256 b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99 WHIRLPOOL 16b1c1448cdd3a35b340f66131a41af88e679e2e5e5383f5586f4cd386462f4a306512a068bbac8020209d6f72ef2ac57db07e4075b1d48bd0dcc0b3dfd9657a
+DIST otp_doc_man_20.1.tar.gz 1334036 SHA256 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46 SHA512 d64cb7e78f1cbc86eccfa338ebe211b4e67ada842d780cf73dac7aadab8209a845de305644b758ed23d939688146012cd5172e005fee207307d6e24c7b7d2345 WHIRLPOOL c772d8febcece3d6b3d7b4a576424aba5f33b9d5aaf5312e5bd0e44bc7350d2e562a93d62d48288cf3dd8e050b83727da624ccf267fd60fa5ac3b28166521148
 DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
 DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
 DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
 DIST otp_src_20.0.tar.gz 87346046 SHA256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951 WHIRLPOOL df800cc5dd9a79a32ebb14376ced74482cbfd85bb4e6d3af7c7b70f32c7080b1c3dee08d9769fa1e296b248c05e3aebb5a3b486f7f6f6f3e1e36486fd3044b56
-EBUILD erlang-18.3.ebuild 4581 SHA256 315eed7d26dda5b5e3e9c0389c6010a63ff494e954026f333fea7ed39a7e38ec SHA512 2b69e383d488e92fb7ba6d7f5dcd3bc520c5130b814e76a3dc90d11fac68c719d497239fe8168c53d6699ad573b5e18e1517161677c97ac54c281ce5a777e7ee WHIRLPOOL 835af1f27e6144d0cebcac90bb2335171beac524d7cf4d63539ee17f4e4d5b9f1e4a164958bd9522465cf6ac826b5e60c3a5d7d6d6a5c33677e1988d6d83e6b9
-EBUILD erlang-19.1.ebuild 4476 SHA256 0bd8e460d5e27d4f6fbf5a2750bcbbe3fb51027e34b6a74892539c767d5e42ea SHA512 55b08029725e407bb7ec9f0d4a9a3d35be9660ec9924a53bdce74359e837801096b26f79e69e5ec6188cbf63f84afc8aba0214c63c59472ea36ccab5d8104ca4 WHIRLPOOL 9a1433747145fb3d3e3d563aec4e7801fd174f4eb26df80b82bbbbf7c88f4dcb5b78a47f6d2b39a2d9a36254ad4e2f25be0554f6dfb5db48c569ec921c658888
-EBUILD erlang-19.3.ebuild 4532 SHA256 3b7175b62a4f081c12922160e03a02ab553d81a64fa3aeedb6c60531a187c9be SHA512 5cd44a540844afe0ec27cf3a6632f12d3ea5bb4a793cb6c148e80a33c9b38fe41022d02ad6a9d74fef2dd2602d5e46789013e899c13b90f96797332badcbef0e WHIRLPOOL dbbf3795beec0d10cd3d13267ab2370a9724b2fb9f70516923184a03e25087a462b09cc35e0f0d171d95e745ee1a8032ef7ecf99553f0ae913a94cf739b79fe5
-EBUILD erlang-20.0.ebuild 4532 SHA256 3b7175b62a4f081c12922160e03a02ab553d81a64fa3aeedb6c60531a187c9be SHA512 5cd44a540844afe0ec27cf3a6632f12d3ea5bb4a793cb6c148e80a33c9b38fe41022d02ad6a9d74fef2dd2602d5e46789013e899c13b90f96797332badcbef0e WHIRLPOOL dbbf3795beec0d10cd3d13267ab2370a9724b2fb9f70516923184a03e25087a462b09cc35e0f0d171d95e745ee1a8032ef7ecf99553f0ae913a94cf739b79fe5
+DIST otp_src_20.1.tar.gz 87342296 SHA256 900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf SHA512 76b5fcfcdd501636ae8b8392e563d03ca351fce055fca3c92354fa7fe78e150701fcfbc607e09afcc13ca04d5cbba33b15ef03b77e1f4af766dd0e6b152df7a2 WHIRLPOOL 28643aa28dc960d1187f7b4b483a75e631bf29297bf5d96cc2199989ec390a4e564391fb8c518212bd9e0852703e412d13ae7f530036643394997afb25b2cd19
+EBUILD erlang-18.3.ebuild 4587 SHA256 22e50df693e8ed0466719e07c34b04a4989b8ada7eafc6d6ff069c8e0bc67947 SHA512 e66b473b6bb3b9274f6610ad30fd47b03337a805ec00afbdc5f0620fb74bc39e0a1650ea719d67ea07ffd6532beb94f6bff980570546e0f625158220876400dc WHIRLPOOL 02f14e2ebfbe67915ad3ea588b817c55e8a542aad90b5da9a78204fdcc11bb3729f15ec7a22a01d82116934b497861902c7c7507e24422d4e14fd39b24c2e805
+EBUILD erlang-19.1.ebuild 4482 SHA256 7cbae5f26cc9c4c70e2b64ffbddc02c2a323cc4b05143d254a738961655c8940 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60 WHIRLPOOL 19f0566c346cad486e82bed73051c5ef45f8e23f6aad0fb89ac2df89f753ee667acd87cdd54e7f228de5d3d427154734c9c36a1e43d3dc934668a3a59541ad07
+EBUILD erlang-19.3.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
+EBUILD erlang-20.0.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
+EBUILD erlang-20.1.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 MISC ChangeLog 6939 SHA256 b53b63e91b559d7d54089facf45163140f393c1eec45f68e49ea2c425dd3e392 SHA512 dcf45a4d02ef5a9705ea67ce7c843adeb5dbef927cb5a03f4143e45ec49f6f302a65ec6050a8bd4ff9850841e1984b47d082f280b06264531058f2abd20481e5 WHIRLPOOL 0106b9728d365040debe47f0237b279492ef606bcfc28aca8795c4a92a15412beacb65c31c23ebae1e307387191ccf89390b6dcc3eef8cd6656879637506554c
 MISC ChangeLog-2015 42199 SHA256 a9beab51a32c9af7307a3954d3ff27d3716ec4809ed8944df3f696110474994f SHA512 bd29ac327f61d9c50230bd83c54c38e3dbe5c520af3a4a21315459927281e99e637cdb6e9e59e167e0da6745917d93320f4e831e893c99d562773225f8ebe8db WHIRLPOOL 5a5861a5200a9c521b6feca878f760d95f12af1d49f1e4ba8a9f331e0fb308ede81f58bd0b01802abef5b697a4e42216ee0fb4aa2e6093a375a3d2df476e6b96
 MISC metadata.xml 758 SHA256 fbfd5a67e7b069b54ac80a82d9250107ad27d150ebc0f38ca4b97936dabc8807 SHA512 b430d16cc736f7a1e8ab9b08c3e79885fe860bce973908a22c5835291582431507746bb5ec3ffc7fe219380e04c5b9b2ac2602997b413548b66785c90c0b71fd WHIRLPOOL ddfdf8b93b774471a15e1770583cb1909db816bee57e886973cd6b6bd2e4852f44f49159ff5ab6fa4164b2a42ea109af48f433a020de22a1a0c574d75831dc13
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
index d8c4f8c00680..70bcb521e11b 100644
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ b/dev-lang/erlang/erlang-18.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-19.1.ebuild b/dev-lang/erlang/erlang-19.1.ebuild
index 8200f15eccd0..19224daf6a1d 100644
--- a/dev-lang/erlang/erlang-19.1.ebuild
+++ b/dev-lang/erlang/erlang-19.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-19.3.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index 0e605a39add6..68a6119c6dcd 100644
--- a/dev-lang/erlang/erlang-19.3.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 REQUIRED_USE="dirty-schedulers? ( smp )" #621610
diff --git a/dev-lang/erlang/erlang-20.0.ebuild b/dev-lang/erlang/erlang-20.0.ebuild
index 0e605a39add6..68a6119c6dcd 100644
--- a/dev-lang/erlang/erlang-20.0.ebuild
+++ b/dev-lang/erlang/erlang-20.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 REQUIRED_USE="dirty-schedulers? ( smp )" #621610
diff --git a/dev-lang/erlang/erlang-20.1.ebuild b/dev-lang/erlang/erlang-20.1.ebuild
new file mode 100644
index 000000000000..68a6119c6dcd
--- /dev/null
+++ b/dev-lang/erlang/erlang-20.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# bug 263129, don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
+
+	# don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	# Nasty workaround, reported upstream
+	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
+
+	cd erts && mv configure.in configure.ac && eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable systemd) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		$(use x64-macos && echo "--enable-darwin-64bit") \
+		$(use_enable dirty-schedulers)
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+		# doman sucks so we can't use it
+		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
+	done
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	dodir /etc/env.d/
+	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		dohtml -A README,erl,hrl,c,h,kwc,info -r \
+			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
+
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 9f4ebd3716ce..077ae04ab840 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -13,7 +13,7 @@ DIST go1.8.3.src.tar.gz 15345996 SHA256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673
 DIST go1.9.1.src.tar.gz 16377700 SHA256 a84afc9dc7d64fe0fa84d4d735e2ece23831a22117b50dafc75c1484f1cb550e SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793 WHIRLPOOL 1cdfddfbe2b432a783d821bf6caf6615868de7eeb71667fd38d77a115b87c0d5321d6928f271bbe7edd6e05d56f5a0e05b6fceeec5dd025673c0a0ad9224ad3e
 DIST go1.9.src.tar.gz 16377363 SHA256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 SHA512 70c4b892b6883fb21fc1a547a2b8d174df8c7aca282a3906e3816b4442b16c5da578b69c19443122a4a45e66fc95d170528d826b70932af09f4afd2a46615d74 WHIRLPOOL ffd7c37ac49ac55546f0712cdfae9eda83c6cbc10a6b495b021d7a5076bac1063f0a322622692f1b67142a995da2de7e297a43727502331788adac43163848a2
 EBUILD go-1.8.3.ebuild 5581 SHA256 0f93c5167e263e8029621377972b4be9f94187d325d459bda30268935bff3b8d SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997 WHIRLPOOL 086b7c4b0ac20a17822d704451f258966921103a297d8038a71183895c6fb645a18edaaaf0d90c34ed0c0b7fcc74d069cfdb62d5d530b71d5967a2b7ddc59ae8
-EBUILD go-1.9.1.ebuild 5582 SHA256 d7d2060ce3c8857867703011c39e7d2b2d8dc5de12fa0982479955ac8179ded8 SHA512 aa97dca1ecf9e7463dbe7b94f48ccd132a839f87997615d6a1f61ea1827cbb75e653a356b2a3ceab6901dc54cfd24b42c18dc2cd07c75df0254f012704b0ff59 WHIRLPOOL 84e1f30529e3d68ccc516198caca9096b96b148acc86b25e2fd10a0d2900cf84468f87c5dccb184a465a17c424a90b60a83c35ee160078bf4c15def846c63f43
+EBUILD go-1.9.1.ebuild 5581 SHA256 0f93c5167e263e8029621377972b4be9f94187d325d459bda30268935bff3b8d SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997 WHIRLPOOL 086b7c4b0ac20a17822d704451f258966921103a297d8038a71183895c6fb645a18edaaaf0d90c34ed0c0b7fcc74d069cfdb62d5d530b71d5967a2b7ddc59ae8
 EBUILD go-1.9.ebuild 5583 SHA256 ed61ef48faff64b18806aa7a2e485f2b350dda25aa28d5c7c412f9e3aadb87c1 SHA512 635afcc0254342631b895b867785d390cad7a671e2dafb2e6a7d9e8c73cd1c951b6b5b1781f6e6b805f7ecba0784c66f574848823c24517a3c8aa1679867dbd8 WHIRLPOOL 9a57db77f411080d78763191fca1b3aec435127e5f752b47e596f3f2ac9e593070073aad9f620ad5395739bceebd3051de2024c543c9abf9390c8c834826c3c2
 EBUILD go-9999.ebuild 5584 SHA256 3854f126a7b2d76ed3dfde8cff697d6c033d6d60e063b07239485a5410666504 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7 WHIRLPOOL dcb1f48b08de50e1ba456c81676bc0c8b2817d73faaa5ce188d9508bb1376833d754cd3391f254fd353ca6100f8fdee5e18d20e0d6b223a7b09790d1e50f9ab0
 MISC ChangeLog 15550 SHA256 1e804542720fb0000c4ae8ed1d840415527ec25a16f77aafd7eceeefbe446377 SHA512 3e8c4083b1a7ee877c55283f3463aaec0144d090b5ffc5be7258a29de69d88ae3ecd2fe69f4ff118667796d8a79235870d47855f033d7e67e1da78fc466df638 WHIRLPOOL 8d80ee3abbf55b198e82d911983ed5155da45e72d2b4d2aa39f71837857c61a02797e5a3b9b776f2f93af5ad81babc8e2d5fc7e9a7405d07b069755333479b9f
diff --git a/dev-lang/go/go-1.9.1.ebuild b/dev-lang/go/go-1.9.1.ebuild
index ba6f541436c8..6b538a0be4e7 100644
--- a/dev-lang/go/go-1.9.1.ebuild
+++ b/dev-lang/go/go-1.9.1.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 88b4c65086ab..fdcbf2881878 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -16,7 +16,7 @@ DIST perl-cross-1.1.6.tar.gz 96075 SHA256 2b3b88f54d85beb438bd2dddd948e2d89461db
 DIST perl-cross-1.1.7.tar.gz 97622 SHA256 b79ce9d766b5f527ad7e73cb86d541da88ecbb69a443ee5f14658dd8f9e9415f SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 WHIRLPOOL 92b4c77e9cefeab026c246fc82abbe20a98c7ba20a4cde2e6f32423dbc98777601b39ca147d4bfa03e42530ad5e1fe7e1d18ca10a407bfd258318934a4a93998
 EBUILD perl-5.24.1-r2.ebuild 17089 SHA256 81c1cce8e4c80c26fa7d176380ec0174265a9f35871d6e0d586dd246eaac7df1 SHA512 2b05056724d99216e116b8fce6fb7f935bce683454a004b85131a815a770d327d67dd762e5111396a34ad0d219a4b42fbb4108d8f52f17fbfd2aa34284ea963d WHIRLPOOL 4a025854d65d5a5a58728b17d53ab9fd18fc490d69d61a71d7ccfe63b97caa9893c0aa99740a1aadb06f88d6f739d881a38c664df913ee7f1b6febffa843b7ea
 EBUILD perl-5.24.2.ebuild 17084 SHA256 e81935c7bfe52f0e636e8ec290bb76b9da326d3ee401cfcf52574b0c9f4c6e93 SHA512 148573132f49a2f46853e3fe171b6d07a72dc50c3b80d2d5c54b7c87833089b366dd0137637160e053f26dfc39dd4b3564d08e0a3891a6822950688cd1844aa8 WHIRLPOOL 2afce33fb37ce2517cbeec1b29688300516c185ed5bc4da9ae7af9eff44ad976b8c1fe713e21eabe1bd7bea69ffcf21fbcb115aa2ef76ffb2877540346d5a7b9
-EBUILD perl-5.24.3.ebuild 17085 SHA256 f0bcb5a6a40e7d4b9fee7dc0a89c4029d9c834f24c86ed12d4783adf35a9f265 SHA512 56b87b0734d15168a42b2de1bba2c3cacaead3d62bafa9ab27b1c2b7aed0786a3c0e0de085f6d2130f4b5a3f98fe33c712766e09ae69263cc2654517e8003f37 WHIRLPOOL 407f4bf6a596617c4cffb957fd3d4cd0f7449c38c5f9826076f58003e9b07ab6b46473bb19ce7a9163a002a5655aa7e64f36bc659a1b46417b6aee433d03445a
+EBUILD perl-5.24.3.ebuild 17083 SHA256 05268aaf4e8e015cd5adbe1afaad2d778fd88dd8393e02e31c51e77f6a1bc9ce SHA512 7bfa3b0b3a4cf07aa981f6c43ee8b53b3f6cc09eed7d6fec56412933017f77fcaa7c30f8196f71b7181458f781bd6c4d1efbbb2ccdb00d2a198415a054a0bda0 WHIRLPOOL 336dd51a20f6b653bab1ea43c1e40df25feed77c36f05a7e9f0dd16fe69782dcc4beacfbc3ac0bede83857d8998f9ed15ef07ac740f253ffedfc781c00bc40d9
 EBUILD perl-5.26.0.ebuild 17993 SHA256 73c71a10fa481c983b3dc4d81bd3db8ed957901c3aac10e39064ec664015c2c1 SHA512 3a9d54c89c428ba1033228287a466e5ab4b3e4b3c8207885491c3f04d8608074609e18fff913def5eeead0a100a3b7ee1569b5c5b318c8f959bb36578eed1f4a WHIRLPOOL 02e2d21535e5f8e55b952c725398cb3ddcae7759a5b17ee953eceadf11ec77d04a67ed6948cbf23612e0c3d0fac84be42de6b6ec711fef982a09ee0944f1fda3
 EBUILD perl-5.26.1.ebuild 19098 SHA256 e9f7efce9624a3e103e0a1b637b28705993d73935a5dd723a95b1b5bbe7be769 SHA512 5e1ff08063a003a0dae392b1b6a7f0fb24838b658ebee2643e2c833ba8b05f1eec9a5bad4e1ba9f97dff542832b372b67104ff0a91044dd4fcf40711308898ea WHIRLPOOL 9f1e65828a2fe55c126750c69bcc7cb35bc17ca25c98b8a4dd97489a1b876a6e99af6d56111c9ba21d6149813bd31bdef480736a84f66d78fbcb9e1789a83073
 EBUILD perl-5.26.9999.ebuild 19091 SHA256 5817274e7388b5c76acfb6751611d50d32522486bb07863932254e0ecbfc2577 SHA512 1d432daec869ffddbf7dd9cd845a8a48a4e942b500ebaae80f80fbdfdf2cc5147fe58f305801688549f071ae1ec3126b828f1b6f95ba109f72bab1584afe3f56 WHIRLPOOL 90e3b0b41d5a48b607c1931a30a2270f61a568076f80d1884359ed1961897f20ceee44efe10408688c64f8bb3ced288ec6df7644e30d22a96a8f0a9c43ffa9d6
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index 3b0d7b2eb6a0..a5921322d0cf 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/solidity/Manifest b/dev-lang/solidity/Manifest
index 50228bd01d94..5e4cf0e02fd3 100644
--- a/dev-lang/solidity/Manifest
+++ b/dev-lang/solidity/Manifest
@@ -1,5 +1,5 @@
 AUX solidity-0.4.2-commit_hash.txt 9 SHA256 605c300b7a7e77c2e4499d50de5ad072dce56f9583f15cf696b0547dd6ad6ae5 SHA512 766569e9ffb283e6efbb81dc546502df8b294a445713392ae9717a845a014f3170c29448d3d7256256b4e467c7c6ea9d9eba45c83ec68c7798a2c67d1cab3033 WHIRLPOOL 520252c80ac2d6f9ffde3d2495542f111f408b56b614d71b74232f67881cf8357c60cea06c7f000273aef9b69c4f616da4a43a7169fb854cee144a97f6f95be5
 DIST solidity-0.4.2.tar.gz 495039 SHA256 0dd176919cab5492aecb27d1d8de39182b5e880979d5082fca6d7a01ebce28f1 SHA512 2ef2e58775e22eefce867ee73dbab61f54def1edd95e089ec3a388b5aaba316c44fe18b92d45e070014b9df6e450b2b27fe78434f5db40f0476c505b2541572c WHIRLPOOL 541c2bd8d729bd9d1ef15739b539ca877b7c1f4e1ed9e9eda8ad7d3fd4c306001799727de14dae8fbf0092c31c9b0448c9ea7af92ca069ac24cf010f0a6c8ef6
-EBUILD solidity-0.4.2.ebuild 1007 SHA256 190f19aaa810219e55fd534d5b16693ffedb76dc023b222f27042e6e991f8f9a SHA512 ea71f3ab973e74861da839eaf9246e3d116b94849e5c90972a5073dc19b5ccbdcc013cae80d62fd35450601ce1dc5815d285587ec76b97f575bfad6f0aeeabcd WHIRLPOOL 83ae4c9367ad148a0696a37ee6341a0ce721db7982cb320259dc3f3fb71529ad25341b338d55d37944dbce32d48f82a9580e364f88399fbaae2e6c98837b1f2d
+EBUILD solidity-0.4.2.ebuild 1023 SHA256 e6ff4dcb429efcacf8ca54f517e4047abc02b82cf493913f31812074e945c78d SHA512 cd7095e9f5c54d3ef42b568ebe019ef337ac64e52f4d6b6041548d964ce39384ed4cdbdb3d3c58f4a061f87dbeb6e1966b7052431ec95a1bd6bc86f619024e6e WHIRLPOOL 9395394e08fde584b88c34d7b15cbf5d3be579a27420e8f90d604cd6bd9e71ec101ca7452b60700d0cb283d7e3940f442f8017e0f7dd5bcc101cc6cfcbd632d1
 MISC ChangeLog 608 SHA256 df195912e6324f813e724ed07cb55d743d69e508881f17d515d2a197df0c6688 SHA512 653d1aaea93f577aca33c4d102181885f8e6217c1b86a94e21955291d42d4dc704d218e9f093effe9424f17af9165700f9ff97ff7d9d3b686a8dec9481b8e77e WHIRLPOOL 0608048a5bf1c89dbb45430dd01077c388684f1e50f33617c6872e4522848b9fd10a5d292fdfbbf15903932bff0ae0e851c0d481dd165ce406c2832ec96ffe5b
 MISC metadata.xml 450 SHA256 73803951718b79fb7fc5a596a3dbe96b45ccadd6a55656d0c43e3ab3e11c448d SHA512 8de6f5dadccb7020d6fbbd17a3800dd9a44e4b19f484e38799fd00b240fbd2a4d213454eb7cec2d99ab8ea7834fe5a0d3f792c62420870e55986b2978af9789d WHIRLPOOL 8437d1c0024613efb9e407e52a3110761358369055e1fa72f3b36a1c4846bb093b8b4f129ce42dd75445bd5ac1558e289856d1f068d5d71a883e9c7c8cca6a51
diff --git a/dev-lang/solidity/solidity-0.4.2.ebuild b/dev-lang/solidity/solidity-0.4.2.ebuild
index 31af5a591f47..7deebb0fb767 100644
--- a/dev-lang/solidity/solidity-0.4.2.ebuild
+++ b/dev-lang/solidity/solidity-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="dev-libs/jsoncpp:=
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# The build won't work without this file but it is missing from
 	# the release tarball.
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 81b5342238d7..3c26defd1a55 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,6 +1,7 @@
 AUX build-2.9.2.xml 2863 SHA256 ac05d993ead76ddf70d50abf95f276f447ba202500b6f221a7d9ba26c24671ac SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673 WHIRLPOOL 1548933f6fe31b00aac4f0cf5a3139e45f1a75cf0016689c463db5f878e698cdf65655c1e4a986d32da62c73071eee09156b9c08e4fb452f2041f88e91326494
 AUX build-3.0.0.xml 2863 SHA256 ac05d993ead76ddf70d50abf95f276f447ba202500b6f221a7d9ba26c24671ac SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673 WHIRLPOOL 1548933f6fe31b00aac4f0cf5a3139e45f1a75cf0016689c463db5f878e698cdf65655c1e4a986d32da62c73071eee09156b9c08e4fb452f2041f88e91326494
 AUX build-3.0.1.xml 2968 SHA256 44940aaf7bca9256c7e145b30bb5da2a4cb0e3ecb05ef63603d89fdc2830d608 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20 WHIRLPOOL 6c4cf3c756c2421a8949383b21758fcaa6b244a258e1d71b1d18c5b2b54d9e8d820603626af7b09b1067ff1619cfd35befc6023560e93ad0bb7395b86de611e6
+AUX build-3.1.0.xml 2968 SHA256 44940aaf7bca9256c7e145b30bb5da2a4cb0e3ecb05ef63603d89fdc2830d608 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20 WHIRLPOOL 6c4cf3c756c2421a8949383b21758fcaa6b244a258e1d71b1d18c5b2b54d9e8d820603626af7b09b1067ff1619cfd35befc6023560e93ad0bb7395b86de611e6
 AUX tuprolog-2.9.2-no-dynamic-object-test.patch 758 SHA256 ef4ee97993fe8c0dd19e16ac7aacf84dcd6ac5003e25415dfe89da1ca3521a31 SHA512 bbaef70b751fe049680826fb82dc46a339f88d7b8062df0865fddb15de2c991939e7e2fae0f889db0c72d802790287487f442316ad6c9e7fa7276b30083b7365 WHIRLPOOL cc35dc699e538c46b9ae195ff0df73525585d3c062e2c1e3041174519262ff5476b325cd6b1ddcbc2ba7c5b45fbbe4e6ccbb4289968d0c599f0a1f410ac88eac
 AUX tuprolog-2.9.2-no-ikvm.patch 3929 SHA256 a3f74a551dd9710ab1069d8d1f3dcbfd39b8fc52777b45100094e9e06c4f6d8b SHA512 a90b55f74841271a6ae9f4143203a9920adee9f7ab32c814d41f8830b7310919fcf035361f87fcd1ba7f7f0f0efe0c0a29ddff704c0d4d14ed2a41b4f7574a74 WHIRLPOOL 54d57bbf90a708d2118728e698be70513724fde6163e718bfe4c0ae52777eadccb7fa34319814efdbc9fcee3516c0e69b37b68276d52c6ccb2d6309cdc24dfbf
 AUX tuprolog-3.0.0-no-dynamic-object-test.patch 752 SHA256 59daafbedde091f2816784195e9f05ade0cce27c0148cac1c42f2eda3be61a18 SHA512 e4797de5d857ddf9dddd4b0b5b73fd99f5b00915d2494661f115ff6da887d73840efb28d596ae7bb650cc0ef46b24381ed1688ca9d57a8ef554b6a878d8ae580 WHIRLPOOL 6d5f2b8f123332bf8249422531d0eccf38e12c21c3893e080406da4bbaf723dd716ec1b6ae1354aec871593564a7fc1436a1e303bb740b2eaae1c0a45e7ae6a1
diff --git a/dev-lang/tuprolog/files/build-3.1.0.xml b/dev-lang/tuprolog/files/build-3.1.0.xml
new file mode 100644
index 000000000000..3b6f5818eaa6
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-3.1.0.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
+
+	<!-- some properties -->
+	<property name="src.dir" value="src"/>
+	<property name="build.dir" value="build"/>
+	<property name="docs.dir" value="docs"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="test.dir" value="test"/>
+	<property name="test.build.dir" value="test.build"/>
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+	<property file="build.properties"/>
+
+	<path id="compile.classpath">
+		<fileset dir="lib" includes="*.jar"/>
+		<pathelement path="${gentoo.classpath}"/>
+	</path>
+
+	<!-- init -->
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${docs.dir}"/>
+		<mkdir dir="${test.build.dir}"/>
+	</target>	
+
+	<!-- compile everything -->
+	<target depends="init" name="compile">
+		<javac deprecation="off"
+			destdir="${build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${src.dir}"
+			source="1.8"
+			target="1.8">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javac>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target depends="compile" name="jar">
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
+			<manifest>
+				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
+				<attribute name="Class-Path" value="."/>
+			</manifest>
+			<zipgroupfileset dir="lib" includes="*.jar"/>
+		</jar>
+	</target>
+
+	<!-- generate javadocs -->
+	<target depends="init" name="javadoc">
+		<javadoc
+			author="false"
+			destdir="${docs.dir}"
+			encoding="ISO-8859-1"
+			breakiterator="yes"
+			packagenames="alice.*"
+			sourcepath="${src.dir}"
+			use="true"
+			version="true"
+			verbose="no"
+			windowtitle="${ant.project.name} API">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javadoc>
+	</target>
+
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${docs.dir}"/>
+		<delete dir="${test.build.dir}"/>
+	</target>
+
+	<!-- run testsuite -->
+	<target name="test">
+		<path id="dist.classpath">
+			<fileset dir="${dist.dir}">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<javac classpathref="dist.classpath"
+			deprecation="off"
+			destdir="${test.build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${test.dir}/unit"
+			source="1.8"
+			target="1.8"/>
+		<junit fork="yes" failureproperty="test.failed" printsummary="yes">
+			<classpath>
+				<path refid="dist.classpath"/>
+				<pathelement path="${test.build.dir}"/>
+			</classpath>
+			<formatter type="xml"/>
+			<test name="alice.tuprolog.TuPrologTestSuite" todir="${test.build.dir}"/>
+			<test name="alice.tuprolog.ExceptionsTestSuite" todir="${test.build.dir}"/>
+		</junit>
+		<fail message="Test failure(s) detected" if="test.failed" />
+	</target>
+</project>