sys-devel/autoconf: drop USE=multislot

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

diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
index be4c4ef43ef128024be38b522824c89a778f5f8f..de7a2ee550a1b1e0cd098a2bc05fe19964ca8bb4 100644 (file)
--- 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 678aa643eff259c03d15260d71eb543f89e7ec6b..57ff1ea0ae4329e5ef67dc873e7e46c442f54ada 100644 (file)
--- 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 3cf317cb2e712ae35895b0cc15b6b0991f23cf0b..5b93a32ccdb9728e8ee7e7d88b9138ba8096480b 100644 (file)
--- 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 0c7b04e207d785f62487a36bbddafd517a3f6fb7..46089ecb6b9e63fe0de74d6e04386687e9ce9554 100644 (file)
--- 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 39d8ca444b4ca7bd05baf4cce2c344c91307908b..02730194b9504a81909a1b629168ec2eae531dda 100644 (file)
--- 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 c91aedf0dead17f888c69a16ab81c75af9a45d22..8bf915b2c44c705ffa37545ab1d7a4e1794b4435 100644 (file)
--- 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 76f9d744a5583d48ba5b6573d9ecc1ad6c87d266..7769a4466f616fa95634c08b0e7bd9c6e9c3319c 100644 (file)
--- 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 76f9d744a5583d48ba5b6573d9ecc1ad6c87d266..7769a4466f616fa95634c08b0e7bd9c6e9c3319c 100644 (file)
--- 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 0f1b5bb5a7e13b3d63304a686c61514669843a39..d8cbfdceb39d5e41ef0bd0e2b19503e05569150e 100644 (file)
--- 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 (file)
index 0000000..522e928
--- /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 b251531b225c1924bf30258777a43bdc54c06a57..1282cb3788a30b36191c3bd7a8a6f5d46ee9ef7c 100644 (file)
--- 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 0ddab8e642348becac42bceefe94e3fb148dd37c..b89934238111d741ab3250bf1ec50aeafc7782d7 100644 (file)
--- 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 )"