Pruning old ebuilds that are no longer needed.

Package-Manager: portage-2.0.51.19

9 files changed, 11 insertions, 749 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 879fe58adca6..4830fd94ca3d 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.30 2005/04/06 19:15:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.31 2005/04/09 04:26:31 fafhrd Exp $
+
+  09 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org> -libffi-3.3.3.ebuild,
+  -libffi-3.3.3-r1.ebuild, -libffi-3.3.4.ebuild, libffi-3.4.1-r1.ebuild:
+  Pruning old ebuilds that are no longer needed.
 
   06 Apr 2005; Markus Rothe <corsair@gentoo.org> libffi-3.4.3.ebuild:
   Stable on ppc64
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 05744f53e87b..0fe9b55ae49d 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,30 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2705fe04da79c768857632094b264cc7 libffi-3.4.1-r1.ebuild 5751
-MD5 78fce81c2abac95d8498d36ec26df445 libffi-3.3.4.ebuild 6669
+MD5 ba9373ec21d7496f26dbab504ea2a9f0 libffi-3.4.1-r1.ebuild 5844
 MD5 ea5e2ecd7602d6f2fb898c3f25f6e353 libffi-1.20.ebuild 604
-MD5 7fb7b7b79fee74e084b316a727d2a224 libffi-3.3.3-r1.ebuild 6671
-MD5 49582270c45808ea4ccf224f0bc2250b libffi-3.3.3.ebuild 6896
 MD5 b1b14c71ebf918ab0ae9cf9588a1886e libffi-3.4.1.ebuild 7094
 MD5 76afbc82a0b8b5f9d9e481a0c4546cf7 libffi-3.3.5.ebuild 6680
 MD5 38d38ff2c7e90c2f55c1bc3ffd305085 libffi-3.4.3.ebuild 5783
-MD5 7b6496d1e6c2aa0188f25d9e692a1a00 ChangeLog 4563
+MD5 8d33654a99efcb5dab8e542f2ff534d6 ChangeLog 4760
 MD5 ef1d6e99f954cc3412a9e513a2d80c64 metadata.xml 1836
 MD5 ed8f1e978198c34ad3dc3b81c4804199 files/digest-libffi-1.20 63
 MD5 1ca677e646f4d209e68601c9ba83c629 files/libffi-without-libgcj.dpatch 2255
 MD5 78c9b1a1b40fcc12f8cf34d57a970f00 files/libffi-soversion.dpatch 1943
-MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libffi-3.3.3-r1 64
 MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1-r1 64
-MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libffi-3.3.3 64
-MD5 4068b84d9ce9d440b063718549cfc354 files/digest-libffi-3.3.4 64
 MD5 595fc5d3e417d76d1f7e7f0a8439535a files/digest-libffi-3.3.5 64
 MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1 64
 MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-libffi-3.4.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCVYnCI1lqEGTUzyQRAn2kAKDGM/93+k9CTc3NFPWi/yoiVRabfgCfSgNJ
-pbodrXhklEMp90PG6IMWvXg=
-=Hi1A
------END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/digest-libffi-3.3.3 b/dev-libs/libffi/files/digest-libffi-3.3.3
deleted file mode 100644
index e87695155cb0..000000000000
--- a/dev-libs/libffi/files/digest-libffi-3.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c6cfd9fcd180481063b4058cf6faff2 gcc-3.3.3.tar.bz2 23279245
diff --git a/dev-libs/libffi/files/digest-libffi-3.3.3-r1 b/dev-libs/libffi/files/digest-libffi-3.3.3-r1
deleted file mode 100644
index e87695155cb0..000000000000
--- a/dev-libs/libffi/files/digest-libffi-3.3.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c6cfd9fcd180481063b4058cf6faff2 gcc-3.3.3.tar.bz2 23279245
diff --git a/dev-libs/libffi/files/digest-libffi-3.3.4 b/dev-libs/libffi/files/digest-libffi-3.3.4
deleted file mode 100644
index fe96fb0b69f8..000000000000
--- a/dev-libs/libffi/files/digest-libffi-3.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1c267b34f05c8660b24251865614d8b gcc-3.3.4.tar.bz2 23331664
diff --git a/dev-libs/libffi/libffi-3.3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3.3-r1.ebuild
deleted file mode 100644
index 9d6671e74efc..000000000000
--- a/dev-libs/libffi/libffi-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.3-r1.ebuild,v 1.5 2005/04/06 08:14:50 kloeri Exp $
-
-inherit eutils flag-o-matic libtool gnuconfig
-
-# This ebuild mod'd from libstdc++ compatbility package ebuild to create
-#   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
-
-do_filter_flags() {
-	declare setting
-
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-	if use amd64
-	then
-		# gcc 3.3 doesn't support -march=k8/etc on amd64, so xgcc will fail
-		setting="`get-flag march`"
-		[ ! -z "${setting}" ] && filter-flags -march="${setting}"
-	fi
-
-	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
-	filter-flags -march=k8
-	filter-flags -march=athlon64
-	filter-flags -march=opteron
-
-	# gcc 3.3 doesn't support -march=pentium-m
-	replace-flags -march=pentium-m -march=pentium3
-
-	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
-	setting="`get-flag mtune`"
-	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
-
-	# xgcc wont understand gcc 3.4 flags...
-	filter-flags -fno-unit-at-a-time
-	filter-flags -funit-at-a-time
-	filter-flags -fweb
-	filter-flags -fno-web
-
-	# xgcc isnt patched with propolice
-	filter-flags -fstack-protector-all
-	filter-flags -fno-stack-protector-all
-	filter-flags -fstack-protector
-	filter-flags -fno-stack-protector
-
-	# xgcc isnt patched with the gcc symbol visibility patch
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	# ...sure, why not?
-	strip-unsupported-flags
-}
-
-S=${WORKDIR}/gcc-${PV}
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
-
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2"
-
-DESCRIPTION="libffi (from gcc) does not commonly build unless gcj is compiled, but is used by other projects, like GNUstep."
-HOMEPAGE="http://gcc.gnu.org/"
-
-LICENSE="libffi"
-
-KEYWORDS="-* ~x86"
-IUSE="nls"
-
-SLOT="0"
-## 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
-#if [ "${CHOST}" == "${CCHOST}" ]
-#then
-#	SLOT="5"
-#else
-#	SLOT="${CCHOST}-5"
-#fi
-
-DEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	=sys-devel/gcc-3.3.3*
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-pkg_setup() {
-	if test_version_info ${PV}
-	then
-		einfo "Correctly using gcc version ${PV}"
-	else
-		eerror "Not using gcc version ${PV}!"
-		einfo "Please switch to this gcc profile using gcc-config and re-run emerge."
-		einfo "If you are using a newer version of gcc, you can see if there is a matching version of libffi."
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# XXX: fix these at some point
-	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-without-libgcj.dpatch
-	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-soversion.dpatch
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-	gnuconfig_update
-}
-
-src_compile() {
-
-	local myconf=
-
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	#use amd64 && myconf="${myconf} --disable-multilib"
-
-	do_filter_flags
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "CXXFLAGS=\"${CXXFLAGS}\""
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring libffi..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=java,c++,objc \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Compiling libffi..."
-	S="${WORKDIR}/build" \
-	emake all-target-libffi \
-		LIBPATH="${LIBPATH}" \
-		BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing libffi..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install-target-libffi || die
-
-	# we want the headers...
-	mkdir -p ${D}/${LOC}/include/${PN}
-	mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
-	# remove now useless directory...
-	rm -Rf ${D}/${LOC}/lib/gcc-lib/
-	# we'll move this into a directory we can put at the end of ld.so.conf
-	# other than the normal versioned directory, so that it doesnt conflict
-	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/${PN}
-	mv ${D}/${LOC}/lib/* ${D}/${LOC}/lib/${PN}
-
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/lib/${PN}\"" >> ${D}/etc/env.d/99libffi
-	echo "CPATH=\"${LOC}/include/${PN}\"" >> ${D}/etc/env.d/99libffi
-}
-
diff --git a/dev-libs/libffi/libffi-3.3.3.ebuild b/dev-libs/libffi/libffi-3.3.3.ebuild
deleted file mode 100644
index 1d6f1c2eef56..000000000000
--- a/dev-libs/libffi/libffi-3.3.3.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.3.ebuild,v 1.2 2005/03/05 10:44:24 corsair Exp $
-
-IUSE="nls"
-SLOT="0"
-inherit eutils flag-o-matic libtool
-
-# This ebuild mod'd from libstdc++ compatbility package ebuild to create
-#   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
-
-# Compile problems with these (bug #6641 among others)...
-#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-#    if use amd64
-#    then
-#        # gcc 3.3 doesnt support -march=k8/etc on amd64, so xgcc will fail
-#        setting="`get-flag march`"
-#        [ ! -z "${setting}" ] && filter-flags -march="${setting}"
-#    fi
-
-	# gcc 3.3 doesnt support -mtune on numerous archs, so xgcc will fail
-	mtsetting="`get-flag mtune`"
-	[ ! -z "${mtsetting}" ] && filter-flags -mtune="${mtsetting}"
-
-	# ...sure, why not?
-	strip-unsupported-flags
-}
-
-S=${WORKDIR}/gcc-${PV}
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
-
-# Branch update support ...
-MAIN_BRANCH="${PV}"  # Tarball, etc used ...
-
-# This branch update includes libffi fixes, so we include it here
-BRANCH_UPDATE="20040412"
-
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2"
-#	mirror://gentoo/gcc-3.3.3-branch-update-${BRANCH_UPDATE}.patch.bz2"
-
-DESCRIPTION="libffi (from gcc) does not commonly build unless gcj is compiled, but is used by other projects, like GNUstep."
-HOMEPAGE="http://gcc.gnu.org/"
-
-# libffi itself under an "as-is" license, the rest of GCC can be.
-#  and is, different
-LICENSE="libffi"
-
-KEYWORDS="-* ~x86"
-
-DEPEND="virtual/libc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	=sys-devel/gcc-3.3.3*
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-PDEPEND="sys-devel/gcc-config"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	#use amd64 && epatch ${FILESDIR}/libstdc++_amd64_multilib_hack.patch
-
-	# Branch update ...
-#	if [ -n "${BRANCH_UPDATE}" ]
-#	then
-#		epatch ${DISTDIR}/gcc-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
-#	fi
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-
-	local myconf=
-
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	#use amd64 && myconf="${myconf} --disable-multilib"
-
-	do_filter_flags
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "CXXFLAGS=\"${CXXFLAGS}\""
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring libffi..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=java,c++,objc \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Compiling libffi..."
-	S="${WORKDIR}/build" \
-	emake all-target-libffi \
-		LIBPATH="${LIBPATH}" \
-		BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing libfii..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install-target-libffi || die
-
-	# we want the headers...
-	mkdir -p ${D}/${LOC}/include/${PN}
-	mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
-	# remove now useless directory...
-	rm -Rf ${D}/${LOC}/lib/gcc-lib/
-	# we'll move this into a directory we can put at the end of ld.so.conf
-	# other than the normal versioned directory, so that it doesnt conflict
-	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/${PN}
-	mv ${D}/${LOC}/lib/* ${D}/${LOC}/lib/${PN}
-
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/lib/${PN}\"" >> ${D}/etc/env.d/99libffi
-	echo "CPATH=\"${LOC}/include/${PN}\"" >> ${D}/etc/env.d/99libffi
-}
-
diff --git a/dev-libs/libffi/libffi-3.3.4.ebuild b/dev-libs/libffi/libffi-3.3.4.ebuild
deleted file mode 100644
index 3f9692fe6dcd..000000000000
--- a/dev-libs/libffi/libffi-3.3.4.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.4.ebuild,v 1.6 2005/04/04 20:24:50 gustavoz Exp $
-
-inherit eutils flag-o-matic libtool gnuconfig
-
-# This ebuild mod'd from libstdc++ compatbility package ebuild to create
-#   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
-
-do_filter_flags() {
-	declare setting
-
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-	if use amd64
-	then
-		# gcc 3.3 doesn't support -march=k8/etc on amd64, so xgcc will fail
-		setting="`get-flag march`"
-		[ ! -z "${setting}" ] && filter-flags -march="${setting}"
-	fi
-
-	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
-	filter-flags -march=k8
-	filter-flags -march=athlon64
-	filter-flags -march=opteron
-
-	# gcc 3.3 doesn't support -march=pentium-m
-	replace-flags -march=pentium-m -march=pentium3
-
-	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
-	setting="`get-flag mtune`"
-	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
-
-	# xgcc wont understand gcc 3.4 flags...
-	filter-flags -fno-unit-at-a-time
-	filter-flags -funit-at-a-time
-	filter-flags -fweb
-	filter-flags -fno-web
-
-	# xgcc isnt patched with propolice
-	filter-flags -fstack-protector-all
-	filter-flags -fno-stack-protector-all
-	filter-flags -fstack-protector
-	filter-flags -fno-stack-protector
-
-	# xgcc isnt patched with the gcc symbol visibility patch
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	# ...sure, why not?
-	strip-unsupported-flags
-}
-
-S=${WORKDIR}/gcc-${PV}
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
-
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2"
-
-DESCRIPTION="libffi (from gcc) does not commonly build unless gcj is compiled, but is used by other projects, like GNUstep."
-HOMEPAGE="http://gcc.gnu.org/"
-
-LICENSE="libffi"
-
-KEYWORDS="-* x86"
-IUSE="nls"
-
-SLOT="0"
-## 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
-#if [ "${CHOST}" == "${CCHOST}" ]
-#then
-#	SLOT="5"
-#else
-#	SLOT="${CCHOST}-5"
-#fi
-
-DEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	=sys-devel/gcc-3.3.4*
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-pkg_setup() {
-	if test_version_info ${PV}
-	then
-		einfo "Correctly using gcc version ${PV}"
-	else
-		eerror "Not using gcc version ${PV}!"
-		einfo "Please switch to this gcc profile using gcc-config and re-run emerge."
-		einfo "If you are using a newer version of gcc, you can see if there is a matching version of libffi."
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# XXX: fix these at some point
-	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-without-libgcj.dpatch
-	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-soversion.dpatch
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-	gnuconfig_update
-}
-
-src_compile() {
-
-	local myconf=
-
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	#use amd64 && myconf="${myconf} --disable-multilib"
-
-	do_filter_flags
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "CXXFLAGS=\"${CXXFLAGS}\""
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring libffi..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=java,c++,objc \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Compiling libffi..."
-	S="${WORKDIR}/build" \
-	emake all-target-libffi \
-		LIBPATH="${LIBPATH}" \
-		BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing libffi..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install-target-libffi || die
-
-	# we want the headers...
-	mkdir -p ${D}/${LOC}/include/${PN}
-	mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
-	# remove now useless directory...
-	rm -Rf ${D}/${LOC}/lib/gcc-lib/
-	# we'll move this into a directory we can put at the end of ld.so.conf
-	# other than the normal versioned directory, so that it doesnt conflict
-	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/${PN}
-	mv ${D}/${LOC}/lib/* ${D}/${LOC}/lib/${PN}
-
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/lib/${PN}\"" >> ${D}/etc/env.d/99libffi
-	echo "CPATH=\"${LOC}/include/${PN}\"" >> ${D}/etc/env.d/99libffi
-}
-
diff --git a/dev-libs/libffi/libffi-3.4.1-r1.ebuild b/dev-libs/libffi/libffi-3.4.1-r1.ebuild
index 88fcc5e1d54d..f608c2ba9319 100644
--- a/dev-libs/libffi/libffi-3.4.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1-r1.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/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.4 2005/03/05 10:44:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.5 2005/04/09 04:26:31 fafhrd Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig
 
@@ -27,6 +27,9 @@ do_filter_flags() {
 	filter-flags -fvisibility-inlines-hidden
 	filter-flags -fvisibility=hidden
 
+	# strict-aliasing is known to break obj-c stuff in gcc-3.4*
+	filter-flags -fstrict-aliasing
+
 	# ...sure, why not?
 	strip-unsupported-flags
 }