Filter -fstack-protector, closing bug #33265

8 files changed, 21 insertions, 180 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index f20c5d0e7b64..7315762e5042 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.15 2003/10/01 11:39:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.16 2003/12/01 06:24:23 usata Exp $
+
+  01 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r1.ebuild:
+  Filter -fstack-protector that causes internal compiler error at xterm.c
+  Closing bug #33265
 
   31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> emacs-21.3-r1.ebuild:
   stable on alpha
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 438d0d23b6a4..a11ae50924ea 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,15 +1,12 @@
-MD5 2037bea8edc9ebf7a8875e342f144043 ChangeLog 2184
+MD5 58921185e34ed5c28deed4dd8e7b89ec ChangeLog 2352
 MD5 67cf7c0e0c11a91a851438ca6bc338ed emacs-21.1-r4.ebuild 2206
-MD5 704db8d0115b42b3b4361f7d40bebd2f emacs-21.2-r1.ebuild 1836
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 4ae3960b78145e7aa8799fbf5b0dd8af emacs-21.2-r2.ebuild 1895
-MD5 c4ccc1e9d1b36d0e8b28273d667e6175 emacs-21.2.ebuild 1720
+MD5 225ebbe74357ca0f11899a14a90834ce emacs-21.3-r1.ebuild 2174
 MD5 34ccf078929416d842ed532f0d5833af emacs-21.3.ebuild 2048
-MD5 d84405df14671c1a8707dea86d2f5ca0 emacs-21.3-r1.ebuild 2051
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
-MD5 b3712a5ad117f8239ed6df12d6873075 files/digest-emacs-21.2 64
-MD5 b3712a5ad117f8239ed6df12d6873075 files/digest-emacs-21.2-r1 64
 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
-MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3 126
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 c196c1f14bc7e319f1dadb065f39bbfb files/digest-emacs-21.3-r1 323
+MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
diff --git a/app-editors/emacs/emacs-21.2-r1.ebuild b/app-editors/emacs/emacs-21.2-r1.ebuild
deleted file mode 100644
index 5e101036a405..000000000000
--- a/app-editors/emacs/emacs-21.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r1.ebuild,v 1.14 2003/09/05 01:52:49 msterret Exp $
-
-IUSE="X nls motif"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An incredibly powerful, extensible text editor"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-libs/gdbm
-	X? ( 	virtual/x11
-		>=media-libs/libungif-4.1.0
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-	local myconf
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	use X \
-		&& myconf="${myconf} \
-			--with-x \
-			--with-xpm \
-			--with-jpeg \
-			--with-tiff \
-			--with-gif \
-			--with-png" \
-		|| myconf="${myconf} --without-x"
-
-	use motif \
-		&& myconf="${myconf} --with-x-toolkit=motif"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	pushd ${D}/usr/share/info
-	rm dir
-	for i in *
-	do
-		mv ${i%.info} $i.info
-	done
-	popd
-
-	einfo "Fixing permissions"
-	find ${D} -perm 666 |xargs chmod 644
-	find ${D} -perm 777 |xargs chmod 755
-
-	dodoc BUGS ChangeLog README
-
-	# Gives a warning if it doesn't exist
-	dodir /usr/share/emacs/21.2/leim
-	touch ${D}/usr/share/emacs/21.2/leim/.keep
-}
diff --git a/app-editors/emacs/emacs-21.2.ebuild b/app-editors/emacs/emacs-21.2.ebuild
deleted file mode 100644
index d01e536aaf59..000000000000
--- a/app-editors/emacs/emacs-21.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2.ebuild,v 1.14 2003/09/05 01:52:49 msterret Exp $
-
-IUSE="X nls motif"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An incredibly powerful, extensible text editor"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-libs/gdbm
-	X? ( 	virtual/x11
-		>=media-libs/libungif-4.1.0
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-	local myconf
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	use X \
-		&& myconf="${myconf} \
-			--with-x \
-			--with-xpm \
-			--with-jpeg \
-			--with-tiff \
-			--with-gif \
-			--with-png" \
-		|| myconf="${myconf} --without-x"
-
-	use motif \
-		&& myconf="${myconf} --with-x-toolkit=motif"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	cd ${D}/usr/share/info
-	rm dir
-
-	for i in *
-	do
-		mv ${i%.info} $i.info
-	done
-
-	dodoc BUGS ChangeLog README
-
-	# Gives a warning if it doesn't exist
-	dodir /usr/share/emacs/21.2/leim
-	touch ${D}/usr/share/emacs/21.2/leim/.keep
-}
diff --git a/app-editors/emacs/emacs-21.3-r1.ebuild b/app-editors/emacs/emacs-21.3-r1.ebuild
index 3e9e33734a75..15bae2260935 100644
--- a/app-editors/emacs/emacs-21.3-r1.ebuild
+++ b/app-editors/emacs/emacs-21.3-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r1.ebuild,v 1.4 2003/09/05 01:52:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r1.ebuild,v 1.5 2003/12/01 06:24:23 usata Exp $
 
 IUSE="X nls motif leim gnome Xaw3d"
 
+inherit flag-o-matic
+
 S=${WORKDIR}/${P}
 DESCRIPTION="An incredibly powerful, extensible text editor"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz
@@ -30,6 +32,9 @@ SANDBOX_DISABLED="1"
 
 DFILE=emacs.desktop
 
+# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+filter-flags -fstack-protector
+
 src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
diff --git a/app-editors/emacs/files/digest-emacs-21.2 b/app-editors/emacs/files/digest-emacs-21.2
deleted file mode 100644
index 9ec99656013d..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4b58e5c2d923fc92495e0c2f167c5db emacs-21.2.tar.gz 20288222
diff --git a/app-editors/emacs/files/digest-emacs-21.2-r1 b/app-editors/emacs/files/digest-emacs-21.2-r1
deleted file mode 100644
index 9ec99656013d..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4b58e5c2d923fc92495e0c2f167c5db emacs-21.2.tar.gz 20288222
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
new file mode 100644
index 000000000000..bc306fe58224
--- /dev/null
+++ b/app-editors/emacs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+</pkgmetadata>