1 |
commit: 423cb12c8b9a54c7031d9b994186980144071f5b |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 15 13:34:19 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 15 13:34:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423cb12c |
7 |
|
8 |
sys-fs/dd-rescue: drop 1.99.10 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sys-fs/dd-rescue/Manifest | 1 - |
13 |
sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild | 105 --------------------- |
14 |
.../files/dd-rescue-1.99.10-musl-r2.patch | 29 ------ |
15 |
3 files changed, 135 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest |
18 |
index 50ff5b318f2..8cf0f92b768 100644 |
19 |
--- a/sys-fs/dd-rescue/Manifest |
20 |
+++ b/sys-fs/dd-rescue/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST dd_rescue-1.99.10.tar.bz2 176603 BLAKE2B 66e9f54274363eb9b66c3fb098d398f7ae6f43812eb1560304c14bbe4b0e8158881f891a80ef2b03a77d205402651c7b9ed8bcdc14b3e6e865f4e713ab9249f4 SHA512 8f7cd4fca09302035f26102ce057a05130dcd808f2e44bd057f776dcd0222f9df6317b9703ab6c3b133a55e4bbbdf0ff58fdcbbbc3f1fc20889b29092b522e06 |
23 |
DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904 |
24 |
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d |
25 |
|
26 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild |
27 |
deleted file mode 100644 |
28 |
index 12cfa7fbbe6..00000000000 |
29 |
--- a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,105 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit autotools flag-o-matic multilib toolchain-funcs |
38 |
- |
39 |
-MY_PN="${PN/-/_}" |
40 |
-MY_P="${MY_PN}-${PV}" |
41 |
- |
42 |
-DESCRIPTION="Similar to dd but can copy from source with errors" |
43 |
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
44 |
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
49 |
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
50 |
- |
51 |
-RDEPEND="lzo? ( dev-libs/lzo ) |
52 |
- xattr? ( sys-apps/attr )" |
53 |
-DEPEND="${RDEPEND}" |
54 |
- |
55 |
-S="${WORKDIR}/${MY_P}" |
56 |
- |
57 |
-PATCHES=( |
58 |
- "${FILESDIR}"/${PN}-1.99.10-musl-r2.patch |
59 |
-) |
60 |
- |
61 |
-src_prepare() { |
62 |
- default |
63 |
- |
64 |
- if ! use cpu_flags_x86_sse4_2; then |
65 |
- sed -i \ |
66 |
- -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \ |
67 |
- configure.ac || die |
68 |
- fi |
69 |
- |
70 |
- if ! use cpu_flags_x86_avx2; then |
71 |
- sed -i \ |
72 |
- -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \ |
73 |
- configure.ac || die |
74 |
- fi |
75 |
- |
76 |
- eautoreconf |
77 |
- |
78 |
- sed -i \ |
79 |
- -e 's:-ldl:$(LDFLAGS) -ldl:' \ |
80 |
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ |
81 |
- Makefile || die |
82 |
-} |
83 |
- |
84 |
-src_configure() { |
85 |
- use static && append-ldflags -static |
86 |
- # OpenSSL is only used by a random helper tool we don't install. |
87 |
- ac_cv_header_attr_xattr_h=$(usex xattr) \ |
88 |
- ac_cv_header_openssl_evp_h=no \ |
89 |
- ac_cv_lib_crypto_EVP_aes_192_ctr=no \ |
90 |
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
91 |
- ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ |
92 |
- econf |
93 |
-} |
94 |
- |
95 |
-_emake() { |
96 |
- local arch |
97 |
- case ${ARCH} in |
98 |
- x86) arch=i386;; |
99 |
- amd64) arch=x86_64;; |
100 |
- arm) arch=arm;; |
101 |
- arm64) arch=aarch64;; |
102 |
- esac |
103 |
- |
104 |
- local os=$(usex kernel_linux Linux IDK) |
105 |
- |
106 |
- # The Makefile is a mess. Override a few vars rather than patch it. |
107 |
- emake \ |
108 |
- MACH="${arch}" \ |
109 |
- OS="${os}" \ |
110 |
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
111 |
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
112 |
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
113 |
- CFLAGS_OPT='$(CFLAGS)' \ |
114 |
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ |
115 |
- CC="$(tc-getCC)" \ |
116 |
- "$@" |
117 |
-} |
118 |
- |
119 |
-src_compile() { |
120 |
- _emake |
121 |
-} |
122 |
- |
123 |
-src_test() { |
124 |
- append-cflags -fcommon # bug 707796 |
125 |
- _emake check |
126 |
-} |
127 |
- |
128 |
-src_install() { |
129 |
- # easier to install by hand than trying to make sense of the Makefile. |
130 |
- dobin dd_rescue |
131 |
- dodir /usr/$(get_libdir)/${PN} |
132 |
- cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die |
133 |
- dodoc README.dd_rescue |
134 |
- doman dd_rescue.1 |
135 |
- use lzo && doman ddr_lzo.1 |
136 |
-} |
137 |
|
138 |
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch |
139 |
deleted file mode 100644 |
140 |
index ae348eadf5c..00000000000 |
141 |
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch |
142 |
+++ /dev/null |
143 |
@@ -1,29 +0,0 @@ |
144 |
-From 5429b36d186e73695244cee66f98ff9f61378b67 Mon Sep 17 00:00:00 2001 |
145 |
-From: Thomas Deutschmann <whissi@g.o> |
146 |
-Date: Wed, 13 Dec 2017 01:02:12 +0100 |
147 |
-Subject: [PATCH] loff_t and __WORDSIZE includes for MUSL |
148 |
- |
149 |
-Rewrite of Justin Keogh's patch [Link 1] to fix build problems |
150 |
-on ARM. |
151 |
- |
152 |
-Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f |
153 |
-Fixes: https://bugs.gentoo.org/616364 |
154 |
---- |
155 |
- configure.ac | 2 +- |
156 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
157 |
- |
158 |
-diff --git a/configure.ac b/configure.ac |
159 |
-index 454bbcb..ec3fcc7 100644 |
160 |
---- a/configure.ac |
161 |
-+++ b/configure.ac |
162 |
-@@ -11,7 +11,7 @@ AC_C_INLINE |
163 |
- |
164 |
- #AC_PROG_INSTALL |
165 |
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" |
166 |
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h]) |
167 |
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h]) |
168 |
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit]) |
169 |
- AC_CHECK_LIB(dl,dlsym) |
170 |
- AC_CHECK_LIB(fallocate,linux_fallocate64) |
171 |
--- |
172 |
-2.31.0.rc2 |