redo install in SYSROOT style

Package-Manager: portage-2.1.2_pre2

3 files changed, 35 insertions, 27 deletions

diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 94c1ff25e69c..8863ef8e4734 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -7,14 +7,14 @@ RMD160 35dbaf28bccb18d6472e2af73ccc8925091751dc files/mingw-runtime-3.9-DESTDIR.
 SHA256 0bb79aaff724272a3642ae83a1c42da95226e63f502f6de9a629d9330a06cd48 files/mingw-runtime-3.9-DESTDIR.patch 1004
 DIST mingw-runtime-3.10-src.tar.gz 338373 RMD160 b8c20dfec6f188a50a51a7fd2c4c3a1228554daa SHA1 c01496252895fa3e37e93ac4fc7b5332fa6e2245 SHA256 eefa03102b49a529c7fa30a531487ded69ac57384ae3a0f07fd0a24af5c9ea2d
 DIST mingw-runtime-3.9-src.tar.gz 301241 RMD160 b50c14fb566f94a9eee40cc2e716c67aa8bece29 SHA1 e324d7afa3bdff5069eb44ad09051a8fda5f54b0 SHA256 e3b1aaa2405a8aa5dbbd2eb0e286c03dcb6e0b9ad6c0f8b64ea02dc3bd3470fc
-EBUILD mingw-runtime-3.10.ebuild 1959 RMD160 038102ded2a616b0e95d83b415258facfde4d10b SHA1 940144c1b1443b526d5be8c4e9dee76bdf39cf4d SHA256 5fa6b981665f3522a96e645b2decd59deed32df9aac3affccedbc323203db723
-MD5 48a3a2a3364d0d218d9a916cb9da0a1a mingw-runtime-3.10.ebuild 1959
-RMD160 038102ded2a616b0e95d83b415258facfde4d10b mingw-runtime-3.10.ebuild 1959
-SHA256 5fa6b981665f3522a96e645b2decd59deed32df9aac3affccedbc323203db723 mingw-runtime-3.10.ebuild 1959
-EBUILD mingw-runtime-3.9.ebuild 1708 RMD160 b6c8b38dd2fee4f27b727ae5bfd63ce545689bb7 SHA1 238598f6a4b643dd7101ca75079cbfbde246a56e SHA256 accefbc3d3dfa38fb963ccbebf3e8cedfe1cc1c2d54c35f073de21d925aeb8e3
-MD5 8220fb4b29a50151010a59017dfd68ec mingw-runtime-3.9.ebuild 1708
-RMD160 b6c8b38dd2fee4f27b727ae5bfd63ce545689bb7 mingw-runtime-3.9.ebuild 1708
-SHA256 accefbc3d3dfa38fb963ccbebf3e8cedfe1cc1c2d54c35f073de21d925aeb8e3 mingw-runtime-3.9.ebuild 1708
+EBUILD mingw-runtime-3.10.ebuild 2080 RMD160 dd24988e71b8d90144be327bf858388e06f0bad8 SHA1 ca2bbf307188641072bcb98c111468dc06dbea1a SHA256 371dedc675452f93d3fb2131fac2d3df0668e6f4c1722757c658f4cf200f9d2b
+MD5 074a867cbd336486ab87d2d468b68ac0 mingw-runtime-3.10.ebuild 2080
+RMD160 dd24988e71b8d90144be327bf858388e06f0bad8 mingw-runtime-3.10.ebuild 2080
+SHA256 371dedc675452f93d3fb2131fac2d3df0668e6f4c1722757c658f4cf200f9d2b mingw-runtime-3.10.ebuild 2080
+EBUILD mingw-runtime-3.9.ebuild 1829 RMD160 966ec2cb95c19342588d29c9627562b9a062adde SHA1 f859f9babc1b270b4e8c4324d38597b98455799f SHA256 12c08cf2cde42e772d3c2ae4eaaa4c228e684f2aaea92411c41250b7f0fac276
+MD5 830df9d90e4223f537838bb38c850f8d mingw-runtime-3.9.ebuild 1829
+RMD160 966ec2cb95c19342588d29c9627562b9a062adde mingw-runtime-3.9.ebuild 1829
+SHA256 12c08cf2cde42e772d3c2ae4eaaa4c228e684f2aaea92411c41250b7f0fac276 mingw-runtime-3.9.ebuild 1829
 MISC ChangeLog 509 RMD160 15b5c93e1cf991db1fd4e1eaf434e1276e5d855c SHA1 66afa65acb078f27bd7f11fb99c7e04f29913224 SHA256 f515907e40deee787132897c15e54fa6e17e330ff69b634b66e293a5caa2fa18
 MD5 8fbe4b26118af25050b24ad37710295f ChangeLog 509
 RMD160 15b5c93e1cf991db1fd4e1eaf434e1276e5d855c ChangeLog 509
@@ -32,7 +32,7 @@ SHA256 cfd69ae054434425d59eed64b731441c2c4aeea16d8a5eca4b3b26bc1717afcc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGMYoamhnQswr0vIRAoC2AKCCcAn/l7Azh+36yRF2WFa24frbRgCglWAt
-nFCu565RzBaEgNbp6RIKijY=
-=CJk4
+iD8DBQFFIXsnamhnQswr0vIRAh8VAKCbNlm3ff2TVv3f0G39f67jDfGPOwCgnb+C
+WDznUQ+xV6zuFfatXoNSuJk=
+=zPF5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild
index 853a9dc62d67..9277c32bdd84 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild,v 1.4 2006/09/26 06:18:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.10.ebuild,v 1.5 2006/10/02 20:47:52 vapier Exp $
 
 # This version does not work as the configure script expects the installed
 # cross-compiler to be able to link binaries ... except we haven't provided
@@ -30,6 +30,9 @@ RESTRICT="strip"
 
 DEPEND=""
 
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
 just_headers() {
 	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -53,10 +56,7 @@ src_compile() {
 	just_headers && return 0
 
 	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET} \
-		|| die
+	econf --host=${CTARGET} || die
 	emake || die
 }
 
@@ -65,10 +65,14 @@ src_install() {
 		insinto /usr/${CTARGET}/usr/include
 		doins -r include/* || die
 	else
-		emake install DESTDIR="${D}" || die
+		local insdir
+		is_crosscompile \
+			&& insdir=${D}/usr/${CTARGET} \
+			|| insdir=${D}
+		emake install DESTDIR="${insdir}" || die
 		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${D}"/usr/${CTARGET}/doc
+		rm -rf "${insdir}"/usr/doc
 		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
 	fi
-	dosym usr/include /usr/${CTARGET}/sys-include
+	is_crosscompile && dosym usr/include /usr/${CTARGET}/sys-include
 }
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild
index 06208d715533..ebde522a7e9e 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild,v 1.4 2006/09/26 06:18:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.9.ebuild,v 1.5 2006/10/02 20:47:52 vapier Exp $
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -24,6 +24,9 @@ RESTRICT="strip"
 
 DEPEND=""
 
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
 just_headers() {
 	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -51,10 +54,7 @@ src_compile() {
 	just_headers && return 0
 
 	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET} \
-		|| die
+	econf --host=${CTARGET} || die
 	emake || die
 }
 
@@ -63,10 +63,14 @@ src_install() {
 		insinto /usr/${CTARGET}/usr/include
 		doins -r include/* || die
 	else
-		emake install DESTDIR="${D}" || die
+		local insdir
+		is_crosscompile \
+			&& insdir=${D}/usr/${CTARGET} \
+			|| insdir=${D}
+		emake install DESTDIR="${insdir}" || die
 		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${D}"/usr/${CTARGET}/doc
+		rm -rf "${insdir}"/usr/doc
 		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
 	fi
-	dosym usr/include /usr/${CTARGET}/sys-include
+	is_crosscompile && dosym usr/include /usr/${CTARGET}/sys-include
 }