| 1 |
commit: 2c81a00c035017c8943747cd9b2372e0a7c3229a |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 22:11:54 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 22:17:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c81a00c |
| 7 |
|
| 8 |
dev-util/astyle: minor cleanup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
dev-util/astyle/astyle-3.0.1-r1.ebuild | 21 ++++++++++----------- |
| 13 |
dev-util/astyle/astyle-3.1-r2.ebuild | 21 ++++++++++----------- |
| 14 |
2 files changed, 20 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild |
| 17 |
index cdc9411aa46..24d96553a97 100644 |
| 18 |
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild |
| 19 |
+++ b/dev-util/astyle/astyle-3.0.1-r1.ebuild |
| 20 |
@@ -52,18 +52,17 @@ src_install() { |
| 21 |
pushd src/bin >/dev/null || die |
| 22 |
dobin ${PN} |
| 23 |
|
| 24 |
- # ex: libastyle.so.3.0.1 |
| 25 |
- local libastylename=lib${PN}.so.${PV} |
| 26 |
- dolib.so ${libastylename} |
| 27 |
- # ex: libastyle.so.3 |
| 28 |
- local libdestdir=/usr/$(get_libdir) |
| 29 |
- dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version) |
| 30 |
- dosym ${libastylename} ${libdestdir}/lib${PN}.so |
| 31 |
+ local libastylename="lib${PN}.so.${PV}" |
| 32 |
+ local libastylejname="lib${PN}j.so.${PV}" |
| 33 |
+ local libdestdir="${EPREFIX}/usr/$(get_libdir)" |
| 34 |
+ |
| 35 |
+ dolib.so "${libastylename}" |
| 36 |
+ dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)" |
| 37 |
+ dosym "${libastylename}" "${libdestdir}/lib${PN}.so" |
| 38 |
if use java ; then |
| 39 |
- local libastylejname=lib${PN}j.so.${PV} |
| 40 |
- dolib.so ${libastylejname} |
| 41 |
- dosym ${libastylejname} ${libdestdir}/lib${PN}j.so.$(get_major_version) |
| 42 |
- dosym ${libastylejname} ${libdestdir}/lib${PN}j.so |
| 43 |
+ dolib.so "${libastylejname}" |
| 44 |
+ dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)" |
| 45 |
+ dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so" |
| 46 |
fi |
| 47 |
if use static-libs ; then |
| 48 |
dolib.a lib${PN}.a |
| 49 |
|
| 50 |
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild |
| 51 |
index 5982affd7b5..ed480708102 100644 |
| 52 |
--- a/dev-util/astyle/astyle-3.1-r2.ebuild |
| 53 |
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild |
| 54 |
@@ -52,18 +52,17 @@ src_install() { |
| 55 |
pushd src/bin >/dev/null || die |
| 56 |
dobin ${PN} |
| 57 |
|
| 58 |
- # ex: libastyle.so.3.0.1 |
| 59 |
- local libastylename=lib${PN}.so.${PV}.0 |
| 60 |
- dolib.so ${libastylename} |
| 61 |
- # ex: libastyle.so.3 |
| 62 |
- local libdestdir=/usr/$(get_libdir) |
| 63 |
- dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version) |
| 64 |
- dosym ${libastylename} ${libdestdir}/lib${PN}.so |
| 65 |
+ local libastylename="lib${PN}.so.${PV}" |
| 66 |
+ local libastylejname="lib${PN}j.so.${PV}" |
| 67 |
+ local libdestdir="${EPREFIX}/usr/$(get_libdir)" |
| 68 |
+ |
| 69 |
+ dolib.so "${libastylename}" |
| 70 |
+ dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)" |
| 71 |
+ dosym "${libastylename}" "${libdestdir}/lib${PN}.so" |
| 72 |
if use java ; then |
| 73 |
- local libastylejname=lib${PN}j.so.${PV}.0 |
| 74 |
- dolib.so ${libastylejname} |
| 75 |
- dosym ${libastylejname} ${libdestdir}/lib${PN}j.so.$(get_major_version) |
| 76 |
- dosym ${libastylejname} ${libdestdir}/lib${PN}j.so |
| 77 |
+ dolib.so "${libastylejname}" |
| 78 |
+ dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)" |
| 79 |
+ dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so" |
| 80 |
fi |
| 81 |
if use static-libs ; then |
| 82 |
dolib.a lib${PN}.a |
Archives