unset LDFLAGS; bug #77430.

Package-Manager: portage-2.0.51.19

6 files changed, 22 insertions, 120 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 832e84d85801..80f2bed7de44 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.33 2005/03/05 08:55:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.34 2005/03/05 14:21:32 usata Exp $
+
+  05 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -emacs-cvs-21.3.50.ebuild,
+  emacs-cvs-22.0.50.ebuild, emacs-cvs-23.0.0.ebuild:
+  unset LDFLAGS; bug #77430.
 
   05 Mar 2005; Joseph Jezak <josejx@gentoo.org> emacs-cvs-22.0.50.ebuild:
   Marked ppc stable for bug #83136.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 1b5476c972aa..53c1c3c08b0d 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,16 +1,14 @@
-MD5 327772e59e9eca94d7f429e4b2625693 ChangeLog 5103
-MD5 4cb1700fdf421a4c17f658bdff6ed71e emacs-cvs-22.0.50.ebuild 4582
-MD5 3b1bff980356c4a65d57cc1b4cf3e0af emacs-cvs-21.3.50.ebuild 3039
+MD5 6e0e500e46d36ad39fe262924df8c832 ChangeLog 5261
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 2984db2b0384630f7c569e7a66cdfa5d emacs-cvs-23.0.0.ebuild 4600
-MD5 8e50e760415e106cd168d8709d31b7dc files/emacs-22.0.50.desktop 206
-MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
+MD5 ca23d5e3caa50cfb78eb5b301ad0e6fb emacs-cvs-22.0.50.ebuild 4638
+MD5 54997615a3a60c566f0fca3e19f01249 emacs-cvs-23.0.0.ebuild 4657
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0
+MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
-MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
+MD5 8e50e760415e106cd168d8709d31b7dc files/emacs-22.0.50.desktop 206
 MD5 86cca3ef7b8ceb7f9e666501bedcc76e files/emacs-23.0.0.desktop 204
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50 0
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
deleted file mode 100644
index 612cae3ebe57..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.27 2005/01/01 13:24:39 eradicator Exp $
-
-ECVS_AUTH="ext"
-export CVS_RSH="ssh"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/emacs"
-ECVS_MODULE="emacs"
-ECVS_USER="anoncvs"
-ECVS_PASS=""
-ECVS_CVS_OPTIONS="-dP"
-ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
-
-inherit elisp-common cvs
-
-IUSE="X Xaw3d gif gnome gtk jpeg nls png spell tiff"
-
-S=${WORKDIR}/${ECVS_MODULE}
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-RESTRICT="$RESTRICT nostrip"
-
-DEPEND=">=sys-libs/ncurses-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( virtual/x11
-		gif? ( >=media-libs/libungif-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="21.3.50"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~amd64"
-
-DFILE=emacs.desktop
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} $(use_with X x)"
-
-	if use X; then
-		myconf="${myconf} --with-xpm"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk
-				--with-toolkit-scroll-bars"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d support"
-			myconf="${myconf} --with-x-toolkit=athena
-				--with-toolkit-scroll-bars"
-		else
-			einfo "Configuring to build without X toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-toolkit-scroll-bars"
-		fi
-	fi
-
-	unset CFLAGS CPPFLAGS
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-debug \
-		${myconf} || die
-
-	make bootstrap || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	# fix info documentation
-	find ${D}/usr/share/info -type f -exec mv {} {}.info \;
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	fi
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
index 769b044364b3..a8ad5f15a147 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild,v 1.6 2005/03/05 08:55:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild,v 1.7 2005/03/05 14:21:32 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -48,7 +48,11 @@ DFILE=emacs-${SLOT}.desktop
 
 src_compile() {
 
+	# no flag is allowed
+	ALLOWED_FLAGS=" "
 	strip-flags
+	unset LDFLAGS
+
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index 3b42f123049b..a2ae118354b7 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.2 2005/02/25 15:14:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.3 2005/03/05 14:21:32 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -48,7 +48,11 @@ DFILE=emacs-${SLOT}.desktop
 
 src_compile() {
 
+	# no flag is allowed
+	ALLOWED_FLAGS=" "
 	strip-flags
+	unset LDFLAGS
+
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
 
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50 b/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50
+++ /dev/null