vapier 15/03/19 23:49:17 Modified: autoconf-2.59-r7.ebuild autoconf-2.65-r1.ebuild autoconf-2.61-r2.ebuild autoconf-2.62-r1.ebuild autoconf-2.13.ebuild autoconf-2.67.ebuild autoconf-2.64.ebuild autoconf-2.63-r1.ebuild autoconf-2.68.ebuild autoconf-9999.ebuild ChangeLog Added: autoconf-2.69-r1.ebuild Log: Copy info page SLOT logic from automake #543730 by Tupone Alfredo. Unify duplicated logic into eblits. Migrate to EAPI=5 for non-default SLOTs. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.23 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.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild?r1=1.22&r2=1.23 Index: autoconf-2.59-r7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- autoconf-2.59-r7.ebuild 3 Dec 2014 05:52:22 -0000 1.22 +++ autoconf-2.59-r7.ebuild 19 Mar 2015 23:49:17 -0000 1.23 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.22 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.23 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" inherit eutils @@ -21,25 +21,13 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + - epatch "${FILESDIR}"/${P}-more-quotes.patch -} - -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 -} - -src_install() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +PATCHES=( + "${FILESDIR}"/${P}-more-quotes.patch +) + +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 ; } 1.14 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.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild?r1=1.13&r2=1.14 Index: autoconf-2.65-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- autoconf-2.65-r1.ebuild 3 Dec 2014 05:52:22 -0000 1.13 +++ autoconf-2.65-r1.ebuild 19 Mar 2015 23:49:17 -0000 1.14 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.13 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.14 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" inherit eutils @@ -21,25 +21,13 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + - epatch "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649 -} - -src_configure() { - # Disable Emacs in the build system since it is in a separate package. - export EMACS=no - 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() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +PATCHES=( + "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649 +) + +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 ; } 1.15 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.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild?r1=1.14&r2=1.15 Index: autoconf-2.61-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- autoconf-2.61-r2.ebuild 3 Dec 2014 05:52:22 -0000 1.14 +++ autoconf-2.61-r2.ebuild 19 Mar 2015 23:49:17 -0000 1.15 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.14 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.15 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" inherit eutils @@ -21,31 +21,19 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + - epatch "${FILESDIR}"/${P}-GETMNTENT.patch -} - -src_configure() { - # Disable Emacs in the build system since it is in a separate package. - export EMACS=no - 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 -} +PATCHES=( + "${FILESDIR}"/${P}-GETMNTENT.patch +) + +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 ; } src_compile() { # From configure output: # Parallel builds via `make -jN' do not work. emake -j1 } - -src_install() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} 1.9 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.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild?r1=1.8&r2=1.9 Index: autoconf-2.62-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- autoconf-2.62-r1.ebuild 3 Dec 2014 05:52:22 -0000 1.8 +++ autoconf-2.62-r1.ebuild 19 Mar 2015 23:49:17 -0000 1.9 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.8 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.9 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" inherit eutils @@ -21,27 +21,15 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -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_configure() { - # Disable Emacs in the build system since it is in a separate package. - export EMACS=no - 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() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +PATCHES=( + "${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825 + "${FILESDIR}"/${P}-at-keywords.patch + "${FILESDIR}"/${P}-fix-multiline-string.patch #217976 +) + +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 ; } 1.25 sys-devel/autoconf/autoconf-2.13.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild?r1=1.24&r2=1.25 Index: autoconf-2.13.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- autoconf-2.13.ebuild 17 Jan 2014 04:23:13 -0000 1.24 +++ autoconf-2.13.ebuild 19 Mar 2015 23:49:17 -0000 1.25 @@ -1,6 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.24 2014/01/17 04:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.25 2015/03/19 23:49:17 vapier Exp $ + +EAPI="5" inherit eutils @@ -19,24 +21,21 @@ RDEPEND="${DEPEND} >=sys-devel/autoconf-wrapper-13" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-destdir.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch #146592 - touch configure # make sure configure is newer than configure.in - - rm -f standards.{texi,info} # binutils installs this infopage +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-destdir.patch + "${FILESDIR}"/${P}-test-fixes.patch #146592 +) + +if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then + source "${FILESDIR}"/eblits/main.eblit || die +fi +src_prepare() { eblit-run src_prepare ; } +src_install() { eblit-run src_install ; } - sed -i \ - -e 's|\* Autoconf:|\* Autoconf v2.1:|' \ - -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \ - autoconf.texi \ - || die "sed failed" -} +src_configure() { + touch configure # make sure configure is newer than configure.in -src_compile() { # need to include --exec-prefix and --bindir or our # DESTDIR patch will trigger sandbox hate :( # @@ -54,15 +53,5 @@ econf \ --exec-prefix=/usr \ --bindir=/usr/bin \ - --program-suffix="-${PV}" \ - || die - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - - dodoc AUTHORS NEWS README TODO ChangeLog ChangeLog.0 ChangeLog.1 - - mv "${D}"/usr/share/info/autoconf{,-${PV}}.info + --program-suffix="-${PV}" } 1.19 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.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild?r1=1.18&r2=1.19 Index: autoconf-2.67.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- autoconf-2.67.ebuild 3 Dec 2014 05:52:22 -0000 1.18 +++ autoconf-2.67.ebuild 19 Mar 2015 23:49:17 -0000 1.19 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.18 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.19 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" @@ -19,24 +19,9 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - 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}" - # econf updates config.{sub,guess} which forces the manpages - # to be regenerated which we dont want to do #146621 - touch man/*.1 -} - -src_install() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +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 ; } 1.10 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.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild?r1=1.9&r2=1.10 Index: autoconf-2.64.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- autoconf-2.64.ebuild 3 Dec 2014 05:52:22 -0000 1.9 +++ autoconf-2.64.ebuild 19 Mar 2015 23:49:17 -0000 1.10 @@ -1,10 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.9 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.10 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" - -inherit eutils +EAPI="5" DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" @@ -21,24 +19,9 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - 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}" - # econf updates config.{sub,guess} which forces the manpages - # to be regenerated which we dont want to do #146621 - touch man/*.1 -} - -src_install() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +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 ; } 1.9 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.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild?r1=1.8&r2=1.9 Index: autoconf-2.63-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- autoconf-2.63-r1.ebuild 3 Dec 2014 05:52:22 -0000 1.8 +++ autoconf-2.63-r1.ebuild 19 Mar 2015 23:49:17 -0000 1.9 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.8 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.9 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" inherit eutils @@ -21,25 +21,13 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + - epatch "${FILESDIR}"/${P}-sh.patch #264303 -} - -src_configure() { - # Disable Emacs in the build system since it is in a separate package. - export EMACS=no - 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() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +PATCHES=( + "${FILESDIR}"/${P}-sh.patch #264303 +) + +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 ; } 1.17 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.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild?r1=1.16&r2=1.17 Index: autoconf-2.68.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- autoconf-2.68.ebuild 3 Dec 2014 05:52:22 -0000 1.16 +++ autoconf-2.68.ebuild 19 Mar 2015 23:49:17 -0000 1.17 @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.16 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.17 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" +EAPI="5" DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html" @@ -19,24 +19,9 @@ !~sys-devel/${P}:0 >=sys-devel/autoconf-wrapper-13" -src_prepare() { - 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}" - # econf updates config.{sub,guess} which forces the manpages - # to be regenerated which we dont want to do #146621 - touch man/*.1 -} - -src_install() { - default - - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done -} +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 ; } 1.17 sys-devel/autoconf/autoconf-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild?r1=1.16&r2=1.17 Index: autoconf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- autoconf-9999.ebuild 3 Dec 2014 05:52:22 -0000 1.16 +++ autoconf-9999.ebuild 19 Mar 2015 23:49:17 -0000 1.17 @@ -1,10 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.16 2014/12/03 05:52:22 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.17 2015/03/19 23:49:17 vapier Exp $ -EAPI="4" - -inherit eutils +EAPI="5" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git @@ -33,27 +31,18 @@ [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" PDEPEND="emacs? ( app-emacs/autoconf-mode )" -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - autoreconf -f -i || die - fi - 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 updates config.{sub,guess} which forces the manpages - # to be regenerated which we dont want to do #146621 - touch man/*.1 -} - -src_install() { - default +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 ; } + +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 - local f - for f in "${ED}"/usr/share/info/*.info* ; do - mv "${f}" "${f/.info/-${SLOT}.info}" || die - done + autoreconf -f -i || die } 1.195 sys-devel/autoconf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?rev=1.195&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?rev=1.195&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/ChangeLog?r1=1.194&r2=1.195 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- ChangeLog 3 Dec 2014 05:52:22 -0000 1.194 +++ ChangeLog 19 Mar 2015 23:49:17 -0000 1.195 @@ -1,6 +1,18 @@ # 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.194 2014/12/03 05:52:22 heroxbd Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.195 2015/03/19 23:49:17 vapier Exp $ + +*autoconf-2.69-r1 (19 Mar 2015) + + 19 Mar 2015; Mike Frysinger <vap...@gentoo.org> +autoconf-2.69-r1.ebuild, + +files/eblits/main.eblit, +files/eblits/src_configure.eblit, + +files/eblits/src_install.eblit, +files/eblits/src_prepare.eblit, + autoconf-2.13.ebuild, 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-9999.ebuild: + Copy info page SLOT logic from automake #543730 by Tupone Alfredo. Unify + duplicated logic into eblits. Migrate to EAPI=5 for non-default SLOTs. 03 Dec 2014; Benda Xu <hero...@gentoo.org> autoconf-2.59-r7.ebuild, autoconf-2.61-r2.ebuild, autoconf-2.62-r1.ebuild, autoconf-2.63-r1.ebuild, 1.1 sys-devel/autoconf/autoconf-2.69-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.69-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/autoconf/autoconf-2.69-r1.ebuild?rev=1.1&content-type=text/plain Index: autoconf-2.69-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69-r1.ebuild,v 1.1 2015/03/19 23:49:17 vapier Exp $ EAPI="4" # For usex. inherit eutils if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git http://git.savannah.gnu.org/r/${PN}.git" 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="http://www.gnu.org/software/autoconf/autoconf.html" LICENSE="GPL-3" SLOT=$(usex multislot "${PV}" "2.5") IUSE="emacs multislot" 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 )" 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 ; }