gentoo resync : 15.12.2019

18 files changed, 42 insertions, 238 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-9999.ebuild b/net-nds/389-ds-base/389-ds-base-9999.ebuild
index 046375125af8..aeacfb8063aa 100644
--- a/net-nds/389-ds-base/389-ds-base-9999.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
 IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise kerberos selinux test"
+RESTRICT="!test? ( test )"
 
 # Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize.
 # The --with-db-inc line in econf will need to be updated as well when changing db version.
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 23788d525e83..4a2266fa2061 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -3,5 +3,5 @@ AUX 389-ds-snmp.initd 960 BLAKE2B cb5b19fb168bb810aff2d4955a3a87b6dfdef6591e2a97
 AUX 389-ds.initd-r1 2366 BLAKE2B 563dabc9ba0d3720956811ac52f85f9257e588953e3b1bfde3fc4ca7749b72604ee5a608c050cdc5222691f541bfd691c5259ac9e60194a669cfa06cd6c76794 SHA512 530316eccf25196453a51398b810dc6ca14a9bf6f8e4487cfd42d00df190653a197b1effae357c6d9e5d00cd51e8e7d47092d0ecddf2d71d6fa100b58d19b6d7
 DIST 389-ds-base-1.3.6.8.tar.bz2 3440164 BLAKE2B 20ff28fc1d59452e48ec6684f844dd2dec2f33492aa142c915029dfb6b0535860f4f598872d2de5d33ed8cb9b5a0d3ae47b1666cac54a4b38f0f4f954cdaf85f SHA512 b08a87bffbdf8e4c6bf6b4f87394aa0a12b8b44fcadec2f97c146b3a21ff89f5f547080aacb0ecda9b91aca83f8bf093b64c2569b2d8be84ffe22439be446234
 EBUILD 389-ds-base-1.3.6.8-r1.ebuild 3034 BLAKE2B 77277e1a31d2e0e718060a4ce007cc601fd48c0f813525c15d6437e1f05821197a6307be8e070af0a69253cd3cabd288ce81d640111a4feb2f708f67a7034ead SHA512 77af6cfe40c112c496c527fe5766430812e2da9d440eef15d155196d5e09b9c69473038e34a736a052e5ba7f3d046d088e8198a47e6991cadc2b7d3a8109a16c
-EBUILD 389-ds-base-9999.ebuild 3083 BLAKE2B 45a20a14951c11131a0ca5fc899e4166eda69611f4f8c7bb9619f9d5d5ad9cd2d846b01c8fc6aba385605e30b455a9344fb9dce27563558141f4bad5f7018dc0 SHA512 a86fa6972731f3e7e3aad42fec4ab14378537e1173f35a18873a38dc78459b2723b7a348333499557fa007677a97c4c2bf748dd3b2fc1bb92131853f5f73102e
+EBUILD 389-ds-base-9999.ebuild 3107 BLAKE2B a7420f89c16ae47bb91fb08ad8c44f2d02b21dd261d9f2987290b9765311672042afabb4ef02def662c5069748285b1319828ac168f3deb2afd59b84ffd501d3 SHA512 20a45810a07b3b737fc0c400f7f10a8cea8409246977abbf7709926d43011ae5ccb6b88467650f95afb9b4b91572c5932ec8501fc46b57235971da37744d2c84
 MISC metadata.xml 1019 BLAKE2B 0258798048756a11ef38481a5abbe2c3e80d186bc3d4474771232397e4ec48a270fed6a0867efafb31c4261caf130511083e65f434f03e8486713a710bd2c470 SHA512 d63ffd88de13739f9889f064cdc135ca0f82e0ecde52617e8bbe477049f0e911e3d79514dbef3ff5913b1760889a20035f89118b760ab241fe864b0d07f694a3
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index bdef4ba45e34..f32994e1913d 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index 8e46532816c3..128151f2d663 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -4,7 +4,7 @@ AUX jxplorer-3-pre 663 BLAKE2B d7311e13b367c74af7ebc005c15ef14af80057c995f2d30dd
 DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 6e5fb357c19ab9fd8a40f38d01fc650b793e8a6058c5e94336a46690283afb8e8a0a489cbab225da8f85f10d9a54fe938cab752b3648264d43c751441fd0991a SHA512 a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9
 DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995 SHA512 aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03
 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb SHA512 6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a
-EBUILD jxplorer-3.3.1.1.ebuild 1654 BLAKE2B 875002c9bb16b2234deda7712e45fbc557ce7478b3797221795bd3799972b19461d6888cedacc809689447e8a8a40b544ae2483e9e0e97112d8b899b8ff0c504 SHA512 d217aa74aba29bfe1908fe06dbb1dae47bd0accee369c197646830286a90bc013bbaa93ce51421345989a0d91a1f8e4deafff0b26ddc99046f51ba4abae0d3d1
-EBUILD jxplorer-3.3.1.2.ebuild 1692 BLAKE2B 91d7cdd675d0787886b5e624823a08242424ee5f67187b0457d4eae9b41ba7ddb214321d5778f19eab0bb84bdb704c71b2bad7a6c803cfde6ab974f2fe3dd4da SHA512 663afe60e3fc55a05b7ada7a64916ba568fb77e7ae3f1b7d8196fec91d5dac4ddb52e5205da565cef2f4027a97642a59a4e873e73b06ce2060df7ebe681ab252
-EBUILD jxplorer-3.3.1.ebuild 1652 BLAKE2B 9908a636886c639dba299a715b8877db72fff8ac9a04b790b64bfed93b94c5b582c5296e1112a0ed17607eafa4dc0c8877c0018519564498a498c62087c744c9 SHA512 2d582080b749f8c67b9d3eee3d57716bb4a8d680f38ecaa91f945b344c82acef3a93e9c7476aa7d3f84a32d50eba48b542188f75f1b8d578f87b582ac8442dd0
+EBUILD jxplorer-3.3.1.1.ebuild 1647 BLAKE2B f3bc3570a9a1318f13134ef057ee3d947067fe6a2714cc5a4a44310474e82c0fc8726c3dd659c94e876d12653ff00ee36d70d13a819b57e1b95013753fdcd91f SHA512 5d930f9d815d7f32861a23fb58020e2e7e3b6456a487c044a8b7157d63bce59b3233f8b91a39f7834bee240ebb7e7c85a25c5fe2f9338329829636365f7c42d2
+EBUILD jxplorer-3.3.1.2.ebuild 1685 BLAKE2B 3961c74ba6be671f4946e5e93a86b9ee510d8266f1bf048432c5c9b97eb2bc0bfc2a3bc69a51514579bca0a27fc548291dac4966195c819658efc1aea54dade1 SHA512 535a8cfdb99029fab8b15a3be5360f9b46d82eaf68b78e6c489d5ea637c24271cff78a23d0647d0e2b7fcf360887dffb72a9411b2f96ebc7bebd7a576278fa00
+EBUILD jxplorer-3.3.1.ebuild 1645 BLAKE2B a8725ed0a0f3ced60229d0f90153f83861e0c9e32af2ef05f9332c9eb3387e9d3b0d08d48917af971fbe5a543ecb81011942951e13c0f71f0c50084275c1b27f SHA512 d7e557677516db4ddb566ba85c6545b366f44f1bbb6d2557e7c084d01c61b1fcc1798d564b5f794f7565c13721398b7e162b5381e5f8708c51b07ed78ad6d734
 MISC metadata.xml 314 BLAKE2B f90c3010c15a26ffb04114d4049aadedb720df7d6bf04801603d6fb4f63331d6a5f7b135d4d926e0cbc8504849c1677b04b9d61e0fe67ee97ec41d5e30375b88 SHA512 28b10ef2e247491aac4d9868d8c42ccef74abdc9806820b84a29d479e8f53218e1aab497c3f450c289cacf40ea8fbd193a508203ffc915ad2fb7582258bc7d96
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
index bbbcea98f709..1e9182ed85aa 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
@@ -51,7 +51,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
 
-	dodoc README*.TXT || die
+	dodoc README*.TXT
 
 	# By default the config dir is ${HOME}/jxplorer
 	java-pkg_dolauncher ${PN} \
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index 24b83acf99b6..161a2fe5f6cc 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
@@ -58,7 +58,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
 
-	dodoc README*.TXT || die
+	dodoc README*.TXT
 
 	# By default the config dir is ${HOME}/jxplorer
 	java-pkg_dolauncher ${PN} \
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
index 4ad7b4dfb867..0ee4964b2fe2 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
@@ -51,7 +51,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
 
-	dodoc README*.TXT || die
+	dodoc README*.TXT
 
 	# By default the config dir is ${HOME}/jxplorer
 	java-pkg_dolauncher ${PN} \
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 3acf55880d7a..c9c8734f90fa 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,6 +25,6 @@ AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d05
 DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
 DIST openldap-2.4.48.tgz 5704883 BLAKE2B ef856ff0b22c9187e68e9c09583a176fe4c2ee1f5bfe6b169f03bc0058294170ec4d1aa1b164e28eecd2ef6bafab539c1b942b0bd74e93852205beeaff39aeef SHA512 cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.45.ebuild 27926 BLAKE2B 639d13201517635fbefd53cf1b34b61bd906dca7245ba9337f4e5498c458171065425ab9db4ac7914fd8767ffe84e3dc1c94be2a5a44c4c60037ad7cc13357ba SHA512 b568fbb665aae0f324fabb3b3385d5d08bbf5e38d1b3481b808016f2e8acff4cd02b5607658659f81f210528c89d44128cf59c8a1a86d52f94976753f3992c01
-EBUILD openldap-2.4.48.ebuild 28960 BLAKE2B fc6c6ec3b6b0fc2aaf5bd8b66965a2d665be6df15384d76b1c961dd188c8f4de70798b9a6216bdebf329182010ce86ab3d24b437f60c0eb56e8fbf09c00bdd33 SHA512 120b981d2cbf09a74487c7f2ee1a7cd47a0ba7314a7c07f0a5fde961a30d56fe0294d1a5c2ec1b5b9b5d7f46ee4127ed4628c9763ba7df033370e71c6e73b0f6
+EBUILD openldap-2.4.45.ebuild 27899 BLAKE2B 4119028f25685c129838b33bf425a13a8a44db909899ff987d96132257408b1e944f229184c114dddf986892cf3cb0881b92fad909e1c63d0418fdae2d06d4cb SHA512 ad3aa0284c46d725205f56eb80cb4ff3086fd14b0b98e0f865410eb7e0ed0c901c6343e5705d094a4d9a7d8fc3403cbbcb194beb8cb3db743d77c1f698738524
+EBUILD openldap-2.4.48.ebuild 28960 BLAKE2B 789327fc98bc94b0ca2e9ced830e5b56072886e2cbee345a2a225b8e35782df41e09618166970639752ea819766029944d2b4f24ac1b162c7d1e6b3b8f88d238 SHA512 f07cff566c178dcb5c1509a32eb081c487433c18f935818fbed5ea0db72545ad937d220acf873b56eafa30963290d67f49ed2535f0ea26779df119b5f605146a
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 344d168105b3..04e0c6793983 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -703,7 +703,7 @@ multilib_src_compile() {
 multilib_src_test() {
 	if multilib_is_native_abi; then
 		cd tests || die
-		emake tests || die "make tests failed"
+		emake tests
 	fi
 }
 
diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild
index ba833c3f7a0a..4a06584e7992 100644
--- a/net-nds/openldap/openldap-2.4.48.ebuild
+++ b/net-nds/openldap/openldap-2.4.48.ebuild
@@ -28,6 +28,7 @@ IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
 IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="cxx? ( sasl )
 	pbkdf2? ( ssl )
 	test? ( berkdb )
@@ -720,7 +721,7 @@ multilib_src_compile() {
 multilib_src_test() {
 	if multilib_is_native_abi; then
 		cd tests || die
-		emake tests || die "make tests failed"
+		emake tests
 	fi
 }
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 48241bc07797..64cbfc8a6fcc 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,7 +1,5 @@
 AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 BLAKE2B 833f2d7b8934b9547ce26c5ed8b63f67ef1a6d416f19fcd1455696b47385d7ee313107f698ef513cb027a9ab92580bf0cf1c246ba4b1f54d97c984eb4e5bc79d SHA512 64830cc864dbbe3d0aa72d0e1165b787287430f3ea7507c8e9df2115b03df73944c63a4e9c09a7f8c9a11d41f48327ee26c204ede3bae2209b0f47076d5587b3
-AUX phpldapadmin-fix-php5.5-support.patch 5157 BLAKE2B 03bd6922b201445be6aba3695e8a162a1716b234d0f314f221dbbd6bdd6c731ec01b7f0c84821c29d6f2ab6f45a6b68c5d5dabe11a649fc26d648f020a74d184 SHA512 c0f990fea6e8f312d36f7eea754d3f4f1c2356a5e233c5df82fa1ce4b194d160ad40ce2ef85441f6686feecffae831770591e44cc67982bee63e870464da7f7b
 AUX postinstall2-en.txt 131 BLAKE2B 7ace4170aa9f57f1eb89319f11cee249be8bbec50dad798c0be22616d31a01a3cfeb6057485c8656318c0330c3d9b4ffb1d343978742618edfc6bbf9789807e8 SHA512 f465adc204ef40675848e39e37bab3f2eb5054549e3b787953793ece683df84a52373d23383601b3c53c6b98bf8f1de83c6d83be117be9c00da7058763709d6b
-DIST phpldapadmin-1.2.3.tgz 1115707 BLAKE2B 85f11713134f7af65a40cb2cab619590bdea9dfc23d2bfdec0b0837772f166f5b8cd61125b753167726abf109a5e5ac8607dc75a750299c61f895638c2d3b98a SHA512 58a57ca577586685ebd0d7fde7e299b8945d1693018c7803e19239b79f4b9d72a4d207d53c9f284268e32398108038efafcdb434e634619bfe87db3524d267b6
-EBUILD phpldapadmin-1.2.3-r1.ebuild 1355 BLAKE2B 0eb44b95e94244b5ae785c5ea7428068af025d439e56a96658f87897e3a1da2b90380c52787e764bc68fbb0f5e42e007c0d51739b15bdb8d5cc41b2df936588e SHA512 70d01949439b7d4374b247be934fb66ad78bd898e119932166dc9ebe0aa6a705ff36709098a4ce3bfae3bea6ddaa4bc17344c073c8aaf84483297ade272394c8
-EBUILD phpldapadmin-1.2.3.ebuild 1112 BLAKE2B 9e749edddaa9927317709e507eb8669434f119239f8c0b0e3101718e44312e2ed40416d9602389be179185f349bc7944409fe54950cae7346abb121fe76e9791 SHA512 08f6c6fb6bdbad3dc80b36d4544a7ff1aa2a49f1ef884287787b71f33afbf53569f035f0d92370e2541eac1e5c95cecd37797f9788eae2e0ebb695ab60ea7589
+DIST phpldapadmin-1.2.5.tar.gz 1117335 BLAKE2B 00d82434dbdadf1f90f5f356ad644d7cfa078cc0696d7cf64e36bc49baf2a5f29bd62fbcd265d9771e713bdd19d4e5708e77e1229199b6712874f982f9b067b0 SHA512 53cf5a8fb3ae3e5fc3c2ab6d23fb9cf731f1d39e122db6531e87461610f13e4bc1c9e8d4fcf7abd2ee5697022a068a9e23d8e039ba79a12929faeb6265920701
+EBUILD phpldapadmin-1.2.5.ebuild 1199 BLAKE2B 58ce16b374b868e16f1ef89629c9475f13f47b9908d1d9ca95f1ef2ddd4bdf1d4bc6641e9708d6607a3059c6483bc6209ac9d946ae03a348f857d953cf311189 SHA512 e2013af12d6e74d8c00f1cb8fe7a7650ce51edf9e92a7d25e94d027316227e6d34e1488a4d526ddfeded961884888740ee518b6b4d11283d3e92ca22cd716ef0
 MISC metadata.xml 593 BLAKE2B fbf89c9834ec8fc07ec9512ee6e3aa3fa13c9665f82a7e773b61ba974132badda5f5c7abccd2c2c63047b9e6e7d237a404b3c0c04d7fbd43a65d2612ce7ec6b7 SHA512 76e19473a162674546562e71b893a1f4a076bae09998b7ad4136421d60c33b2c64ae32fd2d618128417b56437fc6ed1ae823f4642c8c4facd81a36e72a2451b3
diff --git a/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch b/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch
deleted file mode 100644
index df6a7c163758..000000000000
--- a/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-commit 7e53dab990748c546b79f0610c3a7a58431e9ebc
-Author: Michael Laccetti <michael@laccetti.com>
-Date:   Thu Aug 29 09:13:56 2013 -0400
-
-    Fixed two issues to get phpLdapAdmin to work under PHP 5.5.x
-    1) password_hash is an actual function, so renamed instances to password_hash_custom (HT: https://sourceforge.net/mailarchive/message.php?msg_id=31302386)
-    2) Fixed the preg_replace to preg_replace_callback to use the /e/ functionality in the officially endorsed fashion
-
-diff --git a/lib/PageRender.php b/lib/PageRender.php
-index 7d86a54..eed5d5f 100644
---- a/lib/PageRender.php
-+++ b/lib/PageRender.php
-@@ -287,7 +287,7 @@ class PageRender extends Visitor {
- 						break;
- 
- 					default:
--						$vals[$i] = password_hash($passwordvalue,$enc);
-+						$vals[$i] = password_hash_custom($passwordvalue,$enc);
- 				}
- 
- 				$vals = array_unique($vals);
-@@ -957,7 +957,7 @@ class PageRender extends Visitor {
- 		if (trim($val))
- 			$enc_type = get_enc_type($val);
- 		else
--			$enc_type = $server->getValue('appearance','password_hash');
-+			$enc_type = $server->getValue('appearance','password_hash_custom');
- 
- 		$obfuscate_password = obfuscate_password_display($enc_type);
- 
-@@ -982,7 +982,7 @@ class PageRender extends Visitor {
- 		if (trim($val))
- 			$enc_type = get_enc_type($val);
- 		else
--			$enc_type = $server->getValue('appearance','password_hash');
-+			$enc_type = $server->getValue('appearance','password_hash_custom');
- 
- 		echo '<table cellspacing="0" cellpadding="0"><tr><td valign="top">';
- 
-diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php
-index c346660..7532539 100644
---- a/lib/ds_ldap.php
-+++ b/lib/ds_ldap.php
-@@ -1116,13 +1116,24 @@ class ldap extends DS {
- 
- 		if (is_array($dn)) {
- 			$a = array();
--			foreach ($dn as $key => $rdn)
--				$a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+			foreach ($dn as $key => $rdn) {
-+				$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+					function ($m) {
-+						return ''.chr(hexdec('\\1')).'';
-+					},
-+					$rdn
-+					);
-+			}
- 
- 			return $a;
- 
- 		} else
--			return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+			 return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+				function ($m) {
-+					return ''.chr(hexdec('\\1')).'';
-+				},
-+				$dn
-+			);
- 	}
- 
- 	public function getRootDSE($method=null) {
-diff --git a/lib/ds_ldap_pla.php b/lib/ds_ldap_pla.php
-index 7ece393..6b0990e 100644
---- a/lib/ds_ldap_pla.php
-+++ b/lib/ds_ldap_pla.php
-@@ -16,7 +16,7 @@ class ldap_pla extends ldap {
- 	function __construct($index) {
- 		parent::__construct($index);
- 
--		$this->default->appearance['password_hash'] = array(
-+		$this->default->appearance['password_hash_custom'] = array(
- 			'desc'=>'Default HASH to use for passwords',
- 			'default'=>'md5');
- 
-diff --git a/lib/functions.php b/lib/functions.php
-index 56d8bf3..5ac3caf 100644
---- a/lib/functions.php
-+++ b/lib/functions.php
-@@ -2127,7 +2127,7 @@ function password_types() {
-  *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
-  * @return string The hashed password.
-  */
--function password_hash($password_clear,$enc_type) {
-+function password_hash_custom($password_clear,$enc_type) {
- 	if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
- 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
- 
-@@ -2318,7 +2318,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
- 
- 		# SHA crypted passwords
- 		case 'sha':
--			if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
-+			if (strcasecmp(password_hash_custom($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2327,7 +2327,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
- 
- 		# MD5 crypted passwords
- 		case 'md5':
--			if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
-+			if( strcasecmp(password_hash_custom($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2392,7 +2392,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
- 
- 		# SHA512 crypted passwords
- 		case 'sha512':
--			if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
-+			if (strcasecmp(password_hash_custom($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2564,13 +2564,24 @@ function dn_unescape($dn) {
- 	if (is_array($dn)) {
- 		$a = array();
- 
--		foreach ($dn as $key => $rdn)
--			$a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+		foreach ($dn as $key => $rdn) {
-+			$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+				function ($m) {
-+					return ''.chr(hexdec('\\1')).'';
-+				},
-+				$rdn
-+			);
-+		}
- 
- 		return $a;
- 
- 	} else {
--		return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+		 return  preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+			 function ($m) {
-+				return ''.chr(hexdec('\\1')).'';
-+			},
-+			$dn
-+		);
- 	}
- }
- 
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
deleted file mode 100644
index 786fde03497b..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils webapp
-
-DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
-HOMEPAGE="http://phpldapadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
-	>=dev-lang/php-5.3
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-src_prepare() {
-	mv config/config.php.example config/config.php
-	epatch "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
-	# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd
-
-	epatch "${FILESDIR}/${PN}-fix-php5.5-support.patch"
-	# https://sourceforge.net/u/nihilisticz/phpldapadmin/ci/7e53dab990748c546b79f0610c3a7a58431e9ebc/
-	# This patch has been requested to be merged, but there's no recent activity by upstream
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL
-
-	# Restrict config file access - bug 280836
-	chown root:apache "config/config.php"
-	chmod 640 "config/config.php"
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	webapp_configfile "${MY_HTDOCSDIR}/config/config.php"
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-
-	webapp_src_install
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild
index 4dcabc71b146..d2eb59891db2 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils webapp
+inherit webapp
 
+MY_PN="phpLDAPadmin"
 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
 HOMEPAGE="http://phpldapadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+SRC_URI="https://github.com/leenooks/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
-	>=dev-lang/php-5.3
-	virtual/httpd-php"
+RDEPEND="
+	>=dev-lang/php-5.5[hash(+),ldap,session,xml,nls]
+	virtual/httpd-php
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
+)
 
 need_httpd_cgi
 
 src_prepare() {
 	mv config/config.php.example config/config.php
-	epatch "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
-	# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd
+	default
 }
 
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL
+	dodoc INSTALL.md
 
 	# Restrict config file access - bug 280836
 	chown root:apache "config/config.php"
diff --git a/net-nds/tac_plus/Manifest b/net-nds/tac_plus/Manifest
index 6cd872992a48..952bd03d8b7f 100644
--- a/net-nds/tac_plus/Manifest
+++ b/net-nds/tac_plus/Manifest
@@ -10,7 +10,7 @@ AUX tac_plus.init 457 BLAKE2B d295e7a5bd8d744431d164da3a5db21e38f7d56b5d39c2fc8a
 AUX tac_plus.init2 430 BLAKE2B cbbfe931274f7ac4927f38b1521e3a773fdf19892320c5f92d4243481d5978bf522a3019fab2a16a9c8d86e2743f9d45618ff73c9eb0d526c7b21ce2bed398e9 SHA512 9abb9573929c88dfe084432bb7ba7b85796b3bf05663a7596644805b04175d2b7fe36c6eb60fb70579445f03dd9fc8040fc88e5160c2de20ab25b8e8b9a93f55
 DIST tacacs+-F4.0.4.19.tar.gz 500593 BLAKE2B 8e6733e1af83d4cc5234bdb99100350eb91911965fa77a0b4ca9e75cc3d0a32739cb0a867ecb59c3c0c307469db4c9ee86964c9b6e142a86ab013a22ed968cdb SHA512 8482b81514ba91397f613a0593be8bd3ca66d6f4d79ed67a881aa01b3da44cdcfedae59bda6fae9e99a4c006fe54cd8a6ebfd6bc37e998f6b0ae19bd0831c0da
 DIST tacacs+-F4.0.4.27a.tar.gz 504395 BLAKE2B 8cd58d451c28e16d3804e9dcf5a82ae5ec0d1a783088f6ca6d4a4084bdab09fe9e402cf709c46822749edb5df5b9f20a225c420d1430ddd903b725a8f1cefe01 SHA512 2251a21f609d516b3ebc7d3d2d7d030ea1bb491e0fe5e08e7639d2d9bdb0ef9a1ab4d17f340e50e83771dc9a512c5dacc99716fd882ba3f6db2fafb0915e86bd
-EBUILD tac_plus-4.0.4.19-r3.ebuild 1325 BLAKE2B b5bce9a7b9f48b43461f821741ed1f2975461d21ea6b82e14607c4553c85fa0859b85b42a20b12b60f8259011b8e574e27fb5e3cbe7a0c0219ffc3249b43e28f SHA512 e6cc2a37b108856c0bde4f996fc3e3cf1514e7f9745f2427000dba0e68c3ec74a3cb9ff59b2090f849d2e4d82f72e7a9df4f50ae78a3b47583ed201b1ea90fb8
-EBUILD tac_plus-4.0.4.19-r4.ebuild 1365 BLAKE2B 1e90a5a1651b13295dc15f24b9b995958622a611f2c84fe0cae98b9d85ffb61e013090b8cec4d69fd9d30648bcc7f86b1f06206b71c58d4b4b3fec132f8dd50c SHA512 dc8d481e1a2b3f1fa0c6392a9a7f600c2e25b9e3303f38e113d177526aac97736118af00d1323c625b0d9fa2dab76a32a92a6d2bcade1601b59100fa0c7a6f67
-EBUILD tac_plus-4.0.4.27a.ebuild 1454 BLAKE2B 7c23a19577ec10d4da12f150cca0a80a291ddd5cec699928b469a9b9c76f176440782651ceeb3b1c4cce6a15e882bd31a972b3eb86ed18b3df4466511beb2ccf SHA512 723d70b113072ad40bb46cf1b49698e4d48c24c3165232d33b3a57668d173ce1387d2ecb72bbd653c202287f2cd97f9c87f51c6fa439c7b8f82c5a01b67e3574
+EBUILD tac_plus-4.0.4.19-r3.ebuild 1275 BLAKE2B 214656b530dde532feb4d6acf54685efd8952df3f2020ce9535683bac06f806ec7fc18b05e98ce4c37d87390bb4ff182de48d100b569442bdb8ab1ac1aaa99f8 SHA512 8501615fe4d8d98afaccf4c3649abcb036ca77d83c29ce33f6340c239270f4f765d96b7eaed470d487036d3ec0c22ce4d798180222ca8628e671dc478e5f9e73
+EBUILD tac_plus-4.0.4.19-r4.ebuild 1315 BLAKE2B d1345ef2c5d8db9617df52c11f264b7cb2e06e17ebe48b40ccb70e31d191e80daff79dbc39ac5bcabe8a1baa8bd3bef58217a045dd3f2727ff890a07b7b209e4 SHA512 201681e9dd33ff710ce4a4d3861fb3ad3e1a97b50757a39dfaae1f7ba24d906a1e587ca0b1a31fd06b9fe8dcd2a60824e5b43aaa3f2d3cacddfb966ced03c518
+EBUILD tac_plus-4.0.4.27a.ebuild 1404 BLAKE2B 4f41cdad0fe1b8a1b80fac6d0a6e4a5b73c19cb2a2ab5f68617164864ab45cb3e8d0207452cd47ca12664a554306df75fb7c68771e57ff4fd09a0ea78ac91727 SHA512 a61ee09e500d363e684d67a793446354916e3b3bcf3961665087acdc8d95a735015baf8ac0c8c2c2b41f708a7152c2b53fc6e146e87305aebf783455ee1c3f79
 MISC metadata.xml 424 BLAKE2B 1763e51535979013a89d3c9b0b707df068442effdbdaa005c4c3196a66ec5391c84d231f82d15ba6c503a57e93ec57ef38834e0d1b36f46524d2a5be7718e274 SHA512 6f10f5226894b8b6ea6ad298835b7e5322bfbe3470410ec46bb8107203e1788b256192756031bd92e9eca4409765b47bd696a7c3de0c708bf36cef59df7b0a38
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild
index 7fe26ccea4b6..0bb83adc7821 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild
@@ -37,12 +37,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable finger) \
 		$(use_enable maxsess) \
-		$(use_enable static-libs static) \
-		|| die "econf failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 
 	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
 	dodoc CHANGES FAQ
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
index dfb57ee97661..f94caec0a181 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
@@ -40,12 +40,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable finger) \
 		$(use_enable maxsess) \
-		$(use_enable static-libs static) \
-		|| die "econf failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 
 	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
 	dodoc CHANGES FAQ
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
index fc1a2ef19e67..710eeb83ce89 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
@@ -41,12 +41,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable finger) \
 		$(use_enable maxsess) \
-		$(use_enable static-libs static) \
-		|| die "econf failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 
 	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
 	dodoc CHANGES FAQ