vapier 14/08/05 09:32:43
Modified: e2fsprogs-1.42.10.ebuild e2fsprogs-1.42.11.ebuild
ChangeLog
Log:
Get tests building again.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.15 sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.15&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.15&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?r1=1.14&r2=1.15
Index: e2fsprogs-1.42.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- e2fsprogs-1.42.10.ebuild 5 Aug 2014 09:19:10 -0000 1.14
+++ e2fsprogs-1.42.10.ebuild 5 Aug 2014 09:32:43 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v
1.14 2014/08/05 09:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v
1.15 2014/08/05 09:32:43 vapier Exp $
EAPI=4
@@ -35,6 +35,7 @@
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
+
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
sed -i -r \
@@ -45,9 +46,10 @@
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
+ ln -s $(which mk_cmds) lib/ss/ || die
# Avoid rebuild
- touch lib/ss/ss_err.h
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
eautoreconf
}
1.5 sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild?r1=1.4&r2=1.5
Index: e2fsprogs-1.42.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- e2fsprogs-1.42.11.ebuild 5 Aug 2014 09:01:52 -0000 1.4
+++ e2fsprogs-1.42.11.ebuild 5 Aug 2014 09:32:43 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v
1.4 2014/08/05 09:01:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v
1.5 2014/08/05 09:32:43 vapier Exp $
EAPI=4
@@ -39,6 +39,7 @@
fi
epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
+
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
sed -i -r \
@@ -49,9 +50,10 @@
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
+ ln -s $(which mk_cmds) lib/ss/ || die
# Avoid rebuild
- touch lib/ss/ss_err.h
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
eautoreconf
}
1.292 sys-fs/e2fsprogs/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.292&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.292&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.291&r2=1.292
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog 5 Aug 2014 09:19:10 -0000 1.291
+++ ChangeLog 5 Aug 2014 09:32:43 -0000 1.292
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/e2fsprogs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.291
2014/08/05 09:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.292
2014/08/05 09:32:43 vapier Exp $
+
+ 05 Aug 2014; Mike Frysinger <[email protected]> e2fsprogs-1.42.10.ebuild,
+ e2fsprogs-1.42.11.ebuild:
+ Get tests building again.
05 Aug 2014; Mike Frysinger <[email protected]>
+files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.10.ebuild,
