Version bump for security.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

11 files changed, 14 insertions, 612 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index de316e7224c2..f1a8a26d7cfa 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,17 @@
 # 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.165 2012/06/02 06:23:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.166 2012/07/10 06:10:56 vapier Exp $
+
+*automake-1.11.6 (10 Jul 2012)
+*automake-1.12.2 (10 Jul 2012)
+
+  10 Jul 2012; Mike Frysinger <vapier@gentoo.org> +automake-1.11.6.ebuild,
+  +automake-1.12.2.ebuild, -automake-1.11.1-r1.ebuild,
+  -automake-1.11.2-r1.ebuild, -automake-1.11.2.ebuild, -automake-1.11.3.ebuild,
+  -automake-1.11.4.ebuild, -automake-1.11.5.ebuild, -automake-1.12.1.ebuild,
+  -automake-1.12.ebuild, -files/automake-1.11.1-check-java.patch,
+  -files/automake-1.11.2-fix-pkglibexec_SCRIPTS.patch:
+  Version bump for security.
 
 *automake-1.12.1 (02 Jun 2012)
 
diff --git a/sys-devel/automake/automake-1.11.1-r1.ebuild b/sys-devel/automake/automake-1.11.1-r1.ebuild
deleted file mode 100644
index 528a030a5807..000000000000
--- a/sys-devel/automake/automake-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.1-r1.ebuild,v 1.2 2012/01/19 20:55:45 slyfox Exp $
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-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.bz2"
-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() {
-	unpack ${A}
-	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"
-	epatch "${FILESDIR}"/${P}-check-java.patch #362323
-	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
-}
diff --git a/sys-devel/automake/automake-1.11.2-r1.ebuild b/sys-devel/automake/automake-1.11.2-r1.ebuild
deleted file mode 100644
index 57ba300e476d..000000000000
--- a/sys-devel/automake/automake-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2012/01/19 20:55:45 slyfox Exp $
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.bz2"
-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.bz2"
-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() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-fix-pkglibexec_SCRIPTS.patch
-	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
-}
diff --git a/sys-devel/automake/automake-1.11.2.ebuild b/sys-devel/automake/automake-1.11.2.ebuild
deleted file mode 100644
index 07ba9f403e55..000000000000
--- a/sys-devel/automake/automake-1.11.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.2.ebuild,v 1.2 2012/01/19 20:55:45 slyfox Exp $
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.bz2"
-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.bz2"
-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() {
-	unpack ${A}
-	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
-}
diff --git a/sys-devel/automake/automake-1.11.3.ebuild b/sys-devel/automake/automake-1.11.3.ebuild
deleted file mode 100644
index 74380d429f22..000000000000
--- a/sys-devel/automake/automake-1.11.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.3.ebuild,v 1.1 2012/02/05 20:32:14 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
-}
diff --git a/sys-devel/automake/automake-1.11.4.ebuild b/sys-devel/automake/automake-1.11.4.ebuild
deleted file mode 100644
index 66bd7ec61c34..000000000000
--- a/sys-devel/automake/automake-1.11.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.4.ebuild,v 1.1 2012/04/03 03:25:22 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
-}
diff --git a/sys-devel/automake/automake-1.11.5.ebuild b/sys-devel/automake/automake-1.11.6.ebuild
index 9307e7e56460..d9a49bfc92c1 100644
--- a/sys-devel/automake/automake-1.11.5.ebuild
+++ b/sys-devel/automake/automake-1.11.6.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/04/26 13:07:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 1.1 2012/07/10 06:10:56 vapier Exp $
 
 inherit eutils versionator unpacker
 
diff --git a/sys-devel/automake/automake-1.12.1.ebuild b/sys-devel/automake/automake-1.12.2.ebuild
index ede7a2a1fa6b..96ec3de84e32 100644
--- a/sys-devel/automake/automake-1.12.1.ebuild
+++ b/sys-devel/automake/automake-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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.12.1.ebuild,v 1.1 2012/06/02 06:23:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.2.ebuild,v 1.1 2012/07/10 06:10:56 vapier Exp $
 
 inherit eutils versionator unpacker
 
diff --git a/sys-devel/automake/automake-1.12.ebuild b/sys-devel/automake/automake-1.12.ebuild
deleted file mode 100644
index 4e473d9d147e..000000000000
--- a/sys-devel/automake/automake-1.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.12.ebuild,v 1.1 2012/04/26 05:43:14 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
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-#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-7
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die
-	local f
-	for f in doc/automake.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
-	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# 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
-}
diff --git a/sys-devel/automake/files/automake-1.11.1-check-java.patch b/sys-devel/automake/files/automake-1.11.1-check-java.patch
deleted file mode 100644
index 861a5f6c37dc..000000000000
--- a/sys-devel/automake/files/automake-1.11.1-check-java.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-should be in upstream git now
-
-https://bugs.gentoo.org/362323
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8234
-
-diff --git a/automake.in b/automake.in
-index d74730d..a8ec749 100755
---- a/automake.in
-+++ b/automake.in
-@@ -5121,8 +5121,14 @@ sub handle_java
- 	$dir = $curs;
-       }
- 
--
--    push (@all, 'class' . $dir . '.stamp');
-+    if ($dir eq 'check')
-+      {
-+        push (@check, "class$dir.stamp");
-+      }
-+    else
-+      {
-+        push (@all, "class$dir.stamp");
-+      }
- }
- 
- 
-
diff --git a/sys-devel/automake/files/automake-1.11.2-fix-pkglibexec_SCRIPTS.patch b/sys-devel/automake/files/automake-1.11.2-fix-pkglibexec_SCRIPTS.patch
deleted file mode 100644
index fd046c521548..000000000000
--- a/sys-devel/automake/files/automake-1.11.2-fix-pkglibexec_SCRIPTS.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-upstream: yes
-
-commit 4e4dae500390d2ace681e4e4bc4c590ecdca38c6
-Author: Stefano Lattarini <stefano.lattarini@gmail.com>
-Date:   Tue Jan 3 09:06:09 2012 +0100
-
-    install: pkglibexec_SCRIPTS is a valid prefix/primary combination
-    
-    It makes little sense for `libexec_SCRIPTS' to be accepted as valid
-    while `pkglibexec_SCRIPTS' is not.  So fix this inconsistency by
-    explicitly allowing `pkglibexec_SCRIPTS' as well.  It is worth
-    noting that the inconsistency has been there for a long time,
-    but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
-    about primary/prefix mismatch fixed and extended" has made it
-    noisy enough to be noticed.
-    
-    * automake.in (handle_scripts): Also list `pkglibexec' among the
-    prefixes valid for the `SCRIPTS' primary.
-    * doc/automake.texi (Scripts): Likewise.
-    * tests/primary-prefix-valid-couples.test: Update.
-    * THANKS: Likewise.
-    * NEWS: Likewise.
-    
-    Reported by Dennis Schridde on the automake list:
-    <http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
-
-diff --git a/NEWS b/NEWS
-index 599f19f..2e572e4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -82,6 +82,11 @@ New in 1.11.0a:
- 
- Bugs fixed in 1.11.0a:
- 
-+* Bugs introduced by 1.11.2:
-+
-+  - Automake now correctly recognizes the prefix/primary combination
-+   `pkglibexec_SCRIPTS' as valid.
-+
- * Bugs introduced by 1.11:
- 
-   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
-diff --git a/THANKS b/THANKS
-index e9da06c..e9c6db8 100644
---- a/THANKS
-+++ b/THANKS
-@@ -78,6 +78,7 @@ David Pashley		david@davidpashley.com
- David Zaroski		cz253@cleveland.Freenet.Edu
- Dean Povey		dpovey@wedgetail.com
- Dennis J. Linse		Dennis.J.Linse@SAIC.com
-+Dennis Schridde		devurandom@gmx.net
- Derek R. Price		derek.price@openavenue.com
- Diab Jerius		djerius@cfa.harvard.edu
- Didier Cassirame	faded@free.fr
-diff --git a/automake.in b/automake.in
-index a852195..a689b63 100644
---- a/automake.in
-+++ b/automake.in
-@@ -3091,7 +3091,7 @@ sub handle_scripts
-     # useful to sometimes distribute scripts verbatim.  This happens
-     # e.g. in Automake itself.
-     &am_install_var ('-candist', 'scripts', 'SCRIPTS',
--		     'bin', 'sbin', 'libexec', 'pkgdata',
-+		     'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
- 		     'noinst', 'check');
- }
- 
-diff --git a/doc/automake.texi b/doc/automake.texi
-index cebe084..0c4dc01 100644
---- a/doc/automake.texi
-+++ b/doc/automake.texi
-@@ -7099,11 +7099,12 @@ prefix as with other primaries.
- @vindex sbin_SCRIPTS
- @vindex libexec_SCRIPTS
- @vindex pkgdata_SCRIPTS
-+@vindex pkglibexec_SCRIPTS
- @vindex noinst_SCRIPTS
- @vindex check_SCRIPTS
- 
- Scripts can be installed in @code{bindir}, @code{sbindir},
--@code{libexecdir}, or @code{pkgdatadir}.
-+@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
- 
- Scripts that need not be installed can be listed in
- @code{noinst_SCRIPTS}, and among them, those which are needed only by
-diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
-index 88e0817..c3d6471 100755
---- a/tests/primary-prefix-invalid-couples.test
-+++ b/tests/primary-prefix-invalid-couples.test
-@@ -79,7 +79,7 @@ for primary in $primaries; do
-       prefixes_ok='bin sbin libexec pkglibexec'
-       ;;
-     SCRIPTS)
--      prefixes_ok='bin sbin libexec pkgdata'
-+      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
-       ;;
-     DATA)
-       prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
-diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
-index 36ff5d8..6eb4149 100755
---- a/tests/primary-prefix-valid-couples.test
-+++ b/tests/primary-prefix-valid-couples.test
-@@ -57,7 +57,7 @@ for p in lib pkglib; do
-   echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
- done
- 
--for p in bin sbin libexec pkgdata; do
-+for p in bin sbin libexec pkglibexec pkgdata; do
-   echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
- done
-