do not create a lib32 dir, by Yuta SATOH in bug #408595

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

4 files changed, 32 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 2a92588e42fd..06d132ee267e 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.42 2012/03/30 15:48:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.43 2012/03/30 16:01:39 aballier Exp $
+
+  30 Mar 2012; Alexis Ballier <aballier@gentoo.org> freebsd-share-9.0.ebuild,
+  +files/freebsd-share-9.0-gentoowaydir.patch:
+  do not create a lib32 dir, by Yuta SATOH in bug #408595
 
   30 Mar 2012; Alexis Ballier <aballier@gentoo.org>
   -freebsd-share-9.0_rc1.ebuild, -freebsd-share-9.0_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 1b7bc7fef6a4..d873de5eea07 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX freebsd-share-5.3-doc-locations.patch 608 RMD160 62c5b4b8cfe410c41bab4b64e4c47828512a8595 SHA1 008a437fa805bea1666f642fc4c6ba9399c93a1c SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6
 AUX freebsd-share-5.4-gentoo-skel.patch 621 RMD160 52351bb7b714bb458304d8547c7b113fce622d2e SHA1 4b924b94d653a4675914a7267e1a42178953b01a SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 RMD160 7e6a7fd500d65bb3ecafe10a18c91377ef894685 SHA1 d3c7ed64c47f5a70c47b922a699304c4cbb74391 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855
+AUX freebsd-share-9.0-gentoowaydir.patch 314 RMD160 474bee4a3c020ed2d067945f19cba46dc6eaacc0 SHA1 e790db5da46d14f6486a7b0b2f055fcdad3fea6a SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2
 AUX freebsd-share-gnu-miscfiles.patch 962 RMD160 08c81ba5cc6f1853179ba272efbd2ecd32480070 SHA1 91ec2e1362c00554f7aa7df17d304a1b674547dc SHA256 97218d3e62fda9515d275549f5ce2e8220a62807de355f249b0f6e65860aaa82
 DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e1012bd SHA1 b4d936ffe4f6bad5909e334decff6ac5f2b4451d SHA256 4d182bfcce5c906982a77301e9fac059d89890a1495ea42819682409d5d70885
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
@@ -44,13 +45,13 @@ DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc22
 EBUILD freebsd-share-7.2-r1.ebuild 2453 RMD160 42f505dfea4bd3f83fea678b39b128a0db796e52 SHA1 b1d64a575c331f4822bc5c64d52a0af3fd1b1a15 SHA256 f4736859ee4479886743d3117eec978b882c9115127ea69917e77ed9f081a77d
 EBUILD freebsd-share-8.0.ebuild 2572 RMD160 265a2ebcf5b7a9b982ad955748727775a15569e2 SHA1 1553b567a2b4b4cf270674256810509d7193b5b7 SHA256 abe0e28e8d4596bb01645a9f881788c726d56ec5e5b04f73fce164b0e7a850e4
 EBUILD freebsd-share-8.2.ebuild 2572 RMD160 00a61ca8cc88718897a800390dd91c024b70149d SHA1 7ed2823d92b47d4866b1c0b2583349c7a739280a SHA256 2bc35560179ed40e461861655e650562470318b8c50aac28174c2a706aa7502b
-EBUILD freebsd-share-9.0.ebuild 2572 RMD160 36f473c49a1891505f6f73449b36c32d20d55ec9 SHA1 2d511373f13e2e9ec93e531627ee12d4a152c606 SHA256 11c6823a3abbd3af305afb9879478690c67cc35ef020c765e30c222b0c785aa4
-MISC ChangeLog 8226 RMD160 c6cdc5c8b3817b9e6435f1bd4f0b7e38f494d968 SHA1 aa9614da15d85cdd3b36f1e6cad043c5cb1d944f SHA256 4109540299717675f16759cbdecff68019dd33dfd0f4a548df0ae119c53d531c
+EBUILD freebsd-share-9.0.ebuild 2659 RMD160 0b5ed3216a9ba07af75710717cd8fc6b4aa24733 SHA1 4c13f40dbb22098961e339a9e33e7ec99589dc5e SHA256 e06dfc2b28e2bb65b396c2b54307b521071f57c6656745d6014ec210bc70f9e6
+MISC ChangeLog 8410 RMD160 e3c0d9c2ff0db35579793fd279c01c45e43d5b53 SHA1 1f2ac5ceb277b787ab359d9e11eaa8fdc2ed8a36 SHA256 cf567a295c0a28e60ecdf9bb37a60dd1bb3fea3f193faf12bea81aa60006ef9f
 MISC metadata.xml 215 RMD160 b3221479ad9d9025582cc81582fdde3efebc6f4d SHA1 71a4cc587c9bda94b1c7def2e80746586ed630a6 SHA256 909a0b7e60bd9597411228070c56a35f20420d97bbd55197797c5844bc7bfe98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk911e0ACgkQvFcC4BYPU0oYRACfZ20wLuycuJxpKUyffAbSKrO8
-INEAnAhYr6dZdKLDUealWnnil20BUPkq
-=zT20
+iEYEARECAAYFAk912OkACgkQvFcC4BYPU0rROACgzefr+iD4GBGUpfcuIifa4Sk8
+47IAoJaq91xJhXch2gNxnMZ5uBw58cfH
+=27VV
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
new file mode 100644
index 000000000000..f29905144c4c
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
@@ -0,0 +1,16 @@
+diff -Nur etc.orig/mtree/BSD.usr.dist etc/mtree/BSD.usr.dist
+--- etc.orig/mtree/BSD.usr.dist	2012-01-03 12:26:10.000000000 +0900
++++ etc/mtree/BSD.usr.dist	2012-01-27 21:50:47.941466067 +0900
+@@ -25,12 +25,6 @@
+ 	i18n
+ 	..
+     ..
+-    lib32
+-	dtrace
+-	..
+-	i18n
+-	..
+-    ..
+     libdata
+         gcc
+         ..
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
index afb8d5f75e80..55d09f0c3b1b 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild,v 1.1 2012/01/16 16:37:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild,v 1.2 2012/03/30 16:01:39 aballier Exp $
 
 inherit bsdmk freebsd
 
@@ -70,6 +70,10 @@ src_unpack() {
 			die "Error fixing ${sdir}/Makefile"
 	done
 	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
+
+	# see Bug 408595
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${PN}-9.0-gentoowaydir.patch
 }
 
 src_compile() {