Updated for bug #217262 and added some basic java support and a soname

Package-Manager: portage-2.1.5_rc6

4 files changed, 147 insertions, 3 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index 48d13ca71893..926d27c87f11 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/astyle
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.20 2008/02/04 03:58:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.21 2008/05/12 06:03:36 nerdboy Exp $
+
+*astyle-1.22 (12 May 2008)
+
+  12 May 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/astyle-1.22-strip.patch, +astyle-1.22.ebuild:
+  Updated for bug #217262 and added some basic java support and a soname;
+  thanks to Adam <ediap@users.sourceforge.net> for the updated patch.
 
   04 Feb 2008; Steve Arnold <nerdboy@gentoo.org> astyle-1.21.ebuild:
   Fixed string quoting and added some dies to the manual install commands,
@@ -11,7 +18,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.20 2008/02/04 03:58:43 nerdboy Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.21 2008/05/12 06:03:36 nerdboy Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 56afe6b1ba43..28183b7e4ce5 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,10 +1,13 @@
 AUX astyle-1.21-strip.patch 555 RMD160 a88439b27146dee7f02a9fc19f5acab26687069a SHA1 2d7db843c96cffd02677b5138234f5a4226ab8a7 SHA256 980f476309adb279bbde0c39225ca30789ef5489c393528d988ee2040b5f1cf5
+AUX astyle-1.22-strip.patch 711 RMD160 52253bd9c58064e4b79d479b84d05e105f8905f4 SHA1 85f5b578c4105e1592539888331ede9f4a3de056 SHA256 312e7b5471f1286df93ede7d4a012d9d3a1d907e44cbe7f05fb85c4082b15cbf
 AUX astyle-gcc34.patch 322 RMD160 5172371d64574507e0a22d4496c92fbd183aaa6e SHA1 d2d47fc4e0df5736744be3a569b011f57728d9d9 SHA256 698051a5dd8dffd38ab64858a9cda721defa0a1525e42b37adbbbbcc6d669d6d
 AUX cmd-line-fix.diff 5830 RMD160 59d4e4b085ac8a64ffc6ed3ad91ab9ec4f04ac41 SHA1 203b8c6d662362ab6edfd332dfbd1067d08f5a98 SHA256 9dbc57f6d20ed2a25fc13f19fbc47a8695e8c779d25e21358935fb9e08608c03
 DIST astyle_1.15.3.zip 60880 RMD160 ec84150edbe09dcd62ef960f288b688b52553d8b SHA1 51e115d1f84028899fff1725d4c6298d5e191ea4 SHA256 091adc2dbdcc7532c70dfb00e46361271c23726baa9cd0e5e0e3616838693c75
 DIST astyle_1.21_linux.tar.gz 81678 RMD160 929134074557865b95d25b84093851a9240f65ac SHA1 914493e4834183b2544a9baff2898597ab12ef29 SHA256 894ed6838e61977ee846c219c0e0caa2eaf3f6d9f1df4ed354a8cd45c32d0ec2
+DIST astyle_1.22_linux.tar.gz 92580 RMD160 e0707298358ff9bd9c8540b460a87c446fad3b8f SHA1 9c18d9bd23c87cfef3a3bd48a7f31ae9978d1bcb SHA256 0ddac906531192dcecd3d160f181522c065779223f78476c027d9d25ec8bb27a
 EBUILD astyle-1.15.3-r1.ebuild 833 RMD160 e00c05a85a43ce4567d0748d4f48ac8eda4aeec3 SHA1 471bc3e2cc3e7f37d1978dcf6a28e324b30f0f9b SHA256 b858d6a3b262d379cb2234ebbe12463e5464292c9a2224aa157468160bd32a9c
 EBUILD astyle-1.15.3.ebuild 813 RMD160 c56cb404c14e49b13f379ad4850bc75edd740b66 SHA1 f0609e9d51b06d23b4b0438ad16e0fc1a064979d SHA256 87e52c827d06b6f3093cde884a33b78a4daf814132d7af616cd99e3548344a4b
 EBUILD astyle-1.21.ebuild 1567 RMD160 7fd9bd95a00f28a0a5e7d81f07315630ba1a1fc4 SHA1 9e1b38faa42150b7a62428e10940b1f0822cdc83 SHA256 5cd3e8344f2458dda992f06bbadfcf25b1e698bc0e2e1457e369d2fc886b6904
-MISC ChangeLog 2380 RMD160 7b38488c741114543143ed2a73ec64b8f1179ccc SHA1 53d84345ee8d49fc4b71464fd8a7713d9ca8bd28 SHA256 b4e5d3ddebae8c46f792d9d05610fca3b31b126ca06ade7e1d9c08538c690d9e
+EBUILD astyle-1.22.ebuild 2772 RMD160 2b6e09b12acf1e6fd0c555fdc9edfb79bc26084a SHA1 af837cb1c53a7bd56de53a119d6886eea6d42233 SHA256 ffdab4d4b7271fdaed62d2e1c20a0ab80b875a226bbeb080433b501a2af6404a
+MISC ChangeLog 2657 RMD160 fa96a7b188204cadbd570a4ba88fef19d4ab91d1 SHA1 a85dbc3b34418e39fb31e6c370f876081f69bca9 SHA256 a6fce15b8582358bf943a2cee61efbb5a4c6dd461cbc744942181e883484222e
 MISC metadata.xml 1751 RMD160 2b19c912e2ed3fffde21fc78e709adfa01f3f306 SHA1 282847bdb605ee83bc032eeb02922d36e13ba90d SHA256 f7b72e8fca0bd5a04e471921afc936fdd51530996f661d3268fd6eb88e50249f
diff --git a/dev-util/astyle/astyle-1.22.ebuild b/dev-util/astyle/astyle-1.22.ebuild
new file mode 100644
index 000000000000..0abe9c128fc0
--- /dev/null
+++ b/dev-util/astyle/astyle-1.22.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.1 2008/05/12 06:03:36 nerdboy Exp $
+
+inherit eutils java-pkg-opt-2
+
+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"
+
+IUSE="debug java libs"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )"
+
+DEPEND="java? ( >=virtual/jre-1.5 )"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	use java && java-pkg-2_pkg_setup
+
+	if use x86; then
+	    jvmarch=i386
+	else
+	    jvmarch=${ARCH}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-strip.patch
+	# Add basic soname to make QA happy...
+	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile
+	use java && setup-jvm-opts
+}
+
+src_compile() {
+	cd buildgcc
+
+	local build_targets="all"
+	use java && build_targets="${build_targets} javaall"
+
+	emake ${build_targets} || die "build failed"
+}
+
+src_install() {
+	if use debug ; then
+	    newbin bin/astyled astyle || die "install debug bin failed"
+	    newlib.a bin/libastyled.a libastyle.a  \
+		|| die "install debug static lib failed"
+	    if use libs ; then
+		# shared lib got a soname patch
+		newlib.so bin/libastyled.so libastyle.so \
+		    || die "install debug shared lib failed"
+		if use java ; then
+		    local j_dir="/usr/$(get_libdir)"
+		    dolib.so bin/libastylejd.so \
+			|| die "install debug shared java lib failed"
+		    java-pkg_regso "${D}${j_dir}/libastylejd.so"
+		fi
+	    fi
+	else
+	    if use libs ; then
+		dolib.so bin/libastyle.so || die "install shared lib failed"
+		if use java ; then
+		    local j_dir="/usr/$(get_libdir)"
+		    dolib.so bin/libastylej.so \
+			|| die "install shared java lib failed"
+		    java-pkg_regso "${D}${j_dir}/libastylej.so"
+		fi
+	    fi
+	    dobin bin/astyle || die "install bin failed"
+	    dolib.a bin/libastyle.a || die "install static lib failed"
+	fi
+	dohtml doc/*.html
+}
+
+setup-jvm-opts() {
+	# Figure out correct boot classpath
+	# stolen from eclipse-sdk ebuild
+	local bp="$(java-config --jdk-home)/jre/lib"
+	local bootclasspath=$(java-config --runtime)
+	if java-config --java-version | grep -q IBM ; then
+		# IBM JDK
+		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
+	else
+		# Sun derived JDKs (Blackdown, Sun)
+		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
+	fi
+
+	einfo "Using bootclasspath ${bootclasspath}"
+	einfo "Using JVM library path ${JAVA_LIB_DIR}"
+
+	if [[ ! -f ${JAVA_LIB_DIR}/libawt.so ]] ; then
+		die "Could not find libawt.so native library"
+	fi
+
+	export AWT_LIB_PATH=${JAVA_LIB_DIR}
+}
+
diff --git a/dev-util/astyle/files/astyle-1.22-strip.patch b/dev-util/astyle/files/astyle-1.22-strip.patch
new file mode 100644
index 000000000000..3015ec12be08
--- /dev/null
+++ b/dev-util/astyle/files/astyle-1.22-strip.patch
@@ -0,0 +1,29 @@
+--- astyle.orig/buildgcc/Makefile	2008-04-11 11:25:13.000000000 +0200
++++ astyle/buildgcc/Makefile		2008-04-11 11:25:52.000000000 +0200
+@@ -104,7 +104,7 @@
+ release:  astyle
+ astyle:  $(OBJ)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -s -o $(bindir)/$@ $^
++	$(CXX) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ debug:  astyled
+@@ -116,7 +116,7 @@
+ shared:  libastyle.so
+ libastyle.so:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared -s -o $(bindir)/$@ $^
++	$(CXX) -shared -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ shareddebug:  libastyled.so
+@@ -140,7 +140,7 @@
+ java:  libastylej.so
+ libastylej.so:  $(OBJsj)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared -s -o $(bindir)/$@ $^
++	$(CXX) -shared -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ javadebug:  libastylejd.so