summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-09 12:35:08 -0500
committerMike Frysinger <vapier@gentoo.org>2016-03-09 13:28:13 -0500
commit607acd6f779d9842161cfaf78baf4f88429adc20 (patch)
treecedabc28601e46de675e4c66188a18a5212d31b9
parentdev-db/oracle-instantclient-jdbc-12: better depend on -basic still (diff)
downloadgentoo-607acd6f779d9842161cfaf78baf4f88429adc20.tar.gz
gentoo-607acd6f779d9842161cfaf78baf4f88429adc20.tar.bz2
gentoo-607acd6f779d9842161cfaf78baf4f88429adc20.zip
sys-devel/autoconf: drop USE=multislot
Adjust the SLOT blockers to match the value that was actually used.
-rw-r--r--sys-devel/autoconf/autoconf-2.59-r7.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.61-r2.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.62-r1.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.63-r1.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.64.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.65-r1.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.67.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.68.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.69-r1.ebuild5
-rw-r--r--sys-devel/autoconf/autoconf-2.69-r2.ebuild39
-rw-r--r--sys-devel/autoconf/autoconf-2.69.ebuild5
-rw-r--r--sys-devel/autoconf/autoconf-9999.ebuild2
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 be4c4ef43ef..de7a2ee550a 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 678aa643eff..57ff1ea0ae4 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 3cf317cb2e7..5b93a32ccdb 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 0c7b04e207d..46089ecb6b9 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 39d8ca444b4..02730194b95 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 c91aedf0dea..8bf915b2c44 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 76f9d744a55..7769a4466f6 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 76f9d744a55..7769a4466f6 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 0f1b5bb5a7e..d8cbfdceb39 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 00000000000..522e9284054
--- /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 b251531b225..1282cb3788a 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 0ddab8e6423..b8993423811 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 )"