Names that begin with __ are reserved for package manager use.

Closes: https://bugs.gentoo.org/843722
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/multilib.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index ec2676cb6cfb..8590bbdfbff0 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -422,9 +422,9 @@ multilib_env() {

# the default abi is set to the 1-level libdir default

- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64}
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64}

# all other abi are set to the 2-level libdir default

@@ -454,9 +454,9 @@ multilib_env() {

# the default abi is set to the 1-level libdir default

- local __libdir_riscvdefaultabi_variable="

T24gU3VuLCAyMDIyLTA1LTE1IGF0IDA5OjI4ICswMjAwLCBVbHJpY2ggTcO8bGxlciB3cm90ZToK PiBOYW1lcyB0aGF0IGJlZ2luIHdpdGggX18gYXJlIHJlc2VydmVkIGZvciBwYWNrYWdlIG1hbmFn ZXIgdXNlLgo+IAo+IENsb3NlczogaHR0cHM6Ly9idWdzLmdlbnRvby5vcmcvODQzNzIyCj4gU2ln bmVkLW9mZi1ieTogVWxyaWNoIE3DvGxsZXIgPHVsbUBnZW50b28ub3JnPgo+IC0tLQo+IMKgZWNs YXNzL211bHRpbGliLmVjbGFzcyB8IDEyICsrKysrKy0tLS0tLQo+IMKgMSBmaWxlIGNoYW5nZWQs IDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZWNsYXNz L211bHRpbGliLmVjbGFzcyBiL2VjbGFzcy9tdWx0aWxpYi5lY2xhc3MKPiBpbmRleCBlYzI2NzZj YjZjZmIuLjg1OTBiYmRmYmZmMCAxMDA2NDQKPiAtLS0gYS9lY2xhc3MvbXVsdGlsaWIuZWNsYXNz Cj4gKysrIGIvZWNsYXNzL211bHRpbGliLmVjbGFzcwo+IEBAIC00MjIsOSArNDIyLDkgQEAgbXVs dGlsaWJfZW52KCkgewo+IMKgCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIyB0aGUgZGVmYXVsdCBhYmkgaXMgc2V0IHRvIHRoZSAxLWxldmVsIGxpYmRp cgo+IGRlZmF1bHQKPiDCoAo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgbG9jYWwKPiBfX2xpYmRpcl9yaXNjdmRlZmF1bHRhYmlfdmFyaWFibGU9IkxJQkRJ Ul8ke0RFRkFVTFRfQUJJfSIKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoGxvY2FsCj4gX19saWJkaXJfcmlzY3ZkZWZhdWx0YWJpPSR7IV9fbGliZGlyX3Jp c2N2ZGVmYXVsdGFiaV92YXJpYWJsZX0KPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoGV4cG9ydAo+ICR7X19saWJkaXJfcmlzY3ZkZWZhdWx0YWJpX3Zhcmlh YmxlfT0ke19fbGliZGlyX3Jpc2N2ZGVmYXVsdGFiaTotCj4gbGliNjR9Cj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBsb2NhbAo+IF9saWJkaXJfcmlzY3Zk ZWZhdWx0YWJpX3ZhcmlhYmxlPSJMSUJESVJfJHtERUZBVUxUX0FCSX0iCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBsb2NhbAo+IF9saWJkaXJfcmlzY3Zk ZWZhdWx0YWJpPSR7IV9saWJkaXJfcmlzY3ZkZWZhdWx0YWJpX3ZhcmlhYmxlfQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgZXhwb3J0Cj4gJHtfbGliZGly X3Jpc2N2ZGVmYXVsdGFiaV92YXJpYWJsZX09JHtfbGliZGlyX3Jpc2N2ZGVmYXVsdGFiaTotbGli NjR9Cj4gwqAKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAjIGFsbCBvdGhlciBhYmkgYXJlIHNldCB0byB0aGUgMi1sZXZlbCBsaWJkaXIKPiBkZWZhdWx0 Cj4gwqAKPiBAQCAtNDU0LDkgKzQ1NCw5IEBAIG11bHRpbGliX2VudigpIHsKPiDCoAo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCMgdGhlIGRlZmF1bHQg YWJpIGlzIHNldCB0byB0aGUgMS1sZXZlbCBsaWJkaXIKPiBkZWZhdWx0Cj4gwqAKPiAtwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoGxvY2FsCj4gX19saWJkaXJf cmlzY3ZkZWZhdWx0YWJpX3ZhcmlhYmxlPSJMSUJESVJfJHtERUZBVUxUX0FCSX0iCj4gLcKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBsb2NhbAo+IF9fbGliZGly X3Jpc2N2ZGVmYXVsdGFiaT0keyFfX2xpYmRpcl9yaXNjdmRlZmF1bHRhYmlfdmFyaWFibGV9Cj4g LcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBleHBvcnQKPiAk e19fbGliZGlyX3Jpc2N2ZGVmYXVsdGFiaV92YXJpYWJsZX09JHtfX2xpYmRpcl9yaXNjdmRlZmF1 bHRhYmk6LWxpYn0KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoGxvY2FsCj4gX2xpYmRpcl9yaXNjdmRlZmF1bHRhYmlfdmFyaWFibGU9IkxJQkRJUl8ke0RF RkFVTFRfQUJJfSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoGxvY2FsCj4gX2xpYmRpcl9yaXNjdmRlZmF1bHRhYmk9JHshX2xpYmRpcl9yaXNjdmRlZmF1 bHRhYmlfdmFyaWFibGV9Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqBleHBvcnQKPiAke19saWJkaXJfcmlzY3ZkZWZhdWx0YWJpX3ZhcmlhYmxlfT0ke19s aWJkaXJfcmlzY3ZkZWZhdWx0YWJpOi1saWJ9Cj4gwqAKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAjIGFsbCBvdGhlciBhYmkgYXJlIHNldCB0byB0aGUg Mi1sZXZlbCBsaWJkaXIKPiBkZWZhdWx0Cj4gwqAKCkxHVE0K

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)