diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-01-31 20:33:26 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-01-31 20:33:26 +0000 |
| commit | ed1a8f4a0c062bcb01af6687ca41743685a603ce (patch) | |
| tree | 04a84873a877fb8db8a47a344d1ba7dddffe93d5 /app-editors/emacs | |
| parent | Version bump wrt #353082 by Kevin McCarthy. (diff) | |
| download | historical-ed1a8f4a0c062bcb01af6687ca41743685a603ce.tar.gz historical-ed1a8f4a0c062bcb01af6687ca41743685a603ce.tar.bz2 historical-ed1a8f4a0c062bcb01af6687ca41743685a603ce.zip | |
Add explicit --without-ns configure option.
Package-Manager: portage-2.1.9.35/cvs/Linux x86_64
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 10 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.2-r3.ebuild | 18 |
3 files changed, 18 insertions, 15 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 3f33a560699b..b716b7d14475 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.406 2011/01/30 08:42:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.407 2011/01/31 20:33:26 ulm Exp $ + + 31 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild: + Add explicit --without-ns configure option. *emacs-23.2-r3 (30 Jan 2011) *emacs-22.3-r7 (30 Jan 2011) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index c12115637b07..8a791c97f53e 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -18,13 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5014 RMD160 b598a01d292f0652d3d580705970c626a3e84b3 EBUILD emacs-22.3-r6.ebuild 8052 RMD160 444100251b38e4c011889290c70e1e1d0a29416c SHA1 cd5d8ab44f1a1244e6790aef831140dc42604216 SHA256 b7af827b7bae26adffb6e0df84fd12a9f60fcf0238a24f3b307b93a9d591a17d EBUILD emacs-22.3-r7.ebuild 7921 RMD160 99995e7d9afa7894882d7974ebac51071f5a939d SHA1 0fa1f3b98c80c4702ceeb6c0d05e64a3dd2b829d SHA256 059c350fe008259a97e5a15de2b1ab885c67a35e577f13cb6f2adcdf0cb32e6a EBUILD emacs-23.2-r2.ebuild 10008 RMD160 47d6ab99e7483fe18a7fece0a31f1f0ad19fdfef SHA1 57367184d44c8e170f3186cf84c007a4d9be7fd3 SHA256 44fd93a28deb705d0cdbf741bb3ce65ae0c6bdc1b06d147b76abf085cd1cc4f9 -EBUILD emacs-23.2-r3.ebuild 10943 RMD160 0b8e10c781a304adcfff4b64cbef00c0d84a0936 SHA1 4e99f85846fa7ea112e124c9e567d469f2ed547e SHA256 c0225449815667f609ef517f5bce57013913924b7218890860114a812000c4f5 -MISC ChangeLog 58001 RMD160 800f1bc1e2a1e3a57b3ce4d5c20f2917c9bbb6a0 SHA1 0266b96f85ba9fb79b868546603bb82f137bd8c3 SHA256 deb7e6bcb61783f3009b15e096682d394238e30ba1fc33cbabef0b6ad4c2de3b +EBUILD emacs-23.2-r3.ebuild 10969 RMD160 4a32ccdea6de628d28c2a55a8533b119c677ce1a SHA1 84bd7210002fbb28a7965fb6a6c22562a5991ee6 SHA256 830f56650f895bae6434159435a664bad48892cb2ed8c640eaac74bb9a533c7c +MISC ChangeLog 58117 RMD160 61376c0e5816b5b749fe1126208fc04fbca48f17 SHA1 f333a77cc3c5bd78d71aec8e55381c4456bcd49a SHA256 2838b9909822fb876e7ad9fd99f922a999c4576c5042400cadc4db6f6e79ed83 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1FJasACgkQOeoy/oIi7uyFBwCg6ppCcuRkwFef4cJM6eCMpyp7 -uJsAnRRQgEjGBmP/ECNeLSdUxoOnUHD3 -=i+cP +iEYEARECAAYFAk1HHegACgkQOeoy/oIi7uwfAgCgz5ss88l3YaOWvgbob6iNWQjM +rSoAniv5H96Z63rNtdNwnBxbpumTVEKO +=J4rq -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild index 6cb259415fd8..aad8cfbabaa1 100644 --- a/app-editors/emacs/emacs-23.2-r3.ebuild +++ b/app-editors/emacs/emacs-23.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.2 2011/01/31 20:33:26 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -141,13 +141,8 @@ src_configure() { myconf="${myconf} $(use_with sound)" fi - if use aqua; then - einfo "Configuring to build with Cocoa support" - use X && ewarn "aqua USE flag disables X." - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - elif use X; then - myconf="${myconf} --with-x" + if use X; then + myconf="${myconf} --with-x --without-ns" myconf="${myconf} $(use_with gconf)" myconf="${myconf} $(use_with toolkit-scroll-bars)" myconf="${myconf} $(use_with gif) $(use_with jpeg)" @@ -188,8 +183,13 @@ src_configure() { && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" tk="${tk}${tk:+ }${f}" done - else + elif use aqua; then + einfo "Configuring to build with Cocoa support" + use X && ewarn "aqua USE flag disables X." + myconf="${myconf} --with-ns --disable-ns-self-contained" myconf="${myconf} --without-x" + else + myconf="${myconf} --without-x --without-ns" fi myconf="${myconf} $(use_with hesiod)" |