sys-devel/autoconf: drop USE=multislot

Adjust the SLOT blockers to match the value that was actually used.

12 files changed, 52 insertions, 15 deletions

diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
index be4c4ef43ef1..de7a2ee550a1 100644
--- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="=sys-devel/m4-1.4*
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 PATCHES=(
diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
index 678aa643eff2..57ff1ea0ae43 100644
--- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 PATCHES=(
diff --git a/sys-devel/autoconf/autoconf-2.62-r1.ebuild b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
index 3cf317cb2e71..5b93a32ccdb9 100644
--- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 PATCHES=(
diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
index 0c7b04e207d7..46089ecb6b9e 100644
--- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 PATCHES=(
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64.ebuild
index 39d8ca444b4c..02730194b950 100644
--- a/sys-devel/autoconf/autoconf-2.64.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
index c91aedf0dead..8bf915b2c44c 100644
--- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 PATCHES=(
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
index 76f9d744a558..7769a4466f61 100644
--- a/sys-devel/autoconf/autoconf-2.67.ebuild
+++ b/sys-devel/autoconf/autoconf-2.67.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
index 76f9d744a558..7769a4466f61 100644
--- a/sys-devel/autoconf/autoconf-2.68.ebuild
+++ b/sys-devel/autoconf/autoconf-2.68.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 
 if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.69-r1.ebuild b/sys-devel/autoconf/autoconf-2.69-r1.ebuild
index 0f1b5bb5a7e1..d8cbfdceb39d 100644
--- a/sys-devel/autoconf/autoconf-2.69-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r1.ebuild
@@ -21,13 +21,12 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
 
 LICENSE="GPL-3"
-SLOT=$(usex multislot "${PV}" "2.5")
-IUSE="emacs multislot"
+SLOT="2.5"
+IUSE="emacs"
 
 DEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
 RDEPEND="${DEPEND}
-	multislot? ( !~sys-devel/${P}:0 )
 	>=sys-devel/autoconf-wrapper-13"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
diff --git a/sys-devel/autoconf/autoconf-2.69-r2.ebuild b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
new file mode 100644
index 000000000000..522e92840547
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	# We need all the tags in order to figure out the right version.
+	# The git-r3 eclass doesn't support that, so have to stick to 2.
+	inherit git-2
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV}"
+IUSE="emacs"
+
+DEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	!~sys-devel/${P}:2.5
+	>=sys-devel/autoconf-wrapper-13"
+[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild b/sys-devel/autoconf/autoconf-2.69.ebuild
index b251531b225c..1282cb3788a3 100644
--- a/sys-devel/autoconf/autoconf-2.69.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
 
 LICENSE="GPL-3"
-SLOT=$(usex multislot "${PV}" "2.5")
-IUSE="emacs multislot"
+SLOT="2.5"
+IUSE="emacs"
 
 DEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
 RDEPEND="${DEPEND}
-	multislot? ( !~sys-devel/${P}:0 )
 	>=sys-devel/autoconf-wrapper-13"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 0ddab8e64234..b89934238111 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="emacs"
 DEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
 RDEPEND="${DEPEND}
-	!~sys-devel/${P}:0
+	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"