Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/slrn/, net-nntp/slrn/files/
Date: Tue, 17 Sep 2019 21:02:35
Message-Id: 1568754105.d0965b5725756ecd65c8203888b4cbe4c0aa7f7a.mgorny@gentoo
1 commit: d0965b5725756ecd65c8203888b4cbe4c0aa7f7a
2 Author: Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
3 AuthorDate: Tue Sep 17 20:14:47 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 21:01:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0965b57
7
8 net-nntp/slrn: fix QA issue
9
10 Closes: https://bugs.gentoo.org/694660
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Pierre-Olivier Mercier <nemunaire <AT> nemunai.re>
13 Closes: https://github.com/gentoo/gentoo/pull/12958
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 net-nntp/slrn/files/slrn-1.0.3-make.patch | 36 -------------------------------
17 net-nntp/slrn/slrn-1.0.3.ebuild | 4 ++--
18 2 files changed, 2 insertions(+), 38 deletions(-)
19
20 diff --git a/net-nntp/slrn/files/slrn-1.0.3-make.patch b/net-nntp/slrn/files/slrn-1.0.3-make.patch
21 deleted file mode 100644
22 index e03fbb472c3..00000000000
23 --- a/net-nntp/slrn/files/slrn-1.0.3-make.patch
24 +++ /dev/null
25 @@ -1,36 +0,0 @@
26 ---- slrn-1.0.2/src/Makefile.in
27 -+++ slrn-1.0.2/src/Makefile.in
28 -@@ -153,7 +153,7 @@
29 - $(MKINSDIR) $(DEST_SLRN_LIB_DIR)
30 - $(MKINSDIR) $(DEST_SLRN_SLANG_DIR)
31 - # $(MKINSDIR) $(DEST_CONFDIR)
32 --installdocs:
33 -+installdocs: installdirs
34 - @for i in $(MAN_FILES); \
35 - do \
36 - echo $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \
37 -@@ -186,7 +186,7 @@
38 - exit 1; \
39 - fi; \
40 - done
41 --installslang:
42 -+installslang: installdirs
43 - @files=$(CONF_FILES); \
44 - for i in $$files; \
45 - do \
46 -@@ -204,11 +204,11 @@
47 - exit 1; \
48 - fi; \
49 - done
50 --installlocales:
51 -+installlocales: installdirs
52 - -cd ../po; $(MAKE) DESTDIR=$(DESTDIR) LOCALEDIR=$(LOCALEDIR) install
53 --installbin:
54 -- $(INSTALL) -m 755 -s $(OBJDIR)/slrn $(DEST_BINDIR)
55 -- -$(INSTALL) -m 755 -s $(OBJDIR)/slrnpull $(DEST_BINDIR)
56 -+installbin: installdirs
57 -+ $(INSTALL) -m 755 $(OBJDIR)/slrn $(DEST_BINDIR)
58 -+ -$(INSTALL) -m 755 $(OBJDIR)/slrnpull $(DEST_BINDIR)
59 - install: all installdirs installbin installdocs installslang installlocales
60 -
61 - # The symlinks target is for my own private use. It simply creates the object
62
63 diff --git a/net-nntp/slrn/slrn-1.0.3.ebuild b/net-nntp/slrn/slrn-1.0.3.ebuild
64 index 2085d6e7544..07effe06c3a 100644
65 --- a/net-nntp/slrn/slrn-1.0.3.ebuild
66 +++ b/net-nntp/slrn/slrn-1.0.3.ebuild
67 @@ -1,4 +1,4 @@
68 -# Copyright 1999-2018 Gentoo Foundation
69 +# Copyright 1999-2019 Gentoo Authors
70 # Distributed under the terms of the GNU General Public License v2
71
72 EAPI=6
73 @@ -26,7 +26,7 @@ RDEPEND="app-arch/sharutils
74 DEPEND="${RDEPEND}
75 nls? ( sys-devel/gettext )"
76
77 -PATCHES=( "${FILESDIR}"/${P}-make.patch )
78 +PATCHES=( "${FILESDIR}"/${PN}-1.0.2-make.patch )
79
80 src_configure() {
81 econf \