diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-06-04 12:26:51 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-06-04 12:26:51 +0000 |
commit | 4c40dd2cb16e2f9449ef682b9b02356abb023fbb (patch) | |
tree | 125088b64265459ea1c739e5047126fb47f1a68a /app-editors/emacs | |
parent | Remove intermediate version. (diff) | |
download | gentoo-2-4c40dd2cb16e2f9449ef682b9b02356abb023fbb.tar.gz gentoo-2-4c40dd2cb16e2f9449ef682b9b02356abb023fbb.tar.bz2 gentoo-2-4c40dd2cb16e2f9449ef682b9b02356abb023fbb.zip |
Warn about inconsistent toolkit USE flags.
(Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r4 Intel(R) Pentium(R) M processor 1.73GHz)
Diffstat (limited to 'app-editors/emacs')
-rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/emacs/emacs-21.4-r17.ebuild | 5 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.1-r4.ebuild | 16 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.2-r2.ebuild | 10 |
4 files changed, 30 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 2aa1a9090402..575e92bb0ece 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.259 2008/06/01 11:49:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.260 2008/06/04 12:26:51 ulm Exp $ + + 04 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r17.ebuild, + emacs-22.1-r4.ebuild, emacs-22.2-r2.ebuild: + Warn about inconsistent toolkit USE flags. 01 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r15.ebuild, emacs-21.4-r17.ebuild, emacs-22.1-r4.ebuild, emacs-22.2-r2.ebuild: diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild index 49f64336901d..a8c2e43537be 100644 --- a/app-editors/emacs/emacs-21.4-r17.ebuild +++ b/app-editors/emacs/emacs-21.4-r17.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/emacs-21.4-r17.ebuild,v 1.8 2008/06/01 11:49:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.9 2008/06/04 12:26:51 ulm Exp $ WANT_AUTOCONF="2.1" @@ -84,9 +84,12 @@ src_compile() { --with-tiff --with-gif --with-png" + if use Xaw3d ; then einfo "Configuring to build with Xaw3d (Athena) toolkit" myconf="${myconf} --with-x-toolkit=athena" + use motif \ + && ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")" elif use motif ; then einfo "Configuring to build with Motif toolkit" myconf="${myconf} --with-x-toolkit=motif" diff --git a/app-editors/emacs/emacs-22.1-r4.ebuild b/app-editors/emacs/emacs-22.1-r4.ebuild index 4209a7f4ab4e..889655f2f706 100644 --- a/app-editors/emacs/emacs-22.1-r4.ebuild +++ b/app-editors/emacs/emacs-22.1-r4.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/emacs-22.1-r4.ebuild,v 1.3 2008/06/01 11:49:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r4.ebuild,v 1.4 2008/06/04 12:26:51 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" @@ -134,6 +134,14 @@ src_compile() { myconf="${myconf} --with-x-toolkit=no" myconf="${myconf} --without-gtk" fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done else myconf="${myconf} --without-x" fi @@ -218,12 +226,12 @@ emacs-infodir-rebuild() { } pkg_postinst() { - test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || - cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el + [ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \ + || cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el local f for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - test -e "${f}" || touch "${f}" + [ -e "${f}" ] || touch "${f}" done elisp-site-regen diff --git a/app-editors/emacs/emacs-22.2-r2.ebuild b/app-editors/emacs/emacs-22.2-r2.ebuild index b05626640c7d..1117bfda66c3 100644 --- a/app-editors/emacs/emacs-22.2-r2.ebuild +++ b/app-editors/emacs/emacs-22.2-r2.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/emacs-22.2-r2.ebuild,v 1.8 2008/06/01 11:49:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r2.ebuild,v 1.9 2008/06/04 12:26:51 ulm Exp $ inherit autotools elisp-common eutils flag-o-matic @@ -132,6 +132,14 @@ src_compile() { myconf="${myconf} --with-x-toolkit=no" myconf="${myconf} --without-gtk" fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done else myconf="${myconf} --without-x" fi |