18.0 version bump for bug 553200

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 173 insertions, 15 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 1fec7587fa6f..214da49e431f 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.266 2015/04/04 08:11:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.267 2015/07/01 23:46:39 zmedico Exp $
+
+*erlang-18.0 (01 Jul 2015)
+
+  01 Jul 2015; Zac Medico <zmedico@gentoo.org> +erlang-18.0.ebuild:
+  18.0 version bump for bug 553200
 
 *erlang-17.5 (04 Apr 2015)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index b09228bfc6b4..78f1147c7912 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -9,16 +9,19 @@ AUX epmd.service 138 SHA256 689a50cfe05cf644f62b2308920f8ed7f602e1de94d53a67f5fd
 DIST otp_doc_html_17.3.tar.gz 33444170 SHA256 bd8278b34f610d6025549640d4e03d79d2a69d7129ea230c0d71d7e6b231f5b3 SHA512 4b1f46c4258b7189b3651af8763916d791888bbc2232c9db60cfda019f611d34d215225fadc88dcfc39539a2c00fbe13b0feba59dea334b77522d7777dc55497 WHIRLPOOL 97930374b82609e27e7ea997050efaf7e92817ec5503fa895a9db30faf1a1c293a6582c769a12ab407eb6981d53aeb58d6a1d558a3b97aa8d2b533cab5aa4c3b
 DIST otp_doc_html_17.4.tar.gz 33483554 SHA256 dd42b0104418de18e2247608a337bcd3bb24c59bbc36294deb5fae73ab6c90d6 SHA512 511c2331ce577d232a9d4206da9a87de5074d9bf3fd45f5f1b4d50535cc6eb6ecc54ed7fc249008085a553516e5cc4ec174d1cfacd3b4c9d5a36fb0e46e92806 WHIRLPOOL edc0003f6de6c705b6229f774b61604947988284618a320f1c4478121f39ba4871a6df4d27cb0b7cb1a30d95d4fe827cd269d7db47cea7a3795f7cff41eb61b2
 DIST otp_doc_html_17.5.tar.gz 33510258 SHA256 baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5 SHA512 d3e455452e6d6e241c40de6e41a7b1069f8daa45c8d2340adb62f8867948261692c8465db7e288378942ebe86fd938847756992600da93aa99cb294fadcb5211 WHIRLPOOL 9657c1fd133fa713d0f30bae0394f47f43b090149ec3457a177bd9f129c052b73f1e757762ced02c1c8bcbaec294e845859b18b0e2004429e04df8e04e36cade
+DIST otp_doc_html_18.0.tar.gz 33857396 SHA256 e5a766f68406f5025f921ec32e8959937189ed1245e24b03a74156a8898b03b2 SHA512 5fcbd1ac7fb5f646e181ede385a56adb8d754bc645fd9313c2e3a77a01cb686b1c5975695207f388a78c9599b0d4e6b52c7ea121e900c0a1e2ab20679c0bede1 WHIRLPOOL 5e9174059212b3f5023c04b19164184937b2eb4cbea29103a85813f630b733e60e600e31d3478b3ef759150421b6153a1a3e946e313706bc23e110e01dc1a945
 DIST otp_doc_html_R15B03-1.tar.gz 30436303 SHA256 d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e SHA512 8a22ad702d50f40162f7d6051dbbc0226af449f7a1dcfb087e952dd7eb7213257940933441cfb68f055746450e3e5aa2c5ed8107ac67af7c3a940afb195af8c7 WHIRLPOOL ac10f9ce0ffd4cbd98617e4018e5a4729ce83f0ace6a4db219e7beef2f3a626a8c9a419c7f7772c934ca50310f55486df7eb24955ba845a9230c69c93e183d33
 DIST otp_doc_html_R16B03-1.tar.gz 33294165 SHA256 5381d4ffe654e3e943f004e2b91870bd83f0e46e261bb405c1cdf7de81bc0507 SHA512 8f13bdda6a6732c5bee292b4f378539e5fc707be8822e660be9f851faff483b1fc06e612a5eaa843d71c22cec45943bd14aa20ad2323b8683861904d78aec403 WHIRLPOOL 163d2f5b7bac6363ad6ae5c1a083d8894a990f056b6cb27f3cc9923965fd2f0202a2de2248a2ed0fe6fc4afb1d6b096d94c2c141573f0c9439a5e19d5abe5dcb
 DIST otp_doc_man_17.3.tar.gz 1357195 SHA256 3fabdac0b0594432fdd8186fa2c74ff49a629a9bcc4174e3bd605a3d4002dab7 SHA512 2e1c483dae85b84bb15950bb06e765ab47ec10785d1fe9b06dce0310dfd3d194b4690ed19e4b16c79a21c8fd1a701895a21af0ceb3422ceee84498d16d984715 WHIRLPOOL bd86e3ba1df1a73efdcd746e50f941620c0d16595901f8336f5180d1030cd8103c52d2f8c9f550984591ab9f439484ffa73b58fdd30de442ee08a0371119f458
 DIST otp_doc_man_17.4.tar.gz 1360952 SHA256 6c1cdb8e9d367c7b6dc6b20706de9fd0a0f0b7dffd66532663b2a24ed7679a58 SHA512 982e170a0a2db0220c57c9fb554ba0148f67392583a8c0fc8140def897a85a996fc71e68b34d9752ca66f09fd9a95c83278cc65639afb554508e5f74b151692f WHIRLPOOL d06a34dc8b303cba5f6ab2d33294530d1d2bccbb54a3675356349bacfa6b247fcb22f8dcfc03da711354fd0f87844d8bb77998a77d3403562c166d8891bffa13
 DIST otp_doc_man_17.5.tar.gz 1363320 SHA256 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3 SHA512 98d241aa127cfe377e5efc52284cd324713cacefc96db5992275c4f8712a9e35e43f0dbc0d2a8d58a1127fbfa3f762eb001aea1bb1c9fa82205a3d83659ad548 WHIRLPOOL b790046a449824aa02e11bef6b84a7027351edba0fffd241221e690739df30c9c692074b7354612970d8d02b3c1bccfdbd81bb988af9874d181f177ffed49e2c
+DIST otp_doc_man_18.0.tar.gz 1389178 SHA256 e44f0ec36ee0683867bc2aa9cc7fbb020d9dfd57338f37b98dcd0771f5b95673 SHA512 d3e757b15ee03b4fd89b21a456b89c847a60f4715fb8257c4d3d4f431798cb8d1ae30978608bc85db7f0e25d51072a2d32927745ff410956dca11a01ae4fa034 WHIRLPOOL 83fc8d483a5385b053f5c24e51f35d448dd5ab8e4228500a858422192da17078dbd0f776cbea6d2f77a483c97397cb7e80b5bb5184157611c49743d05fd542bd
 DIST otp_doc_man_R15B03-1.tar.gz 1305001 SHA256 07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8 SHA512 eb07552c83a942c1e7f1960b45edfab97b0628a1e08c7c827a07d77797901b4b60a6719b35d0f92a49eb04ada924e9263df70968a5920efc6ccf8e4e966933c6 WHIRLPOOL 764495a8bb67e2c67493452c83ff890d959aa5cd3bd711fce75b3c756dbacb913e50f7d92aab14dc33d6839daaac5a37dc7bcc11fc6392af11dd506a8d99076c
 DIST otp_doc_man_R16B03-1.tar.gz 1322516 SHA256 0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d SHA512 b54771e853d2580be6303cdf20e17348360b60359e6e2b3d98a109f892088fb0071a245649afaca48dd98fe00ce9bb8bf3030535132db842e9a7d7c11880c155 WHIRLPOOL 53d12fa03905698b027e4df2e2a28b3f0df0adc41d6d98c4389cea8d9bf84f7de54ef2f8f00603141e68e65bf071890fd24e442bacab6790e62356cdedb4ee59
 DIST otp_src_17.3.tar.gz 67050599 SHA256 d4be03eb346016f4ca95d53eb9437ffaa6106762f153620dd98cd7f7733b76e4 SHA512 89d005fc3fdb4dc76c191b6e6a35e03f66ce01d765ba4f58cdd812d358025c62e032443d7ae73fea5b06bf6f27c9bf4e786f8090627ecb1e1309b88b82892910 WHIRLPOOL ef73ea10df2126c129ddb85c0a2bd72c6a7885b200b4d584577beab7c90b84f81647e017f2814dc4406427d4b22f48626db983636bcd5a8648f861484bfe6eff
 DIST otp_src_17.4.tar.gz 67171182 SHA256 0d82eda6ae7ac6f0f860093324e540fa514497068ec3b4177800284e8c761f56 SHA512 a2626eea451a5e81027072d08eee158856deabd9fec9d648a736d6fcf0797f5009f8cd749dc3fb4f64d8af6f80d505e3709ea4e6cc0183ddbe365e88c27cc201 WHIRLPOOL 171c449dea4af58df4d4a190b8ce05117a9662725111d3a2f89429335658848c333c2747cc6fb41638402f5594811a5c8087a186dd4b0348980ac1076465d404
 DIST otp_src_17.5.tar.gz 67242289 SHA256 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 SHA512 cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1feda91eeecb70fc658f8987087256f51a2ebd0c526d16eeb09c72889d2390d WHIRLPOOL 3c3d987981383bf148b9788fae0574da398ff63d81eea13da0463bed303922d06fe54354de1cd3d37091eb23438939c645176ab565877f06cc1f11235c4d8d3d
+DIST otp_src_18.0.tar.gz 68124710 SHA256 a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa SHA512 84ec2a3834270c1babe153572d6187faa36c12128e604037d55be01719788c0dd79d46769ea7090d530b746206a25fe02346b02849abee10ee41ed4ac7567c02 WHIRLPOOL 7edc237ef906da5e086bcb7b37fe23da3293b3635f612adc9239736e17731270bf64624444c5556d9fd7a03e4e64678a3bd294d04be2aada2a88d897dad9bee0
 DIST otp_src_R15B03-1.tar.gz 76123810 SHA256 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c SHA512 baa8f388bd56bbdf1d3818802d011970fb51d38d14434532b1e4f04c1b8203e5a0cd9cc870f93a993cce750cd1af6e4b7df40dffc44e455353bce9d7c46c8e34 WHIRLPOOL ce76d01dfd17e0bc70e3daa7eab218000d1e802f55b0892e2e9654d2ea262f214f3bd006c0988885e787a1cfe782e8b61d5d1ee3a1d05cbced465b5a28e2de2e
 DIST otp_src_R16B03-1.tar.gz 66253556 SHA256 17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7 SHA512 c2d26d6e1ae85abb8195c7171a0693388b507be760710f3afdfbcfa776e31508ab9e2a58010d55a95ba4a5075edc1e7c18fcefa196129fa672ccc40a945f7e44 WHIRLPOOL c6e1e6bfef7249e3350ff0e3c5cbad40cb2ef80fff774ca46871a37943d8f4e92af8a5e0c3eaa3a97c18fc47b87ace9477536cf0a251d325165bea869d26b85f
 EBUILD erlang-15.2.3.1.ebuild 5423 SHA256 212dedb4ce233274c9ac98b3a48498a87f42f2b65caaa34547f06401b6e1aeaa SHA512 e8af1f3cb6037bdcff65dff64ec7bf01f3a98006be0d2dda770698128748f47777baf0713f477637121734c7a47f8a6aba66f3465dd0d5217062b6c3de53b216 WHIRLPOOL c0fe8f99cd6e38856e8c22d704e0365ec1b18ce8d489597d1218ca0b0afaf916a90e90d789e6587e3302ad6258456e5bc1caa17657f5e5b3478292ca9616a1d1
@@ -26,22 +29,13 @@ EBUILD erlang-16.3.1.ebuild 5207 SHA256 f98734ed147cb41c6955bdd4bfc8d8a450e9b6e1
 EBUILD erlang-17.3.ebuild 4750 SHA256 da5f7f56042146ebba65fddb89e374fef1ccec8f32f15e9e6ae6d418a714af22 SHA512 05369c7497e161fcd7f65a73fcd1b7084238438943f90550075fee3eb6e5b7d77fff800bb037e7b0ee3e09b793d75b7c2b5861f72a9bfaf9378a856c888801e8 WHIRLPOOL 15166dcb112dd2539ee6fd4e1a14ddf0b7589d3ecc5c81eaf04c1da040a479a96dffca958aab2ab3e356048cffabfb0e655dd65c0a3038e7083a26b9b52ccf82
 EBUILD erlang-17.4.ebuild 4751 SHA256 13bee30147d2b5cf963292110d4bd002dd967d667cd605c00f4147d1e0886760 SHA512 bc89605670bbc3799048317c99e145528ac3557878ac41689a4772534523be857cde3190b0f08074933361c026a17f5ded0f448bf4dcc97a4b4a7d2f9d43e84a WHIRLPOOL 6cabe4a5ab31087fcfd20310a09ec78658439d29639e900a45927dafd01912924c6bdfdc4f559abff136c48bb2cf6f513e3b6b06e34a24506684407d22756f39
 EBUILD erlang-17.5.ebuild 4751 SHA256 831119be25280edafdccd2710d9cf80febd885e889db0bf6a5c9f5fa68b2fe26 SHA512 a6ffe312397b21d39852d8f829929492ca4046eb0ccafdf596be4c26760cfa865a931bea13323ceedb78fcb09cd63d31906ee842b12264a64bc35bd22c99e3f6 WHIRLPOOL 16a4e57cca829d56c1058a52a94b287017513b22eb48cf4e527195f1c8a2dfe3c0f8f28d62287601cd74e890fb0a0dffb14fd2598dd2d6862dca53aaff0890a4
-MISC ChangeLog 41331 SHA256 d14a973752454e27d151b8d5b4c338452e77ecdfceef6986fc701ebb82ed533f SHA512 916415285e438a17de4b7e6a8b6f963764b490b78ec10a5367c8682737feca1edc7c3d7f8d42cba9705d6c7884475d296582fcb37bb8e042da8b9ca52d5e5c20 WHIRLPOOL e6e673ad634a831663dd49de73b30ed119048986f713feea7589e0ce9c20662cac82e571e961db27d16b6b8c29caef6f20dfc6d418bed02250a751c75d97a6b8
+EBUILD erlang-18.0.ebuild 4755 SHA256 897f16a549d2c8f1646f49e6e58b864b64ea6cbdd4e5738e4186280c45a51695 SHA512 5274b8ffb1560d373fd09ddb087bf3a70b1fd76efdf1b4a0b98203ad83554c0dbd9e839f987df74c61470d9bf026f2a52503a8729caae38964427c47f07a2d46 WHIRLPOOL 1457c49463942634b102afe8208f5e6e1516872392b6075a39143c503f01d99713013a4ad69ff2c17f26106a19ad3ff2b26b6101360586aefb9b80234e4e66fc
+MISC ChangeLog 41467 SHA256 47241cc6b489326647071856c3174f214010a60741e41c3e5e1d410dc56731f3 SHA512 e1525997520e837d5296908d71d6db3a89caba9959cf6f2271199c74307d407b1ff58b1b6867951574c95b3279cbaadf8f887a75bf65a2959c481c84f0325ab7 WHIRLPOOL 343a0f17b800bf2e8e349ced346ed2f82e4537f38e11eb6be2d300012b5161073db4ffad002a71a4b6eb9b6f5ca83cf8459fe2b038857699f8d0687854a3a78b
 MISC metadata.xml 852 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27 SHA512 1b22c6d550e7ca634694408f000bd99827aa86037db59b1bb3ca7a2b4259c38d69caac14b0a0db6611f7888dfcdc7972ee70e57a716eb2ac7684aa043b9d3208 WHIRLPOOL 748a8b4560773d970987880ef457194437024ee0f72b3ae9972f6033a5fc14da8e2835dab385c559ae0fe22e2bd31e8e4da3dc946e504388588d23baa39208bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVH513AAoJEJ+WuSkwOAOB+V0QAIQAHFOzyUT7PNPrk9R9mlD9
-Zy7EfKnfM2tAb/3+vWOkqu2fAzWOaec7BXUgH1hJb/cBlH303z6683MZIrnlvhMs
-u4ghFuB5AYXeoi5dVpOgcGa96MM/tmmsFY199kCtnTgwABBWkbpJh+V4NXSWzHdr
-Uvi1OrPNHkEksyBNnTBSK865gQiY8zNHB9gvXQ6g+3TbUmd+4e53I1LWCnu82Mot
-3XsJ7kEybIqPfKRbD2UuRONg0V3asmrGeX0m0YKHFiT5KFtBabmhXJWfFnCD7uH+
-NIpx469oUPe+F62piVhPdlRZX+t0xD/AJ/zhMTdnoNRN8kcRJvHk9ASxVdLvunsn
-XeXO1oBh7Kn2zaqZ9e/dItC73CMv6z94bAzw0bSWUbUOiJXrJythfehbxqRrtx06
-FdXoW5zNJVMl0DBssCKwfPmQlUUAaicsv8DD7IMcLxkyzZec0e+TdUmybwObzWg/
-cECMVACp0lSfZt62GjpHmvZy7PN3XF+8r/HhD0BqakzEfh2qFM7YlEzJR5AgP4Ww
-4aO21Otg1yYvkIe8/6+6gkRe6EBpi1wAE1PSF7MNnS70QvcdCO6/akbapHtFtonz
-rf0f2fnpwSZCM4C+lC8AxdSHzf1Aty3V6ISKDOrMMDQvHrApM4ZyR8j25TlvIAWW
-s00dqEMXDDgrtDsRZ8Eq
-=RoOD
+iEYEAREIAAYFAlWUe+AACgkQ/ejvha5XGaPvTwCgpnmGhFfx0ps2I0EHmiLFbGmE
+KGIAoNFO0FODb1D32EeII4eBcqiCyTiD
+=nPRg
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-18.0.ebuild b/dev-lang/erlang/erlang-18.0.ebuild
new file mode 100644
index 000000000000..28e42f563d9e
--- /dev/null
+++ b/dev-lang/erlang/erlang-18.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-18.0.ebuild,v 1.1 2015/07/01 23:46:39 zmedico Exp $
+
+EAPI=4
+WX_GTK_VER="2.8"
+
+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 large collection of libraries"
+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="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl systemd tk wxwidgets"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	if use halfword ; then
+		use amd64 || die "halfword support is limited to amd64"
+	fi
+}
+
+src_prepare() {
+	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 && eautoreconf
+}
+
+src_configure() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable systemd) \
+		$(use_enable halfword halfword-emulator) \
+		$(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")
+}
+
+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
+
+	## Remove ${D} from the following files
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl"
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start"
+	grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
+
+	## 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
+}