From ec836f1d982ca366a01b0d82fe6b54dd38bbfd36 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 6 Mar 2018 12:27:03 -0500
Subject: [PATCH] dev-util/astyle: install unversioned so files

Closes: https://bugs.gentoo.org/647350
Closes: https://github.com/gentoo/gentoo/pull/7160
Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 dev-util/astyle/astyle-3.1-r1.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-util/astyle/astyle-3.1-r1.ebuild b/dev-util/astyle/astyle-3.1-r1.ebuild
index 56d0130f89fd..75d605a3c894 100644
--- a/dev-util/astyle/astyle-3.1-r1.ebuild
+++ b/dev-util/astyle/astyle-3.1-r1.ebuild
@@ -53,12 +53,17 @@ src_install() {
 	dobin ${PN}
 
 	# ex: libastyle.so.3.0.1
-	dolib.so lib${PN}.so.${PV}.0
+	local libastylename=lib${PN}.so.${PV}.0
+	dolib.so ${libastylename}
 	# ex: libastyle.so.3
-	dosym lib${PN}.so.${PV}.0 /usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
+	local libdestdir=/usr/$(get_libdir)
+	dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
+	dosym ${libastylename} ${libdestdir}/lib${PN}.so
 	if use java ; then
-		dolib.so lib${PN}j.so.${PV}.0
-		dosym lib${PN}j.so.${PV}.0 /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version)
+		local libastylejname=lib${PN}j.so.${PV}.0
+		dolib.so ${libastylejname}
+		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so.$(get_major_version)
+		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so
 	fi
 	if use static-libs ; then
 		dolib.a lib${PN}.a
-- 
2.26.2