1 |
commit: 6ecedda792b9f73ce6ff096dcde5a1732b84470f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 26 06:23:54 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 15:36:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecedda7 |
7 |
|
8 |
app-admin/testdisk: Drop old Qt4-based |
9 |
|
10 |
Bug: https://bugs.gentoo.org/639974 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
app-admin/testdisk/Manifest | 1 - |
14 |
.../testdisk/files/testdisk-7.0-qtbindir.patch | 27 ------- |
15 |
app-admin/testdisk/testdisk-7.0-r3.ebuild | 83 ---------------------- |
16 |
3 files changed, 111 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest |
19 |
index 5a9d30a3529..2a977ec6d5e 100644 |
20 |
--- a/app-admin/testdisk/Manifest |
21 |
+++ b/app-admin/testdisk/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 |
24 |
DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc |
25 |
|
26 |
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch |
27 |
deleted file mode 100644 |
28 |
index cb99e503829..00000000000 |
29 |
--- a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch |
30 |
+++ /dev/null |
31 |
@@ -1,27 +0,0 @@ |
32 |
---- a/configure.ac 2015-04-18 11:04:47.000000000 +0200 |
33 |
-+++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100 |
34 |
-@@ -854,17 +854,14 @@ |
35 |
- |
36 |
- if test "$use_qt" = "true"; |
37 |
- then |
38 |
-- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false) |
39 |
-- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],) |
40 |
-- if test x$MOC = x ; then |
41 |
-- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.) |
42 |
-+ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [ |
43 |
-+ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin" |
44 |
-+ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH]) |
45 |
-+ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH]) |
46 |
-+ ], [ |
47 |
-+ AC_MSG_ERROR([Qt4 not found]) |
48 |
- use_qt=false |
49 |
-- fi |
50 |
-- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],) |
51 |
-- if test x$RCC = x ; then |
52 |
-- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.) |
53 |
-- use_qt=false |
54 |
-- fi |
55 |
-+ ]) |
56 |
- qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" |
57 |
- qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS" |
58 |
- fi |
59 |
|
60 |
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild |
61 |
deleted file mode 100644 |
62 |
index d8f6f196102..00000000000 |
63 |
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild |
64 |
+++ /dev/null |
65 |
@@ -1,83 +0,0 @@ |
66 |
-# Copyright 1999-2017 Gentoo Foundation |
67 |
-# Distributed under the terms of the GNU General Public License v2 |
68 |
- |
69 |
-EAPI=5 |
70 |
- |
71 |
-AUTOTOOLS_AUTORECONF=1 |
72 |
- |
73 |
-inherit autotools-utils eutils flag-o-matic |
74 |
- |
75 |
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" |
76 |
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" |
77 |
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" |
78 |
- |
79 |
-LICENSE="GPL-2" |
80 |
-SLOT="0" |
81 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86" |
82 |
-IUSE="ewf jpeg ntfs reiserfs static qt4" |
83 |
- |
84 |
-REQUIRED_USE="static? ( !qt4 )" |
85 |
- |
86 |
-# WARNING: reiserfs support does NOT work with reiserfsprogs |
87 |
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). |
88 |
-DEPEND=" |
89 |
- static? ( |
90 |
- sys-apps/util-linux[static-libs] |
91 |
- >=sys-libs/ncurses-5.2:0[static-libs] |
92 |
- jpeg? ( virtual/jpeg:0[static-libs] ) |
93 |
- ntfs? ( sys-fs/ntfs3g[static-libs] ) |
94 |
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) |
95 |
- >=sys-fs/e2fsprogs-1.35[static-libs] |
96 |
- sys-libs/zlib[static-libs] |
97 |
- !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) |
98 |
- ) |
99 |
- !static? ( |
100 |
- sys-apps/util-linux |
101 |
- >=sys-libs/ncurses-5.2:0= |
102 |
- jpeg? ( virtual/jpeg:0 ) |
103 |
- ntfs? ( sys-fs/ntfs3g ) |
104 |
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) |
105 |
- >=sys-fs/e2fsprogs-1.35 |
106 |
- sys-libs/zlib |
107 |
- !arm? ( ewf? ( app-forensics/libewf:= ) ) |
108 |
- qt4? ( dev-qt/qtgui:4 ) |
109 |
- )" |
110 |
-RDEPEND="!static? ( ${DEPEND} )" |
111 |
- |
112 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
113 |
-DOCS=( ) |
114 |
- |
115 |
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) |
116 |
- |
117 |
-src_configure() { |
118 |
- local myconf |
119 |
- |
120 |
- # this is static method is the same used by upstream for their 'static' make |
121 |
- # target, but better, as it doesn't break. |
122 |
- use static && append-ldflags -static |
123 |
- |
124 |
- # --with-foo are broken, any use of --with/--without disable the |
125 |
- # functionality. |
126 |
- # The following variation must be used. |
127 |
- use reiserfs || myconf+=" --without-reiserfs" |
128 |
- use ntfs || myconf+=" --without-ntfs --without-ntfs3g" |
129 |
- use jpeg || myconf+=" --without-jpeg" |
130 |
- use ewf || myconf+=" --without-ewf" |
131 |
- myconf+=$(usex qt4 " --enable-qt" " --disable-qt") |
132 |
- |
133 |
- econf \ |
134 |
- --docdir "${ROOT}/usr/share/doc/${P}" \ |
135 |
- --enable-sudo \ |
136 |
- ${myconf} |
137 |
- |
138 |
- # perform safety checks for NTFS, REISERFS and JPEG |
139 |
- if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then |
140 |
- die "Failed to find either NTFS or NTFS-3G library." |
141 |
- fi |
142 |
- if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then |
143 |
- die "Failed to find reiserfs library." |
144 |
- fi |
145 |
- if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then |
146 |
- die "Failed to find jpeg library." |
147 |
- fi |
148 |
-} |