diff options
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild | 9 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild | 9 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 9 |
4 files changed, 21 insertions, 13 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index d7a4ef4b150a..f0b627eeebff 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.205 2008/05/15 15:31:11 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.206 2008/06/01 11:33:58 ulm Exp $ + + 01 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild, + emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild: + Cleanup after bootstrapping, to prevent dumping emacs again in src_install. + Depend on x11-libs/openmotif explicitely for USE=motif. 28 Mar 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild, emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild: diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild index d58e118765d5..59ab367fa4d4 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.5 2008/04/22 17:49:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.6 2008/06/01 11:33:58 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -43,9 +43,7 @@ RDEPEND="sys-libs/ncurses gtk? ( =x11-libs/gtk+-2* ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( - motif? ( virtual/motif ) - ) + !Xaw3d? ( motif? ( x11-libs/openmotif ) ) ) )" @@ -159,6 +157,9 @@ src_compile() { ${myconf} || die "econf emacs failed" emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" + # cleanup, otherwise emacs will be dumped again in src_install + (cd src; emake versionclean) + emake CC="$(tc-getCC)" || die "emake failed" } src_install () { diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild index 77030432236c..4dfc9d322af6 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.7 2008/04/22 17:49:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.8 2008/06/01 11:33:58 ulm Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -40,9 +40,7 @@ RDEPEND="sys-libs/ncurses gtk? ( =x11-libs/gtk+-2* ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( - motif? ( virtual/motif ) - ) + !Xaw3d? ( motif? ( x11-libs/openmotif ) ) ) )" @@ -144,6 +142,9 @@ src_compile() { ${myconf} || die "econf emacs failed" emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" + # cleanup, otherwise emacs will be dumped again in src_install + (cd src; emake versionclean) + emake CC="$(tc-getCC)" || die "emake failed" } src_install () { diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index f512b9b2c12b..cca490b309ca 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.4 2008/04/22 17:49:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.5 2008/06/01 11:33:58 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -56,9 +56,7 @@ RDEPEND="sys-libs/ncurses gtk? ( =x11-libs/gtk+-2* ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( - motif? ( virtual/motif ) - ) + !Xaw3d? ( motif? ( x11-libs/openmotif ) ) ) )" @@ -179,6 +177,9 @@ src_compile() { ${myconf} || die "econf emacs failed" emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" + # cleanup, otherwise emacs will be dumped again in src_install + (cd src; emake versionclean) + emake CC="$(tc-getCC)" || die "emake failed" } src_install () { |