nicolasbock 15/04/20 17:51:38 Modified: testdisk-7.0.ebuild ChangeLog Log: app-admin/testdisk-0.7: Fixed QA issue. The Makefile.am had a customized install-data-hook which didn't conform to QA. I added a patch that changes how the data files are installed. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)
Revision Changes Path 1.2 app-admin/testdisk/testdisk-7.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild?r1=1.1&r2=1.2 Index: testdisk-7.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testdisk-7.0.ebuild 20 Apr 2015 12:41:28 -0000 1.1 +++ testdisk-7.0.ebuild 20 Apr 2015 17:51:38 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.1 2015/04/20 12:41:28 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.2 2015/04/20 17:51:38 nicolasbock Exp $ EAPI=5 -inherit eutils flag-o-matic +inherit autotools-utils eutils flag-o-matic DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"; @@ -18,15 +18,34 @@ # WARNING: reiserfs support does NOT work with reiserfsprogs # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). DEPEND=" - sys-apps/util-linux - >=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) - ntfs? ( sys-fs/ntfs3g ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - >=sys-fs/e2fsprogs-1.35 - sys-libs/zlib" + static? ( + sys-apps/util-linux[static-libs] + >=sys-libs/ncurses-5.2[static-libs] + jpeg? ( virtual/jpeg[static-libs] ) + ntfs? ( <=sys-fs/ntfs3g-2013.1.13[static-libs] ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) + >=sys-fs/e2fsprogs-1.35[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + sys-apps/util-linux + >=sys-libs/ncurses-5.2 + jpeg? ( virtual/jpeg ) + ntfs? ( <=sys-fs/ntfs3g-2013.1.13 ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) + >=sys-fs/e2fsprogs-1.35 + sys-libs/zlib + )" RDEPEND="!static? ( ${DEPEND} )" +AUTOTOOLS_AUTORECONF=1 +BUILD_DIR="${S}" + +src_prepare() { + epatch "${FILESDIR}/install-gentoo.patch" + autotools-utils_src_prepare +} + src_configure() { local myconf @@ -38,12 +57,14 @@ # functionality. # The following variation must be used. use reiserfs || myconf+=" --without-reiserfs" - use ntfs || myconf+=" --without-ntfs" + use ntfs || myconf+=" --without-ntfs --without-ntfs3g" use jpeg || myconf+=" --without-jpeg" econf \ --docdir="${ED}/usr/share/doc/${PF}" \ + --disable-qt \ --without-ewf \ + --without-ext2fs \ --enable-sudo \ ${myconf} 1.55 app-admin/testdisk/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?r1=1.54&r2=1.55 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 20 Apr 2015 12:41:28 -0000 1.54 +++ ChangeLog 20 Apr 2015 17:51:38 -0000 1.55 @@ -1,6 +1,12 @@ # ChangeLog for app-admin/testdisk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.54 2015/04/20 12:41:28 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.55 2015/04/20 17:51:38 nicolasbock Exp $ + + 20 Apr 2015; Nicolas Bock <nicolasb...@gentoo.org> + +files/install-gentoo.patch, testdisk-7.0.ebuild: + app-admin/testdisk-0.7: Fixed QA issue. The Makefile.am had a customized + install-data-hook which didn't conform to QA. I added a patch that changes how + the data files are installed. *testdisk-7.0 (20 Apr 2015)
