1 |
commit: bfce61b9891623f07270301ac41fd04b9216d034 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Dec 29 08:57:01 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 18:33:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfce61b9 |
7 |
|
8 |
app-forensics/magicrescue: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/14160 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../files/magicrescue-1.1.9-ldflags.patch | 50 --------------------- |
15 |
.../files/magicrescue-1.1.9-makefile.patch | 52 ---------------------- |
16 |
2 files changed, 102 deletions(-) |
17 |
|
18 |
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch |
19 |
deleted file mode 100644 |
20 |
index 96818c3d58e..00000000000 |
21 |
--- a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch |
22 |
+++ /dev/null |
23 |
@@ -1,50 +0,0 @@ |
24 |
-diff -Naurd magicrescue-1.1.9/Makefile.in magicrescue-1.1.9.new//Makefile.in |
25 |
---- magicrescue-1.1.9/Makefile.in 2008-06-27 00:24:06.000000000 +0400 |
26 |
-+++ magicrescue-1.1.9.new//Makefile.in 2012-05-13 07:57:59.000000000 +0400 |
27 |
-@@ -21,7 +21,7 @@ |
28 |
- $(CC) -o $@ $(LDFLAGS) $(MAGICRESCUE_OBJS) |
29 |
- |
30 |
- dupemap: $(DUPEMAP_OBJS) |
31 |
-- $(CC) -o $@ $(LDFLAGS) $(DBM_LDFLAGS) $(DUPEMAP_OBJS) |
32 |
-+ $(CC) -o $@ $(LDFLAGS) $(DUPEMAP_OBJS) $(DBM_LDFLAGS) |
33 |
- |
34 |
- tools/inputseek: $(INPUTSEEK_OBJS) |
35 |
- $(CC) -o $@ $(LDFLAGS) $(INPUTSEEK_OBJS) |
36 |
-diff -Naurd magicrescue-1.1.9/config.d/50dbm magicrescue-1.1.9.new//config.d/50dbm |
37 |
---- magicrescue-1.1.9/config.d/50dbm 2008-06-27 00:24:05.000000000 +0400 |
38 |
-+++ magicrescue-1.1.9.new//config.d/50dbm 2012-05-13 07:56:16.000000000 +0400 |
39 |
-@@ -14,18 +14,14 @@ |
40 |
- flag="`echo $flag|sed 's/./-l&/'`" |
41 |
- echo "trying to link with flags [$flag]" >&5 |
42 |
- |
43 |
-- bak_LDFLAGS="$LDFLAGS" |
44 |
-- LDFLAGS="$LDFLAGS $flag" |
45 |
-+ LIBS="$flag" |
46 |
- if conftest_link; then |
47 |
- # we found it! |
48 |
-- LDFLAGS="$bak_LDFLAGS" |
49 |
- DBM_LDFLAGS="$flag" |
50 |
- env_vars="$env_vars DBM_LDFLAGS" |
51 |
- echo "#define $dbmdef" >> config.h |
52 |
- echo "#define HAVE_NDBM" >> config.h |
53 |
- return 0 |
54 |
-- else |
55 |
-- LDFLAGS="$bak_LDFLAGS" |
56 |
- fi |
57 |
- done |
58 |
- |
59 |
-diff -Naurd magicrescue-1.1.9/configure magicrescue-1.1.9.new//configure |
60 |
---- magicrescue-1.1.9/configure 2008-06-27 00:24:06.000000000 +0400 |
61 |
-+++ magicrescue-1.1.9.new//configure 2012-05-13 07:56:16.000000000 +0400 |
62 |
-@@ -63,9 +63,9 @@ |
63 |
- } |
64 |
- |
65 |
- conftest_link() { |
66 |
-- echo "$CC -o conftest $LDFLAGS conftest.o" >&5 |
67 |
-+ echo "$CC -o conftest $LDFLAGS conftest.o $LIBS" >&5 |
68 |
- echo >&5 |
69 |
-- $CC -o conftest $LDFLAGS conftest.o >&5 2>&5 \ |
70 |
-+ $CC -o conftest $LDFLAGS conftest.o $LIBS >&5 2>&5 \ |
71 |
- && [ -x conftest ] && ./conftest 2>&5 |
72 |
- } |
73 |
- |
74 |
|
75 |
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch |
76 |
deleted file mode 100644 |
77 |
index 3f57b1303c6..00000000000 |
78 |
--- a/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch |
79 |
+++ /dev/null |
80 |
@@ -1,52 +0,0 @@ |
81 |
---- magicrescue-1.1.9/Makefile.in.orig |
82 |
-+++ magicrescue-1.1.9/Makefile.in |
83 |
-@@ -57,34 +57,31 @@ |
84 |
- maintainer-clean: distclean docs-clean |
85 |
- |
86 |
- install: all |
87 |
-- [ -d $(PREFIX) ] |
88 |
-+ mkdir -p $(DESTDIR)$(PREFIX)/share/magicrescue/tools \ |
89 |
-+ $(DESTDIR)$(PREFIX)/share/magicrescue/recipes \ |
90 |
-+ $(DESTDIR)$(PREFIX)/share/man/man1 \ |
91 |
-+ $(DESTDIR)$(PREFIX)/bin |
92 |
- |
93 |
-- mkdir -p $(PREFIX)/share/magicrescue/tools \ |
94 |
-- $(PREFIX)/share/magicrescue/recipes \ |
95 |
-- $(PREFIX)/man/man1 \ |
96 |
-- $(PREFIX)/bin |
97 |
-- |
98 |
-- cp magicrescue$(EXE) dupemap$(EXE) magicsort $(PREFIX)/bin/ |
99 |
-- cp recipes/* $(PREFIX)/share/magicrescue/recipes/ |
100 |
-- cp $(DOCS) $(PREFIX)/man/man1 |
101 |
-+ cp magicrescue$(EXE) dupemap$(EXE) magicsort $(DESTDIR)$(PREFIX)/bin |
102 |
-+ cp recipes/* $(DESTDIR)$(PREFIX)/share/magicrescue/recipes/ |
103 |
-+ cp $(DOCS) $(DESTDIR)$(PREFIX)/share/man/man1 |
104 |
- |
105 |
- for f in tools/*; do \ |
106 |
- if [ -x "$$f" ]; then \ |
107 |
-- cp -f "$$f" $(PREFIX)/share/magicrescue/tools/; \ |
108 |
-+ cp -f "$$f" $(DESTDIR)$(PREFIX)/share/magicrescue/tools/; \ |
109 |
- fi; \ |
110 |
- done |
111 |
- |
112 |
- uninstall: |
113 |
-- [ -d $(PREFIX) ] |
114 |
-- rm -f $(PREFIX)/bin/magicrescue$(EXE) |
115 |
-- rm -f $(PREFIX)/bin/dupemap$(EXE) |
116 |
-- rm -f $(PREFIX)/bin/magicsort |
117 |
-+ rm -f $(DESTDIR)$(PREFIX)/bin/magicrescue$(EXE) |
118 |
-+ rm -f $(DESTDIR)$(PREFIX)/bin/dupemap$(EXE) |
119 |
-+ rm -f $(DESTDIR)$(PREFIX)/bin/magicsort |
120 |
- for f in $(DOCS); do \ |
121 |
-- rm -f "$(PREFIX)/man/man1/`basename $$f`"; \ |
122 |
-+ rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/`basename $$f`"; \ |
123 |
- done |
124 |
-- rm -rf $(PREFIX)/share/magicrescue/tools |
125 |
-- rm -rf $(PREFIX)/share/magicrescue/recipes |
126 |
-- -rmdir $(PREFIX)/share/magicrescue |
127 |
-+ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/tools |
128 |
-+ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/recipes |
129 |
-+ -rmdir $(DESTDIR)$(PREFIX)/share/magicrescue |
130 |
- |
131 |
- .PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs |
132 |
- |