diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-09-18 06:48:05 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-09-18 06:48:05 +0000 |
| commit | 5c0c499ee65b16679fb1c3231b19397622501e26 (patch) | |
| tree | 17a71a54258c45dbb46dd8183f69ec5d3d8abbd5 /app-editors | |
| parent | patch c2hs 0.16.3 for ghc 7.6.1 (diff) | |
| download | gentoo-2-5c0c499ee65b16679fb1c3231b19397622501e26.tar.gz gentoo-2-5c0c499ee65b16679fb1c3231b19397622501e26.tar.bz2 gentoo-2-5c0c499ee65b16679fb1c3231b19397622501e26.zip | |
Bootstrapping in src_compile shouldn't be needed, because we already call
eautoreconf in src_prepare. Use lightweight checkout for WORKDIR, bug 434746.
Fix LICENSE to GPL-3+ and FDL-1.3+.
(Portage version: 2.1.11.16/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 2ac6a47c9874..ebf166cfb33e 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.114 2012/09/13 08:41:29 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.115 2012/09/18 06:48:05 ulm Exp $ + + 18 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: + Bootstrapping in src_compile shouldn't be needed, because we already call + eautoreconf in src_prepare. Use lightweight checkout for WORKDIR, bug 434746. + Fix LICENSE to GPL-3+ and FDL-1.3+. 13 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: Upstream has changed the configure option for toolkit selection, gtk diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild index ce876e40b011..d37fffcd491f 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.5 2012/09/13 08:41:29 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.6 2012/09/18 06:48:05 ulm Exp $ EAPI=4 @@ -12,6 +12,7 @@ if [[ ${PV##*.} = 9999 ]]; then EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" # "Nosmart" is much faster for initial branching. EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" + EBZR_WORKDIR_CHECKOUT="t" #434746 inherit bzr SRC_URI="" else @@ -27,7 +28,7 @@ fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="http://www.gnu.org/software/emacs/" -LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" +LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2" SLOT="24" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" @@ -222,11 +223,11 @@ src_configure() { src_compile() { export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - if [[ ${PV##*.} = 9999 ]]; then - emake CC="$(tc-getCC)" bootstrap - # cleanup, otherwise emacs will be dumped again in src_install - (cd src; emake versionclean) - fi + #if [[ ${PV##*.} = 9999 ]]; then + # emake CC="$(tc-getCC)" bootstrap + # # cleanup, otherwise emacs will be dumped again in src_install + # (cd src; emake versionclean) + #fi emake CC="$(tc-getCC)" } |