gentoo resync : 29.05.2018

3 files changed, 28 insertions, 25 deletions

diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 1c9c5a04343d..a78fe5316106 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,5 @@
 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-EBUILD astyle-3.0.1.ebuild 2203 BLAKE2B 970472e208b473cd2b20a1a59a15feb656467f141baeb48f686b1be35f3053077aa4d91caa1f2760ed20b6f6b7e41ccf93ca6996c201e6448ba21c3907681a5b SHA512 0b28bdc51d5a313ea9c297c14b680e31e2ea5c84a3a8d5dca92669c7e93f692c034a1492f5e2dbbad2c8cd881108b4f33c73f28b29bb04c1d6d5b5951253cd6d
-EBUILD astyle-3.1-r1.ebuild 2417 BLAKE2B fd9add4c25203e2d4c9c93bf286122f65a92f804c4080021a9dd22e0df935f05d805f3326b95893958ede31432bda3a150ca464fe4a0465aeed1ee812b15ccb9 SHA512 787156f06c4a928eabd894a3fa7224b82913588a5e1c8affcac4b40321a68fb4818a56e301fb83ec90b2f4687df694541bbf17cc6f4f637020123fc74e61687e
+EBUILD astyle-3.0.1-r1.ebuild 2401 BLAKE2B c27dd1d6b4e886cf68a795563d15d3fc942b62480aeae96116f108ea70dc0c6383a2d4efa5622c2aab03dda4d8ecb8d202eb7fa95c4ada8e2f8229be0f5a98dd SHA512 868aa688a44823004342598fe128af286aa78a071612cecdf335410cf7ccd88ebe91774d3385afd68c29f00fb5d26e95c235f0a2c4afb0650c75b2d802aef67a
+EBUILD astyle-3.1-r2.ebuild 2409 BLAKE2B e3e29396801ed158bf96660d80617ed202b4482e989491ecd31c73605e95f65239a7179498ee73e29f5ed08f371d258bd3a0195ddaa5c2ec4be171af68580bbf SHA512 1682a25a8327cc5bb7fdb0ef23c4341946926b27a119d413f33b0c4c8808520ae5dbb7d24704549c0acf3442d991ea6b4b2d9e17ef56dd1b118efe943db3f52e
 MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.0.1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
index 369eb7a23007..2d3fd9cf88ce 100644
--- a/dev-util/astyle/astyle-3.0.1.ebuild
+++ b/dev-util/astyle/astyle-3.0.1-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
 HOMEPAGE="http://astyle.sourceforge.net/"
 SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/3.0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
@@ -52,16 +52,20 @@ src_install() {
 	pushd src/bin >/dev/null || die
 	dobin ${PN}
 
-	# ex: libastyle.so.3.0.1
-	dolib.so lib${PN}.so.${PV}
-	# ex: libastyle.so.3
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
+	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
-		dolib.so lib${PN}j.so.${PV}
-		dosym lib${PN}j.so.${PV} /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version)
+		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 lib${PN}.a
+		dolib.a lib${PN}.a
 	fi
 	popd >/dev/null || die
 	if use examples ; then
@@ -80,6 +84,6 @@ pkg_postinst() {
 		elog "deprecated. For more information, consult astyle's release notes at"
 		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
 		elog
-		elog "${ROOT}usr/share/doc/${P}/html"
+		elog "${EROOT%/}/usr/share/doc/${P}/html"
 	fi
 }
diff --git a/dev-util/astyle/astyle-3.1-r1.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 75d605a3c894..4394e1defb22 100644
--- a/dev-util/astyle/astyle-3.1-r1.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://astyle.sourceforge.net/"
 SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/3.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
@@ -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}.0"
+	local libastylejname="lib${PN}j.so.${PV}.0"
+	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