Fix install for cris targets. Update to EAPI 4.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 47 insertions, 25 deletions

diff --git a/sys-libs/newlib/ChangeLog b/sys-libs/newlib/ChangeLog
index 008ec53e61a1..c7e07c11caf2 100644
--- a/sys-libs/newlib/ChangeLog
+++ b/sys-libs/newlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/newlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.16 2012/01/14 10:32:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.17 2012/03/23 23:09:33 vapier Exp $
+
+  23 Mar 2012; Mike Frysinger <vapier@gentoo.org> newlib-1.20.0.ebuild,
+  +files/newlib-1.20.0-cris-install.patch:
+  Fix install for cris targets. Update to EAPI 4.
 
 *newlib-1.20.0 (14 Jan 2012)
 
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index f9cf474233d0..2a7af85fe38a 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX newlib-1.20.0-cris-install.patch 370 RMD160 d1a8779ad600de9fa16cdc961389cb930c437c97 SHA1 80935f5547772ff3b71305523028499d7e39221a SHA256 c178c63458b47698ed35ab0ced93d90e790281def29fc17adff56536b8373ae9
 DIST newlib-1.18.0.tar.gz 13598301 RMD160 69d96fd323a23857072f30cb51899040099857cd SHA1 a47d3b8a508304143334b36bdb5b33786a61ce94 SHA256 d608f22b0b2e7725d2fca13cac19f34bc652d9773acadae778db9881746cb071
 DIST newlib-1.19.0.tar.gz 14323667 RMD160 a28bd656ec895da0738dac3fb367851a2992d724 SHA1 b2269d30ce7b93b7c714b90ef2f40221c2df0fcd SHA256 4f43807236b2274c220881ca69f7dc6aecc52f14bb32a6f03404d30780c25007
 DIST newlib-1.20.0.tar.gz 14571004 RMD160 e36c5337a74633456b47d09594974c7dd7a9cc3e SHA1 65e7bdbeda0cbbf99c8160df573fd04d1cbe00d1 SHA256 c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692
 EBUILD newlib-1.18.0.ebuild 1993 RMD160 844ce4b63cecf91208bc23e3da6bc1f6fce27ea7 SHA1 8c5b9ec73064ca9ca15cf76cc55e4873bb3fd61c SHA256 78790829abd7c4a8b7cbec5ea559f15ba6e3d35e1c78ebef8d6ff63d68974699
 EBUILD newlib-1.19.0.ebuild 1993 RMD160 c115d797a2bb912dcb058b567afd013172dc7c83 SHA1 54c25a9beb7cc5f8a73e1737e0f6adb030f0fa11 SHA256 596fea7fc530a4dfc3d89552b9308d3909439d284398c97e601792c277ad98ea
-EBUILD newlib-1.20.0.ebuild 1993 RMD160 35c3365bebb3beb3ed573be3c2fc6feacf437052 SHA1 942d111d78e8edc74a79d88ded02f98a72958436 SHA256 2d8407fc4f6ca8fa241a0a9d45998edfa4be6a90d636125d57931b69206cd78a
-MISC ChangeLog 2454 RMD160 92d07cc14df705c041021cb972c470f90f7ba2bf SHA1 ad57d9667f27fa77d3da2870e4acf323b9a93ce7 SHA256 e6606e210b4dc1f198ffb9a3ea119f84be89ac820390f1a8aa74c8ac6f387906
+EBUILD newlib-1.20.0.ebuild 2023 RMD160 bbf599335a6138ffb5f2250cd20ddd03947a3bbb SHA1 e44b70891b6ee40b87c20fee1d3d9dc9980a5672 SHA256 4e1713915150aaaa0b1b2b419644ae195903111f0a92bdc56d04d09b9986165e
+MISC ChangeLog 2620 RMD160 aec6a7c90616f366efd92274a8ee2333ecbc0927 SHA1 1d4a2fda6faffb4708e1c8b9be24523055dedb0c SHA256 d36f1107126db79cb7414292a2e0f0b4cc52c4088a237f36600dc9d04993d152
 MISC metadata.xml 223 RMD160 f3503c1d2d441f248d9ab96397befec4ee8a952d SHA1 77b37f3782875cc566e33c72b4536df86ff96df3 SHA256 d0effd32fc7c73c97f14108c4bdb0c2636af5763f7c0a987ad7ea264921a827f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPEVneAAoJELEHsLL7fEFWb4oP/igY9MmAYu0v2avTah08PEJ3
-YVUyjBOvODBz87ew2MYUGlRFaxi/4j5g63bgthAfShWZvaSInyzqLIaEFpcBghhl
-tcV4ebH7UOTOgP0zJGaBzo6KeyW+Dq2Q35Ttih5qHMxmZ4ihjBsJkyyQsTS9d1Ev
-vjKPO190FUx96IRVJudClckQfMb1KU/M6S3TYQ0xvUoFgq9UMvqRdSaVfmXLTQhG
-uMQz/URxAc2u1bdIulSfgna4pOkGJVJVPkT+KcMzIKtz0EGEInW/nLUIPuYjt7zu
-5JYWsJ6gOxtCv/ykeppWGJZ1+nut0TEFnpGP7oTO9+jR6vHClwe/uYLOHX/mtlqI
-IzLUvYOROBDc+IOtNOLHhkAzLRN6YpvvlRzCLUMMlL/4Ue+zcA7ClH/oz88ujqdl
-i5/gYXj1NraQBf1M0NUUo+Sndz03SEURwqxbBGqSwrUGi3V2z8GDw2YuH10HicTi
-Hu7I080L3H0Jlk8TYi82MV78z+8zkeN/EpCmVoaUdDsikDAe8Ys1SnG9rQuODGFY
-tgRcjRmyRO7uKmPqUBGgK6qbDgOFT3qG3MdLC9tUE5G8ttcBugpeynK/MG6jGBbJ
-PhAKSCo+c0oN9BLbRW+mlcdeqVC/vnxQKPhofMsguMW6ObmcFqY0D9ptdz0JSMTW
-uLVMXiubCWpF3dmIfK2J
-=LzJ9
+iQIcBAEBAgAGBQJPbQK2AAoJELEHsLL7fEFWC10QAKeE1KQSnr/DfT1RbPz7d7xC
+N7UcLvRrl0zm6i5YQmDo3ovvfF9iNnU9a4Eb5JmYvk4TaLEzZwI4/aFp4ydjvk9r
+IA0XcQwEaHaXgqCp1vUx1yadvrD5UW+0eNcDfEWOcuQH6gaS1u6HYY4l3GDBxKtN
+mVfTE1nXgyu8k8h5LKe3R4Gw5yTs1sauwh8vabQMuo1d9/z7XpK26XtQPDO2/8bn
+62Yzr8XIS8HW4Ofg0AYnjxkv/s8Rp56Nrk5n1YFldKf2FE4PxWl8bqobpHP52eSm
+f0Cdi4VW/kBniiypRu3u059fJb19nqlWxeuZkyIhmCFv1DkTlixYlW89fpnQXeOh
+SNVM/7oQ5TPKWMk2UkMSJ4+K4dEb5Gg4GVp87TZdxZQIZdPURX2FWpazI2kXJh7z
+Lr6cO1WBWOSId2KnpgHW/YHvaJDyMFajU57FxI9FBepQ3BgVN1FdgBlZ1GVbqfjj
+vTIPxbctC7vv58wBGL9QoRiA6vuFe7JDEqfpak0+Yqlf/yon/tStu9aZiIgOoRIE
+J6G7724zFijipoa1j+BBXS8VgxcyF7H3RHuT843rsWmVVxHTNpgV4vL92smU+3XL
+DMOvZmTM5zXviraoRB7N0/YweVhA7QoEHgjOWzDyQe88BwZLwwx7H7pPzp+6AfWU
+Gz8DlncrOpRO3BNEktkK
+=JKJ4
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/newlib/files/newlib-1.20.0-cris-install.patch b/sys-libs/newlib/files/newlib-1.20.0-cris-install.patch
new file mode 100644
index 000000000000..05f571fbe258
--- /dev/null
+++ b/sys-libs/newlib/files/newlib-1.20.0-cris-install.patch
@@ -0,0 +1,13 @@
+sent upstream already
+
+--- libgloss/cris/Makefile.in
++++ libgloss/cris/Makefile.in
+@@ -228,7 +228,7 @@ install-lin:
+           *) \
+ 	    set -e; \
+ 	    for x in ${LIN_BSP} ${LIN_SCRIPTS} ${LIN_EXTRA}; do \
+-	      ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; \
++	      ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
+ 	    done;; \
+ 	esac
+ 
diff --git a/sys-libs/newlib/newlib-1.20.0.ebuild b/sys-libs/newlib/newlib-1.20.0.ebuild
index 64ad7f9e410d..29ea3b99ba94 100644
--- a/sys-libs/newlib/newlib-1.20.0.ebuild
+++ b/sys-libs/newlib/newlib-1.20.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.20.0.ebuild,v 1.1 2012/01/14 10:32:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.20.0.ebuild,v 1.2 2012/03/23 23:09:33 vapier Exp $
+
+EAPI="4"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -36,12 +38,11 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${NEWLIBBUILD}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cris-install.patch
 }
 
-src_compile() {
+src_configure() {
 	# we should fix this ...
 	unset LDFLAGS
 	CHOST=${CTARGET} strip-unsupported-flags
@@ -55,20 +56,23 @@ src_compile() {
 		&& myconf="${myconf} --disable-newlib-multithread" \
 		|| myconf="${myconf} $(use_enable threads newlib-multithread)"
 
+	mkdir -p "${NEWLIBBUILD}"
 	cd "${NEWLIBBUILD}"
 
 	ECONF_SOURCE=${S} \
 	econf \
 		$(use_enable unicode newlib-mb) \
 		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
+		${myconf}
+}
+
+src_compile() {
+	emake -C "${NEWLIBBUILD}"
 }
 
 src_install() {
 	cd "${NEWLIBBUILD}"
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 #	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	# minor hack to keep things clean
 	rm -fR "${D}"/usr/share/info