dev-util/astyle: minor cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9
johu · May 28, 2018 · 2c81a00 · 2c81a00
1 parent 78804d2
commit 2c81a00
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
@@ -52,18 +52,17 @@ src_install() {
 	pushd src/bin >/dev/null || die
 	dobin ${PN}
 
-	# ex: libastyle.so.3.0.1
-	local libastylename=lib${PN}.so.${PV}
-	dolib.so ${libastylename}
-	# ex: libastyle.so.3
-	local libdestdir=/usr/$(get_libdir)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so
+	local libastylename="lib${PN}.so.${PV}"
+	local libastylejname="lib${PN}j.so.${PV}"
+	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
-		local libastylejname=lib${PN}j.so.${PV}
-		dolib.so ${libastylejname}
-		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so.$(get_major_version)
-		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so
+		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

diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -52,18 +52,17 @@ src_install() {
 	pushd src/bin >/dev/null || die
 	dobin ${PN}
 
-	# ex: libastyle.so.3.0.1
-	local libastylename=lib${PN}.so.${PV}.0
-	dolib.so ${libastylename}
-	# ex: libastyle.so.3
-	local libdestdir=/usr/$(get_libdir)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so
+	local libastylename="lib${PN}.so.${PV}"
+	local libastylejname="lib${PN}j.so.${PV}"
+	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
-		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
+		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