| 1 |
grobian 10/09/30 08:19:56 |
| 2 |
|
| 3 |
Modified: ChangeLog p7zip-9.13-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix loading of 7z.bundle on Darwin, bug #338375 (force for dep problems which go beyond my territory) |
| 6 |
|
| 7 |
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.130 app-arch/p7zip/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.130&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.130&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.129&r2=1.130 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v |
| 19 |
retrieving revision 1.129 |
| 20 |
retrieving revision 1.130 |
| 21 |
diff -u -r1.129 -r1.130 |
| 22 |
--- ChangeLog 19 Sep 2010 09:26:59 -0000 1.129 |
| 23 |
+++ ChangeLog 30 Sep 2010 08:19:56 -0000 1.130 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-arch/p7zip |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.129 2010/09/19 09:26:59 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.130 2010/09/30 08:19:56 grobian Exp $ |
| 29 |
+ |
| 30 |
+ 30 Sep 2010; Fabian Groffen <grobian@g.o> p7zip-9.13-r1.ebuild: |
| 31 |
+ Fix loading of 7z.bundle on Darwin, bug #338375 |
| 32 |
|
| 33 |
*p7zip-9.13-r1 (19 Sep 2010) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 app-arch/p7zip/p7zip-9.13-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: p7zip-9.13-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- p7zip-9.13-r1.ebuild 19 Sep 2010 09:26:59 -0000 1.1 |
| 51 |
+++ p7zip-9.13-r1.ebuild 30 Sep 2010 08:19:56 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.1 2010/09/19 09:26:59 jlec Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.2 2010/09/30 08:19:56 grobian Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
WX_GTK_VER="2.8" |
| 60 |
@@ -64,9 +64,11 @@ |
| 61 |
|| cp -f makefile.macosx_32bits makefile.machine |
| 62 |
# bundles have extension .bundle but don't die because USE=-rar |
| 63 |
# removes the Rar directory |
| 64 |
+ sed -i -e '/strcpy(name/s/\.so/.bundle/' \ |
| 65 |
+ CPP/Windows/DLL.cpp || die |
| 66 |
sed -i -e '/^PROG=/s/\.so/.bundle/' \ |
| 67 |
CPP/7zip/Bundles/Format7zFree/makefile \ |
| 68 |
- CPP/7zip/Compress/Rar/makefile |
| 69 |
+ CPP/7zip/Compress/Rar/makefile || die |
| 70 |
elif use x86-fbsd; then |
| 71 |
# FreeBSD needs this special makefile, because it hasn't -ldl |
| 72 |
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine |
Archives