vapier 14/10/24 21:14:20 Modified: autoconf-2.59-r7.ebuild autoconf-2.65-r1.ebuild autoconf-2.61-r2.ebuild autoconf-2.62-r1.ebuild autoconf-2.67.ebuild autoconf-2.64.ebuild autoconf-2.63-r1.ebuild autoconf-2.68.ebuild autoconf-2.69.ebuild ChangeLog Log: Upgrade old ebuilds to EAPI=4 and enable SLOTing all the time. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.21 sys-devel/autoconf/autoconf-2.59-r7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild?r1=1.20&r2=1.21 Index: autoconf-2.59-r7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- autoconf-2.59-r7.ebuild 17 Jan 2014 04:23:13 -0000 1.20 +++ autoconf-2.59-r7.ebuild 24 Oct 2014 21:14:20 -0000 1.21 @@ -1,6 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.20 2014/01/17 04:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.21 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils @@ -9,42 +11,35 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND="=sys-devel/m4-1.4* dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + epatch "${FILESDIR}"/${P}-more-quotes.patch } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no econf --program-suffix="-${PV}" || die # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 - emake || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.12 sys-devel/autoconf/autoconf-2.65-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild?r1=1.11&r2=1.12 Index: autoconf-2.65-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- autoconf-2.65-r1.ebuild 17 Jan 2014 04:23:13 -0000 1.11 +++ autoconf-2.65-r1.ebuild 24 Oct 2014 21:14:20 -0000 1.12 @@ -1,51 +1,45 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.11 2014/01/17 04:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.12 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 - ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + epatch "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649 } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 - emake || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.13 sys-devel/autoconf/autoconf-2.61-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild?r1=1.12&r2=1.13 Index: autoconf-2.61-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- autoconf-2.61-r2.ebuild 17 Jan 2014 04:23:13 -0000 1.12 +++ autoconf-2.61-r2.ebuild 24 Oct 2014 21:14:20 -0000 1.13 @@ -1,52 +1,51 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.12 2014/01/17 04:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.13 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + epatch "${FILESDIR}"/${P}-GETMNTENT.patch } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 +} + +src_compile() { # From configure output: # Parallel builds via `make -jN' do not work. - emake -j1 || die + emake -j1 } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.7 sys-devel/autoconf/autoconf-2.62-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild?r1=1.6&r2=1.7 Index: autoconf-2.62-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- autoconf-2.62-r1.ebuild 16 Aug 2014 05:06:53 -0000 1.6 +++ autoconf-2.62-r1.ebuild 24 Oct 2014 21:14:20 -0000 1.7 @@ -1,52 +1,47 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.6 2014/08/16 05:06:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.7 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + epatch "${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825 epatch "${FILESDIR}"/${P}-at-keywords.patch epatch "${FILESDIR}"/${P}-fix-multiline-string.patch #217976 } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 - emake || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.17 sys-devel/autoconf/autoconf-2.67.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild?r1=1.16&r2=1.17 Index: autoconf-2.67.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- autoconf-2.67.ebuild 24 Oct 2014 19:23:59 -0000 1.16 +++ autoconf-2.67.ebuild 24 Oct 2014 21:14:20 -0000 1.17 @@ -1,58 +1,42 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.16 2014/10/24 19:23:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.17 2014/10/24 21:14:20 vapier Exp $ -EAPI="2" - -inherit eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git" - inherit git-2 -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 - ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -fi +EAPI="4" DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" -SLOT=$(usex multislot "${PV}" "2.5") -IUSE="emacs multislot" +SLOT="${PV}" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" src_prepare() { - if [[ ${PV} == "9999" ]] ; then - autoreconf -f -i || die - fi - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + } src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.8 sys-devel/autoconf/autoconf-2.64.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild?r1=1.7&r2=1.8 Index: autoconf-2.64.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- autoconf-2.64.ebuild 16 Aug 2014 05:06:53 -0000 1.7 +++ autoconf-2.64.ebuild 24 Oct 2014 21:14:20 -0000 1.8 @@ -1,50 +1,44 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.7 2014/08/16 05:06:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.8 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 - ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-2" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 - emake || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.7 sys-devel/autoconf/autoconf-2.63-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild?r1=1.6&r2=1.7 Index: autoconf-2.63-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- autoconf-2.63-r1.ebuild 17 Jan 2014 04:23:13 -0000 1.6 +++ autoconf-2.63-r1.ebuild 24 Oct 2014 21:14:20 -0000 1.7 @@ -1,50 +1,45 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.6 2014/01/17 04:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.7 2014/10/24 21:14:20 vapier Exp $ + +EAPI="4" inherit eutils DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2" -SLOT=$(usex multislot "${PV}" "2.5") +SLOT="${PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="emacs multislot" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_unpack() { - unpack ${A} - cd "${S}" - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + +src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + epatch "${FILESDIR}"/${P}-sh.patch #264303 } -src_compile() { +src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 - emake || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.15 sys-devel/autoconf/autoconf-2.68.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild?r1=1.14&r2=1.15 Index: autoconf-2.68.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- autoconf-2.68.ebuild 24 Oct 2014 19:23:59 -0000 1.14 +++ autoconf-2.68.ebuild 24 Oct 2014 21:14:20 -0000 1.15 @@ -1,58 +1,42 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.14 2014/10/24 19:23:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.15 2014/10/24 21:14:20 vapier Exp $ -EAPI="2" - -inherit eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git" - inherit git-2 -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 - ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -fi +EAPI="4" DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" -SLOT=$(usex multislot "${PV}" "2.5") -IUSE="emacs multislot" +SLOT="${PV}" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" DEPEND=">=sys-devel/m4-1.4.6 dev-lang/perl" RDEPEND="${DEPEND} + !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" src_prepare() { - if [[ ${PV} == "9999" ]] ; then - autoreconf -f -i || die - fi - use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + } src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + econf --program-suffix="-${PV}" # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README TODO THANKS \ - ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2 - - if use multislot ; then - local f - for f in "${D}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done - fi + default + + local f + for f in "${D}"/usr/share/info/*.info* ; do + mv "${f}" "${f/.info/-${SLOT}.info}" || die + done } 1.20 sys-devel/autoconf/autoconf-2.69.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild?r1=1.19&r2=1.20 Index: autoconf-2.69.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- autoconf-2.69.ebuild 24 Oct 2014 19:23:59 -0000 1.19 +++ autoconf-2.69.ebuild 24 Oct 2014 21:14:20 -0000 1.20 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.19 2014/10/24 19:23:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.20 2014/10/24 21:14:20 vapier Exp $ EAPI="3" @@ -26,6 +26,7 @@ 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 )" 1.192 sys-devel/autoconf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?rev=1.192&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?rev=1.192&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?r1=1.191&r2=1.192 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- ChangeLog 24 Oct 2014 19:23:59 -0000 1.191 +++ ChangeLog 24 Oct 2014 21:14:20 -0000 1.192 @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/autoconf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.191 2014/10/24 19:23:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.192 2014/10/24 21:14:20 vapier Exp $ + + 24 Oct 2014; Mike Frysinger <vap...@gentoo.org> autoconf-2.59-r7.ebuild, + autoconf-2.61-r2.ebuild, autoconf-2.62-r1.ebuild, autoconf-2.63-r1.ebuild, + autoconf-2.64.ebuild, autoconf-2.65-r1.ebuild, autoconf-2.67.ebuild, + autoconf-2.68.ebuild, autoconf-2.69.ebuild: + Upgrade old ebuilds to EAPI=4 and enable SLOTing all the time. 24 Oct 2014; Mike Frysinger <vap...@gentoo.org> autoconf-2.67.ebuild, autoconf-2.68.ebuild, autoconf-2.69.ebuild, autoconf-9999.ebuild: