Version bump to 16.1, include epmd.service (fixes 482446, 474778).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 203 insertions, 17 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index b1fd01336d67..17cea5c4db1e 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.240 2013/05/07 17:48:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.241 2013/08/26 12:43:24 djc Exp $
+
+*erlang-16.1 (26 Aug 2013)
+
+  26 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> +erlang-16.1.ebuild,
+  +files/epmd.service:
+  Version bump to 16.1, include epmd.service (fixes 482446, 474778).
 
   07 May 2013; Agostino Sarubbo <ago@gentoo.org> erlang-15.2.3.1.ebuild:
   Stable for ppc64, wrt bug #468374
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 04ccf570e2de..290382a50be4 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,40 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50erlang-gentoo.el 134 SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 WHIRLPOOL 6080f0f76c90f2e5f4577e8a6fc6dd046fc671078eda215c5bd33138aad61c2f2dfc585372966b65fcca24a46df0921a3fd2c4af02c68ef02f2fff443336c702
 AUX epmd.init 509 SHA256 110e6616b2978e74a55a76e119d3e16ac313b4b1b780abec6422f2dd924baa87 SHA512 e9e14f50ffc197f67706e9f419c2b7a7821d42b4d992fcd4b72fdd42a29983a84efaa3afb02a8758a871da6fd11c08e720ec416cc21b29a852d1dd9fc162ba42 WHIRLPOOL 7b9dd42fc706e7dddc98221c08e68759ed0d657030a04e6063131220dc4d6bfbc610a9e574ff5e62b79bb20d601febae4365ee960c316031986cc9a35e67843f
+AUX epmd.service 138 SHA256 689a50cfe05cf644f62b2308920f8ed7f602e1de94d53a67f5fd37eb0249ef17 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 WHIRLPOOL 7d4eb5c5290c8026bdc915210b2273cffd429ea1162cc0ad77f67661a2a660794b9518290c2437cb999abef8051275d6fd30b3dae8b98cf52c65f5c210d3c61b
 DIST otp_doc_html_R15B.tar.gz 28996680 SHA256 40504ad983b450a2c6f7611b3be88ebd6349079764520cca050e9c8f6e79dc93 SHA512 ddb6c143c9eb315d9bc2672e96dd91b33e011825fe340ee34a42341eb8f519381e87e77ef5252e35f8dcb21804e03ccb22d9b06b4c64fb3e08f001790b98bb5a WHIRLPOOL b9a6a0a9371e1b898b3e99a76d70447d481fcb89fd9e8d8bd32c53c714610bc6b8c9fc599aa059927c336b46168d4be216e8fc3be91ba17fdeda6ec74d04b1bb
 DIST otp_doc_html_R15B02.tar.gz 30385932 SHA256 be166976a651da4ea2588b9d277a6684a2d4318b37e8fc029365e992ec404518 SHA512 5cb08b0e13e621738f4b4c44376eaf728593a0e2288ecf5b0c8d47c237ca9549f9d6f0a4d689b5939d9c2066800182da921e04fc541a6176de253e4bde4f2c9f WHIRLPOOL 1dec3112e258d83f9f8df223b1d62949ece384c1ecdae54c84dcf0ce521c7d2e17895c8d7b45b4dc18f06dffee6de42ead83093799399ade49c1d792c2a3636a
 DIST otp_doc_html_R15B03-1.tar.gz 30436303 SHA256 d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e SHA512 8a22ad702d50f40162f7d6051dbbc0226af449f7a1dcfb087e952dd7eb7213257940933441cfb68f055746450e3e5aa2c5ed8107ac67af7c3a940afb195af8c7 WHIRLPOOL ac10f9ce0ffd4cbd98617e4018e5a4729ce83f0ace6a4db219e7beef2f3a626a8c9a419c7f7772c934ca50310f55486df7eb24955ba845a9230c69c93e183d33
 DIST otp_doc_html_R16B.tar.gz 32832774 SHA256 c0bbfd483a267440046c77aed8af7d7eafa5d03553324db9bf365a850a6581ee SHA512 f621714743329267bf87cfbc45c9262402465a38649debbc3826fa1925a5b878fbcbd7c1abf0dc7f5dd89fe75f4944fadfeca36442005cfac2e89de4a258a90d WHIRLPOOL afae8510f7425710e341d9bd926afa185339529c5daf92b380c781bf4779db247ce48775456174e6db4f3e1f8a4cb48b0eb079488160c08705fb8900700e86e7
+DIST otp_doc_html_R16B01.tar.gz 33129717 SHA256 fa8fc507b3f799e8ff4d2ab800f054f3f99b39212e348504024403a6951bd036 SHA512 0af6ed31e278b2d51c2d529fb41bd0d6eed36bf59bff458dcda2c30cb2412cf994063e422c6e4df450094abd5431b66d7455d3dabeefe28f0a8614634a4e9feb WHIRLPOOL ccab8c312765032bc01a533edb5e936b735d810c19ca30677fbb24c454d84a78cf129d4dc73162b6a66f8a5655721b618c46544102d316a752e2ce68a2776ea8
 DIST otp_doc_man_R15B.tar.gz 1122044 SHA256 1839cc4cab3120401989e0e1d7ad6872a59e2fd9d3cd82f05ca8c4ebef18eb6b SHA512 226c67e8edfccba607b717f5af65efc537bd9352a5622ec5083ffe41d12b19740bc351d7d23aa4d7d22f05febe8aee805b413d197652077b5529351e5058f07b WHIRLPOOL 45f2644506f7c6220ddc468ea5b12844f548b897d95d3763561ddf78f069cf4654191f02ed7d8773e4becfa0ee5929a9061a03b48f2a284dc9c7b2f0a4019deb
 DIST otp_doc_man_R15B02.tar.gz 1298793 SHA256 e27ed26259a2560b81e02b89190ae2a3bf0a777dc2e875f9615adab0a5388f95 SHA512 f76bfadb543f3fa6b0fb2362a230e285a232f0239f97f599c980221015e98cbd0fac5b5cb3bc7d1ac0fbf13e121d4e8d374d75218cc4ed6dbc945731c74c19cc WHIRLPOOL 0894810921fb54f962363d0fd362861f25f86281d757cfb7a4f6529a537dc474dbc365164599c8fc817392df8a1d97558016312b560907a16fb090340ff187ae
 DIST otp_doc_man_R15B03-1.tar.gz 1305001 SHA256 07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8 SHA512 eb07552c83a942c1e7f1960b45edfab97b0628a1e08c7c827a07d77797901b4b60a6719b35d0f92a49eb04ada924e9263df70968a5920efc6ccf8e4e966933c6 WHIRLPOOL 764495a8bb67e2c67493452c83ff890d959aa5cd3bd711fce75b3c756dbacb913e50f7d92aab14dc33d6839daaac5a37dc7bcc11fc6392af11dd506a8d99076c
 DIST otp_doc_man_R16B.tar.gz 1309209 SHA256 f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9 SHA512 100148a8fb2f9097fd2c44a392d5f00cf3d366320fffe2574de85775ee9a76edfdbd5e72a24bbaaf18193b20032ecd9dc4b14425adbff2ed9454ec8989aa0969 WHIRLPOOL 73fadef9f18f0d6d6a7343a0d869d00dd60ccc53b4c2b3279fa5e19e014be73ce496d147be3c839938f12c026654cb4d8dee6d2aff057acb1ba80f3dd8447f4b
+DIST otp_doc_man_R16B01.tar.gz 1316676 SHA256 71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2 SHA512 791388a4d76b4c2bbe9898e1fcd8bd976a2b22df90706be5da1b56e30e66d97a8517adc0fb9d61f90e206cb2853df6d88c054387a630be03c27b3b48a0419376 WHIRLPOOL eb7c470185a5a11e496955ff2d876c1b5ad65ca2e9479c8dfe10a91b265970c9914bcee799d431f1622ade163f12a24bd4143e4483d3b13802e3fc6357c259a4
 DIST otp_src_R15B.tar.gz 74100507 SHA256 5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2 SHA512 1817cd49c9b1a192aed209a14321ad9525e7a9b59e4fa0a318a33a7382af41226c3c9bf7c522a24020be2591fd17236616305515f0ae7ce8bc76a285c066da07 WHIRLPOOL 5b78d0f6d911c091b6531a1961a3ae5e84b4851d711e0db654794202197b14c33d080b1609f47602ad768e72927fcf0bf009345cba6046ec080c8f7b9ab4d1c1
 DIST otp_src_R15B02.tar.gz 75959087 SHA256 03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158 SHA512 65efaa986c6764e6e6db8a9f19eda6ea3920962ec4274979ffc267b0b25a69261265474fb6c25ad7df9e77e0545bf8cb211b3fd10699000285b56f9dc68fb76c WHIRLPOOL b3953e89097b0de8464f1bba03b91063bde98fb80fc4f6f657cbfceddec15feb78673f56adda13aa685c21e417be20fbeaa25b86e86f3174ebc5c7c045589621
 DIST otp_src_R15B03-1.tar.gz 76123810 SHA256 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c SHA512 baa8f388bd56bbdf1d3818802d011970fb51d38d14434532b1e4f04c1b8203e5a0cd9cc870f93a993cce750cd1af6e4b7df40dffc44e455353bce9d7c46c8e34 WHIRLPOOL ce76d01dfd17e0bc70e3daa7eab218000d1e802f55b0892e2e9654d2ea262f214f3bd006c0988885e787a1cfe782e8b61d5d1ee3a1d05cbced465b5a28e2de2e
 DIST otp_src_R16B.tar.gz 67097626 SHA256 f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd SHA512 ca8587df663ef3066aaca868a8f79cc002a9ee4d6d57162c75cd54d5e6dcc02a9477fa4a58110cb82f25f50f316ddaf2660010c4b43b8c7b36135b00e0e9221e WHIRLPOOL c7a38bd22c10d41e23f62b906f551b20744d4476dddec5799171be203fd6e855d19f24f6954d693747d3ce39e8a413dfd5bdc5cdc81a6bfa89590af9596ee1d4
+DIST otp_src_R16B01.tar.gz 65813898 SHA256 da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0 SHA512 61b5f5370d5e88c7b5ad662ea71a16e910d16e5d5fe4ec9550947e0ca5824f23fdca268c64b3e70e815b4da08a08a27a5f83017d8fe306a4e62cae6c85a4812f WHIRLPOOL ceb1961a79ac702bb4c9389c071aba9c3a644527847f6a7e0888dbbf3f6e5c4a716cab72267076e3b644a3f746fd3b39db42d6c5766406c341a5c4fc566a0329
 EBUILD erlang-15.2.2.ebuild 5409 SHA256 58090f03cb7579144d46654dacaf1bbe1c02cd67d8c987eabd0ffed0cfc5adda SHA512 7cb4c61ff0a26d58a86b4eaadf30882f33f1522336b760b37b6400d0b90dc282e758f54a2845e3ffd35472e06280d3c39fc3fb1bccdc9fdab52a082aeb3dac78 WHIRLPOOL 083af8a1e83790c0a51d4d64c9bdd5e46136e6aeaeccf3d0ec6be5c55bd4578e0f2abd6854195d1634e532cb48605754dfcf1cf6a1826d70389e7a1ed16b8c6d
 EBUILD erlang-15.2.3.1.ebuild 5453 SHA256 cb8595ac6c0173e27b7293cbf6438f59e8ffb50e1c9e938275731f775f477fa4 SHA512 c2d8faec99021a2b57ca14ab694301dbe89ccbc394086cdcf2e529653d3545a8c6d1d72ae55e5e7421ae05f6fe2f810d89366dca80d932eba59cfbdb2d48d939 WHIRLPOOL 76562a411d37fb57633242f1f459510a91785d093453728a6d757a7ef467cc68e69654c8d5678a021e4bc34e4e93384a8ff9eafb3a52bdc4151c7a0f7d3dd8e3
 EBUILD erlang-15.2.ebuild 5366 SHA256 bb8048b15682b2b39a89abbdf7f848623fef1287c240b204c42dfc96f36e8b82 SHA512 0aa9132c7c36b2214580280d1e9871ee924b84d70a50f0d31991828ac3fea21959e0cd73612a7399ecd33efffb21a79c80ec5b8de17bfe4d8ea26955141055c5 WHIRLPOOL 00e212b6f59de9a9026afd556937fbb52b998b721b8754fc80103056e75d25416233ba9c3181d353c8a49825cbf0b50eb26580f6ac4a4b50a1f22c57fc1a5ba9
+EBUILD erlang-16.1.ebuild 5440 SHA256 a9632b10492adda9452d92668b5057f7771cdd63a1bd68702d1dfee17d9010ec SHA512 3c41879d80f7627496841fad17b3138a37a2b1f7603942af2f1c5648590b0e29c792975ea9f40772c950f8458c64d0f78ae45496856573d4c6ce5571d6ccee1d WHIRLPOOL 6c2c36557176c0b9a90fe03bd510a544e17f66026dbcdd9b38323c35e7c96b200df6e08c0107e1147e1b746f296560e364fae7d1fc5b7050800050cc405d856b
 EBUILD erlang-16.ebuild 5361 SHA256 548dd3adc14b755a9ebfdaab874a09baa0bcd3b8efcedfcfaac96e89c6fc97b5 SHA512 1aa018fa55035d1f7e0e4ebab8ff2b74aade7f55385a12f2b60c8da8769808da07c08cc9fab0b132e8f66be09b44d6963495331083775922171cda7c1fd2d0c1 WHIRLPOOL 28d8fed55e4921d72e38f5b566feb2b74837c203b2b4f93c1b93af171c67edcc74e0d344c59ce06b099818603faf6960bb431196b5ee3c51a4121c42ba0e1f7c
-MISC ChangeLog 37728 SHA256 0604817e89b0cc31b46464de0bc41fedaf0fedf4123be1eb15060f9141ff103b SHA512 1f4b4c67948078410959ba56988562a6a379c71a23dbe4b3edb40545adb16f5f03fa1ec1c3fef1a8ad41db2bbdb088275a45da53733b2c927b0b21307527338a WHIRLPOOL 12a140cc68d58915cfffa5c1686af2b91255b0458ca149d84e1c0ab281ac4bac25381a0a73de6bb36329fe5432c0d8d42425fbec73eb6c48dee24a1883dc4b97
+MISC ChangeLog 37918 SHA256 84350ec3213f54a1097160840eb251f6af051835010aedcc254f83179e443c40 SHA512 a4ecd562a567225c03d502c2a193cfc498c64290e6683741b4981c53ef46847dfa051ce6a9bb2fc4f1ae5d73687b9921436f2554ce116af9594a0787e0729a55 WHIRLPOOL 55546dffafa0194e0cd7f6cc7ae3e2dc3121db4ab3e1e86333a400bb9ee660f80ab3387a7ac937e0b830f1956293a1a57b30800041fccbf29f2570c3f7900156
 MISC metadata.xml 852 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27 SHA512 1b22c6d550e7ca634694408f000bd99827aa86037db59b1bb3ca7a2b4259c38d69caac14b0a0db6611f7888dfcdc7972ee70e57a716eb2ac7684aa043b9d3208 WHIRLPOOL 748a8b4560773d970987880ef457194437024ee0f72b3ae9972f6033a5fc14da8e2835dab385c559ae0fe22e2bd31e8e4da3dc946e504388588d23baa39208bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRiT3nAAoJELp701BxlEWfQL4QAIyD8mff4FI2LnrWZ8KB6K48
-SNUwXVDfpvxZiDOsbifCUBLqwaXEu82JPXxsENOWyJMbyD7NtKWi/UsmyTKA7ulC
-0OAsTAok/KO6QcxVMR+LBmG+sM7yf6cKcBEW70vLf/8sBKWuzm5cZ9zyrMzFAvgH
-VWOozGkH6Gv0fz9ARqlAltUcn31RXielzHAlrv3jyQznAd9e0cn8lBAoU2/Msd4g
-AU1FTHom0Nl5JJiicR+Y5FJ3in+mLhrMz0Rz8DCkUruzrmP2tAdeQoD1Bm82Wk/e
-i02Wcss4zGnwprMPyywKO3uwAtaD+GeqX9UonOCWBMN5OUPZEoIjsQtqvqfAZL+p
-b+5QGf6NakUhmcVtgLrlthryso3Etm1KOjYVOdTu6S5XVMkjTl2KhdvVnqBxZJ0L
-i4rnWSNC1IqhKLvZHm1lI88HpvDwkSD+T6uLkJCCIpZlbpStbICFrXmrCY1T3nX6
-RS5/xLqyfM7iOnVbH/546gsXREvs5KmZF9SFiPgT6t6yzVvt5otU4+RzQJWnt24K
-9pmkojOEFCkHc+gB1GdJ7ic0wHp7FKz1pNigqa8UJPZLA2/ngALIGR+zC5v3OBmM
-5ywntcp+Ng3lv3JKX+lyZpL0SBY7wyfUR3yVsAPwvSPKBcfWBmP7ef5VzQXXlveR
-vQF2bJK/mnkKbR2G+gkX
-=sVd2
+iEYEAREIAAYFAlIbTXEACgkQxeMuLWsGW/uBWwCgtkj55VMG6ZptsqMESdiqA+7U
+xfgAnji1xgUhhMG6qVUXM74PyrQ2DMyt
+=WCxA
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-16.1.ebuild b/dev-lang/erlang/erlang-16.1.ebuild
new file mode 100644
index 000000000000..6fd604cfdcde
--- /dev/null
+++ b/dev-lang/erlang/erlang-16.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-16.1.ebuild,v 1.1 2013/08/26 12:43:24 djc Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+
+inherit 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.
+
+# erlang uses a really weird versioning scheme which caused quite a few problems
+# already. Thus we do a slight modification converting all letters to digits to
+# make it more sane (see e.g. #26420)
+
+# the next line selects the right source.
+MY_PV="R16B01"
+
+# ATTN!! Take care when processing the C, etc version!
+MY_P=otp_src_${MY_PV}
+
+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_${MY_PV}.tar.gz
+	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${MY_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 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[opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${MY_PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_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 || die
+
+	# 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 || die
+
+	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 || die
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die
+}
+
+src_configure() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		--enable-shared-zlib \ \
+		$(use_enable sctp) \
+		$(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") \
+		|| die
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake || die
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el || die
+		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 || die
+	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" || die
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die
+	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"||die
+
+	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 || die
+	systemd_newunit "${FILESDIR}"/epmd.service 'epmd@.service' || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog
+	elog "If you need a symlink to one of Erlang's binaries,"
+	elog "please open a bug on http://bugs.gentoo.org/"
+	elog
+	elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/epmd.service b/dev-lang/erlang/files/epmd.service
new file mode 100644
index 000000000000..57382ff36a40
--- /dev/null
+++ b/dev-lang/erlang/files/epmd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Erlang Portmapper Daemon
+Wants=network.target
+
+[Service]
+ExecStart=/usr/bin/epmd
+
+[Install]
+WantedBy=multi-user.target