Install /bin/vi -> busybox symlink when USE=livecd #319917 by Antoni Sawicki.

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 20 insertions, 7 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 9fb3f372201a..7d5a6351365c 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.308 2012/05/26 00:03:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.309 2012/05/26 00:07:11 vapier Exp $
+
+  26 May 2012; Mike Frysinger <vapier@gentoo.org> busybox-1.19.3-r1.ebuild,
+  busybox-1.20.0.ebuild, busybox-9999.ebuild:
+  Install /bin/vi -> busybox symlink when USE=livecd #319917 by Antoni Sawicki.
 
   26 May 2012; Mike Frysinger <vapier@gentoo.org> busybox-1.19.3-r1.ebuild,
   busybox-1.20.0.ebuild, busybox-9999.ebuild:
diff --git a/sys-apps/busybox/busybox-1.19.3-r1.ebuild b/sys-apps/busybox/busybox-1.19.3-r1.ebuild
index ad15da3f78d2..3d78368508c5 100644
--- a/sys-apps/busybox/busybox-1.19.3-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.19.3-r1.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-apps/busybox/busybox-1.19.3-r1.ebuild,v 1.13 2012/05/26 00:03:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.19.3-r1.ebuild,v 1.14 2012/05/26 00:07:11 vapier Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -59,7 +59,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 make-symlinks mdev -pam selinux static elibc_glibc"
+IUSE="ipv6 livecd make-symlinks mdev -pam selinux static elibc_glibc"
 RESTRICT="test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -230,6 +230,9 @@ src_install() {
 
 		newinitd "${FILESDIR}"/mdev.rc.1 mdev || die
 	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install || die
diff --git a/sys-apps/busybox/busybox-1.20.0.ebuild b/sys-apps/busybox/busybox-1.20.0.ebuild
index 3130bdd0d2e5..9d73ac89834f 100644
--- a/sys-apps/busybox/busybox-1.20.0.ebuild
+++ b/sys-apps/busybox/busybox-1.20.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-apps/busybox/busybox-1.20.0.ebuild,v 1.4 2012/05/26 00:03:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.0.ebuild,v 1.5 2012/05/26 00:07:11 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -57,7 +57,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 make-symlinks math mdev -pam selinux sep-usr static"
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
 RESTRICT="test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -246,6 +246,9 @@ src_install() {
 
 		newinitd "${FILESDIR}"/mdev.rc.1 mdev
 	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 826b8c3d0392..c68342d28b22 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.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-apps/busybox/busybox-9999.ebuild,v 1.3 2012/05/26 00:03:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.4 2012/05/26 00:07:11 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -57,7 +57,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 make-symlinks math mdev -pam selinux sep-usr static"
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
 RESTRICT="test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -246,6 +246,9 @@ src_install() {
 
 		newinitd "${FILESDIR}"/mdev.rc.1 mdev
 	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install