commit: f573a07ea65bbbe518d0ce42e0f631630a36069b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 14:19:29 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 14:19:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f573a07e
dev-util/astyle: version bump to 2.05.1 (bug #530584)
This commit also updates the soname handling (no trailing .0 in soname any
more).
Special thanks to David Hallas for an initial ebuild update.
Gentoo-Bug: 530584
Package-Manager: portage-2.2.20.1
dev-util/astyle/Manifest | 1 +
.../{astyle-2.04.ebuild => astyle-2.04-r1.ebuild} | 4 +-
.../{astyle-2.04.ebuild => astyle-2.05.1.ebuild} | 16 +++----
.../astyle/files/astyle-2.05.1-build_system.patch | 56 ++++++++++++++++++++++
4 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 6701525..d036cc3 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,3 +1,4 @@
DIST astyle_2.02.1_linux.tar.gz 153253 SHA256
0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953 SHA512
5a156910a2610b1c49bfe78ac237e1bb13e9627912db107ef98fead88a29f000ed355446c033fd052112d54a4f2bbdf3f484ef58b9976c311c06cde951fda274
WHIRLPOOL
96451afd3f4bb6eaa51f33b2f565e545f401973a00ef6653ee4dbeff85ca7c06928e12d54249a8221e881c20f4d1bdea023fbe04ac57631601e15a3453dc2b79
DIST astyle_2.03_linux.tar.gz 142577 SHA256
22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389 SHA512
5f23ef010edba0ddd7377b2a6023a0d97e22f7247e20a0c94d56252fef55b6de291b3c9de67f5ddfa02906cd44470e136ae49e38f7bd2afe65a204245230a579
WHIRLPOOL
b97a212dd4c92e24af9c5aa99fafcc5de929e94a81e160244d9cbc66bc7b97e0ca415e21b8e1eae35ef659b42423e1dd9b154fbddf36fef7fc344deca39dc156
DIST astyle_2.04_linux.tar.gz 156974 SHA256
70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60 SHA512
bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd
WHIRLPOOL
d9aa3f537885e373d791204652ed5c8d5231be0840ef5dde3714bb8c9c524e327585a51b7b14da1aae2952f7c9248401bc2769290bc5828d15f030f41d95c1fe
+DIST astyle_2.05.1_linux.tar.gz 152765 SHA256
fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac SHA512
853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495
WHIRLPOOL
ceef3bfa64632a4fe9afcc332fdf742e60b6e7d21655449372bd6c89db7444eddf6bbfee48684bb9f18e119cf040f36c62544cfc8bb040ed83095e9aed9fce56
diff --git a/dev-util/astyle/astyle-2.04.ebuild
b/dev-util/astyle/astyle-2.04-r1.ebuild
similarity index 95%
copy from dev-util/astyle/astyle-2.04.ebuild
copy to dev-util/astyle/astyle-2.04-r1.ebuild
index 71a7e6c..3ac6b57 100644
--- a/dev-util/astyle/astyle-2.04.ebuild
+++ b/dev-util/astyle/astyle-2.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x86-macos"
IUSE="doc java static-libs"
DEPEND="app-arch/xz-utils
- java? ( >=virtual/jdk-1.6 )"
+ java? ( >=virtual/jdk-1.6:= )"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}
diff --git a/dev-util/astyle/astyle-2.04.ebuild
b/dev-util/astyle/astyle-2.05.1.ebuild
similarity index 73%
rename from dev-util/astyle/astyle-2.04.ebuild
rename to dev-util/astyle/astyle-2.05.1.ebuild
index 71a7e6c..9a0762b 100644
--- a/dev-util/astyle/astyle-2.04.ebuild
+++ b/dev-util/astyle/astyle-2.05.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x86-macos"
IUSE="doc java static-libs"
DEPEND="app-arch/xz-utils
- java? ( >=virtual/jdk-1.6 )"
+ java? ( >=virtual/jdk-1.6:= )"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}
@@ -28,7 +28,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.02.1-build_system.patch
+ epatch "${FILESDIR}"/${P}-build_system.patch
java-pkg-opt-2_src_prepare
sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
-e "s:ar crs:$(tc-getAR) crs:" \
@@ -50,13 +50,11 @@ src_install() {
pushd src/bin &> /dev/null
dobin ${PN}
- dolib.so lib${PN}.so.0.0.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
+ dolib.so lib${P}.so
+ dosym lib${P}.so /usr/$(get_libdir)/lib${PN}.so
if use java ; then
- dolib.so lib${PN}j.so.0.0.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
+ dolib.so lib${P}j.so
+ dosym lib${P}j.so /usr/$(get_libdir)/lib${PN}j.so
fi
if use static-libs ; then
dolib lib${PN}.a
diff --git a/dev-util/astyle/files/astyle-2.05.1-build_system.patch
b/dev-util/astyle/files/astyle-2.05.1-build_system.patch
new file mode 100644
index 0000000..2355449
--- /dev/null
+++ b/dev-util/astyle/files/astyle-2.05.1-build_system.patch
@@ -0,0 +1,56 @@
+diff --git a/build/gcc/Makefile b/build/gcc/Makefile
+index b1af4c1..1dfa021 100755
+--- a/build/gcc/Makefile
++++ b/build/gcc/Makefile
+@@ -34,15 +34,15 @@ objdir = obj
+ ipath=$(prefix)/bin
+ CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
+ JAVAINCS = -I$(JAVA_HOME)/include
+-CXX = g++
++CXX ?= g++
+ INSTALL=install -o $(USER) -g $(USER)
+
+ ##################################################
+
+ # define compile options for each build
+-ifdef CFLAGS
+- CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CFLAGS)
+- CFLAGSd = -g $(CBASEFLAGS) $(CFLAGS)
++ifdef CXXFLAGS
++ CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS)
++ CFLAGSd = -g $(CBASEFLAGS) $(CXXFLAGS)
+ else
+ CFLAGSr = -DNDEBUG -O3 $(CBASEFLAGS)
+ CFLAGSd = -g $(CBASEFLAGS)
+@@ -134,13 +134,13 @@ astyled: $(OBJd)
+ shared: libastyle-2.05.1.so
+ libastyle-2.05.1.so: $(OBJs)
+ @ mkdir -p $(bindir)
+- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ @ echo
+
+ shareddebug: libastyle-2.05.1d.so
+ libastyle-2.05.1d.so: $(OBJsd)
+ @ mkdir -p $(bindir)
+- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^
++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ @ echo
+
+ static: libastyle.a
+@@ -158,13 +158,13 @@ libastyled.a: $(OBJad)
+ java: libastyle-2.05.1j.so
+ libastyle-2.05.1j.so: $(OBJsj)
+ @ mkdir -p $(bindir)
+- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ @ echo
+
+ javadebug: libastyle-2.05.1jd.so
+ libastyle-2.05.1jd.so: $(OBJsjd)
+ @ mkdir -p $(bindir)
+- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^
++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ @ echo
+
+ all: release debug shared shareddebug static staticdebug
