Diff astyle-3.1-r2 with a astyle-3.4.8

/usr/portage/dev-util/astyle/astyle-3.4.8.ebuild 2023-10-09 14:52:30.936368387 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
inherit flag-o-matic toolchain-funcs java-pkg-opt-2
6
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/andresimon.asc
7
inherit toolchain-funcs java-pkg-opt-2 verify-sig
7 8

  
8 9
DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
9
HOMEPAGE="http://astyle.sourceforge.net/"
10
SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
10
HOMEPAGE="https://astyle.sourceforge.net/ https://gitlab.com/saalen/astyle"
11
SRC_URI="
12
	mirror://sourceforge/astyle/${P}.tar.bz2
13
	http://www.andre-simon.de/zip/${P}.tar.bz2
14
	verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
15
"
11 16

  
12 17
LICENSE="MIT"
13
SLOT="0/3.1"
14
KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
18
SLOT="0/3.2"
19
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
15 20
IUSE="examples java static-libs"
16 21

  
17
DEPEND="app-arch/xz-utils
18
	java? ( >=virtual/jdk-1.6:= )"
22
DEPEND="
23
	app-arch/xz-utils
24
	java? ( >=virtual/jdk-1.6:= )
25
"
19 26
RDEPEND="${DEPEND}"
20

  
21
S="${WORKDIR}/${PN}"
27
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )"
22 28

  
23 29
src_prepare() {
24 30
	if use java ; then
......
32 38
}
33 39

  
34 40
src_configure() {
35
	append-cxxflags -std=c++11
36 41
	tc-export CXX
37 42
	default
38 43
}
......
43 48
		${PN} \
44 49
		shared \
45 50
		$(usev java) \
46
		$(usex static-libs static '')
51
		$(usev static-libs static)
47 52
}
48 53

  
49 54
src_install() {
......
52 57
	pushd src/bin >/dev/null || die
53 58
	dobin ${PN}
54 59

  
55
	local libastylename="lib${PN}.so.${PV}.0"
56
	local libastylejname="lib${PN}j.so.${PV}.0"
60
	local libastylename="lib${PN}.so.${SLOT##*/}.0"
61
	local libastylejname="lib${PN}j.so.${SLOT##*/}.0"
57 62
	local libdestdir="/usr/$(get_libdir)"
58 63

  
59 64
	dolib.so "${libastylename}"
60
	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1)"
65
	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1 ${SLOT##*/})"
61 66
	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
62 67
	if use java ; then
63 68
		dolib.so "${libastylejname}"
64
		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1)"
69
		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1 ${SLOT##*/})"
65 70
		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
66 71
	fi
67 72
	if use static-libs ; then
Thank you!