Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/files/
Date: Sat, 11 Feb 2017 20:17:20
Message-Id: 1486844094.2877cacb6798eee20ec15bb19bb66738f11875a3.soap@gentoo
1 commit: 2877cacb6798eee20ec15bb19bb66738f11875a3
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 11 16:33:17 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 11 20:14:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2877cacb
7
8 sys-fs/dmraid: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3913
11
12 .../dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch | 24 ---------------
13 .../files/dmraid-1.0.0_rc15-undo-p-rename.patch | 13 ---------
14 .../files/dmraid-1.0.0_rc16-as-needed2.patch | 11 -------
15 sys-fs/dmraid/files/dmraid-destdir-fix.patch | 34 ----------------------
16 4 files changed, 82 deletions(-)
17
18 diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
19 deleted file mode 100644
20 index 1ce8834eba..0000000000
21 --- a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
22 +++ /dev/null
23 @@ -1,24 +0,0 @@
24 ---- ./lib/device/scsi.c.org 2009-06-25 15:22:26.605895909 -0700
25 -+++ ./lib/device/scsi.c 2009-06-25 15:56:39.784749181 -0700
26 -@@ -110,7 +110,9 @@
27 - }
28 -
29 - ret = ret &&
30 -- (di->serial = dbg_strdup((char *) &response[p->start + 1]));
31 -+ (di->serial = dbg_strdup(remove_white_space
32 -+ (lc, (char *)&response[p->start + 1],
33 -+ MAX_RESPONSE_LEN)));
34 - }
35 -
36 - dbg_free(response);
37 ---- ./lib/metadata/metadata.c.org 2009-06-25 17:32:19.856309659 -0700
38 -+++ ./lib/metadata/metadata.c 2009-06-25 17:32:35.502920755 -0700
39 -@@ -839,7 +839,7 @@
40 - */
41 - if (T_GROUP(rs)) {
42 - _discover_partitions(lc, &rs->sets);
43 -- return;
44 -+ continue;
45 - }
46 -
47 - /*
48
49 diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
50 deleted file mode 100644
51 index 6636b05630..0000000000
52 --- a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
53 +++ /dev/null
54 @@ -1,13 +0,0 @@
55 -Author: Giuseppe Iuculano <giuseppe@××××××××.it>
56 -Description: Removed "p" from device name. A proper upgrade script is needed before using it.
57 ---- a/1.0.0.rc15/lib/format/partition/dos.c
58 -+++ b/1.0.0.rc15/lib/format/partition/dos.c
59 -@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai
60 - {
61 - const char *base = get_basename(lc, rd->di->path);
62 -
63 -- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
64 -+ return type ? snprintf(str, len, "%s%u", base,
65 - partition) : snprintf(str, len, "%s", base);
66 - }
67 -
68
69 diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
70 deleted file mode 100644
71 index cf3018863f..0000000000
72 --- a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
73 +++ /dev/null
74 @@ -1,11 +0,0 @@
75 ---- 1.0.0.rc16/make.tmpl.in 2010-08-16 10:22:32.000000000 -0400
76 -+++ 1.0.0.rc16/make.tmpl.in 2010-08-16 10:42:49.000000000 -0400
77 -@@ -136,7 +136,7 @@
78 -
79 - %.so: $(OBJECTS)
80 - $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
81 -- -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event
82 -+ $(LDFLAGS) -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -ldl
83 -
84 - $(LIB_STATIC): $(OBJECTS)
85 - $(RM) $@
86
87 diff --git a/sys-fs/dmraid/files/dmraid-destdir-fix.patch b/sys-fs/dmraid/files/dmraid-destdir-fix.patch
88 deleted file mode 100644
89 index 07c6b442f9..0000000000
90 --- a/sys-fs/dmraid/files/dmraid-destdir-fix.patch
91 +++ /dev/null
92 @@ -1,34 +0,0 @@
93 ---- make.tmpl.in.old 2006-09-03 14:38:36.000000000 -0400
94 -+++ make.tmpl.in 2006-09-03 14:37:43.000000000 -0400
95 -@@ -21,21 +21,21 @@
96 - SOFLAG += @SOFLAG@
97 -
98 - # Setup directory variables
99 --prefix = $(DESTDIR)@prefix@
100 --exec_prefix = $(DESTDIR)@exec_prefix@
101 --bindir = @bindir@
102 -+prefix = @prefix@
103 -+exec_prefix = @exec_prefix@
104 -+bindir = $(DESTDIR)@bindir@
105 - ifeq ("@KLIBC@", "no")
106 -- libdir = @libdir@
107 -- sbindir = @sbindir@
108 -- includedir = @includedir@
109 -- infodir = @infodir@
110 -- mandir = @mandir@
111 -+ libdir = $(DESTDIR)@libdir@
112 -+ sbindir = $(DESTDIR)@sbindir@
113 -+ includedir = $(DESTDIR)@includedir@
114 -+ infodir = $(DESTDIR)@infodir@
115 -+ mandir = $(DESTDIR)@mandir@
116 - else
117 - libdir = $(DESTDIR)@KLIBC_LIB_DIR@
118 - sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
119 - includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
120 -- infodir = @infodir@
121 -- mandir = @mandir@
122 -+ infodir = $(DESTDIR)@infodir@
123 -+ mandir = $(DESTDIR)@mandir@
124 - endif
125 -
126 -