gentoo resync : 10.01.2018

5 files changed, 52 insertions, 221 deletions

diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index b53ca2116ce2..17796ab3e9be 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,9 +1,6 @@
 AUX gupnp-igd-0.1.11-disable_static_modules.patch 250 BLAKE2B dcc3697895faa8f525b07797e44add4a553ea7e9f750c0464543b22116489ade38086f0f4e29527409c421d40c98d09cf668fa3558e9b365030b1017025b46df SHA512 93e656357e1191972f14cf0e23a1a6eb5929af022e431e1c37f0f1196b6fbed874bcb27f1b787b634308bdcfbf9c7c5375df83385669ab6989c6eb2e0f891d86
-AUX gupnp-igd-0.2.2-underlinking.patch 502 BLAKE2B c56e468190691fd02964132ae1a22043d22f3d91982f91095ed6fd1ea2c65f08fa4cc0becbf792ff573e5c860e3c62f690988c112d25e6ceb4c84ba60ed2a90e SHA512 89db92780320e6d2144b358d553c8aac1d68afa2b5a254c701079e8efe7b73be84e5f3214ce96292bab8febfc9a792d9586a445f0a3b20d7a77d3482790264d8
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24 SHA512 5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c SHA512 74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
 DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
-EBUILD gupnp-igd-0.2.2-r1.ebuild 1961 BLAKE2B e93c71404b23e9543cff10fa2043b887d023d3311cc1b5ca1afc1e4a1e4c1cd30f72e06403c40edaf41f5202db85b123e99abdeeb3c568ec912baa82cb498fd5 SHA512 a7baf58308432c73e332cbae8783d49ca45b91d64777aab3512e740c7eb7e0e0b92821e81817f6a361a3533a85f2f56566f4ec7352f84b9df02ed5883c356dab
-EBUILD gupnp-igd-0.2.3-r1.ebuild 2308 BLAKE2B 0868828d176d10a2f9c2b2d29ac6aadbc4853c6d82f4b0a2fc77156819f3b010d324b9ca47c8de73c2db9f7f49ad079758781c3ed2aa5716e230ad4ac46f5b5c SHA512 dc7fba2565e178a4c75642ed8ac1af48022b7ea17ee40cb6af1887fae8fce447537a06c279c9ce0d247aa6dc76d9a17af50002f58b54124e4fe3ae79238bc6eb
+DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 EBUILD gupnp-igd-0.2.4.ebuild 2338 BLAKE2B 3e12803fb56566c218f22168798484b736ac33242c7f59bfed562a379f911879f3111cd37a533d63138647cf41bc3634efe8d12711d8efb1a90235ee45432a28 SHA512 3a251b986fcbbe0bafd702a62e86cebdba7fd70743a8760541569cf7582d4cf7363d425ec297e6e38ff6de7d0a8c5cdc07aad43e94c2670a66745c8facbd69ee
+EBUILD gupnp-igd-0.2.5.ebuild 1166 BLAKE2B f7faa6b1a837fcd3b7ef7c3458440550f306624fed0508e4fdc5ebcebb876c1fdc7091380dd110e891c5aa25ff78679010cce45f465b20d913ab892366a56d04 SHA512 73764154de1203c4bd0559d64b2657d96d9c7c810d10b46e317a231c993ca37cac053fbae18da4fe27d8e2b031f8ca48809ec2139ce95f7821fe3df14f289104
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a388..000000000000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
- 
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0 gssdp-1.0)
- 
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbfb..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/gssdp
-	>=net-libs/gupnp-0.18
-	>=dev-libs/glib-2.16:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.10
-		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-underlinking.patch
-		"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-	)
-
-src_prepare() {
-	rm missing || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	# Python bindings are built/installed manually.
-	if use python; then
-		sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--disable-gtk-doc
-		$(use_enable introspection)
-		$(use_enable python)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_copy_sources
-
-		building() {
-			cd "${BUILD_DIR}"/python || die
-			emake \
-				PYTHON_INCLUDES="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		installation() {
-			cd "${BUILD_DIR}"/python || die
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
deleted file mode 100644
index 2286f628e1be..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit eutils gnome.org multilib-minimal python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.10
-		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-)
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-gtk-doc
-		$(multilib_native_use_enable introspection)
-		# python is built separately
-		--disable-python
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-
-		python_configure() {
-			mkdir -p "${BUILD_DIR}" || die
-			cd "${BUILD_DIR}" || die
-
-			ECONF_SOURCE=${S} \
-			econf "${myconf[@]}" \
-				--enable-python
-		}
-
-		use python && python_foreach_impl python_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${S}/python:${native_builddir}/python" \
-				igd_la_LIBADD="\$(PYGUPNP_IGD_LIBS) ${native_builddir}/libgupnp-igd/libgupnp-igd-1.0.la"
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${S}/python:${native_builddir}/python" \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
new file mode 100644
index 000000000000..71474607dad1
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune gnome.org multilib-minimal xdg-utils
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+multilib_src_configure() {
+	xdg_environment_reset
+
+	# python is old-style bindings; use introspection and pygobject instead
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-gtk-doc \
+		--disable-python \
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}