3 files changed, 102 insertions, 16 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 649183618c0a..baf27ecc5df0 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.159 2012/04/03 03:25:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.160 2012/04/13 22:33:58 vapier Exp $
+
+*automake-1.11.5 (13 Apr 2012)
+
+  13 Apr 2012; Mike Frysinger <vapier@gentoo.org> +automake-1.11.5.ebuild:
+  Version bump.
 
 *automake-1.11.4 (03 Apr 2012)
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e0ef173eb803..01ed48556cfd 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -32,6 +32,7 @@ DIST automake-1.11.1.tar.bz2 1066685 RMD160 0d160a06a022b145095c6433c3f0511ec5a8
 DIST automake-1.11.2.tar.bz2 1199488 RMD160 98c7c37b4912dcd97a6aa0a8c76ce7aff21ed36d SHA1 34b3808e1d536ee3724fbde28bc1f13b8b40dc43 SHA256 4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718
 DIST automake-1.11.3.tar.xz 1076640 RMD160 0172db7fc14b5e8f2b3eb751fc9fb235babcad4a SHA1 711b365fce1522d7ab1ffb26ca49d67757264e9b SHA256 f9e0be260c24ef61223fe961ba830fe46afc421fc0edf3864dbc88b5de36a529
 DIST automake-1.11.4.tar.xz 1091628 RMD160 6f81fb82d599dc7d6c8c3831fb3e6937a7befbf6 SHA1 96b0bb00b20a8b0be67de11400f5e4b033ab4e71 SHA256 e52a03516b545ccaf5d7baa0a2991e2a32c8ba7cf20584a184d406f2fb8b6960
+DIST automake-1.11.5.tar.xz 1092140 RMD160 dd6e87858ad6bda945c8bdf412ab88bdf3ad60f8 SHA1 d4cf2a8b5b7fd1458014e3d7fefbdc175639f59f SHA256 894b1fd7a18db868cefb5246e335a19f7cdb92297d20aeda356e921f0981f3a9
 DIST automake-1.4-p6.tar.gz 375060 RMD160 ae40b2200eec95b601ebc65bc3cc916bb2a54066 SHA1 330c75c98e6dcdf21cbb63cf94ced8ea564b9438 SHA256 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f
 DIST automake-1.5.tar.gz 526934 RMD160 5c5310c3923a8bfb1c94d77c7c53c593552e0464 SHA1 9c426ac75e514dc214dea6309b07c5d9cb95002c SHA256 24b4775e3143fd3e35db5cbaba80845d9359c7bfd751a6cebe3014fbf6115d78
 DIST automake-1.6.3.tar.bz2 476275 RMD160 2ca8c4f2dc6651db8472b61c4cb098493177d603 SHA1 55145c44828243a27ca8482683d4e4784f6eb051 SHA256 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81
@@ -45,6 +46,7 @@ EBUILD automake-1.11.2-r1.ebuild 2296 RMD160 45ea88e34ab4c7cf32b930fb2d5e07850af
 EBUILD automake-1.11.2.ebuild 2237 RMD160 958e0a57444883ee998d19362d4caa4e0050028e SHA1 c5c518fa5cb321fa796ad935ac1bb33a317422fa SHA256 86af1aa3e76dc523ab1c1e065c69bbd8ffc30b03a9399fd49bf9437afeddac87
 EBUILD automake-1.11.3.ebuild 2251 RMD160 bf87598495ce01b5fe6690c2b8772dacab0ccf80 SHA1 46900130e6f836f5e78bd1eb0de5e07e290bd9bd SHA256 bf7cf7ec093d02147b895306f9d1debf7c03ccac10124077370581fde36de32d
 EBUILD automake-1.11.4.ebuild 2251 RMD160 97104c2c4ff2cdceacc62ab0000e6c86b7a96b81 SHA1 197dd243d77a590f7a4222aadf8fc2c13f1dcf8f SHA256 81ef3b80a1c9d690942ae2e0e3cc9f727f8a3348f735b12e8910aea8ccc13422
+EBUILD automake-1.11.5.ebuild 2251 RMD160 664340f62695a17a7c0f3f03a71e76e0514f847f SHA1 58122c8ee26a61d9923677eb30210f92ef4e09d3 SHA256 571e7cf2b4bee57d006249e1c9de6ff3cf38e0ef932b8746c91c6099976b4e8f
 EBUILD automake-1.4_p6-r1.ebuild 1813 RMD160 e3bf21d267f701aa905293585917c47b7286edf9 SHA1 a386ca34cedcfe5174261bd1ed4b7ff4a4d7158a SHA256 10d728b164429499a47e45cb23f50bb4d264f06917ce37caa43af6c7430bd024
 EBUILD automake-1.5-r1.ebuild 1770 RMD160 cf4af79326934136c5e1a815b98b8902e3fce6e5 SHA1 c9c8350696e661e61654a6cd654a2f0eba5614b3 SHA256 77fed57734ee58938de42125104b96d4c97f4eeb4a815ee3f1c21954d3993b4b
 EBUILD automake-1.6.3-r1.ebuild 1498 RMD160 bb7a3232c05e8c1462cf79fdaaf2d35610bd9720 SHA1 aacf89078fd5b54389a70d9165ee2b6e0bd3b8ff SHA256 5aa8d9a63e5089de12e7b2ee26c9d319f55258c35e4e133b46fafbf40a6047d0
@@ -52,22 +54,22 @@ EBUILD automake-1.7.9-r2.ebuild 1672 RMD160 71215606ad5e26b3a9b27ed211f7717e8ac3
 EBUILD automake-1.8.5-r4.ebuild 1689 RMD160 45918ad61c6b4bd06ac551a433196cc40ef1be1d SHA1 c8af476ade2671041e7d8dcdaf44915966ecebd2 SHA256 be13ca556177543788bbfcc4a4ee549a60a00b2ef5b10ea64ad1d2e1fefd224a
 EBUILD automake-1.9.6-r3.ebuild 1912 RMD160 57ae9bad95975453475135696fc4c86cebbbc12e SHA1 934da49b23105ab438879db2120866631eb7c2c6 SHA256 a6d7f9a7c3af971745d2fc207a275fd1ad8aece02effbf4c3e726229871f0ab2
 EBUILD automake-9999.ebuild 1618 RMD160 256890b4f706a72fce3362fbf7ad083c9164bac1 SHA1 9a778bb2177169b77b7c5dd3d2edbdd35aba7bc8 SHA256 7782594efd3039c7411b593aa1a491ce67e857891cd2ee6cd5d9b7438e64a63d
-MISC ChangeLog 26135 RMD160 d5e513f380736d92e77e94a0cf56e10eda136696 SHA1 be2f66c4f4fa12b5aa9ecc9961148882df62c1cb SHA256 6411660288acda88897452382657daa62679e3853dd68d8a7ac570de8ede7076
+MISC ChangeLog 26259 RMD160 3b4865099f26f1c088b07e053e9906dfc3f20ca3 SHA1 b4b944568341a67eb229ad332e42653a9d15971e SHA256 48222d40158594b77d2660ceacce5fde197328c72e9c14fdb96b494b558e9615
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPem2xAAoJELEHsLL7fEFWMxMQALsgY1VJUKXIZ3RQ3dY4QByG
-8tw68uUKPPTtIBGdmVd7YUO/UYxLJVcYlEV5HNfJzQIHZJvu1u4VaFmVb2Lnx017
-H4zVa46TZtkHeFZb20f8fZZ3hnfP8WNpeYQuft+vVOtgbl/+u/xhgtq1fi86mMSo
-+DdARQXOTnsaZtzh3eOrlC2o3oG6hCcBG9VHK6Z/hgwD+KMgj9zHP/abdezoa95l
-F3TPaoKMf79flJ73tSegdrn8nydBqs+vsrnYjzozB3Jgh33IhZTxbUzsEKcMtsRl
-HwuwepzEHmft59LFLkhzGC/WkDUELPeA+P87/UvgT9Vsr+VQN2qyeBy8iYrw1Md2
-ocSH4xFXugkkCpi2Z0dXEgzD/pGBQUXOEZf+fAQtBbyWfnUO0SAHf/LjknSG3u5b
-aroIE35lHAMo3SDZDvWPHBYJLem72dlxUASSV+H35O5B6Wi7FzLHqkXon0f1lkjp
-cCCDgMikRs3Zc+/mjuj9781VBE8Xez48sfs1x1kjzWzAY/zmPdje2z364Vo0wj8m
-2xsEn/weBP/hZ0/qortl+jubevnmYfE3/xi2+Jm1FKi08qaI/rHpdUqK01x9Gn2C
-7+F4vKXFGyTIRuLPfy+Y4VxEL3rdwexV2s1mk00xTB5dDXLQHnjC8sJzqQ+BKYO+
-IqaxDlcGRucpXhzEvva9
-=9K2/
+iQIcBAEBAgAGBQJPiKoVAAoJELEHsLL7fEFWvzsQAMal+4x4mbKWVXEzTwswPzTw
+IAtK8kF1rcO0N1k88D96oJxbLX+aGSlgfwGLmiC0pkIxKVob27vE1v/9A5GZo9Df
+xFE83GxJSwkqvTWBmA6/nTwOj8RbydpW0NsavyzN5+PNvIi38AZvbaYs4hXYpCfV
+JROnxJSDWOXFd0q7x/WGlgQE0muQfZgJAmDEaOMC5z4zCjtvViBD5LfLuGPU9L3F
+ALtQ7B9d9dMqzgSTuZIFPSE1V+6RKUSeyX9g4nlcK/L/dw3k1obHEG31Nmia1IRN
+tg1936hDvsD9b3B/RfZzfMNVscicYdeHcV8yuo9lc29y/5/aftxV4iMzdI5J9RJl
+yoJ/otOOJl4/ExJ0zNoiZT6Kc4/hXq8nX6fAmMz8LGLa7dXd3xp6oyB/Dza0OTUo
+EgcISQeiZh/YGtVyFz8OWF+9y6VWoNE+B43rafFyvHKm8/Y8QuXNUYX3gkW4b5GJ
+74W2YocT1MUTy2zjJUKITu3/N9d+DyK12MhjA15pGZ3TYuGce/YtwEv0NeJ9H5o3
+tFX/e727nL8eRjtBKturwHzIPo3T4X1Lr5p8cDp2HtM43R+GsUTr5jHzETy1CPnZ
+Erd3CJJ3vQjrp9YOEKSmFInGHdFJ0uxJ1G3khnE3U7k7Tm+8OLiwuOFVL2TwC/83
+rD++wk0PNbWZqhqVjmWW
+=ODwx
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.11.5.ebuild b/sys-devel/automake/automake-1.11.5.ebuild
new file mode 100644
index 000000000000..c758563f4422
--- /dev/null
+++ b/sys-devel/automake/automake-1.11.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.5.ebuild,v 1.1 2012/04/13 22:33:58 vapier Exp $
+
+inherit eutils versionator unpacker
+
+if [[ ${PV/_beta} == ${PV} ]]; then
+	MY_P=${P}
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+else
+	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+	MY_P="${PN}-${MY_PV}"
+
+	# Alpha/beta releases are not distributed on the usual mirrors.
+	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-3-r2
+	>=sys-devel/autoconf-2.62
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpacker_src_unpack
+	cd "${S}"
+	chmod a+rx tests/*.test
+	sed -i \
+		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	mv doc/automake{,${SLOT}}.texi
+	sed -i \
+		-e "s:automake.info:automake${SLOT}.info:" \
+		-e "s:automake.texi:automake${SLOT}.texi:" \
+		doc/Makefile.in || die "sed on Makefile.in failed"
+	export WANT_AUTOCONF=2.5
+}
+
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+
+	local x
+	for x in aclocal automake; do
+		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+
+	rm \
+		"${D}"/usr/bin/{aclocal,automake} \
+		"${D}"/usr/share/man/man1/{aclocal,automake}.1
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}