| 1 |
dolsen 14/09/26 02:28:58 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Update live ebuild for needed changes |
| 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.102 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.102&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.102&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.101&r2=1.102 |
| 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.101 |
| 20 |
retrieving revision 1.102 |
| 21 |
diff -u -r1.101 -r1.102 |
| 22 |
--- portage-9999.ebuild 12 Sep 2014 07:04:31 -0000 1.101 |
| 23 |
+++ portage-9999.ebuild 26 Sep 2014 02:28:58 -0000 1.102 |
| 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.101 2014/09/12 07:04:31 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.102 2014/09/26 02:28:58 dolsen Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -182,14 +182,16 @@ |
| 33 |
} |
| 34 |
|
| 35 |
pkg_preinst() { |
| 36 |
- if [[ $ROOT == / ]] ; then |
| 37 |
- # Run some minimal tests as a sanity check. |
| 38 |
- local test_runner=$(find "${ED}" -name runTests) |
| 39 |
- if [[ -n $test_runner && -x $test_runner ]] ; then |
| 40 |
- einfo "Running preinst sanity tests..." |
| 41 |
- "$test_runner" || die "preinst sanity tests failed" |
| 42 |
- fi |
| 43 |
- fi |
| 44 |
+ # comment out sanity test until it is fixed to work |
| 45 |
+ # with the new PORTAGE_PYM_PATH |
| 46 |
+ #if [[ $ROOT == / ]] ; then |
| 47 |
+ ## Run some minimal tests as a sanity check. |
| 48 |
+ #local test_runner=$(find "${ED}" -name runTests) |
| 49 |
+ #if [[ -n $test_runner && -x $test_runner ]] ; then |
| 50 |
+ #einfo "Running preinst sanity tests..." |
| 51 |
+ #"$test_runner" || die "preinst sanity tests failed" |
| 52 |
+ #fi |
| 53 |
+ #fi |
| 54 |
|
| 55 |
# elog dir must exist to avoid logrotate error for bug #415911. |
| 56 |
# This code runs in preinst in order to bypass the mapping of |
| 57 |
@@ -199,4 +201,13 @@ |
| 58 |
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
| 59 |
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
| 60 |
fi |
| 61 |
+ |
| 62 |
+ local sbin_deprecated='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
| 63 |
+ local relative_path=../lib/portage/bin |
| 64 |
+ einfo "Creating symlinks for deprecated /usr/sbin/ paths" |
| 65 |
+ |
| 66 |
+ for target in ${sbin_deprecated}; do |
| 67 |
+ einfo "linking: ${relative_path}/deprecated-path to sbin/${target}" |
| 68 |
+ dosym "${relative_path}/deprecated-path" "usr/sbin/${target}" || die "Failed to create symlinks" |
| 69 |
+ done |
| 70 |
} |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1410 sys-apps/portage/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1410&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1410&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1409&r2=1.1410 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 83 |
retrieving revision 1.1409 |
| 84 |
retrieving revision 1.1410 |
| 85 |
diff -u -r1.1409 -r1.1410 |
| 86 |
--- ChangeLog 17 Sep 2014 06:51:11 -0000 1.1409 |
| 87 |
+++ ChangeLog 26 Sep 2014 02:28:58 -0000 1.1410 |
| 88 |
@@ -1,6 +1,10 @@ |
| 89 |
# ChangeLog for sys-apps/portage |
| 90 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1409 2014/09/17 06:51:11 zmedico Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1410 2014/09/26 02:28:58 dolsen Exp $ |
| 93 |
+ |
| 94 |
+ 26 Sep 2014; Brian Dolbec <dolsen@g.o> portage-9999.ebuild: |
| 95 |
+ Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check |
| 96 |
+ untill fixed for the new install method. |
| 97 |
|
| 98 |
17 Sep 2014; Zac Medico <zmedico@g.o> portage-2.2.13.ebuild: |
| 99 |
Fix last commit to account for PYTHON_TARGETS. |
Archives