| 1 |
dolsen 14/09/26 17:04:07 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Move the admin scripts to /usr/sbin/ in pkg_preinst instead |
| 6 |
|
| 7 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.103 sys-apps/portage/portage-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.102&r2=1.103 |
| 15 |
|
| 16 |
Index: portage-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 19 |
retrieving revision 1.102 |
| 20 |
retrieving revision 1.103 |
| 21 |
diff -u -r1.102 -r1.103 |
| 22 |
--- portage-9999.ebuild 26 Sep 2014 02:28:58 -0000 1.102 |
| 23 |
+++ portage-9999.ebuild 26 Sep 2014 17:04:07 -0000 1.103 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.102 2014/09/26 02:28:58 dolsen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.103 2014/09/26 17:04:07 dolsen Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -157,6 +157,8 @@ |
| 33 |
} |
| 34 |
|
| 35 |
python_install() { |
| 36 |
+ # Install sbin scripts to bindir for python-exec linking |
| 37 |
+ # they will be relocated in pkg_preinst() |
| 38 |
distutils-r1_python_install \ |
| 39 |
--system-prefix="${EPREFIX}/usr" \ |
| 40 |
--bindir="$(python_get_scriptdir)" \ |
| 41 |
@@ -202,12 +204,13 @@ |
| 42 |
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
| 43 |
fi |
| 44 |
|
| 45 |
- local sbin_deprecated='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
| 46 |
- local relative_path=../lib/portage/bin |
| 47 |
- einfo "Creating symlinks for deprecated /usr/sbin/ paths" |
| 48 |
- |
| 49 |
- for target in ${sbin_deprecated}; do |
| 50 |
- einfo "linking: ${relative_path}/deprecated-path to sbin/${target}" |
| 51 |
- dosym "${relative_path}/deprecated-path" "usr/sbin/${target}" || die "Failed to create symlinks" |
| 52 |
+ # Due to distutils/python-exec limitations |
| 53 |
+ # they must be installed to /usr/bin. |
| 54 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
| 55 |
+ einfo "Moving admin scripts to the correct directory" |
| 56 |
+ dodir /usr/sbin |
| 57 |
+ for target in ${sbin_relocations}; do |
| 58 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
| 59 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" |
| 60 |
done |
| 61 |
} |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1411 sys-apps/portage/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1410&r2=1.1411 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 74 |
retrieving revision 1.1410 |
| 75 |
retrieving revision 1.1411 |
| 76 |
diff -u -r1.1410 -r1.1411 |
| 77 |
--- ChangeLog 26 Sep 2014 02:28:58 -0000 1.1410 |
| 78 |
+++ ChangeLog 26 Sep 2014 17:04:07 -0000 1.1411 |
| 79 |
@@ -1,6 +1,9 @@ |
| 80 |
# ChangeLog for sys-apps/portage |
| 81 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1410 2014/09/26 02:28:58 dolsen Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1411 2014/09/26 17:04:07 dolsen Exp $ |
| 84 |
+ |
| 85 |
+ 26 Sep 2014; Brian Dolbec <dolsen@g.o> portage-9999.ebuild: |
| 86 |
+ Move the admin scripts to /usr/sbin/ in pkg_preinst |
| 87 |
|
| 88 |
26 Sep 2014; Brian Dolbec <dolsen@g.o> portage-9999.ebuild: |
| 89 |
Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check |
Archives