summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2016-07-03 18:25:11 +0300
committerAndrew Savchenko <bircoph@gentoo.org>2016-07-03 18:27:46 +0300
commitd9e5273308c0b71372b2a1876b4f506454d4c582 (patch)
tree9db23fb642c326a92ad64c0f3305623315b5fe9b /net-libs/libupnp
parentdev-erlang/fast_xml: Restore tests (diff)
downloadgentoo-d9e5273308c0b71372b2a1876b4f506454d4c582.tar.gz
gentoo-d9e5273308c0b71372b2a1876b4f506454d4c582.tar.bz2
gentoo-d9e5273308c0b71372b2a1876b4f506454d4c582.zip
net-libs/libupnp: fix bug 556604
Remove duplicates from sources listings, so that examples may be installed. Package-Manager: portage-2.3.0 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'net-libs/libupnp')
-rw-r--r--net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch13
-rw-r--r--net-libs/libupnp/libupnp-1.6.19.ebuild5
2 files changed, 16 insertions, 2 deletions
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
new file mode 100644
index 000000000000..622f58a9003f
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
@@ -0,0 +1,13 @@
+--- libupnp-1.6.19/upnp/sample/Makefile.am.orig 2013-11-15 19:50:02.000000000 +0400
++++ libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 +0300
+@@ -65,8 +65,8 @@
+ if WITH_DOCUMENTATION
+ examplesdir = $(docdir)/examples
+ examples_DATA = \
+- $(tv_ctrlpt_SOURCES) \
+- $(tv_device_SOURCES)
++ $(sort $(tv_ctrlpt_SOURCES) \
++ $(tv_device_SOURCES) )
+ endif
+
+ EXTRA_DIST = \
diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild
index 161fa7ef80c3..c589c65c4df2 100644
--- a/net-libs/libupnp/libupnp-1.6.19.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,8 @@ IUSE="debug doc ipv6 static-libs"
DOCS="NEWS README ChangeLog"
src_prepare() {
- epatch "${FILESDIR}"/${P}-suse.patch
+ epatch "${FILESDIR}"/${P}-suse.patch \
+ "${FILESDIR}"/${P}-docs-install.patch
# fix tests
chmod +x ixml/test/test_document.sh || die