Version bump. Drop older.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

10 files changed, 70 insertions, 389 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index f154ba8d609d..98794a6236ad 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/astyle
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.37 2009/09/12 01:35:36 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.38 2010/09/24 15:13:42 scarabeus Exp $
+
+*astyle-1.24 (24 Sep 2010)
+
+  24 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -astyle-1.15.3.ebuild, -astyle-1.15.3-r1.ebuild, -astyle-1.21.ebuild,
+  -files/astyle-1.21-strip.patch, -files/astyle-gcc34.patch,
+  -astyle-1.23.ebuild, +astyle-1.24.ebuild, -files/cmd-line-fix.diff:
+  Version bump. Drop older.
 
 *astyle-1.23 (12 Sep 2009)
 
@@ -74,7 +82,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.37 2009/09/12 01:35:36 patrick Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.38 2010/09/24 15:13:42 scarabeus Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 8118989f4617..f98127a1d543 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,15 +1,18 @@
-AUX astyle-1.21-strip.patch 555 RMD160 a88439b27146dee7f02a9fc19f5acab26687069a SHA1 2d7db843c96cffd02677b5138234f5a4226ab8a7 SHA256 980f476309adb279bbde0c39225ca30789ef5489c393528d988ee2040b5f1cf5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX astyle-1.22-Makefile.patch 2030 RMD160 bb194c0eba0219c97076bbd98c02bc80c7387265 SHA1 ebca43ac7ed51a0e4e56faceac459606a3952a8b SHA256 3c0350a282f5727b65cf1f483fea5def7a24eb1295064585898bde18d15ce047
-AUX astyle-gcc34.patch 322 RMD160 5172371d64574507e0a22d4496c92fbd183aaa6e SHA1 d2d47fc4e0df5736744be3a569b011f57728d9d9 SHA256 698051a5dd8dffd38ab64858a9cda721defa0a1525e42b37adbbbbcc6d669d6d
-AUX cmd-line-fix.diff 5823 RMD160 fd3311e10f568928d0aa02453cb862f9870abcf1 SHA1 44a5a4487ca4f1ff0a11c5ee1b7018867e30d862 SHA256 6f7d6c3bc82cbbf5d98b2ff40bc1a262fba61116cfe7b5122f54495d33b4b799
-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 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.23_linux.tar.gz 101917 RMD160 93785633d8d26cb8f18f62a07bb58559ffa788d4 SHA1 87f2864bf06c265026d43bcd26830305ca75ab65 SHA256 f11b4467e0f42f968a23a36a1849cf885e6f0193b563908da53903248dcccb21
-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 1562 RMD160 be22db1cb1a06c982501754289c30b5ddd08d0f8 SHA1 b37bffebd36b30d0f89239ac3aae446245962a31 SHA256 e23f4157ca6f84563716ca290e7447bbd754de0e0a4a2acad40b2c4a2a27e186
+DIST astyle_1.24_linux.tar.gz 126791 RMD160 1baec4d093a036a2352134cce514cd16d109f3bf SHA1 fdd077315c9818f3b012892b91a0ac0578756336 SHA256 41b8825ab186e517182627a154762ff0d2084228100e29c6012cc98f6774a25a
 EBUILD astyle-1.22.ebuild 2123 RMD160 1d23c540d5bdc30f16d64be82b2111a796cd9229 SHA1 1369f7d93feb8e69462800bf707ea5142f8e3798 SHA256 a892b5c7476f8978b5b686ad3cbfc7c77abd63164331f41e184eabc4a3dd5a63
-EBUILD astyle-1.23.ebuild 2120 RMD160 d94c7d32b59e084926d6a6a6196454ca003a8235 SHA1 f9ac0cca0538512581091594c7cd0ff09b3a9ad6 SHA256 28d0e856fa17ba2c673f9b29cfb5dc2bc5056c8bb82a33f7dfe0d983f073d425
-MISC ChangeLog 4763 RMD160 cd7a3d4d2dcecd40092de6949f890a1599a08974 SHA1 a3ce25de18b5d70089d61907195b47c89cd3687c SHA256 c96baedf3ec5a9d60cefc03f8a388a480333f25477a7e20f50e34e1d34f0d104
+EBUILD astyle-1.24.ebuild 1046 RMD160 ca62cc6340c2dfdebf00630b7b0556af279eb9d9 SHA1 2e379f8c4c21c1490dcd0818db1017f0000bd681 SHA256 ae32666092c89e43c8abbc71db6b3110f2e3c5a1bbf2b7a4dd1b53d480934366
+MISC ChangeLog 5082 RMD160 782406c44cd0e29dadac3abf9f7d1f3b6a43f99e SHA1 00474bb00e90a646a79bf58b0efa45d1196cb8c9 SHA256 f26b2b41755d0c110e4b5743f18eb80be10b63ed69066bad6f2db31d8bea6b62
 MISC metadata.xml 1870 RMD160 37574beac94e9e90c65cd7a32ede203251425390 SHA1 ee0bae24008249d404bd1d16bb30cfcce59df598 SHA256 904db7ed27910cf28033f752c2e3e4b5ff1435ca7594fc78bea37d3e857ef5d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkycv+oACgkQHB6c3gNBRYf5mACfY59Fpsnwp+KqCuXvrAZOEuoS
+ZSAAoJdG/zFIFQwSd7/gMu/W4XBvvngQ
+=+OAH
+-----END PGP SIGNATURE-----
diff --git a/dev-util/astyle/astyle-1.15.3-r1.ebuild b/dev-util/astyle/astyle-1.15.3-r1.ebuild
deleted file mode 100644
index ae7009eb1a64..000000000000
--- a/dev-util/astyle/astyle-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.15.3-r1.ebuild,v 1.11 2008/01/27 10:39:22 grobian Exp $
-
-inherit eutils
-
-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}.zip"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.42"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/cmd-line-fix.diff
-
-	#gcc-3.4 fix
-	epatch "${FILESDIR}"/${PN}-gcc34.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin astyle
-	dohtml astyle.html astyle_release_notes.html license.html
-	dodoc INSTALL.TXT
-}
diff --git a/dev-util/astyle/astyle-1.15.3.ebuild b/dev-util/astyle/astyle-1.15.3.ebuild
deleted file mode 100644
index 37748c966b56..000000000000
--- a/dev-util/astyle/astyle-1.15.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.15.3.ebuild,v 1.15 2008/02/04 03:58:43 nerdboy Exp $
-
-inherit eutils
-
-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}.zip"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.42"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/cmd-line-fix.diff
-
-	#gcc-3.4 fix
-	epatch "${FILESDIR}"/${PN}-gcc34.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin astyle
-	dohtml astyle.html astyle_release_notes.html license.html
-	dodoc INSTALL.TXT
-}
diff --git a/dev-util/astyle/astyle-1.21.ebuild b/dev-util/astyle/astyle-1.21.ebuild
deleted file mode 100644
index 50dea5308deb..000000000000
--- a/dev-util/astyle/astyle-1.21.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.21.ebuild,v 1.8 2008/09/10 13:06:01 fmccor Exp $
-
-inherit eutils
-
-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 libs"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-${PV}-strip.patch
-}
-
-src_compile() {
-	cd build
-	local build_targets="release"
-	if use debug; then
-	    build_targets="debug"
-	    if use libs; then
-		build_targets="debug staticdebug shareddebug"
-	    fi
-	else
-	    if use libs; then
-		build_targets="release static shared"
-	    fi
-	fi
-	emake ${build_targets} || die "build failed"
-}
-
-src_install() {
-	if use debug; then
-	    newbin bin/astyled astyle || die "install debug bin failed"
-	    if use libs; then
-		newlib.a bin/libastyled.a libastyle.a  \
-		    || die "install debug static lib failed"
-		# shared lib needs at least a soname patch
-		newlib.so bin/libastyled.so libastyle.so \
-		    || die "install debug shared lib failed"
-	    fi
-	else
-	    if use libs; then
-		dolib.a bin/libastyle.a || die "install static lib failed"
-		dolib.so bin/libastyle.so || die "install shared lib failed"
-	    fi
-	    dobin bin/astyle || die "install bin failed"
-	fi
-	dohtml doc/*.html
-}
diff --git a/dev-util/astyle/astyle-1.23.ebuild b/dev-util/astyle/astyle-1.23.ebuild
deleted file mode 100644
index 7d22167bb6e4..000000000000
--- a/dev-util/astyle/astyle-1.23.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.23.ebuild,v 1.1 2009/09/12 01:35:36 patrick Exp $
-
-EAPI="2"
-
-inherit eutils java-pkg-opt-2 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"
-
-IUSE="debug java libs"
-
-RDEPEND="java? ( >=virtual/jdk-1.6 )"
-
-DEPEND="java? ( >=virtual/jdk-1.6 )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Add basic soname to make QA happy...
-	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile
-	# Fix JAVA_HOME
-	sed -i -e \
-	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
-	    buildgcc/Makefile || die "sed failed"
-	# respect CFLAGS, remove strip and other hard-coded crap
-	epatch "${FILESDIR}"/${PN}-1.22-Makefile.patch
-}
-
-src_compile() {
-	cd buildgcc
-
-	emake CXX="$(tc-getCXX)" all $(use java && echo javaall) \
-	    || 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
-		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
-}
diff --git a/dev-util/astyle/astyle-1.24.ebuild b/dev-util/astyle/astyle-1.24.ebuild
new file mode 100644
index 000000000000..9e02ca87f263
--- /dev/null
+++ b/dev-util/astyle/astyle-1.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.24.ebuild,v 1.1 2010/09/24 15:13:42 scarabeus Exp $
+
+EAPI=3
+
+inherit base java-pkg-opt-2 autotools
+
+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
+	http://gentoo.ccss.cz/${PV}-autotools.patch.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug java"
+
+DEPEND="java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	cd "${WORKDIR}"
+	epatch "${PV}-autotools.patch"
+	cd "${S}"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+	if use java; then
+		myopts="--with-java-include-dir=${JAVA_HOME}/include/"
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--htmldir=/usr/share/doc/${PF}/html/ \
+		$(use_enable debug) \
+		${myopts}
+}
diff --git a/dev-util/astyle/files/astyle-1.21-strip.patch b/dev-util/astyle/files/astyle-1.21-strip.patch
deleted file mode 100644
index 06f9a46159b4..000000000000
--- a/dev-util/astyle/files/astyle-1.21-strip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur astyle.orig/build/Makefile astyle/build/Makefile
---- astyle.orig/build/Makefile	2007-06-14 17:28:24.000000000 +0200
-+++ astyle/build/Makefile	2007-10-06 17:43:53.000000000 +0200
-@@ -83,7 +83,7 @@
- release:  astyle
- astyle:  $(OBJ)
- 	@ mkdir -p $(bindir)
--	$(CXX) -s -o $(bindir)/$@ $^
-+	$(CXX) -o $(bindir)/$@ $^
- 	@ echo
- 
- debug:  astyled
-@@ -95,7 +95,7 @@
- shared:  libastyle.so
- libastyle.so:  $(OBJs)
- 	@ mkdir -p $(bindir)
--	$(CXX) -shared -s -o $(bindir)/$@ $^
-+	$(CXX) -shared -o $(bindir)/$@ $^
- 	@ echo
- 
- shareddebug:  libastyled.so
diff --git a/dev-util/astyle/files/astyle-gcc34.patch b/dev-util/astyle/files/astyle-gcc34.patch
deleted file mode 100644
index 50b7e8631cc4..000000000000
--- a/dev-util/astyle/files/astyle-gcc34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- astyle_main.cpp~	2004-05-01 18:42:25.026637744 +0400
-+++ astyle_main.cpp	2004-05-01 18:45:39.716040456 +0400
-@@ -53,6 +53,7 @@
- 
- const string _version = "1.15.3";
- 
-+bool parseOption(ASFormatter &formatter, const string &arg, const string &errorInfo);
- 
- class ASStreamIterator :
-             public ASSourceIterator
diff --git a/dev-util/astyle/files/cmd-line-fix.diff b/dev-util/astyle/files/cmd-line-fix.diff
deleted file mode 100644
index 477f13a2a28d..000000000000
--- a/dev-util/astyle/files/cmd-line-fix.diff
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/astyle_main.cpp	2002-03-07 08:22:30.000000000 +0100
-+++ b/astyle_main.cppd	2004-02-25 22:05:13.841700600 +0100
-@@ -267,22 +267,22 @@
-     {
-         manuallySetJavaStyle(formatter);
-     }
--    else if ( IS_OPTIONS(arg, "t", "indent=tab=") )

--    {

--        int spaceNum = 4;

--        string spaceNumParam = GET_PARAMS(arg, "t", "indent=tab=");

--        if (spaceNumParam.length() > 0)

--            spaceNum = atoi(spaceNumParam.c_str());

--        formatter.setTabIndentation(spaceNum, false);

--    }

--    else if ( IS_OPTIONS(arg, "T", "force-indent=tab=") )

--    {

--        int spaceNum = 4;

--        string spaceNumParam = GET_PARAMS(arg, "T", "force-indent=tab=");

--        if (spaceNumParam.length() > 0)

--            spaceNum = atoi(spaceNumParam.c_str());

--        formatter.setTabIndentation(spaceNum, true);

--    }

-+    else if ( IS_PARAM_OPTIONS(arg, "t", "indent=tab=") )
-+    {
-+        int spaceNum = 4;
-+        string spaceNumParam = GET_PARAMS(arg, "t", "indent=tab=");
-+        if (spaceNumParam.length() > 0)
-+            spaceNum = atoi(spaceNumParam.c_str());
-+        formatter.setTabIndentation(spaceNum, false);
-+    }
-+    else if ( IS_PARAM_OPTIONS(arg, "T", "force-indent=tab=") )
-+    {
-+        int spaceNum = 4;
-+        string spaceNumParam = GET_PARAMS(arg, "T", "force-indent=tab=");
-+        if (spaceNumParam.length() > 0)
-+            spaceNum = atoi(spaceNumParam.c_str());
-+        formatter.setTabIndentation(spaceNum, true);
-+    }
-     else if ( IS_PARAM_OPTION(arg, "indent=tab") )
-     {
-         formatter.setTabIndentation(4);
-@@ -343,10 +343,10 @@
-     {
-         formatter.setLabelIndent(true);
-     }
--    else if ( IS_OPTION(arg, "brackets=break-closing-headers") )

--    {

--        formatter.setBreakClosingHeaderBracketsMode(true);

--    }

-+    else if ( IS_OPTION(arg, "brackets=break-closing-headers") )
-+    {
-+        formatter.setBreakClosingHeaderBracketsMode(true);
-+    }
-     else if ( IS_OPTIONS(arg, "b", "brackets=break") )
-     {
-         formatter.setBracketFormatMode(BREAK_MODE);
-@@ -400,10 +400,10 @@
-     else if (IS_OPTION(arg, "break-blocks"))
-     {
-         formatter.setBreakBlocksMode(true);
--    }

--    else if (IS_OPTION(arg, "break-elseifs"))

--    {

--        formatter.setBreakElseIfsMode(true);

-+    }
-+    else if (IS_OPTION(arg, "break-elseifs"))
-+    {
-+        formatter.setBreakElseIfsMode(true);
-     }
-     else if ( IS_OPTIONS(arg, "X", "errors-to-standard-output") )
-     {
-@@ -528,20 +528,20 @@
-     (*_err) << "    -j   OR   --mode=java\n";
-     (*_err) << "    Indent a Java(TM) source file\n";
-     (*_err) << endl;
--    (*_err) << "    -s   OR   -s#   OR   --indent=spaces=#\n";

--    (*_err) << "    Indent using # spaces per indent. Not specifying #\n" ;

--    (*_err) << "    will result in a default of 4 spacec per indent.\n" ;

--    (*_err) << endl;

-+    (*_err) << "    -s   OR   -s#   OR   --indent=spaces=#\n";
-+    (*_err) << "    Indent using # spaces per indent. Not specifying #\n" ;
-+    (*_err) << "    will result in a default of 4 spacec per indent.\n" ;
-+    (*_err) << endl;
-     (*_err) << "    -t   OR   -t#   OR   --indent=tab=#\n";
-     (*_err) << "    Indent using tab characters, assuming that each\n";
-     (*_err) << "    tab is # spaces long. Not specifying # will result\n";
-     (*_err) << "    in a default assumption of 4 spaces per tab.\n" ;
--    (*_err) << endl;

--    (*_err) << "    -T#   OR   --force-indent=tab=#";

--    (*_err) << "    Indent using tab characters, assuming that each\n";

--    (*_err) << "    tab is # spaces long. Force tabs to be used in areas\n";

--    (*_err) << "    Astyle would prefer to use spaces.\n" ;

--    (*_err) << endl;

-+    (*_err) << endl;
-+    (*_err) << "    -T#   OR   --force-indent=tab=#";
-+    (*_err) << "    Indent using tab characters, assuming that each\n";
-+    (*_err) << "    tab is # spaces long. Force tabs to be used in areas\n";
-+    (*_err) << "    Astyle would prefer to use spaces.\n" ;
-+    (*_err) << endl;
-     (*_err) << "    -C   OR   --indent-classes\n";
-     (*_err) << "    Indent 'class' blocks, so that the inner 'public:',\n";
-     (*_err) << "    'protected:' and 'private: headers are indented in\n";
-@@ -596,10 +596,10 @@
-     (*_err) << "    Break definition-block brackets and attach command-block\n";
-     (*_err) << "    brackets.\n";
-     (*_err) << endl;
--    (*_err) << "    --brackets=break-closing-headers\n";

--    (*_err) << "    Break brackets before closing headers (e.g. 'else', 'catch', ..).\n";

--    (*_err) << "    Should be appended to --brackets=attach or --brackets=linux.\n";

--    (*_err) << endl;

-+    (*_err) << "    --brackets=break-closing-headers\n";
-+    (*_err) << "    Break brackets before closing headers (e.g. 'else', 'catch', ..).\n";
-+    (*_err) << "    Should be appended to --brackets=attach or --brackets=linux.\n";
-+    (*_err) << endl;
-     (*_err) << "    -o   OR  --one-line=keep-statements\n";
-     (*_err) << "    Don't break lines containing multiple statements into\n";
-     (*_err) << "    multiple single-statement lines.\n";
-@@ -626,9 +626,9 @@
-     (*_err) << "    Like --break-blocks, except also insert empty lines \n";
-     (*_err) << "    around closing headers (e.g. 'else', 'catch', ...).\n";
-     (*_err) << endl;
--    (*_err) << "    --break-elseifs\n";

--    (*_err) << "    Break 'else if()' statements into two different lines.\n";

--    (*_err) << endl;

-+    (*_err) << "    --break-elseifs\n";
-+    (*_err) << "    Break 'else if()' statements into two different lines.\n";
-+    (*_err) << endl;
-     (*_err) << "Other options:\n";
-     (*_err) << "-------------\n";
-     (*_err) << "    --suffix=####\n";
-@@ -762,7 +762,7 @@
- 
-     if (shouldPrintHelp)
-     {
--        printHelp();

-+        printHelp();
- 		exit(1);
-     }
-