--- ../portage/./dev-util/catalyst/catalyst-1.0.8.1.ebuild	Fri Jul  2 19:37:28 2004
+++ ./dev-util/catalyst/catalyst-1.0.8.1.ebuild	Sun Jul 11 11:24:58 2004
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.0.8.1.ebuild,v 1.5 2004/07/02 17:36:43 zhen Exp $
 
+inherit gcc
+
 DESCRIPTION="Gentoo Linux official release metatool"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
 SRC_URI="http://dev.gentoo.org/~zhen/catalyst/${P}.tar.bz2"
@@ -9,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~arm ~s390 ~amd64 ~alpha ~sparc"
-IUSE="doc cdr"
+IUSE="doc cdr uclibc"
 
 DEPEND=""
 RDEPEND="dev-lang/python
@@ -17,7 +19,21 @@
 	dev-util/ccache
 	amd64? ( sys-apps/linux32 )
 	cdr? ( app-cdr/cdrtools app-misc/zisofs-tools sys-fs/squashfs-tools )
 	>=sys-kernel/genkernel-3.0.2b"
+
+src_unpack() {
+	unpack ${A}
+	sed -e 's|sys-libs/glibc ||' -i catalyst/targets/stage1/stage1.sh
+	sed -e 's|sys-kernel/linux-headers|virtual/os-headers|' -i catalyst/targets/stage1/stage1.sh
+	sed -e 's|virtual/glibc|virtual/libc|' -i catalyst/targets/stage1/stage1.sh
+	if use uclibc && [ ! -f /lib/libc.so.6 -a -f /lib/libc.so.0 ] ; then
+		sed -e 's/linux-gnu/linux-uclibc/' -i catalyst/arch/*.py
+		sed -e 's/-O2/-Os/' -i catalyst/arch/*.py
+	fi
+	if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "4" ] ; then
+		sed -e 's/mcpu/mtune/' -i catalyst/arch/*.py
+	fi
+}
 
 S=${WORKDIR}/${PN}