scummvm random work

[patches.git] / newlib-ebuild-cleanup.patch

Index: newlib-1.14.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v
retrieving revision 1.2
diff -u -p -r1.2 newlib-1.14.0.ebuild
--- newlib-1.14.0.ebuild	23 Aug 2006 08:55:02 -0000	1.2
+++ newlib-1.14.0.ebuild	5 Nov 2006 23:07:17 -0000
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v 1.2 2006/08/23 08:55:02 mr_bones_ Exp $
 
-inherit eutils flag-o-matic gnuconfig autotools
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils autotools flag-o-matic
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -20,7 +22,7 @@ fi
 DESCRIPTION="Newlib is a C library intended for use on embedded systems"
 HOMEPAGE="http://sourceware.org/newlib/"
 SRC_URI="ftp://sources.redhat.com/pub/newlib/${P}.tar.gz
-		 mirror://gentoo/${P}-spu.patch.gz"
+	mirror://gentoo/${P}-spu.patch.gz"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
@@ -28,71 +30,51 @@ LICENSE="NEWLIB LIBGLOSS GPL-2"
 	|| SLOT="0"
 KEYWORDS="-* ~ppc64 ~ppc"
 IUSE="nls threads unicode multilib"
+RESTRICT="strip"
 
-DEPEND="sys-devel/gnuconfig"
+DEPEND=""
 RDEPEND=""
 
-RESTRICT="nostrip"
-
 NEWLIBBUILD="${WORKDIR}/build"
 
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr
-	else
-		echo /usr/${CTARGET}/usr
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${P}-spu.patch
-	einfo "Updating configure scripts"
-	cd ${S}
-	gnuconfig_update
-	export WANT_AUTOCONF=2.1
-	# ugly workaround
-	for a in libgloss libgloss/doc libgloss/libnosys
-	do
-		pushd ${S}/${a} >/dev/null
-		aclocal 2>/dev/null
-		autoconf 2>/dev/null
-		popd >/dev/null
-	done
-	mkdir ${NEWLIBBUILD}
+	epatch "${WORKDIR}"/${P}-spu.patch
+	cd "${S}"
+	eautoreconf
+	mkdir -p "${NEWLIBBUILD}"
 }
 
 src_compile() {
+	unset LDFLAGS
+	CHOST=${CTARGET} strip-unsupported-flags
+
 	local myconf=""
-#hardwired to avoid breakages
+	# hardwired to avoid breakages
 	[[ ${CTARGET} == *-softfloat-* ]] \
 		&& myconf="--disable-newlib-hw-fp" \
 		|| myconf="--enable-newlib-hw-fp"
-
-#to the user discretion
-	myconf="${myconf} `use_enable unicode newlib-mb`"
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable multilib`"
 	[[ ${CTARGET} == "spu" ]] \
 		&& myconf="${myconf} --disable-threads" \
-		|| myconf="${myconf} `use_enable threads`"
+		|| myconf="${myconf} $(use_enable threads)"
 
-	cd ${NEWLIBBUILD}
+	cd "${NEWLIBBUILD}"
 
-	../${P}/configure \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--prefix=/usr \
-		${myconf} || die "econf failed"
+	ECONF_SOURCE=${S} \
+	econf \
+		--host=${CTARGET} \
+		$(use_enable unicode newlib-mb) \
+		$(use_enable nls) \
+		$(use_enable multilib) \
+		${myconf} \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	cd ${NEWLIBBUILD}
-	emake -j1 DESTDIR=${D} install
+	cd "${NEWLIBBUILD}"
+	emake -j1 DESTDIR="${D}" install
 	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	# minor hack to keep things clean
-	rm -fR ${D}/usr/info
+	rm -fR "${D}"/usr/info
 }