| 1 |
zmedico 11/02/25 20:46:25 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
25 Feb 2011; Zac Medico <zmedico@g.o> portage-9999.ebuild: |
| 6 |
Fix broken doexe call with all symlinks. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha25/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.20 sys-apps/portage/portage-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.20&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.20&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.19&r2=1.20 |
| 16 |
|
| 17 |
Index: portage-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 20 |
retrieving revision 1.19 |
| 21 |
retrieving revision 1.20 |
| 22 |
diff -u -r1.19 -r1.20 |
| 23 |
--- portage-9999.ebuild 8 Feb 2011 23:00:59 -0000 1.19 |
| 24 |
+++ portage-9999.ebuild 25 Feb 2011 20:46:25 -0000 1.20 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.19 2011/02/08 23:00:59 zmedico Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.20 2011/02/25 20:46:25 zmedico Exp $ |
| 30 |
|
| 31 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 32 |
# syntax support) which also requires EAPI 2. |
| 33 |
@@ -187,14 +187,16 @@ |
| 34 |
rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" |
| 35 |
fi |
| 36 |
|
| 37 |
- local x symlinks |
| 38 |
+ local x symlinks files |
| 39 |
|
| 40 |
cd "$S" || die "cd failed" |
| 41 |
for x in $(find bin -type d) ; do |
| 42 |
exeinto $portage_base/$x || die "exeinto failed" |
| 43 |
cd "$S"/$x || die "cd failed" |
| 44 |
- doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ |
| 45 |
- die "doexe failed" |
| 46 |
+ files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) |
| 47 |
+ if [ -n "$files" ] ; then |
| 48 |
+ doexe $files || die "doexe failed" |
| 49 |
+ fi |
| 50 |
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) |
| 51 |
if [ -n "$symlinks" ] ; then |
| 52 |
cp -P $symlinks "$D$portage_base/$x" || die "cp failed" |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.804 sys-apps/portage/ChangeLog |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.804&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.804&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.803&r2=1.804 |
| 61 |
|
| 62 |
Index: ChangeLog |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 65 |
retrieving revision 1.803 |
| 66 |
retrieving revision 1.804 |
| 67 |
diff -u -r1.803 -r1.804 |
| 68 |
--- ChangeLog 22 Feb 2011 19:46:40 -0000 1.803 |
| 69 |
+++ ChangeLog 25 Feb 2011 20:46:25 -0000 1.804 |
| 70 |
@@ -1,6 +1,9 @@ |
| 71 |
# ChangeLog for sys-apps/portage |
| 72 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 73 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.803 2011/02/22 19:46:40 zmedico Exp $ |
| 74 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.804 2011/02/25 20:46:25 zmedico Exp $ |
| 75 |
+ |
| 76 |
+ 25 Feb 2011; Zac Medico <zmedico@g.o> portage-9999.ebuild: |
| 77 |
+ Fix broken doexe call with all symlinks. |
| 78 |
|
| 79 |
*portage-2.2.0_alpha25 (22 Feb 2011) |
Archives