summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-03-30 16:01:39 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-03-30 16:01:39 +0000
commit31a221b99060d4edeee76099c585f119316b31a0 (patch)
tree949cfd661a57c64bc83445a56613a498558a811f /sys-freebsd/freebsd-share
parentkeyword -x86-fbsd for bug #374425, sandbox is broken of fbsd and this leaves ... (diff)
downloadgentoo-2-31a221b99060d4edeee76099c585f119316b31a0.tar.gz
gentoo-2-31a221b99060d4edeee76099c585f119316b31a0.tar.bz2
gentoo-2-31a221b99060d4edeee76099c585f119316b31a0.zip
do not create a lib32 dir, by Yuta SATOH in bug #408595
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-share')
-rw-r--r--sys-freebsd/freebsd-share/ChangeLog6
-rw-r--r--sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch16
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild6
3 files changed, 26 insertions, 2 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/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() {