diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-09-26 17:04:07 +0000 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-09-26 17:04:07 +0000 |
| commit | 1b90a4282eb90564fd1a142ea7773c5330ae4137 (patch) | |
| tree | fbef1d64a170772e935c9713cf8fc730ad262cdc /sys-apps | |
| parent | Utilize PYTHON_REQUIRED_USE unconditionally. We always need at least one pyth... (diff) | |
| download | gentoo-2-1b90a4282eb90564fd1a142ea7773c5330ae4137.tar.gz gentoo-2-1b90a4282eb90564fd1a142ea7773c5330ae4137.tar.bz2 gentoo-2-1b90a4282eb90564fd1a142ea7773c5330ae4137.zip | |
Move the admin scripts to /usr/sbin/ in pkg_preinst instead
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 9a6732b85484..84e8ca139e89 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1410 2014/09/26 02:28:58 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1411 2014/09/26 17:04:07 dolsen Exp $ + + 26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild: + Move the admin scripts to /usr/sbin/ in pkg_preinst 26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild: Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 4950ff35619f..a2a84434a947 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.102 2014/09/26 02:28:58 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.103 2014/09/26 17:04:07 dolsen Exp $ EAPI=5 @@ -157,6 +157,8 @@ python_test() { } python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() distutils-r1_python_install \ --system-prefix="${EPREFIX}/usr" \ --bindir="$(python_get_scriptdir)" \ @@ -202,12 +204,13 @@ pkg_preinst() { chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} fi - local sbin_deprecated='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - local relative_path=../lib/portage/bin - einfo "Creating symlinks for deprecated /usr/sbin/ paths" - - for target in ${sbin_deprecated}; do - einfo "linking: ${relative_path}/deprecated-path to sbin/${target}" - dosym "${relative_path}/deprecated-path" "usr/sbin/${target}" || die "Failed to create symlinks" + # Due to distutils/python-exec limitations + # they must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" done } |