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>

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 (file)
index 0000000..622f58a
--- /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 161fa7ef80c3028774a29c8d7852855e5a2b6fb7..c589c65c4df22e0d30c1427bd0f658d2eafe0a19 100644 (file)
--- 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