commit: 75bb550eb671ab4ef8479b8106c2d9e173da0b2d Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> AuthorDate: Sat Jul 7 21:52:01 2018 +0000 Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> CommitDate: Wed Jul 11 10:53:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bb550e
sys-fs/extundelete: fix build with newer e2fsprogs version Closes: https://bugs.gentoo.org/652688 Package-Manager: Portage-2.3.41, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/9094 Closes: https://bugs.gentoo.org/652688 sys-fs/extundelete/extundelete-0.2.4.ebuild | 15 ++++++++------- .../extundelete/files/extundelete-0.2.4-e2fsprogs.patch | 11 +++++++++++ sys-fs/extundelete/metadata.xml | 15 ++++++++------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/sys-fs/extundelete/extundelete-0.2.4.ebuild b/sys-fs/extundelete/extundelete-0.2.4.ebuild index c39d376e3b0..cb98d1828d5 100644 --- a/sys-fs/extundelete/extundelete-0.2.4.ebuild +++ b/sys-fs/extundelete/extundelete-0.2.4.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition" -HOMEPAGE="http://extundelete.sourceforge.net/"; +HOMEPAGE="https://extundelete.sourceforge.net/"; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT=0 KEYWORDS="amd64 ~arm x86" -IUSE="" -E2FSPROGS=1.42.6 -RDEPEND=">=sys-fs/e2fsprogs-${E2FSPROGS} - >=sys-libs/e2fsprogs-libs-${E2FSPROGS}" +RDEPEND="sys-fs/e2fsprogs + sys-libs/e2fsprogs-libs" + DEPEND=${RDEPEND} DOCS=README + +PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" ) diff --git a/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch new file mode 100644 index 00000000000..ea0da14f165 --- /dev/null +++ b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch @@ -0,0 +1,11 @@ +--- a/src/insertionops.cc 2012-12-30 18:23:32.000000000 +0100 ++++ b/src/insertionops.cc 2018-05-07 22:58:13.065868723 +0200 +@@ -33,7 +33,7 @@ + os << "File flags: " << inode.i_flags << std::endl; + os << "File version (for NFS): " << inode.i_generation << std::endl; + os << "File ACL: " << inode.i_file_acl << std::endl; +- os << "Directory ACL: " << inode.i_dir_acl << std::endl; ++ os << "Directory ACL: " << inode.i_size_high << std::endl; + os << "Fragment address: " << inode.i_faddr << std::endl; + os << "Direct blocks: "; + for (int n = 0; n < EXT2_NDIR_BLOCKS; n++) diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml index a5550604b14..458b539da8f 100644 --- a/sys-fs/extundelete/metadata.xml +++ b/sys-fs/extundelete/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="sourceforge">extundelete</remote-id> -</upstream> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <bugs-to>https://sourceforge.net/p/extundelete/tickets/</bugs-to> + <remote-id type="sourceforge">extundelete</remote-id> + </upstream> </pkgmetadata>
