gentoo resync : 30.06.2019

11 files changed, 443 insertions, 21 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index dd9a8f92dd00..8813e63e9c3a 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index 3d18447d946f..766a9f6948be 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,4 +1,6 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
-AUX blas.eselect.5 2065 BLAKE2B a86cf9f357871021867c30a24fe945435d247b755eec8557c4e6986fab7658ee2ee7246e46c650998a5ce252544f35142ec4d67a8c4e865602d02779e812ac20 SHA512 94264f61bbe29ac027d9ec82b3921e99cc8f7108544682508748e407fbe7d393748cef876c240796adf82122370ac963def90fd8b01a3186049223e3eaf21ffd
+AUX blas.eselect-0.2 4952 BLAKE2B 14d60fdbae1dded65d6846f7e1fb6214994b7fce6d7d6340f9261e1e9081a46d21084c622ca2dcf2568dc07e0110b925ffc957e254d24850f741d943fa22f91c SHA512 a85f27c9808debaf9f47831c9d35194084bf0db818d3b8264532a7956b084633d9d462dfdda4a84f9a011721dbfc3abc419465e887a7ff9d17328f43a8f91790
+AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
 EBUILD eselect-blas-0.1.ebuild 701 BLAKE2B 07d2cb7f44eaf74d802d02eaf7732a17d215bc875088933794ee175ff422d15c9bf1a240e265ac1c015cb819e51b5c471d7dafbe7cff80528cc9a48dbaf72a81 SHA512 4d0e04454caf2ae898917df40a8c25578b7fd35d3bd7d0481d5a645b5ca2255063dc108540db68e6e25b3dd82e95ebcbc70f3c9d74142ec57399a5f2d9c5b666
+EBUILD eselect-blas-0.2.ebuild 661 BLAKE2B a1f105fb0f3accdcb3977eb07c8d24cb16d3cbb0f3d8b64094898175dd520cdf418d67f027931b0b21583117ef2910f18d08678ccd3f202bb7ecfcdc4b8aba78 SHA512 0c34ecd4d9f473aea069d0e2ab881a8d52a5fadf843733d757e7ae05b005788964a518dbe27bb115c7cc26674c58cce682fbadb9ea8e0884aad3a9fd6522caf4
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
new file mode 100644
index 000000000000..c69353354359
--- /dev/null
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="BLAS/CBLAS module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# Need skel.bash lib
+RDEPEND=( ">=app-admin/eselect-1.0.5"
+		  "!app-eselect/eselect-cblas" )
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+	local MODULEDIR="/usr/share/eselect/modules"
+	local MODULE="blas"
+	insinto ${MODULEDIR}
+	newins "${FILESDIR}"/${MODULE}.eselect-${PVR} ${MODULE}.eselect
+	doman "${FILESDIR}"/blas.eselect.5
+}
diff --git a/app-eselect/eselect-blas/files/blas.eselect-0.2 b/app-eselect/eselect-blas/files/blas.eselect-0.2
new file mode 100644
index 000000000000..001ddb941e82
--- /dev/null
+++ b/app-eselect/eselect-blas/files/blas.eselect-0.2
@@ -0,0 +1,168 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2019 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+
+inherit config tests multilib skel
+
+MODULE="BLAS/CBLAS"
+IFACE="blas"
+DESCRIPTION="Manage installed alternatives of $MODULE shared objects"
+MAINTAINER="lumin@debian.org"
+VERSION="20190621"
+
+### helper utility to find all available BLAS/CBLAS implementations
+find_targets_in() {
+	[[ $# -eq 1 ]] || die -q "in which libdir?"
+
+	local cand
+	for cand in ${EROOT}/etc/env.d/blas/$1/*; do
+		[[ "config" = $(basename ${cand}) ]] && continue
+		[[ -r ${cand} ]] && basename ${cand}
+	done
+}
+
+### helper utility to validate a BLAS/CBLAS library directory
+validate_blaslibdir() {
+	[[ -d $1 ]] || return 2  # dir doesn't exist
+	[[ -r "${1}/libblas.so.3" ]] && [[ -r "${1}/libblas.so" ]] \
+	&& [[ -r "${1}/libcblas.so.3" ]] && [[ -r "${1}/libcblas.so" ]] \
+	|| return 1
+}
+
+### show action
+do_show() {
+	# do_show -- show both lib64 and lib32 selection
+	# do_show libxx -- show libxx selection
+	local libdir cur libdirs=( $(list_libdirs) )
+
+	# if manually specified libdirs
+	if [[ ! $# -eq 0 ]]; then
+		for libdir in $@; do
+			has $libdir ${libdirs[@]} || die -q "invalid libdir '$libdir'!"
+		done
+		libdirs=( $@ )
+	fi
+
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] && continue
+		[[ ! -r ${EROOT}/etc/env.d/blas/${libdir}/config ]] && continue
+		cur=$(load_config ${EROOT}/etc/env.d/blas/${libdir}/config CURRENT)
+		echo ${libdir}: $cur
+	done
+}
+
+### list action
+do_list() {
+	local i cur targets
+	local libdir libdirs=( $(list_libdirs) )
+
+	# if manually specified libdirs
+	if [[ ! $# -eq 0 ]]; then
+		for libdir in $@; do
+			has $libdir ${libdirs[@]} || die -q "invalid libdir '$libdir'!"
+		done
+		libdirs=( $@ )
+	fi
+	
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
+		targets=( $(find_targets_in $libdir) )
+		cur=$(load_config ${EROOT}/etc/env.d/blas/${libdir}/config CURRENT)
+
+		write_list_start "Available BLAS/CBLAS ($libdir) candidates:"
+		for (( i = 0; i < ${#targets[@]}; i++ )); do
+			[[ ${targets[i]} = $cur ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+		done
+		write_numbered_list -m "(none found)" "${targets[@]}"
+	done
+}
+
+### validate action
+describe_validate() {
+	echo "validate candidates and remove invalid ones"
+}
+
+do_validate() {
+	local i ldpath targets target candidate
+	local libdir libdirs=( $(list_libdirs) )
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
+		targets=( $(find_targets_in $libdir) )
+		for target in ${targets[@]}; do
+			candidate=${EROOT}/etc/env.d/blas/${libdir}/${target}
+			ldpath=$(load_config $candidate LDPATH)
+			if ! validate_blaslibdir $ldpath; then
+				echo "Removing invalid BLAS/CBLAS candidate ($candidate) ..."
+				rm -v $candidate
+			fi
+		done
+	done
+}
+
+### set action
+
+describe_set() {
+        echo "Activate one of the installed $MODULE implementations"
+}
+
+describe_set_parameters() {
+        echo "[<libdir>] <implementation>"
+}
+
+describe_set_options() {
+	echo "libdir: lib64 or lib32. Will use the native one when omitted."
+        echo "implementation : implementation name or number (from 'list' action)"
+}
+
+do_set() {
+	local libdirs=( $(list_libdirs) )
+	local targets libdir ldconf libpath impl
+
+	# check argument existence
+	[[ $# -eq 1 ]] || [[ $# -eq 2 ]] || \
+		die -q "Please specify [<libdir>] <impl> to activate!"
+	# read argumenets
+	if [[ $# -eq 2 ]]; then libdir="$1"; else libdir="$(get_libdir)"; fi
+	if [[ $# -eq 2 ]]; then impl="$2"; else impl="$1"; fi
+	# validate arguments
+	has "$libdir" "${libdirs[@]}" || die -q "Invalid libdir ($libdir) !"
+	targets=( $(find_targets_in $libdir) )
+	if ! has "$impl" "${targets[@]}"; then
+		if [[ ${impl} -gt 0 ]] && [[ ${impl} -le ${#targets[@]} ]]; then
+			impl=${targets[(${impl} - 1)]}
+		else
+			die -q "Invalid impl ($impl) !"
+		fi
+	fi
+	# store the configuration to env.d
+	store_config ${EROOT}/etc/env.d/blas/${libdir}/config CURRENT "${impl}"
+	# generate ld.so.conf file
+	ldconf="${EROOT}/etc/ld.so.conf.d/81-blas-${libdir}.conf"
+	libpath=$(load_config ${EROOT}/etc/env.d/blas/${libdir}/${impl} LDPATH)
+	truncate -s0 $ldconf
+	echo "# Auto-generated by eselect::blas. DON'T EDIT." >> $ldconf
+	echo "$libpath" >> $ldconf
+
+	# refresh cache. env-update will call ldconfig (see
+	# portage::env_update.py) so we don't need to call it explicitly.
+	env-update
+}
+
+### add action
+describe_add_parameters() {
+	echo "<libdir> <dir> <impl>"
+}
+
+describe_add_options() {
+	echo "libdir : library directory where $MODULE implementation is installed (lib, lib64, etc.)"
+	echo "dir : directory containing lib{,c}blas.so{.3}"
+	echo "impl : name of the $MODULE implementation"
+}
+
+do_add() {
+	[[ $# -eq 3 ]] \
+		|| die -q "Please specify <libdir> <dir> <impl> to activate!"
+	validate_blaslibdir $2 || die -q "invalid blas libdir!"
+	store_config ${EROOT}/etc/env.d/blas/$1/$3 LDPATH $2
+}
diff --git a/app-eselect/eselect-blas/files/blas.eselect.5 b/app-eselect/eselect-blas/files/blas.eselect.5
index c9df9fde8d7f..9779268bc65b 100644
--- a/app-eselect/eselect-blas/files/blas.eselect.5
+++ b/app-eselect/eselect-blas/files/blas.eselect.5
@@ -1,22 +1,22 @@
-.TH "ESELECT" "5" "June 2006" "Gentoo Linux" "eselect"
+.TH "ESELECT" "5" "June 2019" "Gentoo Linux" "eselect"
 .SH "NAME"
 blas.eselect \- The BLAS management module for Gentoo's eselect
 .SH "SYNOPSIS"
 \fBeselect blas\fR [\fBhelp\fR|\fBusage\fR]
 .br 
-\fBeselect blas\fR \fBlist\fR [\fIoptions\fR]
+\fBeselect blas\fR \fBlist\fR [\fIlibdir\fR]
 .br 
 \fBeselect blas\fR \fBadd\fR
 .br 
-\fBeselect blas\fR \fBset\fR \fIimplementation\fR [\fIoptions\fR]
+\fBeselect blas\fR \fBset\fR  [\fIlibdir\fR] \fIimplementation\fR
 .br 
-\fBeselect blas\fR \fBshow\fR [\fIoptions\fR]
+\fBeselect blas\fR \fBshow\fR [\fIlibdir\fR]
 
 .SH "DESCRIPTION"
 \fBeselect\fR is Gentoo's configuration and management tool. It features
 modules that care for the individual administrative tasks.
 .SH "ACTION: LIST"
-\fBeselect blas list\fR [\fIoptions\fR]
+\fBeselect blas list\fR [\fIlibdir\fR]
 .br 
 Displays an ordered list of installed BLAS implementations. It distinguishes between versions with different
 Application Binary Interfaces (e.g. x86/AMD64). Furthermore, it also distinguishes
@@ -31,7 +31,7 @@ Installed BLAS for libdir \fBlib\fR
   [1]   atlas *
   [2]   reference
 
-Possible \fIoptions\fR to the \fBlist\fR action are restrictions to
+Possible \fIlibdir\fR to the \fBlist\fR action are restrictions to
 handle only certain ABI\-specific library directories. For example,
  
 \fBeselect blas list lib64\fR
@@ -39,7 +39,7 @@ handle only certain ABI\-specific library directories. For example,
 lists only BLAS implementations found in \fB/usr/lib64\fR.
 
 .SH "ACTION: SHOW"
-\fBeselect blas show\fR [\fIoptions\fR]
+\fBeselect blas show\fR [\fIlibdir\fR]
 .br 
 Shows your system's currently active BLAS implementations.
 
@@ -49,17 +49,31 @@ lib: atlas
 .br
 lib64: reference
 
-The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+The same \fIlibdir\fR that apply to the \fBlist\fR action can be used
 with the \fBshow\fR action to restrict it to given ABIs.
 .SH "ACTION: SET"
-\fBeselect blas set\fR \fIimplementation\fR [\fIoptions\fR]
+\fBeselect blas set\fR [\fIlibdir\fR] \fIimplementation\fR
 .br 
 Sets your system's currently active BLAS implementations to \fIimplementation\fR. 
-The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+The same \fIlibdir\fR that apply to the \fBlist\fR action can be used
 with the \fBset\fR action to restrict it to given ABIs.
 
 phi / # eselect blas set atlas
+
+.SH "ACTION: VALIDATE"
+\fBeselect blas validate\fR
+.br
+Validates BLAS/CBLAS candidates under the /etc/env.d directory and automatically
+remove the invalid ones.
+
+.SH "ACTION: ADD"
+\fBeselect blas add\fR \fIlibdir\fR \fIdir\fR \fIimpl\fR
+.br
+Add a new BLAS/CBLAS implementation.
+
 .SH "AUTHOR"
 Danny van Dyk <kugelfang@gentoo.org>
 .br
 Donnie Berkholz <spyderous@gentoo.org>
+.br
+Mo Zhou <lumin@debian.org>
diff --git a/app-eselect/eselect-lapack/Manifest b/app-eselect/eselect-lapack/Manifest
index 948e0375a016..3bdb6220b867 100644
--- a/app-eselect/eselect-lapack/Manifest
+++ b/app-eselect/eselect-lapack/Manifest
@@ -1,4 +1,6 @@
 AUX lapack.eselect-0.1 354 BLAKE2B db08d71fb50a5d6715e642a1581f8b0598a61f298916d2136e57d526cd58db4d48730856d8294ce13f25a7b4bde2c3e6d8b3cbfcffe0288f2e354dd11c0c6619 SHA512 06e859b2ae6f93286a266f642aa374ed83b21c940ac25f9650973e6edb6e5fb75e9da39dba86e8f0f8a4ab2779b7a49065a6d4cc278e9becf6e8d35a34c47d9d
-AUX lapack.eselect.5 2103 BLAKE2B 367f10c0e6fc6acdc8b5eaf8215660a78f8895082c40853f47f5c3df4a107d918c86f8184b766d4e4f7554bdc724f3efce7a4d2e0eec58c4079fee8efe1a5490 SHA512 e393bf70301002df11d9b5ece21e5f6b15aab9dc0612315b74882ec5e255595b12ae05c408243b26563f477a7e77480d66f42be0582103e4967d4e12cfdc7f21
+AUX lapack.eselect-0.2 4897 BLAKE2B 2f6dab00f59c0556dcff1d944b8042460521dbc099175552ec8a3aa272d0d16eae7b178747372b2c2e503c22c3cb0fbb2443967c964bf10daa667141d08ebeca SHA512 16c3fef58525de4a50a3daf14ff70b47c506246f22b71937c6aa2fb4131e9ef3bfe736844ce0f8b6b95275a89fbbbc1bd2f036496f3202693a52fcf2fb90cd13
+AUX lapack.eselect.5 2406 BLAKE2B 12da8dafd86ee178455de3476bfd6f4b2f24318244c4b387b46e45ea7a0b3ed4f33b05207f3f1201f17af4bea2a01798d6de0eb579db3503d27ed3d90f8edec7 SHA512 8659833ef7ff6e78d0592bb2ea34f04647fda68b388d60f7a39f0cd21dc2c5d198b369aae14f2d742d6c6a77cb3da9a46d1ea34a2ee8d403d5faab537dd7b940
 EBUILD eselect-lapack-0.1.ebuild 709 BLAKE2B 8294be10eac3e103385fb04c7129ca3c603166f8a57e10c42faaef87c2507c0d27ef502cc4007a376dbc6e731df78b261786c01de90ad5269d15448da3c8c7fc SHA512 929ffc9d3d28f25744696683757df6f9d945d96711dba32ac5711e9fe652197b95ed3c3ef734fda7d50543b25e8fb0d08b6e60fedbbfd4c9efbf714934f57986
+EBUILD eselect-lapack-0.2.ebuild 628 BLAKE2B 49756a96b15d4d645b062cc85ab58bf0a5d068c618057797325c994291c604b97a8ebcda4cf350f54a6fe23da3c3c126d422ece5663a523c794fa3fd3b6f99ac SHA512 27be17ec635f15a419271777802190d4177b9c063393de8f6636b9e6265fc48b2ad1ce4d9dad14c12db2135eee5722e4d35dde4dcb112feb81768c407c491389
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
new file mode 100644
index 000000000000..05e9e67bcb9b
--- /dev/null
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LAPACK module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# Need skel.bash lib
+RDEPEND=( ">=app-admin/eselect-1.0.5" )
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+	local MODULEDIR="/usr/share/eselect/modules"
+	local MODULE="lapack"
+	insinto ${MODULEDIR}
+	newins "${FILESDIR}"/${MODULE}.eselect-${PVR} ${MODULE}.eselect
+	doman "${FILESDIR}"/lapack.eselect.5
+}
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect-0.2 b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
new file mode 100644
index 000000000000..76c038e13f8c
--- /dev/null
+++ b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
@@ -0,0 +1,167 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2019 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+
+inherit config tests multilib skel
+
+MODULE="LAPACK"
+IFACE="lapack"
+DESCRIPTION="Manage installed alternatives of $MODULE shared objects"
+MAINTAINER="lumin@debian.org"
+VERSION="20190621"
+
+### helper utility to find all available LAPACK implementations
+find_targets_in() {
+	[[ $# -eq 1 ]] || die -q "in which libdir?"
+
+	local cand
+	for cand in ${EROOT}/etc/env.d/lapack/$1/*; do
+		[[ "config" = $(basename ${cand}) ]] && continue
+		[[ -r ${cand} ]] && basename ${cand}
+	done
+}
+
+### helper utility to validate a LAPACK library directory
+validate_lapacklibdir() {
+	[[ -d $1 ]] || return 2  # dir doesn't exist
+	[[ -r "${1}/liblapack.so.3" ]] && [[ -r "${1}/liblapack.so" ]] \
+	|| return 1
+}
+
+### show action
+do_show() {
+	# do_show -- show both lib64 and lib32 selection
+	# do_show libxx -- show libxx selection
+	local libdir cur libdirs=( $(list_libdirs) )
+
+	# if manually specified libdirs
+	if [[ ! $# -eq 0 ]]; then
+		for libdir in $@; do
+			has $libdir ${libdirs[@]} || die -q "invalid libdir '$libdir'!"
+		done
+		libdirs=( $@ )
+	fi
+
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] && continue
+		[[ ! -r ${EROOT}/etc/env.d/lapack/${libdir}/config ]] && continue
+		cur=$(load_config ${EROOT}/etc/env.d/lapack/${libdir}/config CURRENT)
+		echo ${libdir}: $cur
+	done
+}
+
+### list action
+do_list() {
+	local i cur targets
+	local libdir libdirs=( $(list_libdirs) )
+
+	# if manually specified libdirs
+	if [[ ! $# -eq 0 ]]; then
+		for libdir in $@; do
+			has $libdir ${libdirs[@]} || die -q "invalid libdir '$libdir'!"
+		done
+		libdirs=( $@ )
+	fi
+	
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
+		targets=( $(find_targets_in $libdir) )
+		cur=$(load_config ${EROOT}/etc/env.d/lapack/${libdir}/config CURRENT)
+
+		write_list_start "Available LAPACK ($libdir) candidates:"
+		for (( i = 0; i < ${#targets[@]}; i++ )); do
+			[[ ${targets[i]} = $cur ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+		done
+		write_numbered_list -m "(none found)" "${targets[@]}"
+	done
+}
+
+### validate action
+describe_validate() {
+	echo "validate candidates and remove invalid ones"
+}
+
+do_validate() {
+	local i ldpath targets target candidate
+	local libdir libdirs=( $(list_libdirs) )
+	for libdir in ${libdirs[@]}; do
+		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
+		targets=( $(find_targets_in $libdir) )
+		for target in ${targets[@]}; do
+			candidate=${EROOT}/etc/env.d/lapack/${libdir}/${target}
+			ldpath=$(load_config $candidate LDPATH)
+			if ! validate_lapacklibdir $ldpath; then
+				echo "Removing invalid LAPACK candidate ($candidate) ..."
+				rm -v $candidate
+			fi
+		done
+	done
+}
+
+### set action
+
+describe_set() {
+        echo "Activate one of the installed $MODULE implementations"
+}
+
+describe_set_parameters() {
+        echo "[<libdir>] <implementation>"
+}
+
+describe_set_options() {
+	echo "libdir: lib64 or lib32. Will use the native one when omitted."
+        echo "implementation : implementation name or number (from 'list' action)"
+}
+
+do_set() {
+	local libdirs=( $(list_libdirs) )
+	local targets libdir ldconf libpath impl
+
+	# check argument existence
+	[[ $# -eq 1 ]] || [[ $# -eq 2 ]] || \
+		die -q "Please specify [<libdir>] <impl> to activate!"
+	# read argumenets
+	if [[ $# -eq 2 ]]; then libdir="$1"; else libdir="$(get_libdir)"; fi
+	if [[ $# -eq 2 ]]; then impl="$2"; else impl="$1"; fi
+	# validate arguments
+	has "$libdir" "${libdirs[@]}" || die -q "Invalid libdir ($libdir) !"
+	targets=( $(find_targets_in $libdir) )
+	if ! has "$impl" "${targets[@]}"; then
+		if [[ ${impl} -gt 0 ]] && [[ ${impl} -le ${#targets[@]} ]]; then
+			impl=${targets[(${impl} - 1)]}
+		else
+			die -q "Invalid impl ($impl) !"
+		fi
+	fi
+	# store the configuration to env.d
+	store_config ${EROOT}/etc/env.d/lapack/${libdir}/config CURRENT "${impl}"
+	# generate ld.so.conf file
+	ldconf="${EROOT}/etc/ld.so.conf.d/82-lapack-${libdir}.conf"
+	libpath=$(load_config ${EROOT}/etc/env.d/lapack/${libdir}/${impl} LDPATH)
+	truncate -s0 $ldconf
+	echo "# Auto-generated by eselect::lapack. DON'T EDIT." >> $ldconf
+	echo "$libpath" >> $ldconf
+
+	# refresh cache. env-update will call ldconfig (see
+	# portage::env_update.py) so we don't need to call it explicitly.
+	env-update
+}
+
+### add action
+describe_add_parameters() {
+	echo "<libdir> <dir> <impl>"
+}
+
+describe_add_options() {
+	echo "libdir : library directory where $MODULE implementation is installed (lib, lib64, etc.)"
+	echo "dir : directory containing liblapack.so{.3}"
+	echo "impl : name of the $MODULE implementation"
+}
+
+do_add() {
+	[[ $# -eq 3 ]] \
+		|| die -q "Please specify <libdir> <dir> <impl> to activate!"
+	validate_lapacklibdir $2 || die -q "invalid lapack libdir!"
+	store_config ${EROOT}/etc/env.d/lapack/$1/$3 LDPATH $2
+}
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect.5 b/app-eselect/eselect-lapack/files/lapack.eselect.5
index 92730a7ac852..4a9b7bda213e 100644
--- a/app-eselect/eselect-lapack/files/lapack.eselect.5
+++ b/app-eselect/eselect-lapack/files/lapack.eselect.5
@@ -1,22 +1,22 @@
-.TH "ESELECT" "5" "June 2006" "Gentoo Linux" "eselect"
+.TH "ESELECT" "5" "June 2019" "Gentoo Linux" "eselect"
 .SH "NAME"
 lapack.eselect \- The LAPACK management module for Gentoo's eselect
 .SH "SYNOPSIS"
 \fBeselect lapack\fR [\fBhelp\fR|\fBusage\fR]
 .br 
-\fBeselect lapack\fR \fBlist\fR [\fIoptions\fR]
+\fBeselect lapack\fR \fBlist\fR [\fIlibdir\fR]
 .br 
 \fBeselect lapack\fR \fBadd\fR
 .br 
-\fBeselect lapack\fR \fBset\fR \fIimplementation\fR [\fIoptions\fR]
+\fBeselect lapack\fR \fBset\fR [\fIoptions\fR] \fIimplementation\fR
 .br 
-\fBeselect lapack\fR \fBshow\fR [\fIoptions\fR]
+\fBeselect lapack\fR \fBshow\fR [\fIlibdir\fR]
 
 .SH "DESCRIPTION"
 \fBeselect\fR is Gentoo's configuration and management tool. It features
 modules that care for the individual administrative tasks.
 .SH "ACTION: LIST"
-\fBeselect lapack list\fR [\fIoptions\fR]
+\fBeselect lapack list\fR [\fIlibdir\fR]
 .br 
 Displays an ordered list of installed LAPACK implementations. It distinguishes between versions with different
 Application Binary Interfaces (e.g. x86/AMD64). Furthermore, it also distinguishes
@@ -39,7 +39,7 @@ handle only certain ABI\-specific library directories. For example,
 lists only LAPACK implementations found in \fB/usr/lib64\fR.
 
 .SH "ACTION: SHOW"
-\fBeselect lapack show\fR [\fIoptions\fR]
+\fBeselect lapack show\fR [\fIlibdir\fR]
 .br 
 Shows your system's currently active LAPACK implementations.
 
@@ -59,7 +59,21 @@ The same \fIoptions\fR that apply to the \fBlist\fR action can be used
 with the \fBset\fR action to restrict it to given ABIs.
 
 phi / # eselect lapack set atlas
+
+.SH "ACTION: VALIDATE"
+\fBeselect lapack validate\fR
+.br
+Validates LAPACK candidates under the /etc/env.d directory and automatically
+remove the invalid ones.
+
+.SH "ACTION: ADD"
+\fBeselect lapack add\fR \fIlibdir\fR \fIdir\fR \fIimpl\fR
+.br
+Add a new LAPACK implementation.
+
 .SH "AUTHOR"
 Danny van Dyk <kugelfang@gentoo.org>
 .br
 Donnie Berkholz <spyderous@gentoo.org>
+.br
+Mo Zhou <lumin@debian.org>
diff --git a/app-eselect/eselect-rails/Manifest b/app-eselect/eselect-rails/Manifest
index 6e6416678a1c..62fbbeea06d7 100644
--- a/app-eselect/eselect-rails/Manifest
+++ b/app-eselect/eselect-rails/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-rails-0.23.tar.xz 1596 BLAKE2B d958e870c63d32517d681d5e815616506cf318004e5d4f00d0ff6db4e0927a405b295bb0ede5e13664fe510f7cf9324eb63042abe283f0386bc9600552a32193 SHA512 34a2d8a2b613eb3a3e20515fdf916c4b7e862322816d78a32a9243fcc56bea1c154892df7f27eb5e640560b1e63b273b02807669155184ad28f085d2f84dd3b8
 DIST eselect-rails-0.24.tar.xz 1600 BLAKE2B 84ef0f6d9ba78b652567cb36a6835ef0a793122864b46afe9643a73d98300466a6c81845bd36ff834967ba7ad0ae99fc3b4a6327298f28f29ebfc273b40155aa SHA512 df36b71865e41d61a9e5e497402cc819b5c7266a5df3fa6b960ae7a4d2fe4ddaa686d6971968b41e8a0c65bcb229a4d3a953d30c9f8a54b271478730e88a8dd3
 EBUILD eselect-rails-0.23.ebuild 721 BLAKE2B 49b77a5247ae51c29a479264707ab5e29fb0ec026e6faac8d7dfaf839b6c540336fd57a7bad638686ae336e6b259afab4034018c770b024185c5cc5c7775162a SHA512 c1ad714b120dc82883ba311b14586290ae288166ab81cde1dd5bfd178f43daa2633dddaf10765f99772e7dd6becc2ea024863030c5e03eedc4b9ec480fd9f2eb
-EBUILD eselect-rails-0.24.ebuild 722 BLAKE2B de2511b460b8e4a3d7ebcc54c554e3aac69906bb244777b6b47a27e8c3cb8312f8bd72b05333ba5f221e75e049dd86151e7a9cba34846d8b8dc3d50f52733889 SHA512 a3571bc7e4e80b8957ef21c49ced47e776c1a8cb3d4c59c746e97ce477e09a9158283935fa3c403742be1e0ed336640a31bd26551188d58f7cb4bc1f0f36417a
+EBUILD eselect-rails-0.24.ebuild 718 BLAKE2B c4ffb6a9ed6ea354c4cd67eb8dfb05ee6f6c38eab74fecb7dd57d9489f28dd1b39ab1582d52bb45a4b1edf690235fa8f1a99a4d03bfcec51de5c75c0cab0eda4 SHA512 a8abb80a36110b51d9d1bed45cddb42e758d2476328922c2ce21fc1456fd4bd6b163eb793430fd1c532d4715e1d78a13a9ff030ef515af1ecde988ffec4f1efa
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
index 4aed52bf3363..d47329b0484e 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.24.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=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.0"