reinit the tree, so we can have metadata

9 files changed, 511 insertions, 0 deletions

diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
new file mode 100644
index 000000000000..35b7168f7b34
--- /dev/null
+++ b/dev-util/astyle/Manifest
@@ -0,0 +1,15 @@
+AUX astyle-2.02.1-build_system.patch 1654 SHA256 014689e01c664096394720283ef9c65cd7fcfb24c68bc87fd64eeaa3f7b9b979 SHA512 350a950a700cd65ad526f133cf29bc0371339bdad3ccd08930d6edad32784b7adfdd5a28bf617255f0836c2e57cd9b1f97c25eb2021a889852da3a819c21cf3e WHIRLPOOL 8d7bc764f7fa1f449e8471510f6b3c37a34c3ecf207cae20201b16a6ff4f45368705fab2d0d3b65b3abb025ec6e0ce7f18e7503f19faeba34c14e3d375f96992
+AUX astyle-2.05.1-build_system.patch 1747 SHA256 a635e8ddda0e626eaef860f31c2a65f04c7597abd2e0486f4c1c74c71bae329e SHA512 f79258f5fff835216b96ca44094b0edb09be3407f82ce0960245df203a435688d96e74d68403919d1a98b8af38456a4d39ce37ad927bdad412b5a1870a0e748b WHIRLPOOL 67cd687352ea4db3711b1c45e5aa896a58cb326e8146432b502475f01bf71727e38710b75e1a6849a6e2789388ef7837960aa3445e469bf2c2a8d20f5512258a
+DIST astyle_2.04_linux.tar.gz 156974 SHA256 70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60 SHA512 bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd WHIRLPOOL d9aa3f537885e373d791204652ed5c8d5231be0840ef5dde3714bb8c9c524e327585a51b7b14da1aae2952f7c9248401bc2769290bc5828d15f030f41d95c1fe
+DIST astyle_2.05.1_linux.tar.gz 152765 SHA256 fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac SHA512 853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495 WHIRLPOOL ceef3bfa64632a4fe9afcc332fdf742e60b6e7d21655449372bd6c89db7444eddf6bbfee48684bb9f18e119cf040f36c62544cfc8bb040ed83095e9aed9fce56
+DIST astyle_2.06_linux.tar.gz 162037 SHA256 3b7212210dc139e8f648e004b758c0be1b3ceb1694b22a879202d2b833db7c7e SHA512 e2da96b45d06385b284ed3107309dfa4fad904910a729232bdb8554b40332a673d33e1f153ffb2ebb0342c73098b79980628678be9dde45a4d4d23237fe8a8c5 WHIRLPOOL 02696ffbfb7f621d45ff8140f75cda38cce8587349269d9b87aba56a365f4375c7ce1ca67b3c0af8e1c6f627397d016ecc907437b4085599f24d2927b86c7878
+DIST astyle_3.0.1_linux.tar.gz 172483 SHA256 6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158 WHIRLPOOL 62f5e81d37f22c45da890cdf7214ce1f7b30db64c29710c217b315d769e0f584eefa6907d2984e3577255ce031d43f90550ba2a5c5664397a651ca0b16d14671
+DIST astyle_3.0_linux.tar.gz 172303 SHA256 983e4fe87f20427ddf0d06fa5ba046b5ee95347f9ada33a681af3892426a4ff3 SHA512 77ef75139b08a91829373558753d78a3253f23a2a53a81f591d8877ba31b9a5163fbe8453894366aebbe287051259a568e725ee3b5e68d8ed4852a12d7798f9d WHIRLPOOL a6fb79f6202df85260adbf92ce529efc905bd9aaa093d7fa270d39adf9d34146a365479376dc9271cdc9334cb4f15c782436a1f2d0fdbc03be8a7979c38f23d6
+EBUILD astyle-2.04-r1.ebuild 1549 SHA256 84e434e3e5c8965d7b3aef899e2696db96052095496c20c8f1d26b48126b8c7e SHA512 a9cf3e1ebaf9ff05d5b81d2004d4694be8c3be1b80bd0fba2758b434f38c4b94236b978a8811a60caa9021a34fb58cdbb39fd7d80fd623e18f2139b1756121bb WHIRLPOOL f5153a83bd03cfa8efe9f87f25de05f1aee77483a18139ff873e6479a5b3e1ebcaf92425bbb793f7f0bc6da2d1b53e29e9d6f01e1deb0981701c6bd2e06d78d4
+EBUILD astyle-2.05.1.ebuild 1397 SHA256 4e71e84a93929a5749b528e7f8be4b061f2efd8a6a58c432a91e05a06c836a6d SHA512 0cc5c277556b8203168d10446106c1a3c5d17d79dfe9c783ce5bb674dd338a227cad277d49c93987f46f5f24ad0acdfc7cdd5b2061c604170a081cf6492132e4 WHIRLPOOL 1e0a060745bd071a51da4bb0bc9e051596fcc44a62126e92c5429e718bf52072aa352af66e3e496606ab2a55b4b0d8ba46282f16c06cca10dceffff6c5694550
+EBUILD astyle-2.06.ebuild 1359 SHA256 f0882f883a31c918d4b5c667fe7e64ce21d9413672ac06f3af84f9cd7b30c8e2 SHA512 1e0f7b029461bae3b2271a530268ecf15df0367491266c5456d49399342baaa44d9f59fe816796e9c8a88ab7243f93cb8486497ff94cddbd1f2938e6b1a91643 WHIRLPOOL d184b62b6ac13d3b00e4347f831e2ceb21a57319cf33817ee2ac97c640094e56a43e7a8b5cf2531bc58dfec5447e8de1fa8b50d63e142ebbf2ca536597be0627
+EBUILD astyle-3.0.1.ebuild 2203 SHA256 5c42397eb8f0e86a56681b22eb3449ed81d7f60de1a9b615022a9aa6bc6559c5 SHA512 0b28bdc51d5a313ea9c297c14b680e31e2ea5c84a3a8d5dca92669c7e93f692c034a1492f5e2dbbad2c8cd881108b4f33c73f28b29bb04c1d6d5b5951253cd6d WHIRLPOOL 070ec3d5653a30f73ae6566b1d4bb2c6558f13193d57bc75294d1c92328e5aaffe7e4fe614161633a71bf2b7d4be40d3ebc3bd8c6440148f18577e1ff9cd0ef0
+EBUILD astyle-3.0.ebuild 2215 SHA256 5ac523efe845043e42559b20146db43f93a6a7c5d0e97eb0a8fc30c5b3120c27 SHA512 1f8ca4e7e94218161e08217ebd278f48f7d8a3dff091bd0ff516ea76a4c949d8d37a80f25d9528d0b8672877545ec9c25853f03cc95551750d8cd9a0fa6ff96f WHIRLPOOL d51b3c9cc9edb481409279f0a5cb769404b9761711ee72aa27bfb1c97da1200cae789497eb2d9f752370cf053724ff29b19a4bac89fe4d3a89b225907f04cdf0
+MISC ChangeLog 3974 SHA256 69d35f756b710f83d1b84a2d8696049616a66386f28fbb2da3d6ffcbfb06db0d SHA512 24791606309db47f75397fb1a9707b3f5222fa5f358fb77da96bdfd4178a461009b1dff7dc007a627984db7ec0bddb4934c29cbb09d30a388a1b9487f97a1ec8 WHIRLPOOL 13d94691f3746b86706aa269083cd4a38d9abc0a151b567c772b869dc14987c893c9d859188081452fd91a3f9f7aa2646fb0d50f40270fac27e0aae33124c343
+MISC ChangeLog-2015 6632 SHA256 edd773473b5516fd419d787e8a265611c241a16d3826d6deb2b8d5a7c413441f SHA512 4567e523519b5a2d0c0ed282f8fb312b505b47da2134a2212d6ea0be78f189f65a5b4fce96d046a690f8c589c05d302cfb5e34125076d7165c85feb89ba6ab28 WHIRLPOOL 665f7bc942f14d0d35d3701c458db6c4b108675a85836dec344234c05374fe0cdc1141f94f6711860001bbed0f20ed7fa7fab433a9cf544a9dfec1813146747f
+MISC metadata.xml 751 SHA256 6f4742ea81725680829b56f51d83d56d6d942c1526076d469f83d8536f89ef72 SHA512 fd80778c425419d2162641aa66c8ddea11b7cf1061cb2532a587c852333113049b86bc6292b0f7c1eaa4e0f5e4860f0738b821cfa77f1adbbca7dffbbfa9cead WHIRLPOOL 2a47a714a2c926eaa078aa16af2c246bfa435c9b7e9732d0186e64ce6ffe91d2df19952a1ab638e756ef4ba9ed981109f32df8114f4789c7b895bfcee4f645e2
diff --git a/dev-util/astyle/astyle-2.04-r1.ebuild b/dev-util/astyle/astyle-2.04-r1.ebuild
new file mode 100644
index 000000000000..0e5f5d5dfe7a
--- /dev/null
+++ b/dev-util/astyle/astyle-2.04-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/*
+}
diff --git a/dev-util/astyle/astyle-2.05.1.ebuild b/dev-util/astyle/astyle-2.05.1.ebuild
new file mode 100644
index 000000000000..d0921eb88421
--- /dev/null
+++ b/dev-util/astyle/astyle-2.05.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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}"/${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() {
+	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${P}.so
+	dosym lib${P}.so /usr/$(get_libdir)/lib${PN}.so
+	if use java ; then
+		dolib.so lib${P}j.so
+		dosym lib${P}j.so /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/astyle-2.06.ebuild b/dev-util/astyle/astyle-2.06.ebuild
new file mode 100644
index 000000000000..70a8f8a5969d
--- /dev/null
+++ b/dev-util/astyle/astyle-2.06.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="MIT"
+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() {
+	eapply_user
+	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${P}.so
+	dosym lib${P}.so /usr/$(get_libdir)/lib${PN}.so
+	if use java ; then
+		dolib.so lib${P}j.so
+		dosym lib${P}j.so /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/astyle-3.0.1.ebuild b/dev-util/astyle/astyle-3.0.1.ebuild
new file mode 100644
index 000000000000..369eb7a23007
--- /dev/null
+++ b/dev-util/astyle/astyle-3.0.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+
+DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="examples java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if use java ; then
+		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
+	else
+		default
+	fi
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usev java) \
+		$(usex static-libs static '')
+}
+
+src_install() {
+	doheader src/${PN}.h
+
+	pushd src/bin >/dev/null || die
+	dobin ${PN}
+
+	# ex: libastyle.so.3.0.1
+	dolib.so lib${PN}.so.${PV}
+	# ex: libastyle.so.3
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
+	if use java ; then
+		dolib.so lib${PN}j.so.${PV}
+		dosym lib${PN}j.so.${PV} /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version)
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd >/dev/null || die
+	if use examples ; then
+		docinto examples
+		dodoc -r file/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
+		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
+		elog "for modern use. Some options that were valid in 2.06 or older are now"
+		elog "deprecated. For more information, consult astyle's release notes at"
+		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
+		elog
+		elog "${ROOT}usr/share/doc/${P}/html"
+	fi
+}
diff --git a/dev-util/astyle/astyle-3.0.ebuild b/dev-util/astyle/astyle-3.0.ebuild
new file mode 100644
index 000000000000..85544bdc8bb1
--- /dev/null
+++ b/dev-util/astyle/astyle-3.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+
+DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="examples java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if use java ; then
+		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
+	else
+		default
+	fi
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usev java) \
+		$(usex static-libs static '')
+}
+
+src_install() {
+	doheader src/${PN}.h
+
+	pushd src/bin >/dev/null || die
+	dobin ${PN}
+
+	# ex: libastyle.so.3.0.0
+	dolib.so lib${PN}.so.${PV}.0
+	# ex: libastyle.so.3
+	dosym lib${PN}.so.${PV}.0 /usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
+	if use java ; then
+		dolib.so lib${PN}j.so.${PV}.0
+		dosym lib${PN}j.so.${PV}.0 /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version)
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd >/dev/null || die
+	if use examples ; then
+		docinto examples
+		dodoc -r file/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
+		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
+		elog "for modern use. Some options that were valid in 2.06 or older are now"
+		elog "deprecated. For more information, consult astyle's release notes at"
+		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
+		elog
+		elog "${ROOT}usr/share/doc/${P}/html"
+	fi
+}
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
diff --git a/dev-util/astyle/files/astyle-2.05.1-build_system.patch b/dev-util/astyle/files/astyle-2.05.1-build_system.patch
new file mode 100644
index 000000000000..23554499c798
--- /dev/null
+++ b/dev-util/astyle/files/astyle-2.05.1-build_system.patch
@@ -0,0 +1,56 @@
+diff --git a/build/gcc/Makefile b/build/gcc/Makefile
+index b1af4c1..1dfa021 100755
+--- a/build/gcc/Makefile
++++ b/build/gcc/Makefile
+@@ -34,15 +34,15 @@ objdir = obj
+ 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)
+@@ -134,13 +134,13 @@ astyled:  $(OBJd)
+ shared:  libastyle-2.05.1.so
+ libastyle-2.05.1.so:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ shareddebug:  libastyle-2.05.1d.so
+ libastyle-2.05.1d.so:  $(OBJsd)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ static:  libastyle.a
+@@ -158,13 +158,13 @@ libastyled.a:  $(OBJad)
+ java:  libastyle-2.05.1j.so
+ libastyle-2.05.1j.so:  $(OBJsj)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ javadebug:  libastyle-2.05.1jd.so
+ libastyle-2.05.1jd.so:  $(OBJsjd)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ all:  release debug shared shareddebug static staticdebug
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
new file mode 100644
index 000000000000..284e178263af
--- /dev/null
+++ b/dev-util/astyle/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+	</maintainer>
+	<longdescription>
+		astyle is a code formatter for C, C++, and Java source code, with many
+		granular formatting options to assist in enforcing code formatting
+		standards in projects.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>jimp03@email.com</email>
+			<name>Jim Pattee</name>
+		</maintainer>
+		<remote-id type="sourceforge">astyle</remote-id>
+		<bugs-to>https://sourceforge.net/p/astyle/bugs/</bugs-to>
+		<doc>http://astyle.sourceforge.net/astyle.html</doc>
+	</upstream>
+</pkgmetadata>