[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/

[Akinori Hattori]

commit:     75c91c730b02f8f85ca27c1017c241927e34f650
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 13:18:04 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 13:31:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c91c73

www-client/w3m: update patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-client/w3m/files/w3m-0.5.3-underlinking.patch         | 15 ---------------
 .../{w3m-0.5.3-fix-missing-time.patch => w3m-time.patch}  |  2 --
 www-client/w3m/w3m-0.5.3-r9.ebuild                        |  5 +----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
deleted file mode 100644
index 1b034b46cb1..00000000000
--- a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@××××××.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
- 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
- 
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
- 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c

diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch b/www-client/w3m/files/w3m-time.patch
similarity index 80%
rename from www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
rename to www-client/w3m/files/w3m-time.patch
index 03efd85d653..8489eee3fae 100644
--- a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
+++ b/www-client/w3m/files/w3m-time.patch
@@ -1,5 +1,3 @@
-diff --git a/html.h b/html.h
-index c490655..2a9a431 100644
 --- a/html.h
 +++ b/html.h
 @@ -8,6 +8,8 @@

diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index a4a9eb180c8..811e11b5efd 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-fix-missing-time.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-time.patch" )
 
 src_prepare() {
 	default