coreutils: add symlink-usr use flag to 8.23 and mark as stable.

This commit is contained in:
Michael Marineau 2015-02-11 14:47:09 -08:00
parent 9a734bb714
commit c218040ffc

View File

@ -23,8 +23,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~arm-linux ~x86-linux" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~arm-linux ~x86-linux"
IUSE="acl caps gmp multicall nls selinux static userland_BSD vanilla xattr" IUSE="acl caps gmp multicall nls selinux static symlink-usr userland_BSD vanilla xattr"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
caps? ( sys-libs/libcap ) caps? ( sys-libs/libcap )
@ -135,7 +135,7 @@ src_install() {
insinto /etc insinto /etc
newins src/dircolors.hin DIR_COLORS newins src/dircolors.hin DIR_COLORS
if [[ ${USERLAND} == "GNU" ]] ; then if [[ ${USERLAND} == "GNU" ]] && ! use symlink-usr; then
cd "${ED}"/usr/bin cd "${ED}"/usr/bin
dodir /bin dodir /bin
# move critical binaries into /bin (required by FHS) # move critical binaries into /bin (required by FHS)
@ -151,7 +151,7 @@ src_install() {
for x in ${com} uname ; do for x in ${com} uname ; do
dosym /bin/${x} /usr/bin/${x} dosym /bin/${x} /usr/bin/${x}
done done
else elif [[ ${USERLAND} != "GNU" ]] ; then
# For now, drop the man pages, collides with the ones of the system. # For now, drop the man pages, collides with the ones of the system.
rm -rf "${ED}"/usr/share/man rm -rf "${ED}"/usr/share/man
fi fi