dolsen 14/09/26 17:04:07 Modified: portage-9999.ebuild ChangeLog Log: 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)
Revision Changes Path 1.103 sys-apps/portage/portage-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.102&r2=1.103 Index: portage-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- portage-9999.ebuild 26 Sep 2014 02:28:58 -0000 1.102 +++ portage-9999.ebuild 26 Sep 2014 17:04:07 -0000 1.103 @@ -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_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 @@ 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 } 1.1411 sys-apps/portage/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1410&r2=1.1411 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v retrieving revision 1.1410 retrieving revision 1.1411 diff -u -r1.1410 -r1.1411 --- ChangeLog 26 Sep 2014 02:28:58 -0000 1.1410 +++ ChangeLog 26 Sep 2014 17:04:07 -0000 1.1411 @@ -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 <dol...@gentoo.org> portage-9999.ebuild: + Move the admin scripts to /usr/sbin/ in pkg_preinst 26 Sep 2014; Brian Dolbec <dol...@gentoo.org> portage-9999.ebuild: Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check
