gentoo resync : 22.01.2019

4 files changed, 3 insertions, 125 deletions

diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 028c66246d8b..c7e668dd118a 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,3 @@
-AUX gupnp-igd-0.1.11-disable_static_modules.patch 250 BLAKE2B dcc3697895faa8f525b07797e44add4a553ea7e9f750c0464543b22116489ade38086f0f4e29527409c421d40c98d09cf668fa3558e9b365030b1017025b46df SHA512 93e656357e1191972f14cf0e23a1a6eb5929af022e431e1c37f0f1196b6fbed874bcb27f1b787b634308bdcfbf9c7c5375df83385669ab6989c6eb2e0f891d86
-DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.4.ebuild 2356 BLAKE2B 95f1a6eeace04555c56bbb17e88ea6675f6adf54db31ff056d981d4c5031a05a4801e26a2712a1378f36e37436860312928d4c047640500a349b2248693d6aaf SHA512 85fef8ef5215049f27531d49f3eba0b74078c13786f8c4d88d255c726101c9f652ac8dc11097654ed23f846736ad18524cb5a0f63576ed9d965618dada07ae87
-EBUILD gupnp-igd-0.2.5.ebuild 1181 BLAKE2B 45490842810ee17427fa4bc8f70d07b220c71187222bdfef173fca789ec9a99e9a934d8c3da0116dc83cba19fc9ed9f2c0399db165c65fb84379f7244add1ca3 SHA512 f13a0190a3b3859439b091961b4beb0c08680890dfebcddb499bbfe89f0fdee307910e395b43496a0c7c92b399e1a43a236b8d85536810f639add6ac8d484601
+EBUILD gupnp-igd-0.2.5.ebuild 1180 BLAKE2B 21dd3249375595ba1c3a4196843f6afe93086a99468565c2a182af316618c60153841c7d59a9ca452cde44a83ce9af08ef5cf03b5fcaf7a4d766f8313825f3a0 SHA512 9f8f63f26d2db72b3435a109457d40f81f12344120398c66c90e7ea515f8b67370e340c1d99f71c12067b25347be46e651360d05d8d801cc21e6c1b998860367
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
deleted file mode 100644
index ccd4b8da2fea..000000000000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -27,7 +28,7 @@
- 
- igd_la_LDFLAGS =					\
--	-module -avoid-version
-+	-module -avoid-version -shared
- 
- pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs
- 	$(PYCODEGEN)						\
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
deleted file mode 100644
index 2b84b9c579f7..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit eutils gnome.org python-r1 multilib-minimal xdg-utils
-
-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/glib-utils
-	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() {
-	xdg_environment_reset
-
-	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
index 7f0c4f8d162b..92cf19cf3430 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="