Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/, net-libs/libupnp/files/
Date: Sun, 03 Jul 2016 15:29:19
Message-Id: 1467559666.d9e5273308c0b71372b2a1876b4f506454d4c582.bircoph@gentoo
1 commit: d9e5273308c0b71372b2a1876b4f506454d4c582
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 15:25:11 2016 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 15:27:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e52733
7
8 net-libs/libupnp: fix bug 556604
9
10 Remove duplicates from sources listings, so that examples may be
11 installed.
12
13 Package-Manager: portage-2.3.0
14 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
15
16 net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch | 13 +++++++++++++
17 net-libs/libupnp/libupnp-1.6.19.ebuild | 5 +++--
18 2 files changed, 16 insertions(+), 2 deletions(-)
19
20 diff --git a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch b/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
21 new file mode 100644
22 index 0000000..622f58a
23 --- /dev/null
24 +++ b/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
25 @@ -0,0 +1,13 @@
26 +--- libupnp-1.6.19/upnp/sample/Makefile.am.orig 2013-11-15 19:50:02.000000000 +0400
27 ++++ libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 +0300
28 +@@ -65,8 +65,8 @@
29 + if WITH_DOCUMENTATION
30 + examplesdir = $(docdir)/examples
31 + examples_DATA = \
32 +- $(tv_ctrlpt_SOURCES) \
33 +- $(tv_device_SOURCES)
34 ++ $(sort $(tv_ctrlpt_SOURCES) \
35 ++ $(tv_device_SOURCES) )
36 + endif
37 +
38 + EXTRA_DIST = \
39
40 diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild
41 index 161fa7e..c589c65 100644
42 --- a/net-libs/libupnp/libupnp-1.6.19.ebuild
43 +++ b/net-libs/libupnp/libupnp-1.6.19.ebuild
44 @@ -1,4 +1,4 @@
45 -# Copyright 1999-2015 Gentoo Foundation
46 +# Copyright 1999-2016 Gentoo Foundation
47 # Distributed under the terms of the GNU General Public License v2
48 # $Id$
49
50 @@ -18,7 +18,8 @@ IUSE="debug doc ipv6 static-libs"
51 DOCS="NEWS README ChangeLog"
52
53 src_prepare() {
54 - epatch "${FILESDIR}"/${P}-suse.patch
55 + epatch "${FILESDIR}"/${P}-suse.patch \
56 + "${FILESDIR}"/${P}-docs-install.patch
57
58 # fix tests
59 chmod +x ixml/test/test_document.sh || die