1 |
grobian 14/07/06 17:08:35 |
2 |
|
3 |
Modified: e2fsprogs-1.42.10.ebuild ChangeLog |
4 |
Log: |
5 |
Update patch for FreeMiNT by Alan Hourihane, bug #498412, drop darwin keywords since this is broken now, drop old stuff to cleanup |
6 |
|
7 |
(Portage version: 2.2.10.1-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: e2fsprogs-1.42.10.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- e2fsprogs-1.42.10.ebuild 29 May 2014 02:38:52 -0000 1.2 |
23 |
+++ e2fsprogs-1.42.10.ebuild 6 Jul 2014 17:08:35 -0000 1.3 |
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-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.2 2014/05/29 02:38:52 patrick Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.3 2014/07/06 17:08:35 grobian Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
@@ -13,11 +13,12 @@ |
33 |
|
34 |
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
35 |
HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
36 |
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz" |
37 |
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz |
38 |
+ https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> ${PN}-1.42.9-mint-r1.patch" |
39 |
|
40 |
LICENSE="GPL-2 BSD" |
41 |
SLOT="0" |
42 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" |
43 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" |
44 |
IUSE="nls static-libs elibc_FreeBSD" |
45 |
|
46 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
47 |
@@ -41,11 +42,9 @@ |
48 |
src_prepare() { |
49 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
50 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
51 |
- epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch |
52 |
epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch |
53 |
if [[ ${CHOST} == *-mint* ]] ; then |
54 |
- epatch "${FILESDIR}"/${PN}-1.41-mint.patch |
55 |
- epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch |
56 |
+ epatch "${DISTDIR}"/${PN}-1.42.9-mint-r1.patch |
57 |
fi |
58 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
59 |
rm -rf doc |
60 |
@@ -69,20 +68,11 @@ |
61 |
# needs open64() prototypes and friends |
62 |
append-cppflags -D_GNU_SOURCE |
63 |
|
64 |
- # We want to use the "bsd" libraries while building on Darwin, but while |
65 |
- # building on other Gentoo/*BSD we prefer elf-naming scheme. |
66 |
- local libtype |
67 |
- case ${CHOST} in |
68 |
- *-darwin*) libtype=--enable-bsd-shlibs ;; |
69 |
- *-mint*) libtype= ;; |
70 |
- *) libtype=--enable-elf-shlibs ;; |
71 |
- esac |
72 |
- |
73 |
ac_cv_path_LDCONFIG=: \ |
74 |
econf \ |
75 |
--with-root-prefix="${EPREFIX}/" \ |
76 |
--enable-symlink-install \ |
77 |
- ${libtype} \ |
78 |
+ $(tc-is-static-only || echo --enable-elf-shlibs) \ |
79 |
$(tc-has-tls || echo --disable-tls) \ |
80 |
--without-included-gettext \ |
81 |
$(use_enable nls) \ |
82 |
|
83 |
|
84 |
|
85 |
1.277 sys-fs/e2fsprogs/ChangeLog |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.277&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.277&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.276&r2=1.277 |
90 |
|
91 |
Index: ChangeLog |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
94 |
retrieving revision 1.276 |
95 |
retrieving revision 1.277 |
96 |
diff -u -r1.276 -r1.277 |
97 |
--- ChangeLog 29 May 2014 02:38:52 -0000 1.276 |
98 |
+++ ChangeLog 6 Jul 2014 17:08:35 -0000 1.277 |
99 |
@@ -1,6 +1,11 @@ |
100 |
# ChangeLog for sys-fs/e2fsprogs |
101 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
102 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.276 2014/05/29 02:38:52 patrick Exp $ |
103 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.277 2014/07/06 17:08:35 grobian Exp $ |
104 |
+ |
105 |
+ 06 Jul 2014; Fabian Groffen <grobian@g.o> e2fsprogs-1.42.10.ebuild, |
106 |
+ e2fsprogs-1.42.9.ebuild: |
107 |
+ Update patch for FreeMiNT by Alan Hourihane, bug #498412, drop darwin keywords |
108 |
+ since this is broken now, drop old stuff to cleanup |
109 |
|
110 |
29 May 2014; Patrick Lauer <patrick@g.o> |
111 |
+files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch, |