Version bump wrt #466198 by David Hallas <david@cgp.dk>. Drop old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

7 files changed, 99 insertions, 198 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index 9ab47a9330ae..7b09c91c7693 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/astyle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.46 2012/10/07 08:58:26 pacho Exp $
+# 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 $
+
+*astyle-2.03 (24 Apr 2013)
+
+  24 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org> +astyle-2.03.ebuild,
+  -astyle-1.22.ebuild, -astyle-1.24.ebuild, -files/astyle-1.22-Makefile.patch,
+  metadata.xml:
+  Version bump wrt #466198 by David Hallas <david@cgp.dk>. Drop old
 
   07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, #24135.
@@ -112,7 +119,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.46 2012/10/07 08:58:26 pacho Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.47 2013/04/24 06:46:17 xarthisius Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 8cf495306cc5..4e8c8099dc96 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX astyle-1.22-Makefile.patch 2030 SHA256 3c0350a282f5727b65cf1f483fea5def7a24eb1295064585898bde18d15ce047 SHA512 479f9114f7ed07c9c783dcb9cf166b0c5ecb82674a04fe498ee1a6fd9afd3327b666ce382e8eae4809069c2e5ba7052a43635ac45af2380f19da9da1c89032c7 WHIRLPOOL ed6f546b58d52f1e15b67f70f6fa56499cc75eda0d2b0293b777eb09dd16df04c8601da5e082c8f416a0aef49745561b3d81a9cce0b212ab2c0f18797da7b423
 AUX astyle-2.02.1-build_system.patch 1654 SHA256 014689e01c664096394720283ef9c65cd7fcfb24c68bc87fd64eeaa3f7b9b979 SHA512 350a950a700cd65ad526f133cf29bc0371339bdad3ccd08930d6edad32784b7adfdd5a28bf617255f0836c2e57cd9b1f97c25eb2021a889852da3a819c21cf3e WHIRLPOOL 8d7bc764f7fa1f449e8471510f6b3c37a34c3ecf207cae20201b16a6ff4f45368705fab2d0d3b65b3abb025ec6e0ce7f18e7503f19faeba34c14e3d375f96992
-DIST 1.24-autotools.patch.bz2 14271 SHA256 d107342d5f3447f3f834d34d2b0dffaf7e2fdf34138662313e82534188277b7e SHA512 cc8a762f704840ddd1155fdad48c97b4ce502e76ab7b8b10ecc7e580a4453e0af027b789fc143270ab18e9fafa81cad15a2e2ad10ccc6f7aab29f7c75ab52dbb WHIRLPOOL 12f969159f083ecd4c077fbe735dce0d0740934b3ea6e9e5a9ff32e59521c69d05099b3ee1f96d5535f86bb3eb4c4d5e0181698c344678e83fe72d719ff2aa7f
-DIST astyle_1.22_linux.tar.gz 92580 SHA256 0ddac906531192dcecd3d160f181522c065779223f78476c027d9d25ec8bb27a SHA512 5bef4f54c5da249c130cd11a21dbf54a9ef81b6641f893200697a6172431e74930c9a53c42158ec99720420d125b2afc055f41a46761a6920b4c7edb6ce7b28c WHIRLPOOL 29f9df0351f66a79b071cf482dfaee93f2459c38e36eea5dca2fedfff954f85cf22ca6380b1410f44b032d7523bfb95003751aa327862d42867fcff1ccf34c6a
-DIST astyle_1.24_linux.tar.gz 126791 SHA256 41b8825ab186e517182627a154762ff0d2084228100e29c6012cc98f6774a25a SHA512 b2128d4fa737155856bd988868f76a3e810469eee476476656647a731bef6a8ddac8fcc84f8603bf899c199da08053b6075c4b91753b3de23a607f049af8c0ee WHIRLPOOL 5b3787ea684606ee8016fc927c10c04de9d56b13ceb9be5e804d087f910e1d4967014e2621b7bda0f7ac36d90b4d158e1a7c2cd229934567375c98f28992930e
 DIST astyle_2.02.1_linux.tar.gz 153253 SHA256 0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953 SHA512 5a156910a2610b1c49bfe78ac237e1bb13e9627912db107ef98fead88a29f000ed355446c033fd052112d54a4f2bbdf3f484ef58b9976c311c06cde951fda274 WHIRLPOOL 96451afd3f4bb6eaa51f33b2f565e545f401973a00ef6653ee4dbeff85ca7c06928e12d54249a8221e881c20f4d1bdea023fbe04ac57631601e15a3453dc2b79
-EBUILD astyle-1.22.ebuild 2120 SHA256 aa06570430eae4cec125519c08cc99f51520bf34dee53f05bfb24ab2ea7879ff SHA512 df82efc7e15ff733cd0ce537689821d6c6523353d7d9b90098a72a853e6ae3c3526ef9fefb0db34bfc4ace6272771899004cc4dff51ed69e048b7a237069f0a0 WHIRLPOOL a49efaa659cb2b259063c1eecd2c392e92c656e9d90790b2db1aaff62bd57968a47b59b50f341d9bd715d9d3d68cf81815db5837938bd79c987953d9ab3ba6ff
-EBUILD astyle-1.24.ebuild 1088 SHA256 1991639ddb34840b6759a9998bbb8d9ffedc135952cd8880328a38ddd7665677 SHA512 47f6df45168567a52e3bad71b1c9f8e360eea9f645c95dff0b5a3aed0a06732d6b657196a3f128cb2dcc14b673fee165e8ce865aba88e7f2c0502a05b42a2840 WHIRLPOOL e12853857860cdd0546c2c23039740806eeff42e8616e9673b670ff3cb4f6f2e447e1bd40db8af2a593a2b8630e6cd9ce02e9418f0525471ec36569399254267
+DIST astyle_2.03_linux.tar.gz 142577 SHA256 22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389 SHA512 5f23ef010edba0ddd7377b2a6023a0d97e22f7247e20a0c94d56252fef55b6de291b3c9de67f5ddfa02906cd44470e136ae49e38f7bd2afe65a204245230a579 WHIRLPOOL b97a212dd4c92e24af9c5aa99fafcc5de929e94a81e160244d9cbc66bc7b97e0ca415e21b8e1eae35ef659b42423e1dd9b154fbddf36fef7fc344deca39dc156
 EBUILD astyle-2.02.1.ebuild 1735 SHA256 d42089606807eb6760679bc3c9e5021cb793d8f9e0799b35f7eec12dd89e00e2 SHA512 27550e5e6a9b19e7e37f7c7b80cecd03a16bb8cb0af9c474087f241061c099f4512ba129d0ae5ea82739438677fe7575104b5a3f90956741f14e36833431634d WHIRLPOOL 7ff8269cc198db7e1dc3d5f1c5e590ee7f703a151a9a816c15a2d2acf81a7bbe962c95d4898ded0737784ae25eb9911287ee81a4915b3898a5a469a2e2893d77
-MISC ChangeLog 6226 SHA256 56ff9530461ec0a2d31f90350db7e344b5d7eb3b6c3e439672f4e029c655b9dd SHA512 8d3054772e646e691898e1d91db4b62cff676db729e331e581e2bd4061e0423f65fc8943af5040a3119b65eeec5f6cdfa3606c6d6233efaa68df1a64a7fd23bf WHIRLPOOL ad55f1d13110c569f38b6680442c5126f08ac0f2d94d0f56f61db06f4f02be5f2f3e4d621085431b25a586f48a72f9e155ab22eafaf324cefc073c513eb36020
-MISC metadata.xml 1751 SHA256 aa284dc8b4811d470512a78be4ab5d1cf3b9c1bc7ca7d680a10320997e894218 SHA512 4ebea7d4cc81bf1870e3d7af98cc77fce14bb2fa1479330a340b873d2567d69ceb2cf3e3b58c1c880f9fd8cb6a4e1d220796b6696034e7d72bd05a5589908e7b WHIRLPOOL 0b4f1e7a5a240c1210845cff27d60f686b16cef326ab4e9eedcfb88d54bbae4fde812b4b8ddae5045da66c4cf559ba999c0a49565e7d537a5e1d349708620db2
+EBUILD astyle-2.03.ebuild 1747 SHA256 f067f1747d3b548eb256613bdb6b3d6229bc30103e18f69ff0c6ddb579856e01 SHA512 f76a58ae3ebd2c6e8456cf697915ec96de48e8485d549f470c45c3166d90ea7f1b76367a540c30d227812927c239e71d47fbe3f3c28712e956c7ec97d1a1deb4 WHIRLPOOL 4886c42d68d49fa01bf5d683e80a8c065973773385c279bac44d396d2463aab7d6ac3516d4c4c32d6804d6fb89b199686e25371255d1075de69ed77c2dfd3fa3
+MISC ChangeLog 6503 SHA256 01fbbe6aa8bfc76b508b6caa92ae5719a6c8a37a6daa1b4506a2d7f9bbb8f422 SHA512 3c1d1446202861dcc83df00cfa9f730f1f9a8547c5b4f1936646e5f314441a0514cd0a720cef2084d14bb4cc929889c8afde183b149123137a18cf16c39c2790 WHIRLPOOL 6f0648b0155df5118fd265ca1cdced2f6b41ed9d78b620489c3ea190afe033602f7d68ddfdcaa64717bc06c7286681a762ffa67f55430a3c6f60d53c6949f961
+MISC metadata.xml 1645 SHA256 b089b05eaea77f07ecd1e89a0d5c093b5308f51576bbe4e603461444d6b755cb SHA512 ca2de3c430390e474ac0e5703f6dce8f4c3512b858a7a6e519544beb252968faea382077f10a50fa28ef6435c49adbbe184c1647dcd1b86468ee442255810505 WHIRLPOOL cbc72c4a0d6f8d2760ba48f262d40514c4e826b1f5bb7cddcbdf06c19cac4924db427cc571b3994684f9fe4377490220f5df63f1c19ba8530dcaa66267c334bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBxRDMACgkQCaWpQKGI+9SCkACeL+f+2DX9SO4Qt+nz3BW9Nvd1
-0k8AmweoyAhUqgymxVd4noEmzEfHDDVV
-=HSrV
+iQIcBAEBCAAGBQJRd3/CAAoJEF0huFKJUZL5sbwP/2vMSqp9fFAmKvqdjYjSx5hN
+7KdcO0AFDnXCXxjXql7wR7+1xcm2oYL8nFNc9dxODgjEdtxa45mfnGk8re2LPTT4
+SJSh2TAZw44EKWYRMH+zvHmdAbY6dJ1hmv2nZis9s3BoOa4pgUedt108LLI5nET3
+WfUQrLJHyH2oLYCIXpDEBLNdMlvjDlUrgSQqN7ipsZBgg+JFYlATBAA3PtN6K0ZL
+uCcVuFSqXhXwZRWNUTDHWbrydVPwhLGxVmdEr17zojnpKpUK+/h8JcPi4wVREHMP
+t6Bs4N7MV7VAdg1qlGAoAhdCVn3hMQa47FmMN1tmD/TK9CqcCy5/oP09qr1DuoZz
+W8q5DUqGGtSY/+376BmpaDkVqW1ZjqQdIBq4evrd7PcakCgkGv1XIpLbUmEo5LjA
+zSMQ0Zwt4rUYT0YsDkbtiIAgnpljjLh5UiINixU01mAuAIqAs7CyjSS3r38oqm4t
+tTp5XnU0iAO6JCQryZ+wOtLAGrxmdHCUcR/Iz3+kI7srJ8AzystMkn69fPBOihCL
+UDjvG/nZ7ob5/BZFEQt4B1Q4smdvIZKByCNqo8dnxeIxy031GjeepzqxgFEkTXe6
+MBIWX5bRvznOXJyzFaH3iNCS6ufGSPe76Vgd+at7faWaemTeQNNlc1rvqMaWFomb
+XhuccV4x85PzUMq249RQ
+=/ZSg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/astyle/astyle-1.22.ebuild b/dev-util/astyle/astyle-1.22.ebuild
deleted file mode 100644
index 83ce6ce184be..000000000000
--- a/dev-util/astyle/astyle-1.22.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-1.22.ebuild,v 1.14 2012/07/29 16:56:41 armin76 Exp $
-
-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"
-
-IUSE="debug java libs"
-
-RDEPEND="java? ( >=virtual/jdk-1.6 )"
-
-DEPEND="java? ( >=virtual/jdk-1.6 )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# 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}"/${P}-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
deleted file mode 100644
index c067f4720d96..000000000000
--- a/dev-util/astyle/astyle-1.24.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-1.24.ebuild,v 1.3 2012/07/29 16:56:41 armin76 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="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-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="${EPREFIX}"/usr/share/doc/${PF}/html/ \
-		$(use_enable debug) \
-		${myopts}
-}
diff --git a/dev-util/astyle/astyle-2.03.ebuild b/dev-util/astyle/astyle-2.03.ebuild
new file mode 100644
index 000000000000..e6e8479c3631
--- /dev/null
+++ b/dev-util/astyle/astyle-2.03.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-2.03.ebuild,v 1.1 2013/04/24 06:46:17 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="~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() {
+	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-1.22-Makefile.patch b/dev-util/astyle/files/astyle-1.22-Makefile.patch
deleted file mode 100644
index 44779a28b0cf..000000000000
--- a/dev-util/astyle/files/astyle-1.22-Makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- buildgcc/Makefile.orig	2008-10-14 20:31:23.645424162 -0700
-+++ buildgcc/Makefile	2008-10-14 20:36:36.484423984 -0700
-@@ -36,14 +36,14 @@
- ##################################################
- 
- # define compile options for each build
--CFLAGS   = -DNDEBUG -O3 $(CBASEFLAGS)
--CFLAGSd  = -g $(CBASEFLAGS)
--CFLAGSs  = -DNDEBUG -DASTYLE_LIB -O3 -fpic $(CBASEFLAGS)
--CFLAGSsd = -DASTYLE_LIB -g -fpic $(CBASEFLAGS)
--CFLAGSa  = -DNDEBUG -DASTYLE_LIB -O3 $(CBASEFLAGS)
--CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS)
--CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS)
--CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS)
-+CFLAGSb   = -DNDEBUG $(CFLAGS)
-+CFLAGSd  = -g $(CFLAGS)
-+CFLAGSs  = -DNDEBUG -DASTYLE_LIB -fPIC $(CFLAGS)
-+CFLAGSsd = -DASTYLE_LIB -g -fPIC $(CFLAGS)
-+CFLAGSa  = -DNDEBUG -DASTYLE_LIB $(CFLAGS)
-+CFLAGSad = -DASTYLE_LIB -g $(CFLAGS)
-+CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -fPIC $(CFLAGS) $(JAVAINCS)
-+CFLAGSsjd = -DASTYLE_JNI -g -fPIC $(CFLAGS) $(JAVAINCS)
- 
- # object files are built from the source list $(SRC)
- # a suffix is added for each build
-@@ -61,7 +61,7 @@
- # OBJ
- $(objdir)/%.o:  %.cpp  astyle.h
- 	@ mkdir -p $(objdir)
--	$(CXX) $(CFLAGS) -c -o $@ $<
-+	$(CXX) $(CFLAGSb) -c -o $@ $<
- 
- # OBJd
- $(objdir)/%_d.o:  %.cpp  astyle.h
-@@ -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 -Wl,-soname,$@  -s -o $(bindir)/$@ $^
-+	$(CXX) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
- 	@ echo
- 
- shareddebug:  libastyled.so
---- buildgcc/Makefile.orig	2008-11-10 18:00:51.462464681 -0800
-+++ buildgcc/Makefile	2008-11-10 18:31:21.586465413 -0800
-@@ -140,7 +140,7 @@
- java:  libastylej.so
- libastylej.so:  $(OBJsj)
- 	@ mkdir -p $(bindir)
--	$(CXX) -shared -Wl,-soname,$@  -s -o $(bindir)/$@ $^
-+	$(CXX) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
- 	@ echo
- 
- javadebug:  libastylejd.so
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index 9279c323d62d..a38af152191e 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@@ -29,8 +29,5 @@
   written in C++, that automatically reindent &amp; reformat C/C++/Java source 
   files. These can be used from a command line, or it can be incorporated as 
   classes in another C++ program.  
-</longdescription>
-  <use>
-    <flag name="libs">builds and installs both shared and static library interfaces</flag>
-  </use>
+  </longdescription>
 </pkgmetadata>