commit:     e8f7b002330ec9985b91cd1cee4018b38f29b362
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 08:17:25 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 08:17:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f7b002

dev-libs/libspt: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-libs/libspt/files/libspt-gentoo.patch | 29 +++++++++++++++++++++++++++++
 dev-libs/libspt/files/libspt-werror.patch | 11 -----------
 dev-libs/libspt/libspt-1.1-r2.ebuild      |  8 +++-----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/dev-libs/libspt/files/libspt-gentoo.patch 
b/dev-libs/libspt/files/libspt-gentoo.patch
new file mode 100644
index 00000000000..f6c709b6b79
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,7 +9,7 @@
+ libexecdir = @libexecdir@
+ includedir = @includedir@
+ #docdir = $(prefix)/doc
+-mandir = $(prefix)/man
++mandir = @mandir@
+ 
+ EXEEXT = @EXEEXT@
+ 
+@@ -29,7 +29,7 @@
+ INCLUDES = -I.
+ DEFS = @DEFS@
+ CC = @CC@
+-COMMONCFLAGS = -Wall -g -Werror -pipe
++COMMONCFLAGS = -Wall -g -pipe
+ CFLAGS = $(COMMONCFLAGS) @CFLAGS@
+ INSTALL = $(LIBTOOL) --mode=install @INSTALL@
+ INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644
+@@ -48,7 +48,7 @@
+ AGENTOBJS = sptagent.o sptconn.$lo cfuncs.$lo
+ LIBOBJS = libspt.$lo sptconn.$lo cfuncs.$lo error.$lo utilapi.$lo termios.$lo
+ OBJS = test.o $(LIBOBJS)
+-AGENT_MODE = -m 4755 -o root -g wheel
++AGENT_MODE =
+ 
+ .SUFFIXES: .c .o .cc .lo
+ .c.lo:

diff --git a/dev-libs/libspt/files/libspt-werror.patch 
b/dev-libs/libspt/files/libspt-werror.patch
deleted file mode 100644
index 6190ea5a455..00000000000
--- a/dev-libs/libspt/files/libspt-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in        2003-12-07 06:42:15.000000000 +0000
-+++ Makefile.in        2009-03-10 21:09:43.000000000 +0000
-@@ -29,7 +29,7 @@
- INCLUDES = -I.
- DEFS = @DEFS@
- CC = @CC@
--COMMONCFLAGS = -Wall -g -Werror -pipe
-+COMMONCFLAGS = -Wall -g -pipe
- CFLAGS = $(COMMONCFLAGS) @CFLAGS@
- INSTALL = $(LIBTOOL) --mode=install @INSTALL@
- INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644

diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild 
b/dev-libs/libspt/libspt-1.1-r2.ebuild
index 255689643e5..cd153e95227 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
+
 inherit base
 
 DESCRIPTION="Library for handling root privilege"
@@ -12,13 +13,10 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
-
 RESTRICT="test"
 
 src_prepare() {
-       epatch \
-               "${FILESDIR}/libspt-werror.patch" \
-               "${FILESDIR}/${P}-gentoo.patch"
+       epatch "${FILESDIR}/${PN}-gentoo.patch"
 }
 
 src_install() {

Reply via email to