From 203715a77cd87c186822f01643861737a55d170a Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 26 Jun 2018 16:39:40 -0400 Subject: app-admin/testdisk: fix qa warning and subslot dep on ntfs3g Package-Manager: Portage-2.3.40, Repoman-2.3.9 RepoMan-Options: --force --- .../testdisk/testdisk-7.1_pre20180322-r1.ebuild | 99 ++++++++++++++++++++++ app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 91 -------------------- 2 files changed, 99 insertions(+), 91 deletions(-) create mode 100644 app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild delete mode 100644 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild new file mode 100644 index 000000000000..b7dc995f76b3 --- /dev/null +++ b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1 +inherit autotools flag-o-matic gnome2-utils + +DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" +HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk" +SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ppc x86" +IUSE="ewf jpeg ntfs qt5 reiserfs static zlib" + +REQUIRED_USE="static? ( !qt5 )" + +# WARNING: reiserfs support does NOT work with reiserfsprogs +# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). +COMMON_DEPEND=" + static? ( + sys-apps/util-linux[static-libs] + sys-fs/e2fsprogs[static-libs] + sys-libs/ncurses:0[static-libs] + jpeg? ( virtual/jpeg:0[static-libs] ) + ntfs? ( sys-fs/ntfs3g:=[static-libs] ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) + zlib? ( sys-libs/zlib[static-libs] ) + !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) + ) + !static? ( + sys-apps/util-linux + sys-fs/e2fsprogs + sys-libs/ncurses:0= + jpeg? ( virtual/jpeg:0 ) + ntfs? ( sys-fs/ntfs3g ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) + zlib? ( sys-libs/zlib ) + !arm? ( ewf? ( app-forensics/libewf:= ) ) + ) +" +DEPEND="${COMMON_DEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" +RDEPEND="!static? ( ${COMMON_DEPEND} )" + +DOCS=( ) + +S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-sudo + --without-ntfs + $(use_with ewf) + $(use_with jpeg) + $(use_with ntfs ntfs3g) + $(use_enable qt5 qt) + $(use_with reiserfs) + $(use_with zlib) + ) + + # this static method is the same used by upstream for their 'static' make + # target, but better, as it doesn't break. + use static && append-ldflags -static + + econf "${myeconfargs[@]}" + + # perform safety checks for NTFS, REISERFS and JPEG + if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then + die "Failed to find either NTFS or NTFS-3G library." + fi + if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then + die "Failed to find reiserfs library." + fi + if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then + die "Failed to find jpeg library." + fi +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild deleted file mode 100644 index 5cebad4ea172..000000000000 --- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1 -inherit autotools flag-o-matic - -DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" -HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk" -SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc x86" -IUSE="ewf jpeg ntfs qt5 reiserfs static zlib" - -REQUIRED_USE="static? ( !qt5 )" - -# WARNING: reiserfs support does NOT work with reiserfsprogs -# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). -COMMON_DEPEND=" - static? ( - sys-apps/util-linux[static-libs] - sys-fs/e2fsprogs[static-libs] - sys-libs/ncurses:0[static-libs] - jpeg? ( virtual/jpeg:0[static-libs] ) - ntfs? ( sys-fs/ntfs3g[static-libs] ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) - zlib? ( sys-libs/zlib[static-libs] ) - !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) - ) - !static? ( - sys-apps/util-linux - sys-fs/e2fsprogs - sys-libs/ncurses:0= - jpeg? ( virtual/jpeg:0 ) - ntfs? ( sys-fs/ntfs3g ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - zlib? ( sys-libs/zlib ) - !arm? ( ewf? ( app-forensics/libewf:= ) ) - ) -" -DEPEND="${COMMON_DEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND="!static? ( ${COMMON_DEPEND} )" - -DOCS=( ) - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-sudo - --without-ntfs - $(use_with ewf) - $(use_with jpeg) - $(use_with ntfs ntfs3g) - $(use_enable qt5 qt) - $(use_with reiserfs) - $(use_with zlib) - ) - - # this static method is the same used by upstream for their 'static' make - # target, but better, as it doesn't break. - use static && append-ldflags -static - - econf "${myeconfargs[@]}" - - # perform safety checks for NTFS, REISERFS and JPEG - if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then - die "Failed to find either NTFS or NTFS-3G library." - fi - if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then - die "Failed to find reiserfs library." - fi - if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then - die "Failed to find jpeg library." - fi -} -- cgit v1.2.3-65-gdbad