From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1A66138330 for ; Mon, 28 May 2018 22:17:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 208D9E07EC; Mon, 28 May 2018 22:17:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4BF3E07EC for ; Mon, 28 May 2018 22:17:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 355BF335C75 for ; Mon, 28 May 2018 22:17:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84EC02A0 for ; Mon, 28 May 2018 22:17:37 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1527545838.2c81a00c035017c8943747cd9b2372e0a7c3229a.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/astyle/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/astyle/astyle-3.0.1-r1.ebuild dev-util/astyle/astyle-3.1-r2.ebuild X-VCS-Directories: dev-util/astyle/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 2c81a00c035017c8943747cd9b2372e0a7c3229a X-VCS-Branch: master Date: Mon, 28 May 2018 22:17:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1538d3fe-5260-4278-b3de-e92844d3d4b3 X-Archives-Hash: 708bebbb14750bc6f274b546d02b6228 commit: 2c81a00c035017c8943747cd9b2372e0a7c3229a Author: Matthias Maier gentoo org> AuthorDate: Mon May 28 22:11:54 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon May 28 22:17:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c81a00c dev-util/astyle: minor cleanup Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/astyle/astyle-3.0.1-r1.ebuild | 21 ++++++++++----------- dev-util/astyle/astyle-3.1-r2.ebuild | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild index cdc9411aa46..24d96553a97 100644 --- 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 index 5982affd7b5..ed480708102 100644 --- 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