From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A743138334 for ; Thu, 21 Jun 2018 19:01:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1414E08DD; Thu, 21 Jun 2018 19:00:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96E19E08DD for ; Thu, 21 Jun 2018 19:00:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4436E335C76 for ; Thu, 21 Jun 2018 19:00:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88C4A2CD for ; Thu, 21 Jun 2018 19:00:55 +0000 (UTC) From: "Hanno Boeck" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hanno Boeck" Message-ID: <1529607560.06df722649b38d027a32cf58f47f144426e16c48.hanno@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext3grep/files/, sys-fs/ext3grep/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/ext3grep/ext3grep-0.10.2.ebuild sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch X-VCS-Directories: sys-fs/ext3grep/files/ sys-fs/ext3grep/ X-VCS-Committer: hanno X-VCS-Committer-Name: Hanno Boeck X-VCS-Revision: 06df722649b38d027a32cf58f47f144426e16c48 X-VCS-Branch: master Date: Thu, 21 Jun 2018 19:00:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62454257-b4af-4200-bc71-925c50fc6ed6 X-Archives-Hash: c98a38ba28f4246b67b1951ff5010a66 commit: 06df722649b38d027a32cf58f47f144426e16c48 Author: Conrad Kostecki kostecki com> AuthorDate: Mon May 7 21:28:02 2018 +0000 Commit: Hanno Boeck gentoo org> CommitDate: Thu Jun 21 18:59:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06df7226 sys-fs/ext3grep: Fix build with newer e2fsprogs version Also bumped to EAPI=6 Closes: https://bugs.gentoo.org/650042 Package-Manager: Portage-2.3.36, Repoman-2.3.9 sys-fs/ext3grep/ext3grep-0.10.2.ebuild | 30 ++++++++++------------ ...3grep-0.10.2-include-unistd_h-for-sysconf.patch | 4 +-- ...gs.diff => ext3grep-0.10.2-new-e2fsprogs.patch} | 0 .../files/ext3grep-0.10.2-newer-e2fsprogs.patch | 22 ++++++++++++++++ 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild index 88c27978d04..1c8c5533ad9 100644 --- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild +++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils +EAPI=6 DESCRIPTION="Recover deleted files on an ext3 file system" HOMEPAGE="https://code.google.com/p/ext3grep/" @@ -13,25 +12,24 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug pch" -DOCS="NEWS README" - -RDEPEND="" DEPEND="sys-fs/e2fsprogs virtual/os-headers virtual/pkgconfig" -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.10.1-gcc44.patch \ - "${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch +DOCS="NEWS README" - # Fix build against latest e2fsprogs, taken from - # https://code.google.com/p/ext3grep/issues/detail?id=34 - epatch "${FILESDIR}"/${P}-new-e2fsprogs.diff -} +PATCHES=( + "${FILESDIR}/${PN}-0.10.1-gcc44.patch" + "${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch" + "${FILESDIR}/${P}-new-e2fsprogs.patch" + "${FILESDIR}/${P}-newer-e2fsprogs.patch" +) src_configure() { - econf \ - $(use_enable debug) \ + myeconfargs=( + $(use_enable debug) $(use_enable pch) + ) + + econf "${myeconfargs[@]}" } diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch index bf38c27e709..42588f71d6e 100644 --- a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/422789 ---- src/init_consts.cc -+++ src/init_consts.cc +--- a/src/init_consts.cc ++++ b/src/init_consts.cc @@ -27,6 +27,10 @@ #include "debug.h" #endif diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch similarity index 100% rename from sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff rename to sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch new file mode 100644 index 00000000000..8a029f9916b --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch @@ -0,0 +1,22 @@ +--- a/src/ext3.h 2008-04-09 13:20:31.000000000 +0200 ++++ b/src/ext3.h 2018-05-07 23:16:35.413754674 +0200 +@@ -106,7 +106,7 @@ + __u32 const* block(void) const { return i_block; } + __u32 generation(void) const { return i_generation; } + __u32 file_acl(void) const { return i_file_acl; } +- __u32 dir_acl(void) const { return i_dir_acl; } ++ __u32 size_high(void) const { return i_size_high; } + __u32 faddr(void) const { return i_faddr; } + __u16 uid_high(void) const { return i_uid_high; } + __u16 gid_high(void) const { return i_gid_high; } +--- a/src/print_inode_to.cc 2008-10-17 03:27:15.000000000 +0200 ++++ b/src/print_inode_to.cc 2018-05-07 23:16:54.379754601 +0200 +@@ -118,7 +118,7 @@ + os << '\n'; + } + //os << "File ACL: " << inode.file_acl() << '\n'; +- //os << "Directory ACL: " << inode.dir_acl() << '\n'; ++ //os << "Directory ACL: " << inode.size_high() << '\n'; + //os << "Fragment address: " << inode.faddr() << '\n'; + //os << "Fragment number: " << (int)inode.osd2.linux2.l_i_frag << '\n'; + //os << "Fragment size: " << (int)inode.osd2.linux2.l_i_fsize << '\n';