From: Hans de Graaff Date: Sat, 9 Dec 2006 15:52:18 +0000 (+0000) Subject: Fix bug 23852 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7af4bf90487c53bde8c2cb059fb9f62a132a6b7f;p=gentoo.git Fix bug 23852 Package-Manager: portage-2.1.1-r2 --- diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog index 62006cf7ed2e..d0a8e0e439a1 100644 --- a/app-editors/xemacs/ChangeLog +++ b/app-editors/xemacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/xemacs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.68 2006/12/09 14:53:05 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.69 2006/12/09 15:52:18 graaff Exp $ + + 09 Dec 2006; Hans de Graaff xemacs-21.4.19-r1.ebuild: + Rewrite UI configuration options; fixes #23852. 09 Dec 2006; Hans de Graaff -files/xemacs-21.4.15-gdbm.patch, +files/xemacs-21.4.19-texi.patch, diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index dcaa8e6ea455..5932a7a7769e 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -25,18 +25,18 @@ EBUILD xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f MD5 8b1f6863027886f7a8fc5accd066d487 xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f6 xemacs-21.4.17.ebuild 5055 SHA256 2dab6dff04290d0aa17cd38648c9ca65c13a5129459c35d22b6fa95d5a789590 xemacs-21.4.17.ebuild 5055 -EBUILD xemacs-21.4.19-r1.ebuild 5732 RMD160 81e38fb2168a39613fc1d095d0a9a8e0e5cce3dd SHA1 5dacdedc62ee749ca0196323279284fa189a5a53 SHA256 edf7b1952036d5a223f681f8e9f8516e50602bd8fe21ded3d96940f4cf75cfd7 -MD5 9924c44c954ef6de0cba46d6d3209fee xemacs-21.4.19-r1.ebuild 5732 -RMD160 81e38fb2168a39613fc1d095d0a9a8e0e5cce3dd xemacs-21.4.19-r1.ebuild 5732 -SHA256 edf7b1952036d5a223f681f8e9f8516e50602bd8fe21ded3d96940f4cf75cfd7 xemacs-21.4.19-r1.ebuild 5732 +EBUILD xemacs-21.4.19-r1.ebuild 5603 RMD160 cccb2ccc6e0c676c56411858b73352a91d68dee1 SHA1 ea6f9866354812b39a0c2ff98884c63b9058ac8e SHA256 7fdff922820219cacd1f78b6f9342591b4257d052e8dea9819879f4704906068 +MD5 140403ad902363df2dba393619356fd0 xemacs-21.4.19-r1.ebuild 5603 +RMD160 cccb2ccc6e0c676c56411858b73352a91d68dee1 xemacs-21.4.19-r1.ebuild 5603 +SHA256 7fdff922820219cacd1f78b6f9342591b4257d052e8dea9819879f4704906068 xemacs-21.4.19-r1.ebuild 5603 EBUILD xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 SHA1 8f7acdc0032b170626d226bccd0f30380c493fb7 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 MD5 37b66f3a6be83ba0305333ccaa9f13b1 xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 xemacs-21.4.19.ebuild 5255 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 xemacs-21.4.19.ebuild 5255 -MISC ChangeLog 12721 RMD160 d4e80f0e1f3093707532ee13a31b6cff2db837f0 SHA1 fd3afef999ad8e693437b0c46278b78c8c334a31 SHA256 f88ac73a60e8d7d962aed6dd0b122dd5a7a58af82a4cb5334d334cbd54177b94 -MD5 07ab9273e7cbbece27edd9a27b097d45 ChangeLog 12721 -RMD160 d4e80f0e1f3093707532ee13a31b6cff2db837f0 ChangeLog 12721 -SHA256 f88ac73a60e8d7d962aed6dd0b122dd5a7a58af82a4cb5334d334cbd54177b94 ChangeLog 12721 +MISC ChangeLog 12848 RMD160 f5dff7141db769d22d057e0d2c9581d4572afce7 SHA1 06957c89dc4fc7c47148b7ff23ef8d7ba1131c25 SHA256 748b6a5b958d2f8f751020fa9c5044361ac1cd1b13273dbd8ca01d83bab12d54 +MD5 bc52312d59330755e758b3155adafa41 ChangeLog 12848 +RMD160 f5dff7141db769d22d057e0d2c9581d4572afce7 ChangeLog 12848 +SHA256 748b6a5b958d2f8f751020fa9c5044361ac1cd1b13273dbd8ca01d83bab12d54 ChangeLog 12848 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365 diff --git a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild index ce62f4950506..e947b0987cc8 100644 --- a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild +++ b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19-r1.ebuild,v 1.2 2006/12/09 14:53:05 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19-r1.ebuild,v 1.3 2006/12/09 15:52:18 graaff Exp $ export WANT_AUTOCONF="2.1" inherit autotools eutils @@ -70,10 +70,10 @@ src_compile() { if use X; then - myconf="--with-widgets=lucid" - myconf="${myconf} --with-dialogs=lucid" - myconf="${myconf} --with-scrollbars=lucid" + myconf="${myconf} --with-widgets=athena" + myconf="${myconf} --with-dialogs=athena" myconf="${myconf} --with-menubars=lucid" + myconf="${myconf} --with-scrollbars=lucid" if use motif ; then myconf="--with-widgets=motif" myconf="${myconf} --with-dialogs=motif" @@ -81,17 +81,15 @@ src_compile() { myconf="${myconf} --with-menubars=lucid" fi if use athena ; then - myconf="--with-widgets=athena" - if use Xaw3d ; then - myconf="${myconf} --with-athena=xaw3d" - elif use neXt ; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=3d" - fi - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-scrollbars=lucid" - myconf="${myconf} --with-menubars=lucid" + myconf="--with-scrollbars=athena" + fi + + if use Xaw3d; then + myconf="${myconf} --with-athena=3d" + elif use neXt; then + myconf="${myconf} --with-athena=next" + else + myconf="${myconf} --with-athena=xaw" fi use dnd && myconf="${myconf} --with-dragndrop --with-offix"