gentoo resync : 10.11.2017

8 files changed, 6 insertions, 98 deletions

diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 1126d177203c..eb40c382fd1c 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -2,7 +2,7 @@ AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b7
 DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
 DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
 EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
-EBUILD libscrypt-1.21.ebuild 710 SHA256 9e1cd1a7e2fb18d37762538fdfd47bf440117589cf33eed7e07e84e7f7cfed01 SHA512 f47b2b835acd83b9f4409533eb1d7c88c53d5c5fbfc208d8d07976992cc0787da134c455a42ce36ec5e8da1abd977953821324cbf633267a691a136c98a86cf3 WHIRLPOOL 979ef44ca648fc559816e1f925c2a0e854358790af09f2f18435168896b9d692b310be50ade44c63598ee98b366981a5e45d1e4aa5058061469e3716069d1ee3
+EBUILD libscrypt-1.21.ebuild 709 SHA256 27f7703de4fbdab81b0041cbe2e844e41f48c77028f09ed5674c0aa0d8818b66 SHA512 6999f0a1a937c7b7fae9e3af4c60a4385e7c3662e9625760d2c3392eaad2cd11e5a0e1b2f863f35368fc66c16f765539275eeafdc20afaa5d44826e59018f30e WHIRLPOOL 1e29e74776aadc1c425eb43d0b00e6ab82920afb0ad72aa648a7e3ceefa3ef1f7f1ec3eb39e371f8b9cf9a888447289761ae63f09f8fc6a4b96ddb3ce75162a6
 MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
 MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
 MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index a2a17c257efb..62491faa8ab2 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 01eb8e93637e..34b5a24f3ded 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -21,7 +21,7 @@ EBUILD mit-krb5-1.14.3.ebuild 3641 SHA256 ee5e3ac9e0ad5d22f5ac0c243a692d73a50fdf
 EBUILD mit-krb5-1.14.4.ebuild 3853 SHA256 32f1855442a041fea26339374946c627d2f41a9d16e85a3e6f6ff5faab9c3e8b SHA512 90ca4cda193fcd9b8bf448ec97fbfcd6ceb41cea7c1253739405e428ff4f382c4996638bca465c899eec63ac5f5e391826a066ebd29f582c309c5759a7d5e2b3 WHIRLPOOL c300ea6ee6b3e6948a253a33cc55574fc132ae5520adf67941b30b67bd06b3260ceef03e39b7afc8c00860bf056e5f4229826bbe917c324ee0700da3ef31f47c
 EBUILD mit-krb5-1.14.5.ebuild 3853 SHA256 b7636470f22928156f9f298662f33c78941e47310fe47bda8bb49adc9589f2d0 SHA512 c9dbaa7d7a9432b263afbe37ba27f86ec5b656be84e16a0d3772fbce5e04a2cbba26008135d7d1b9509db10770f8ff879c2748cca5421571d560b3e5917c475c WHIRLPOOL 513819e5acad6c0f0488b8833b67bfe57813199a9de86db8ad954e144f9c6248743c70fa1294277c117dcaaeb6684d2f01814b716acae1e4ff3da38c5b63f10c
 EBUILD mit-krb5-1.15.1.ebuild 3864 SHA256 38920b114635a7d0823871b5b5a57b7f228b1ae9f3bb9e48b3c0622291accb76 SHA512 2b46e5d462d0b2fa3ef760415b6d5d7e8fa453c129102d0e92074b9a5ee86007d9376a27fd45c5dcdae93d59462edae7d5ca1a1ba89e75d64c95758b9d59e948 WHIRLPOOL 949b176ba9d8ed46764328d174f209296db0ef3c65d3057f767a42d5e2c5c6a1145cc3725e51486054bb24a1b2c0328bdd5a544de163bbb73462b2e17b309d9a
-EBUILD mit-krb5-1.15.2.ebuild 3864 SHA256 38920b114635a7d0823871b5b5a57b7f228b1ae9f3bb9e48b3c0622291accb76 SHA512 2b46e5d462d0b2fa3ef760415b6d5d7e8fa453c129102d0e92074b9a5ee86007d9376a27fd45c5dcdae93d59462edae7d5ca1a1ba89e75d64c95758b9d59e948 WHIRLPOOL 949b176ba9d8ed46764328d174f209296db0ef3c65d3057f767a42d5e2c5c6a1145cc3725e51486054bb24a1b2c0328bdd5a544de163bbb73462b2e17b309d9a
+EBUILD mit-krb5-1.15.2.ebuild 3861 SHA256 d3b6186e4c1750546ba539f9333a31e97b87ffcdec0df8d5cb1ec9856e871559 SHA512 f5df97b748bc830e49c8180ffe8972a195f91eef6c49fb5450f5be440d85de834e1494ba7263902a668d5ffcfca7dbc456de1f89a18c8d8e0512a516445ab9e8 WHIRLPOOL c8164b9c94587febf6fdb5eb52b3807ea16ad77cf37183aa20cbe31e10609aebe99c5f9a466483bda75e095978a95936294288485766e8b79f5ddc64920f3452
 EBUILD mit-krb5-1.15.ebuild 3864 SHA256 ec62511317c0754144467a732223b1dd1dfb76e5aadd9620d6611c4378a5fc6a SHA512 43878eda33aa3842e46753fe08e3a25e2102ece093b5a86b5a26ef20178917dea34f45c17f97e35d63bb9505dcef07ea26b2403daff3bf4b7df9c8e5423719fd WHIRLPOOL 75e27ef87ac4876d67bf01d4b250d46522e8d45138eaa0adac3c9332dbf93fc644edd09fbcb7ddb055e4f93444422d0faca1df7e19aaa956623f6b5983636546
 MISC ChangeLog 11631 SHA256 47629e47270ddce6f7ff35cf51ae9ba2ab357c284adca567278a4c5b98c06fe4 SHA512 07615910b39d1840caac4849aa054428e8fd5e1725d41920b46755501bcf54d9da0e05cbb0c1c631b4b51ffd99ee1b77d97eab43cc35e1304942b13b46d917f4 WHIRLPOOL 2e096d4afb254dec1a9f10a007f1293c58fd2838d13dc5428796ac19efef27620dec7188980b4dbf98ccbe87209d572e784574bbae764c01adb78f5fe2dbffb7
 MISC ChangeLog-2015 69731 SHA256 b36a2d9ca5172503de725c371c312d47f4eea26af2d43011d1c2c23f6f637a6f SHA512 9d54838fda9eade825266ff2480848c0d1cdd89dba306fd2598f75399eca04440517ed78844d742c17da48cbb6f3c80c6212eed2fba715a0f8dd58f8635badfa WHIRLPOOL 47435d373fa97d0eaa99f92870f7e759b8a1defc0f41b668ea05b3c72b93d0b4d0516639f326417744cc30008a871b20365301c5bf0b6676b22e61d092c7cd4b
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
index 43d73e446296..9ef806ffc04a 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 0bd464d72512..94c3c438035d 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -6,7 +6,7 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 SHA256 4121a847697fd6
 DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
 DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187
 EBUILD pinentry-0.9.7-r1.ebuild 3246 SHA256 7f098011d46661c2b5fea2b03ec0402d232b7845564d57e1d56d954f70367325 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af WHIRLPOOL ede02f69437072f1b2251613078a62f592f682793c8c4fa422be6982f071b563b0a85c4207996f8c5752fa0d176b194ef805d960536f9c3a1434023e9f4c3c3d
-EBUILD pinentry-1.0.0-r2.ebuild 2941 SHA256 599e2cb03cf5f33272582b2a3b4502f455dc4918fce776628296eb002c6a756a SHA512 48c195501912a0d2943b524ccd99a406701e1daa41249a275a60af81b2dea4ed81414532e11ca3d4930b39a3d6a32b06589b4132baed37711d0f33ac189cf66d WHIRLPOOL eeda7482410bd8ed855fe52f677ce41b6f4ff8191b93e144fe8db44269a634506f262fad0b5cecb31ad36f09591aeaa78a85f80d9304093925088b0197b70421
+EBUILD pinentry-1.0.0-r2.ebuild 2937 SHA256 06ad681b992208d78fd27bedcc18945706fc6872b712431535d2e70024e74276 SHA512 d47d70f237229c8bf8b4e32e6b04e18033b1ed9918c49d505eb52974e2c7ae107811e0b9d28fc1a0c2df440f8496bf5620f68b26a68ff43c00eaf9c85df457d6 WHIRLPOOL 8503e31336bb9b76e0b4fd857b41a4ebad4d07819689f69ca3edd1f614b8742c4a9112ec107ad7ffa4e8d95c399ac8515ca8ec83479b12f693d1145d2fe338fb
 MISC ChangeLog 9508 SHA256 c9cc05ed15e6ab1341299c3fb985fdd2d8a9539e62d73a16b4dd8f5815bbeefb SHA512 7ff10fc6c2e2621c475ebb0805b63092d8d9fd56b40d69fa4669a4456c5900644aa51b758b92086621035b83e4f728fcfc20d2d8a13e53194d7ef88b3aeb3fa4 WHIRLPOOL 4dac379391947f44aec42b9c3d71b01f46700ede56347dea6b73d9771c7e55cdcbdbdec20cf7781119e1aaf4d3dd822eb423a4810ff3657a8d76dd1768f2a6dc
 MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56
 MISC metadata.xml 352 SHA256 7fd48348fd50b298029c84f873443f5b826fb46f05437440cef6dc2e1ce3773e SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 WHIRLPOOL 46aba74d2e5243e320da11ac8193123ec2576b4fa7d6c904a494b8e234716afe4a90fe1c2c6ea211b40b53edef261eb1735200950563ecc1592d213c66d40ad8
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index f26a7c9f5bc5..029bf96660fc 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index a11b14fa9b0e..e371827125e6 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,4 @@
-DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
 DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
-EBUILD rhash-1.3.4.ebuild 2642 SHA256 e9823e366370edf45b8270b31aec98ad33c175bc25e2d52057eb4a1b9c71fdeb SHA512 a869ce272ad55fc586fcd7ec563e9856ff0a87757914756e1ba46fd3da34ba3a467d5e0454e8d530c9c72975bd5e06f5b42f072ba8301546d01226753dd1d52a WHIRLPOOL 4bde3bb3e0a8a2f815e166ff91dd606434d2026024c9d889479df2982cadd17b45196f05906570926123e65be153a8f1cfd74ab8243df1e0294c49c8c814b66f
 EBUILD rhash-1.3.5.ebuild 2591 SHA256 be1ef694a1e7667cd7f96d1260aea5e5eb99f855f3c8d48de7729e9332e45f5e SHA512 a3a0465fb6453b98974defebc4d8e3140a57a5ea978a19d84ea8b3bdcc5d89ee73e20335bb4549c98239d99c2ead559dde398d1f0f2da2e19a064cc291792747 WHIRLPOOL 2c5a624234a0e1e8111656d9b004055e66c07b2f7a374d69c2b7976f4123bda435ffa9ea0ac38ae305a72030d6614d8a647d29887a2701aea47aecf1186a9b3b
 MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
 MISC metadata.xml 843 SHA256 89065f6503470d30fefb7f8c0edb4d8acc8fb486e2f9c4f0e68756ae073bbf7e SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f WHIRLPOOL b56ecfad838655183ee34037e82528f2a839309a03a26726fbfb6b4868813b9785db132b5f54acca7e400692dd27afff7733518353ada932cb3efd27322cd1a5
diff --git a/app-crypt/rhash/rhash-1.3.4.ebuild b/app-crypt/rhash/rhash-1.3.4.ebuild
deleted file mode 100644
index 4a7b49a21d52..000000000000
--- a/app-crypt/rhash/rhash-1.3.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.anz.ru/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls openssl static-libs"
-
-RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# Exit on test failure or src_test will always succeed.
-	sed -i "s/return 1/exit 1/g" tests/test_rhash.sh || die
-
-	# Install /etc stuff inside the Prefix
-	sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)'
-		local install_name='-install_name $(LIBDIR)/$(SONAME)'
-		sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \
-			-e '/^SOLINK/s/\.so/.dylib/' \
-			-e "s:${ver_script}:${install_name}:" \
-			librhash/Makefile \
-			Makefile || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=12548
-		# skip the export.sym for now
-		sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local ADDCFLAGS=(
-		$(use debug || echo -DNDEBUG)
-		$(use nls && echo -DUSE_GETTEXT)
-		$(use openssl && echo -DOPENSSL_RUNTIME -rdynamic)
-	)
-
-	local ADDLDFLAGS=(
-		$(use openssl && echo -ldl)
-	)
-
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
-		&& ADDLDFLAGS+=( $(use nls && echo -lintl) )
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		  ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \
-		  PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \
-		  build-shared $(use static-libs && echo lib-static)
-}
-
-myemake() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
-		LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}"
-}
-
-multilib_src_install() {
-	myemake -C librhash install-lib-shared install-so-link
-	multilib_is_native_abi && myemake install-shared
-	use static-libs && myemake install-lib-static
-}
-
-multilib_src_install_all() {
-	myemake -C librhash install-headers
-	use nls && myemake install-gmo
-	einstalldocs
-}
-
-multilib_src_test() {
-	cd tests || die
-	LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed"
-}