commit: 607acd6f779d9842161cfaf78baf4f88429adc20
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 17:35:08 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 18:28:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607acd6f
sys-devel/autoconf: drop USE=multislot
Adjust the SLOT blockers to match the value that was actually used.
sys-devel/autoconf/autoconf-2.59-r7.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.61-r2.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.62-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.63-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.64.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.65-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.67.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.68.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.69-r1.ebuild | 5 ++---
.../{autoconf-9999.ebuild => autoconf-2.69-r2.ebuild} | 13 ++-----------
sys-devel/autoconf/autoconf-2.69.ebuild | 5 ++---
sys-devel/autoconf/autoconf-9999.ebuild | 2 +-
12 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
index be4c4ef..de7a2ee 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 678aa64..57ff1ea 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 3cf317c..5b93a32 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 0c7b04e..46089ec 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 39d8ca4..0273019 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 c91aedf..8bf915b 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 76f9d74..7769a44 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 76f9d74..7769a44 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 0f1b5bb..d8cbfdc 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-9999.ebuild
b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
similarity index 78%
copy from sys-devel/autoconf/autoconf-9999.ebuild
copy to sys-devel/autoconf/autoconf-2.69-r2.ebuild
index 0ddab8e..522e928 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -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 )"
@@ -37,12 +37,3 @@ fi
src_prepare() { eblit-run src_prepare ; }
src_configure() { eblit-run src_configure ; }
src_install() { eblit-run src_install ; }
-
-eblit-src_prepare-pre() {
- # Avoid the "dirty" suffix in the git version by generating it
- # before we run later stages which might modify source files.
- local ver=$(./build-aux/git-version-gen .tarball-version)
- echo "${ver}" > .tarball-version
-
- autoreconf -f -i || die
-}
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild
b/sys-devel/autoconf/autoconf-2.69.ebuild
index b251531..1282cb3 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 0ddab8e..b899342 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 )"
