Version bump wrt bug #311281 by Arseny Solokha <asolokha@gmx.com>. Use package's build system and helpers instead of rewriting it from scratch. Drop useless debug flag, install docs and build/install static lib conditionally

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 160 insertions, 4 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index 0114b49d52ef..257d336cfb4b 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/astyle
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.39 2011/01/28 19:17:50 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.40 2012/03/02 17:26:38 xarthisius Exp $
+
+*astyle-2.02.1 (02 Mar 2012)
+
+  02 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org> +astyle-2.02.1.ebuild,
+  +files/astyle-2.02.1-build_system.patch:
+  Version bump wrt bug #311281 by Arseny Solokha <asolokha@gmx.com>. Use
+  package's build system and helpers instead of rewriting it from scratch. Drop
+  useless debug flag, install docs and build/install static lib conditionally
 
   28 Jan 2011; Fabian Groffen <grobian@gentoo.org> astyle-1.24.ebuild:
   Fix for Prefix, add keywords
@@ -85,7 +93,7 @@
   Dropped ppc-macos keyword, see you in prefix
 
   14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> astyle-1.21.ebuild:
-  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.39 2011/01/28 19:17:50 grobian Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.40 2012/03/02 17:26:38 xarthisius Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 7fc0225aaf31..f12c84a4ac31 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,8 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX astyle-1.22-Makefile.patch 2030 RMD160 bb194c0eba0219c97076bbd98c02bc80c7387265 SHA1 ebca43ac7ed51a0e4e56faceac459606a3952a8b SHA256 3c0350a282f5727b65cf1f483fea5def7a24eb1295064585898bde18d15ce047
+AUX astyle-2.02.1-build_system.patch 1654 RMD160 60ce01a77f17b23ba171b72ea8b54deb3e9c084f SHA1 c16541c7c8353338fb2c7c7dfa3596ea90b247e0 SHA256 014689e01c664096394720283ef9c65cd7fcfb24c68bc87fd64eeaa3f7b9b979
 DIST 1.24-autotools.patch.bz2 14271 RMD160 7d5f340e70a3c19ba7432291696364233465ec8e SHA1 7facc3654bfed900513676797ed09f4b479789e3 SHA256 d107342d5f3447f3f834d34d2b0dffaf7e2fdf34138662313e82534188277b7e
 DIST astyle_1.22_linux.tar.gz 92580 RMD160 e0707298358ff9bd9c8540b460a87c446fad3b8f SHA1 9c18d9bd23c87cfef3a3bd48a7f31ae9978d1bcb SHA256 0ddac906531192dcecd3d160f181522c065779223f78476c027d9d25ec8bb27a
 DIST astyle_1.24_linux.tar.gz 126791 RMD160 1baec4d093a036a2352134cce514cd16d109f3bf SHA1 fdd077315c9818f3b012892b91a0ac0578756336 SHA256 41b8825ab186e517182627a154762ff0d2084228100e29c6012cc98f6774a25a
+DIST astyle_2.02.1_linux.tar.gz 153253 RMD160 1b90265b66a430a86a73ef3f1daf673c2f77a5be SHA1 c73c4cad659330ea871377eac14f993f22e28abd SHA256 0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953
 EBUILD astyle-1.22.ebuild 2123 RMD160 1d23c540d5bdc30f16d64be82b2111a796cd9229 SHA1 1369f7d93feb8e69462800bf707ea5142f8e3798 SHA256 a892b5c7476f8978b5b686ad3cbfc7c77abd63164331f41e184eabc4a3dd5a63
 EBUILD astyle-1.24.ebuild 1102 RMD160 19571266179725ae1c763157cf1b245a26c37818 SHA1 26b95b34e2f054a5c3916d514e21fd344aa5b1af SHA256 6829b0c80b89e1c54522989a030f457f30fe4e0613b8df45acd4ba29f8753555
-MISC ChangeLog 5181 RMD160 1893049fe68a8f7edcdf06d200deefaa6c50ee9c SHA1 e71bd461d7b5f222a4bf4e68130c65ea84c97035 SHA256 30a058c27b6e7d9cdf3390f82984fb42589de1db01a1710f03ddd2a6d785c8e5
+EBUILD astyle-2.02.1.ebuild 1755 RMD160 38813f44b02e02e80ad25095d3249bc0315d6cc6 SHA1 b00af4686ed6c6b9f53c2ac1dfedf8b74c2e3820 SHA256 1700e69775fabea5c3803029a2e29d66c50a01b31d6915728b1125c87d068934
+MISC ChangeLog 5569 RMD160 0ac0270d69939c5a07a646bff37fd38346f00adf SHA1 f3ab7d60475573ab98aabb4f07c01ea26258f1a5 SHA256 5b91a640e4344d42bd6ab84c2452cdd16f14f6454431bac29848ad858dcc3860
 MISC metadata.xml 1870 RMD160 37574beac94e9e90c65cd7a32ede203251425390 SHA1 ee0bae24008249d404bd1d16bb30cfcce59df598 SHA256 904db7ed27910cf28033f752c2e3e4b5ff1435ca7594fc78bea37d3e857ef5d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPUQLXAAoJEF0huFKJUZL5+boQAKcDGq2QQphiGhHW7Ta8UV4z
+dpl2Cw8GVfgdI18UbLdirC+r1Lm8rCwiLoKZY71pwv3qpzu8Gav9XNskFH1+CT27
+MAirrkRwGR6XZTq0ikpEvMGLej9sKb5eiipVgC51oeo16aNIhHfRJxbBR8IfSfHm
+ex7w1oKBOg6K0l68TnMUWSy0pAoYYxitEVet3v/RHc4mj1q6ewBSAhOzg9v2uDfJ
+CSoQ+QcoZSj+HKLKPlapGCo33ZVJnkrhFFECsescn949M+LjjmLLACuaTZIncnO7
+g8MEgeSOWKWIm6BZAHLcw5gD3hPWaftGmSzw4E4CnE15J8arS/evI8aZtf1Sv9Pw
+OECP1EFsg+m09H1iiQ9jJ2DkjfR1/nycP6b+arYVW+iLJpwhX37jWNO+ZTP0TUsG
+tlwxqRi5URGgLAebUlc3uaT8I2EBW/wLPEhpExu98oABs0GBzoPNIEmCg0A0yGN8
+tT0XwxsBqPBqlAi8NMWx7jhSZXxPS6rlL+UdraOeqqfgBJBWfKmEWkQEvbGH9UMg
+t3+ma00A4d9AkyEFxPUs0rVoyMTeP++RVW0+692QM5vxecvbnbL5ArG70G+m7ens
+JSUHZS6Zs86Db4JGANK61aBZ2JoaN+jW8b/kTAGPl/sNMoFUdDryTYpZ2SdreXBp
+uRyVYVUaNfwrmClpbMJw
+=hCh/
+-----END PGP SIGNATURE-----
diff --git a/dev-util/astyle/astyle-2.02.1.ebuild b/dev-util/astyle/astyle-2.02.1.ebuild
new file mode 100644
index 000000000000..3b6a747f4a56
--- /dev/null
+++ b/dev-util/astyle/astyle-2.02.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-2.02.1.ebuild,v 1.1 2012/03/02 17:26:38 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-opt-2 multilib toolchain-funcs
+
+DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+IUSE="doc java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	tc-export CXX
+}
+
+src_prepare() {
+	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:" \
+		-i build/gcc/Makefile || die
+}
+
+src_compile() {
+	local mk_opts="-f ../build/gcc/Makefile -C src"
+	emake ${mk_opts} ${PN}
+	emake ${mk_opts} shared
+	if use java ; then
+		emake ${mk_opts} java
+	fi
+	if use static-libs ; then
+		emake ${mk_opts} static
+	fi
+}
+
+src_install() {
+	insinto /usr/include
+	doins src/${PN}.h
+
+	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
+	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
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd &> /dev/null
+
+	use doc && dohtml doc/*
+}
diff --git a/dev-util/astyle/files/astyle-2.02.1-build_system.patch b/dev-util/astyle/files/astyle-2.02.1-build_system.patch
new file mode 100644
index 000000000000..1d63a512e9bc
--- /dev/null
+++ b/dev-util/astyle/files/astyle-2.02.1-build_system.patch
@@ -0,0 +1,54 @@
+--- a/build/gcc/Makefile
++++ b/build/gcc/Makefile
+@@ -34,25 +34,25 @@
+ 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)
+ endif
+-CFLAGSs   = -DASTYLE_LIB -fpic $(CFLAGSr)
+-CFLAGSsd  = -DASTYLE_LIB -fpic $(CFLAGSd)
++CFLAGSs   = -DASTYLE_LIB -fPIC $(CFLAGSr)
++CFLAGSsd  = -DASTYLE_LIB -fPIC $(CFLAGSd)
+ CFLAGSa   = -DASTYLE_LIB $(CFLAGSr)
+ CFLAGSad  = -DASTYLE_LIB $(CFLAGSd)
+-CFLAGSsj  = -DASTYLE_JNI -fpic $(CFLAGSr) $(JAVAINCS)
+-CFLAGSsjd = -DASTYLE_JNI -fpic $(CFLAGSd) $(JAVAINCS)
++CFLAGSsj  = -DASTYLE_JNI -fPIC $(CFLAGSr) $(JAVAINCS)
++CFLAGSsjd = -DASTYLE_JNI -fPIC $(CFLAGSd) $(JAVAINCS)
+ 
+ # define link options
+ ifdef LDFLAGS
+@@ -134,7 +134,7 @@
+ shared:  libastyle.so
+ libastyle.so:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^
+ 	@ echo
+ 
+ shareddebug:  libastyled.so
+@@ -158,7 +158,7 @@
+ java:  libastylej.so
+ libastylej.so:  $(OBJsj)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^
+ 	@ echo
+ 
+ javadebug:  libastylejd.so