Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/bircoph:master commit in: net-libs/libupnp/files/, net-libs/libupnp/
Date: Sun, 03 Jul 2016 15:34:10
Message-Id: 1467560034.7e05f5f11a2c2b4531da47cc9a6bbfcfcc244171.bircoph@gentoo
1 commit: 7e05f5f11a2c2b4531da47cc9a6bbfcfcc244171
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 15:33:54 2016 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 15:33:54 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=7e05f5f1
7
8 net-libs/libupnp is fixed in the tree now
9
10 net-libs/libupnp/Manifest | 1 -
11 .../files/libupnp-1.6.19-docs-install.patch | 13 --
12 net-libs/libupnp/files/libupnp-1.6.19-suse.patch | 132 ---------------------
13 net-libs/libupnp/libupnp-1.6.19.ebuild | 53 ---------
14 net-libs/libupnp/metadata.xml | 19 ---
15 5 files changed, 218 deletions(-)
16
17 diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
18 deleted file mode 100644
19 index e86b7dc..0000000
20 --- a/net-libs/libupnp/Manifest
21 +++ /dev/null
22 @@ -1 +0,0 @@
23 -DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661 WHIRLPOOL fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68
24
25 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
26 deleted file mode 100644
27 index 622f58a..0000000
28 --- a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
29 +++ /dev/null
30 @@ -1,13 +0,0 @@
31 ---- libupnp-1.6.19/upnp/sample/Makefile.am.orig 2013-11-15 19:50:02.000000000 +0400
32 -+++ libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 +0300
33 -@@ -65,8 +65,8 @@
34 - if WITH_DOCUMENTATION
35 - examplesdir = $(docdir)/examples
36 - examples_DATA = \
37 -- $(tv_ctrlpt_SOURCES) \
38 -- $(tv_device_SOURCES)
39 -+ $(sort $(tv_ctrlpt_SOURCES) \
40 -+ $(tv_device_SOURCES) )
41 - endif
42 -
43 - EXTRA_DIST = \
44
45 diff --git a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch
46 deleted file mode 100644
47 index 75a7f0d..0000000
48 --- a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch
49 +++ /dev/null
50 @@ -1,132 +0,0 @@
51 ---- configure.ac 2013-01-29 16:39:56.000000000 +0100
52 -+++ configure.ac 2013-02-17 10:40:53.680021913 +0100
53 -@@ -7,9 +7,9 @@
54 - # (C) Copyright 2005-2007 Rémi Turboult <r3mi@×××××××××××××××××.net>
55 - #
56 -
57 --AC_PREREQ(2.60)
58 -+AC_PREREQ([2.60])
59 -
60 --AC_INIT([libupnp], [1.6.19], [mroberto@×××××××××××××××××.net])
61 -+AC_INIT([libupnp],[1.6.19],[mroberto@×××××××××××××××××.net])
62 - dnl ############################################################################
63 - dnl # *Independently* of the above libupnp package version, the libtool version
64 - dnl # of the 3 libraries need to be updated whenever there is a change released:
65 -@@ -366,7 +366,6 @@
66 - # installed libraries.
67 - #
68 - AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
69 --#AC_SYS_LARGEFILE_SENSITIVE
70 -
71 - AC_REVISION([$Revision: 1.1 $])
72 -
73 -@@ -519,10 +519,12 @@
74 - #
75 - # Checks for programs
76 - #
77 --AC_PROG_CC
78 -+AC_PROG_CC_STDC
79 -+AC_USE_SYSTEM_EXTENSIONS
80 -+AC_SYS_LARGEFILE
81 - AM_PROG_CC_C_O
82 - m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
83 --AC_PROG_LIBTOOL
84 -+LT_INIT
85 - AC_PROG_INSTALL
86 - AC_PROG_MAKE_SET
87 - AC_PROG_EGREP
88 -@@ -532,9 +534,7 @@
89 - #:
90 - # Use -O0 in debug so that variables do not get optimized out
91 - AX_CFLAGS_GCC_OPTION([-O0, -g])
92 -- else
93 -- # add optimise for size
94 -- AX_CFLAGS_GCC_OPTION([-Os])
95 -+
96 - fi
97 - ;;
98 - esac
99 -@@ -548,8 +548,7 @@
100 - #
101 - AC_TYPE_SIZE_T
102 - AC_TYPE_OFF_T
103 --AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
104 --AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
105 -+
106 -
107 -
108 - #
109 ---- ixml/Makefile.am.orig
110 -+++ ixml/Makefile.am
111 -@@ -7,7 +7,7 @@
112 -
113 - SUBDIRS = doc
114 -
115 --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
116 -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
117 - AM_CFLAGS =
118 -
119 - LDADD = libixml.la
120 ---- threadutil/Makefile.am.orig
121 -+++ threadutil/Makefile.am
122 -@@ -4,7 +4,7 @@
123 - # (C) Copyright 2005 Remi Turboult <r3mi@×××××××××××××××××.net>
124 - #
125 -
126 --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
127 -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
128 -
129 - if ENABLE_DEBUG
130 - AM_CPPFLAGS += -DDEBUG -DSTATS
131 ---- upnp/src/api/UpnpString.c.orig
132 -+++ upnp/src/api/UpnpString.c
133 -@@ -28,38 +28,6 @@
134 - /* Other systems have strncasecmp */
135 - #endif
136 -
137 --#ifndef UPNP_USE_MSVCPP
138 -- /* VC has strnlen which is already included but with (potentially) different linkage */
139 -- /* strnlen() is a GNU extension. */
140 -- #if HAVE_STRNLEN
141 -- extern size_t strnlen(const char *s, size_t maxlen);
142 -- #else /* HAVE_STRNLEN */
143 -- static size_t strnlen(const char *s, size_t n)
144 -- {
145 -- const char *p = (const char *)memchr(s, 0, n);
146 -- return p ? p - s : n;
147 -- }
148 -- #endif /* HAVE_STRNLEN */
149 --#endif /* WIN32 */
150 --
151 --/* strndup() is a GNU extension. */
152 --#if HAVE_STRNDUP && !defined(WIN32)
153 -- extern char *strndup(__const char *__string, size_t __n);
154 --#else /* HAVE_STRNDUP && !defined(WIN32) */
155 -- static char *strndup(const char *__string, size_t __n)
156 -- {
157 -- size_t strsize = strnlen(__string, __n);
158 -- char *newstr = (char *)malloc(strsize + 1);
159 -- if (newstr == NULL)
160 -- return NULL;
161 --
162 -- strncpy(newstr, __string, strsize);
163 -- newstr[strsize] = 0;
164 --
165 -- return newstr;
166 -- }
167 --#endif /* HAVE_STRNDUP && !defined(WIN32) */
168 --
169 - /*!
170 - * \brief Internal implementation of the class UpnpString.
171 - *
172 ---- upnp/Makefile.am.orig
173 -+++ upnp/Makefile.am
174 -@@ -6,7 +6,7 @@
175 -
176 - SUBDIRS = doc . sample
177 -
178 --AM_CPPFLAGS = \
179 -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \
180 - -I$(srcdir)/inc \
181 - -I$(top_srcdir)/threadutil/inc \
182 - -I$(top_srcdir)/ixml/inc
183
184 diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild
185 deleted file mode 100644
186 index c589c65..0000000
187 --- a/net-libs/libupnp/libupnp-1.6.19.ebuild
188 +++ /dev/null
189 @@ -1,53 +0,0 @@
190 -# Copyright 1999-2016 Gentoo Foundation
191 -# Distributed under the terms of the GNU General Public License v2
192 -# $Id$
193 -
194 -EAPI=5
195 -
196 -inherit eutils flag-o-matic autotools
197 -
198 -DESCRIPTION="An Portable Open Source UPnP Development Kit"
199 -HOMEPAGE="http://pupnp.sourceforge.net/"
200 -SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
201 -
202 -LICENSE="BSD"
203 -SLOT="0"
204 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
205 -IUSE="debug doc ipv6 static-libs"
206 -
207 -DOCS="NEWS README ChangeLog"
208 -
209 -src_prepare() {
210 - epatch "${FILESDIR}"/${P}-suse.patch \
211 - "${FILESDIR}"/${P}-docs-install.patch
212 -
213 - # fix tests
214 - chmod +x ixml/test/test_document.sh || die
215 -
216 - eautoreconf
217 -}
218 -
219 -src_configure() {
220 - use x86-fbsd && append-flags -O1
221 - # w/o docdir to avoid sandbox violations
222 - econf \
223 - $(use_enable debug) \
224 - $(use_enable ipv6) \
225 - $(use_enable static-libs static) \
226 - $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
227 -}
228 -
229 -src_install () {
230 - default
231 - dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
232 - use static-libs || prune_libtool_files
233 -}
234 -
235 -pkg_postinst() {
236 - ewarn "Please remember to run revdep-rebuild when upgrading"
237 - ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages"
238 - ewarn "gets linked with the new library."
239 - echo ""
240 - ewarn "The revdep-rebuild script is part of the"
241 - ewarn "app-portage/gentoolkit package."
242 -}
243
244 diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
245 deleted file mode 100644
246 index 0fcdbd7..0000000
247 --- a/net-libs/libupnp/metadata.xml
248 +++ /dev/null
249 @@ -1,19 +0,0 @@
250 -<?xml version="1.0" encoding="UTF-8"?>
251 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
252 -<pkgmetadata>
253 - <maintainer type="person">
254 - <email>maq@××××××××.com</email>
255 - <name>Marcus Stjärnås</name>
256 - </maintainer>
257 - <maintainer type="person">
258 - <email>gurligebis@g.o</email>
259 - <name>Bjarke Istrup Pedersen</name>
260 - </maintainer>
261 - <maintainer type="project">
262 - <email>proxy-maint@g.o</email>
263 - <name>Proxy Maintainers</name>
264 - </maintainer>
265 - <upstream>
266 - <remote-id type="sourceforge">pupnp</remote-id>
267 - </upstream>
268 -</pkgmetadata>