fix #111880 (again)

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 7 insertions, 49 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index 7c00db0c75b1..b930ca0f2927 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.79 2009/08/10 10:21:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.80 2009/08/24 15:42:30 hollow Exp $
+
+  24 Aug 2009; Benedikt Böhm <hollow@gentoo.org>
+  -dietlibc-0.32_pre20081116.ebuild, dietlibc-0.33_pre20090721.ebuild:
+  fix #111880 (again)
 
 *dietlibc-0.33_pre20090721 (10 Aug 2009)
 
diff --git a/dev-libs/dietlibc/dietlibc-0.32_pre20081116.ebuild b/dev-libs/dietlibc/dietlibc-0.32_pre20081116.ebuild
deleted file mode 100644
index 34f86f0436b0..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.32_pre20081116.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.32_pre20081116.ebuild,v 1.1 2008/11/16 14:13:41 hollow Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A minimal libc"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="http://people.linux-vserver.org/~hollow/dietlibc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-DEPEND=""
-
-DIETHOME=/usr/diet
-
-pkg_setup() {
-	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
-	use sparc && replace-sparc64-flags
-
-	# gcc-hppa suffers support for SSP, compilation will fail
-	use hppa && strip-unsupported-flags
-
-	# debug flags
-	use debug && append-flags -g
-
-	# Makefile does not append CFLAGS
-	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
-		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls
-}
-
-src_compile() {
-	emake prefix=${DIETHOME} CFLAGS="${CFLAGS}" -j1 || die "make failed"
-}
-
-src_install() {
-	emake prefix=${DIETHOME} DESTDIR="${D}" -j1 install || die "make install failed"
-	dobin "${D}"${DIETHOME}/bin/* || die "dobin failed"
-	doman "${D}"${DIETHOME}/man/*/* || die "doman failed"
-	rm -r "${D}"${DIETHOME}/{man,bin}
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild b/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
index 224907626848..83f982ebfb72 100644
--- a/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild,v 1.1 2009/08/10 10:21:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild,v 1.2 2009/08/24 15:42:30 hollow Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -31,7 +31,7 @@ pkg_setup() {
 	# Makefile does not append CFLAGS
 	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
 		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls
+		-Wno-unused -Wredundant-decls -nopie
 }
 
 src_compile() {