1 |
commit: e8f7b002330ec9985b91cd1cee4018b38f29b362 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 8 08:17:25 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 08:17:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f7b002 |
7 |
|
8 |
dev-libs/libspt: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/libspt/files/libspt-gentoo.patch | 29 +++++++++++++++++++++++++++++ |
13 |
dev-libs/libspt/files/libspt-werror.patch | 11 ----------- |
14 |
dev-libs/libspt/libspt-1.1-r2.ebuild | 8 +++----- |
15 |
3 files changed, 32 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/libspt/files/libspt-gentoo.patch b/dev-libs/libspt/files/libspt-gentoo.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..f6c709b6b79 |
20 |
--- /dev/null |
21 |
+++ b/dev-libs/libspt/files/libspt-gentoo.patch |
22 |
@@ -0,0 +1,29 @@ |
23 |
+--- a/Makefile.in |
24 |
++++ b/Makefile.in |
25 |
+@@ -9,7 +9,7 @@ |
26 |
+ libexecdir = @libexecdir@ |
27 |
+ includedir = @includedir@ |
28 |
+ #docdir = $(prefix)/doc |
29 |
+-mandir = $(prefix)/man |
30 |
++mandir = @mandir@ |
31 |
+ |
32 |
+ EXEEXT = @EXEEXT@ |
33 |
+ |
34 |
+@@ -29,7 +29,7 @@ |
35 |
+ INCLUDES = -I. |
36 |
+ DEFS = @DEFS@ |
37 |
+ CC = @CC@ |
38 |
+-COMMONCFLAGS = -Wall -g -Werror -pipe |
39 |
++COMMONCFLAGS = -Wall -g -pipe |
40 |
+ CFLAGS = $(COMMONCFLAGS) @CFLAGS@ |
41 |
+ INSTALL = $(LIBTOOL) --mode=install @INSTALL@ |
42 |
+ INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644 |
43 |
+@@ -48,7 +48,7 @@ |
44 |
+ AGENTOBJS = sptagent.o sptconn.$lo cfuncs.$lo |
45 |
+ LIBOBJS = libspt.$lo sptconn.$lo cfuncs.$lo error.$lo utilapi.$lo termios.$lo |
46 |
+ OBJS = test.o $(LIBOBJS) |
47 |
+-AGENT_MODE = -m 4755 -o root -g wheel |
48 |
++AGENT_MODE = |
49 |
+ |
50 |
+ .SUFFIXES: .c .o .cc .lo |
51 |
+ .c.lo: |
52 |
|
53 |
diff --git a/dev-libs/libspt/files/libspt-werror.patch b/dev-libs/libspt/files/libspt-werror.patch |
54 |
deleted file mode 100644 |
55 |
index 6190ea5a455..00000000000 |
56 |
--- a/dev-libs/libspt/files/libspt-werror.patch |
57 |
+++ /dev/null |
58 |
@@ -1,11 +0,0 @@ |
59 |
---- Makefile.in 2003-12-07 06:42:15.000000000 +0000 |
60 |
-+++ Makefile.in 2009-03-10 21:09:43.000000000 +0000 |
61 |
-@@ -29,7 +29,7 @@ |
62 |
- INCLUDES = -I. |
63 |
- DEFS = @DEFS@ |
64 |
- CC = @CC@ |
65 |
--COMMONCFLAGS = -Wall -g -Werror -pipe |
66 |
-+COMMONCFLAGS = -Wall -g -pipe |
67 |
- CFLAGS = $(COMMONCFLAGS) @CFLAGS@ |
68 |
- INSTALL = $(LIBTOOL) --mode=install @INSTALL@ |
69 |
- INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644 |
70 |
|
71 |
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild |
72 |
index 255689643e5..cd153e95227 100644 |
73 |
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild |
74 |
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild |
75 |
@@ -1,7 +1,8 @@ |
76 |
-# Copyright 1999-2010 Gentoo Foundation |
77 |
+# Copyright 1999-2017 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
|
80 |
EAPI="2" |
81 |
+ |
82 |
inherit base |
83 |
|
84 |
DESCRIPTION="Library for handling root privilege" |
85 |
@@ -12,13 +13,10 @@ LICENSE="BSD-2" |
86 |
SLOT="0" |
87 |
KEYWORDS="alpha amd64 ppc x86" |
88 |
IUSE="" |
89 |
- |
90 |
RESTRICT="test" |
91 |
|
92 |
src_prepare() { |
93 |
- epatch \ |
94 |
- "${FILESDIR}/libspt-werror.patch" \ |
95 |
- "${FILESDIR}/${P}-gentoo.patch" |
96 |
+ epatch "${FILESDIR}/${PN}-gentoo.patch" |
97 |
} |
98 |
|
99 |
src_install() { |