nicolasbock 15/04/20 19:59:01 Modified: testdisk-7.0.ebuild testdisk-6.14.ebuild ChangeLog Log: app-admin/testdisk: Various QA fixes. * Fix isntallation location of DOCS. * Fix missing slot dependencies. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)
Revision Changes Path 1.4 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.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild?r1=1.3&r2=1.4 Index: testdisk-7.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- testdisk-7.0.ebuild 20 Apr 2015 18:39:48 -0000 1.3 +++ testdisk-7.0.ebuild 20 Apr 2015 19:59:01 -0000 1.4 @@ -1,6 +1,6 @@ # 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.3 2015/04/20 18:39:48 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.4 2015/04/20 19:59:01 nicolasbock Exp $ EAPI=5 @@ -21,7 +21,7 @@ static? ( sys-apps/util-linux[static-libs] >=sys-libs/ncurses-5.2[static-libs] - jpeg? ( virtual/jpeg[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] @@ -30,7 +30,7 @@ !static? ( sys-apps/util-linux >=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:* ) ntfs? ( <=sys-fs/ntfs3g-2013.1.13 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 @@ -38,14 +38,11 @@ )" RDEPEND="!static? ( ${DEPEND} )" +PATCHES=( "${FILESDIR}/install-gentoo.patch" ) +DOCS=( ) AUTOTOOLS_AUTORECONF=1 BUILD_DIR="${S}" -src_prepare() { - epatch "${FILESDIR}/install-gentoo.patch" - autotools-utils_src_prepare -} - src_configure() { local myconf @@ -61,7 +58,6 @@ use jpeg || myconf+=" --without-jpeg" econf \ - --docdir="${ED}/usr/share/doc/${PF}" \ --disable-qt \ --without-ewf \ --enable-sudo \ 1.3 app-admin/testdisk/testdisk-6.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild?r1=1.2&r2=1.3 Index: testdisk-6.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testdisk-6.14.ebuild 30 Dec 2014 19:51:44 -0000 1.2 +++ testdisk-6.14.ebuild 20 Apr 2015 19:59:01 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-6.14.ebuild,v 1.2 2014/12/30 19:51:44 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.3 2015/04/20 19:59:01 nicolasbock Exp $ EAPI=5 @@ -20,7 +20,7 @@ DEPEND=" sys-apps/util-linux >=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:* ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 1.57 app-admin/testdisk/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.57&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.57&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?r1=1.56&r2=1.57 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 20 Apr 2015 18:39:48 -0000 1.56 +++ ChangeLog 20 Apr 2015 19:59:01 -0000 1.57 @@ -1,6 +1,11 @@ # 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.56 2015/04/20 18:39:48 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.57 2015/04/20 19:59:01 nicolasbock Exp $ + + 20 Apr 2015; Nicolas Bock <nicolasb...@gentoo.org> files/install-gentoo.patch, + testdisk-6.14.ebuild, testdisk-7.0.ebuild: + app-admin/testdisk: Various QA fixes. * Fix isntallation location of DOCS. * + Fix missing slot dependencies. 20 Apr 2015; Nicolas Bock <nicolasb...@gentoo.org> testdisk-7.0.ebuild: app-admin/testdisk-7.0: Re-enable ext2fs