Version bump (bug #496746 by David Hallas).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

2 files changed, 75 insertions, 3 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index 7b09c91c7693..fef3f03aa27d 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/astyle
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.47 2013/04/24 06:46:17 xarthisius Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.48 2014/05/28 23:58:15 jer Exp $
+
+*astyle-2.04 (28 May 2014)
+
+  28 May 2014; Jeroen Roovers <jer@gentoo.org> +astyle-2.04.ebuild:
+  Version bump (bug #496746 by David Hallas).
 
 *astyle-2.03 (24 Apr 2013)
 
@@ -119,7 +124,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.47 2013/04/24 06:46:17 xarthisius Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.48 2014/05/28 23:58:15 jer Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/astyle-2.04.ebuild b/dev-util/astyle/astyle-2.04.ebuild
new file mode 100644
index 000000000000..87fc42cefeb9
--- /dev/null
+++ b/dev-util/astyle/astyle-2.04.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-2.04.ebuild,v 1.1 2014/05/28 23:58:15 jer Exp $
+
+EAPI=5
+
+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="~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 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	tc-export CXX
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.02.1-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() {
+	emake -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usex java java '') \
+		$(usex static-libs static '')
+}
+
+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/*
+}