diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2004-09-23 04:45:55 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2004-09-23 04:45:55 +0000 |
| commit | 3dedd7cc341eca45f8e942bb78ad7a4cc0bd3a20 (patch) | |
| tree | 1b321b0165e6dc0ccddf0c8fb499829d5c8ef25c /app-editors | |
| parent | security stable (diff) | |
| download | historical-3dedd7cc341eca45f8e942bb78ad7a4cc0bd3a20.tar.gz historical-3dedd7cc341eca45f8e942bb78ad7a4cc0bd3a20.tar.bz2 historical-3dedd7cc341eca45f8e942bb78ad7a4cc0bd3a20.zip | |
Filtered out -O[3-9] if gcc-3.4 detected; bug #64832, bug #64790 and bug #64286.
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 6 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.3-r3.ebuild | 11 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.3-r4.ebuild | 9 |
4 files changed, 24 insertions, 9 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index c1a0b64c11fa..f0daa0a450bc 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.34 2004/09/07 14:29:18 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.35 2004/09/23 04:45:55 usata Exp $ + + 23 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r3.ebuild, + emacs-21.3-r4.ebuild: + Filtered out -O[3-9] if gcc-3.4 detected; bug #64832, bug #64790 + and bug #64286. 07 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r4.ebuild: Added nosendmail USE flag. This closes bug #11104. diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index fa5d342d7f85..c300e9106065 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,11 +1,11 @@ -MD5 69445a7d53d607e7b5ba4666aa998229 ChangeLog 5223 +MD5 dcb0994facee7a90c96190bda50d7da3 ChangeLog 5404 MD5 815768d41e602e71dd2e51d9f336796f emacs-21.1-r4.ebuild 2139 MD5 2a994cbeab581cade6f48cfd07ce4230 emacs-21.2-r2.ebuild 1828 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 MD5 7d975de4f15aed0d378b05aac474de1d emacs-21.3-r2.ebuild 2189 MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002 -MD5 c2e92c0988b4afc7a81ed1b6b6e12f8f emacs-21.3-r3.ebuild 2356 -MD5 ed9f56ad5e7837ada9dc548520e183d7 emacs-21.3-r4.ebuild 3079 +MD5 68b2319adc5108e55d2bd6c39e8b272a emacs-21.3-r3.ebuild 2517 +MD5 26c8804e7f98cba805dab963a4d4af26 emacs-21.3-r4.ebuild 3242 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126 diff --git a/app-editors/emacs/emacs-21.3-r3.ebuild b/app-editors/emacs/emacs-21.3-r3.ebuild index f6d19c3eb9b4..0c656e8e0b63 100644 --- a/app-editors/emacs/emacs-21.3-r3.ebuild +++ b/app-editors/emacs/emacs-21.3-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.7 2004/07/04 14:15:47 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.8 2004/09/23 04:45:55 usata Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils gcc DESCRIPTION="An incredibly powerful, extensible text editor" HOMEPAGE="http://www.gnu.org/software/emacs" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc -alpha arm -hppa ~amd64 -ia64 ~s390" +KEYWORDS="x86 ppc ~sparc -alpha arm -hppa ~amd64 -ia64 ~s390" IUSE="X nls motif leim gnome Xaw3d lesstif" RDEPEND="sys-libs/ncurses @@ -43,6 +43,11 @@ src_compile() { # -fstack-protector gets internal compiler error at xterm.c (bug 33265) filter-flags -fstack-protector + # gcc 3.4 with -O3 or stronger flag spoils emacs + if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then + replace-flags -O[3-9] -O2 + fi + epatch ${FILESDIR}/${P}-amd64.patch epatch ${FILESDIR}/${P}-hppa.patch diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild index cef032e276d7..dc7b41898feb 100644 --- a/app-editors/emacs/emacs-21.3-r4.ebuild +++ b/app-editors/emacs/emacs-21.3-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.4 2004/09/07 14:29:18 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.5 2004/09/23 04:45:55 usata Exp $ -inherit flag-o-matic eutils alternatives +inherit flag-o-matic eutils alternatives gcc DESCRIPTION="An incredibly powerful, extensible text editor" HOMEPAGE="http://www.gnu.org/software/emacs" @@ -44,6 +44,11 @@ src_compile() { # -fstack-protector gets internal compiler error at xterm.c (bug 33265) filter-flags -fstack-protector + # gcc 3.4 with -O3 or stronger flag spoils emacs + if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then + replace-flags -O[3-9] -O2 + fi + epatch ${FILESDIR}/${P}-amd64.patch epatch ${FILESDIR}/${P}-hppa.patch use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch |