commit: 3fde55eea5fb94b5fb0496642f8a916cc41da405
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 19:30:30 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 20:22:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fde55ee
sys-apps/powerpc-utils: Remove nvsetenv from this package
sys-boot/yaboot{,-static} depends on this package for the nvsetenv
binary. sys-boot/grub depends on sys-apps/ibm-powerpc-utils.
Before this commit, both sys-apps/powerpc-utils and
sys-apps/ibm-powerpc-utils installed /usr/sbin/nvsetenv and thus could
not be installed simultaneously, thereby preventing sys-boot/yaboot and
sys-boot/grub from being installed simultaneously, which prevents
dev-util/catalyst run building ISOs on a system using sys-boot/yaboot.
We've confirmed that yaboot (ybin specifically) works with nvsetenv from
sys-apps/ibm-powerpc-utils, so just remove nvsetenv from this package.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...ls-1.1.3.18-r3.ebuild => powerpc-utils-1.1.3.18-r4.ebuild} | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
similarity index 75%
rename from sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
rename to sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
index 09eeef791f3..fc1157cb099 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit toolchain-funcs
BASEVER=$(ver_cut 1-3)
DEBREV=$(ver_cut 4)
-DESCRIPTION="PowerPC utilities including nvsetenv, and additional OldWorld
apps"
+DESCRIPTION="PowerPC utilities and additional OldWorld apps"
SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}.orig.tar.gz
http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}-${DEBREV}.diff.gz
mirror://gentoo/${PN}-cleanup.patch.bz2"
@@ -44,10 +44,11 @@ src_compile() {
src_install() {
into /usr
dosbin autoboot backlight bootsched clock fblevel fdeject fnset
- dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad
+ dosbin macos mousemode nvsetvol nvvideo sndvolmix trackpad
doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8
- doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8
+ doman mousemode.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8
- ewarn "The lsprop utility has been moved into the ibm-powerpc-utils
package."
+ ewarn "The lsprop and nvsetenv utilities have been moved into the"
+ ewarn "sys-apps/ibm-powerpc-utils package."
}
