7 files changed, 91 insertions, 10 deletions
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 5d71c6305f0e..42666ae7cd68 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,7 +1,11 @@
-AUX 2.2.11-segfault.patch 369 SHA256 63c66b49831a90c5191cd3295d17a4e1888d8fa2a0b02589448de3b78d4e0293 SHA512 342600d476849d936d022e54ea0b6b244a956b11b99cc94dc9084f224d42ea2829640cde7a98e43efd0ee1fd88eb7147ba960af8075d290cd14a9d549abec022 WHIRLPOOL 37dc81ca3a2f67122ddfcf618b4aea5a3dc0846b6bd3413bbef972f19ba3fbd91dce94258dedfdbb0a3f624e58d8c675e832d8008f6ccfe86bccb8791a5cb838
-AUX 2.2.11-texi2html-5.patch 2666 SHA256 34451f004e0f9750df4a239cad6e30c0e63c702054f41b27c98eeb8fbcf6a356 SHA512 0356443bf7f9fd066113ddb7f59b8126f4b32f7dd8be9fa661ecfd4436ed0652d9229ac867365486f04bc7cb3623e3e8792549de4678f03e4f2bd582e4ee2d67 WHIRLPOOL b0739d768c22524f56188e2c2588047ffa35475267aad7b623761011c0aeb7643a75d9ea46625e29badbc3121cdcbbb6391993ef001a2b6b6ff6b9b959a94cf4
+AUX indent-2.2.11-ac_config_headers.patch 228 SHA256 30ea81f48688fce76a2a99f71bb0979a1e51cad9c4cb7bd24f4e031f58124201 SHA512 9efd632d596e7b768f56c757fcb15ee49f287542d00e75c2a2f2a5c915b76cb8fd4e07836a85e0b1fefd8658e147454ace3d73dd6555b5a42d1399baf4a2c542 WHIRLPOOL fcc25c33da0f6d5c6959decc39644ae5538d0739319bf0ce6dc1eb2eb2c88680e0bc7e47434f91929e34b15d8e1a966bf2556980ea1ad884845dab914234aebc
+AUX indent-2.2.11-linguas.patch 185 SHA256 aea44d8eaf6a422f21acc92e1482b9211e840526ab74509181975908b74aed92 SHA512 66a29effc9ec5a3a4ade4a5b6a527ac1fe48624d1e92170ee930867ea106ce9397b5aa82822e734949b79609b6255a656af0e491a07df5db769c974d9d096f91 WHIRLPOOL 5ba9eb449fcdb228e0f301d736cce783db08a32e6650dbc4489ca1e0330ef02ff4883213744892de6887dd1462a31b0e7a3f11cea9338aaf7ad3e69c552e7dd3
+AUX indent-2.2.11-segfault.patch 369 SHA256 63c66b49831a90c5191cd3295d17a4e1888d8fa2a0b02589448de3b78d4e0293 SHA512 342600d476849d936d022e54ea0b6b244a956b11b99cc94dc9084f224d42ea2829640cde7a98e43efd0ee1fd88eb7147ba960af8075d290cd14a9d549abec022 WHIRLPOOL 37dc81ca3a2f67122ddfcf618b4aea5a3dc0846b6bd3413bbef972f19ba3fbd91dce94258dedfdbb0a3f624e58d8c675e832d8008f6ccfe86bccb8791a5cb838
+AUX indent-2.2.11-texi2html-5.patch 2666 SHA256 34451f004e0f9750df4a239cad6e30c0e63c702054f41b27c98eeb8fbcf6a356 SHA512 0356443bf7f9fd066113ddb7f59b8126f4b32f7dd8be9fa661ecfd4436ed0652d9229ac867365486f04bc7cb3623e3e8792549de4678f03e4f2bd582e4ee2d67 WHIRLPOOL b0739d768c22524f56188e2c2588047ffa35475267aad7b623761011c0aeb7643a75d9ea46625e29badbc3121cdcbbb6391993ef001a2b6b6ff6b9b959a94cf4
 DIST indent-2.2.11.tar.gz 778563 SHA256 aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be WHIRLPOOL b50d6af34af8e08febde01fc70a280e8fdce0eb25b2e7e23f9d20bf08afc055c98b01c28f971c05bf4f8f52d9a70af10265329b5e146b2c6e64481aecb9fb8ad
-EBUILD indent-2.2.11-r1.ebuild 1443 SHA256 ca774a10fec9626a2c579f2a493c385e7474bbdd3dcf24c80fac7ec7d7ba73d2 SHA512 7ee3e4fcad6c3da4818113036a744e877df1c3db722419c710e58949f0f8ecf29194c54b379baca7b8d46c9477f6c4980ec04ec97798f2eb6c0d9403a8f90323 WHIRLPOOL 61a5c9b275d2d362064a68233ea757179057292bbba42185b443e9c56b9f7fedc9b33c15bb913c3c735d62194bac25b098f0ac84177c7e835baba6dd43ed4fa5
+DIST indent_2.2.11-5.debian.tar.xz 6540 SHA256 74accb95981a28b823f9b3d582b4a01daa3500fd0bf2596218f99db4a1a950e1 SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31 WHIRLPOOL d2fd540285de5dcccf207c867dcef05b99861da123cf6bc2b717f91e9e2ba0e498b31f8d1b45cfcce6b29bbd2a2a1ddbad20b4b3d1c2976ed47a7bbd07222722
+EBUILD indent-2.2.11-r1.ebuild 1389 SHA256 0ae93149aa52974d3cb40a6fbab06210b6d7dda05f397dd0e2b141bf2658f245 SHA512 aa95e7487130d78dd61f034ffb3761b8959b488a39b9e02bed826c9ea03cebda19c788edb16a79cf9618a2e19ad9dc0a04b54bd220db71924b002c3295ae130c WHIRLPOOL 75cee6ef61c4bff3221289b5ad6098e1f4d69745f23dadaa33310c868de6eedd0aa232fa940ccaaafccb756c9ac043304f6d3c3835636cc74756214fe9e78053
+EBUILD indent-2.2.11_p5.ebuild 1382 SHA256 e91436c0ed89fbb06617fa7571bce2e28919f47d3997bab0ce915d00f6a79dcf SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d WHIRLPOOL 17c6d9959f3541961eb25267d78dca38a031ab697ca867a981e023d919ea16035d267507414b3bc70157588dda79ea28afd8e79b439c0bc8b3e2139697666afe
 MISC ChangeLog 2522 SHA256 0e5e180ebf9fe9ba3056ecba8f165c6eab572df39e0dad52bad2901e0fc7384f SHA512 706fe90e060131b367b7d6a1394db633afb93f3fe845dcea060381cee60b9e155e1a6881f54d83185c3ba12dd68b99db147dd938dc986bf454923fb77cca35f6 WHIRLPOOL 2406ded0012fd436c9389b03a4734354c74e007150cbad2c794587bb8d290f4651ad0848788aea4c164ef1ca94fae83cab977f1ff639ccbccf6a626cef88a81c
 MISC ChangeLog-2015 9140 SHA256 a4e57d07aba5d9e5ec9aa5d2b402a86b2d9a1967ca2167ead4e80cce111f3a2a SHA512 894f833b5a90e46157890bf1e3fdd93df55cec3e0944904246a7a22aaf7903b771ac20ed50eaea3fc87b35d37bfee5978529dff826438b3f103fcce8922d4851 WHIRLPOOL c5499d212815b100800bed0070a30a8c34bb76bb9a7415c4511b0a5b47f4bdd425e907f851b360e94b7986afd5de3416cd35d118c6ce6bb7ee5b4a2af044d5c3
 MISC metadata.xml 371 SHA256 1a50668dea7a82328a89fda816982386261af5c3876fe844b8abe1a2dcec8724 SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8 WHIRLPOOL 082221442371914f5a7d2a9e4c8a9e64eeb15515b6bbe315ddf7f6e91844d1a71b1c588cb3dff2268d023dbac6c14b0349acabf1c9fa317e12c3eef2dcb75a63
diff --git a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
new file mode 100644
index 000000000000..8728a26a8254
--- /dev/null
+++ b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ AC_CONFIG_SRCDIR(src/indent.c)
+ AC_CONFIG_AUX_DIR(config)
+ AM_INIT_AUTOMAKE(indent, 2.2.11)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_MAINTAINER_MODE
+ 
diff --git a/dev-util/indent/files/indent-2.2.11-linguas.patch b/dev-util/indent/files/indent-2.2.11-linguas.patch
new file mode 100644
index 000000000000..d540219b7cd2
--- /dev/null
+++ b/dev-util/indent/files/indent-2.2.11-linguas.patch
@@ -0,0 +1,5 @@
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
++ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
diff --git a/dev-util/indent/files/2.2.11-segfault.patch b/dev-util/indent/files/indent-2.2.11-segfault.patch
index e91922480951..e91922480951 100644
--- a/dev-util/indent/files/2.2.11-segfault.patch
+++ b/dev-util/indent/files/indent-2.2.11-segfault.patch
diff --git a/dev-util/indent/files/2.2.11-texi2html-5.patch b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
index 5bad3da2867b..5bad3da2867b 100644
--- a/dev-util/indent/files/2.2.11-texi2html-5.patch
+++ b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index 778fe8b8c99b..24c2a1546d11 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-
 inherit autotools eutils
 
 DESCRIPTION="Indent program source files"
-HOMEPAGE="http://indent.isidore-it.eu/beautify.html https://www.gnu.org/software/indent/"
-SRC_URI="http://${PN}.isidore-it.eu/${P}.tar.gz"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -39,10 +38,11 @@ src_prepare() {
 	sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
 
 	epatch \
-		"${FILESDIR}"/${PV}-segfault.patch \
-		"${FILESDIR}"/${PV}-texi2html-5.patch
+		"${FILESDIR}"/${P}-segfault.patch \
+		"${FILESDIR}"/${P}-texi2html-5.patch
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautomake
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
new file mode 100644
index 000000000000..3a8feffd428d
--- /dev/null
+++ b/dev-util/indent/indent-2.2.11_p5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Indent program source files"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
+	http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	app-text/texi2html
+"
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*/}-segfault.patch
+	"${FILESDIR}"/${P/_p*/}-texi2html-5.patch
+	"${FILESDIR}"/${P/_p*/}-ac_config_headers.patch
+	"${FILESDIR}"/${P/_p*/}-linguas.patch
+)
+S=${WORKDIR}/${P/_p*/}
+
+src_prepare() {
+	default
+
+	eapply "${WORKDIR}"/debian/patches/*.patch
+
+	local pofile
+	for pofile in po/zh_TW*; do
+		mv ${pofile} ${pofile/.Big5} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas -i po/
+
+	econf $(use_enable nls)
+}
+
+src_test() {
+	emake -C regression/
+}
+
+src_install() {
+	# htmldir as set in configure is ignored in doc/Makefile*
+	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
+}