Version bump. Clean up old revisions.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C6085806)

8 files changed, 41 insertions, 406 deletions

diff --git a/net-libs/gupnp-igd/ChangeLog b/net-libs/gupnp-igd/ChangeLog
index e80b7469a2b6..1978d48cf2aa 100644
--- a/net-libs/gupnp-igd/ChangeLog
+++ b/net-libs/gupnp-igd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/gupnp-igd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.53 2014/01/26 12:20:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.54 2014/02/06 22:14:39 eva Exp $
+
+*gupnp-igd-0.2.3 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> -gupnp-igd-0.1.7.ebuild,
+  -gupnp-igd-0.1.11.ebuild, -gupnp-igd-0.2.1.ebuild, -gupnp-igd-0.2.2.ebuild,
+  +gupnp-igd-0.2.3.ebuild, -files/gupnp-igd-0.1.7-disable_static_modules.patch,
+  -files/gupnp-igd-0.1.7-make-382.patch,
+  -files/gupnp-igd-0.2.2-underlinking.patch:
+  Version bump. Clean up old revisions.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> gupnp-igd-0.2.2-r1.ebuild:
   Stable for sparc, wrt bug #496626
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch
deleted file mode 100644
index 9eae01f19a6a..000000000000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -1,6 +1,7 @@
- PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
- 
- AM_CPPFLAGS =						\
-+	-shared						\
- 	-I.						\
- 	-I$(top_srcdir)					\
- 	-DDATADIR=\""$(datadir)"\"			\
-@@ -27,7 +28,7 @@
- 
- igd_la_LDFLAGS =					\
- 	`python-config --libs`				\
--	-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/files/gupnp-igd-0.1.7-make-382.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-make-382.patch
deleted file mode 100644
index fdb71d92a055..000000000000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-make-382.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-http://bugs.gentoo.org/334353
-
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -1,5 +1,4 @@
- PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
--[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`]
- 
- AM_CPPFLAGS =						\
- 	-I.						\
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.1.11.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild
deleted file mode 100644
index bee3bc8ef5ea..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild,v 1.4 2012/05/05 02:54:30 jdhore Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit autotools eutils python
-
-DESCRIPTION="This is a library to handle UPnP IGD port mapping for GUPnP."
-HOMEPAGE="http://gupnp.org"
-SRC_URI="http://www.gupnp.org/sites/all/files/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+introspection python"
-
-RDEPEND=">=net-libs/gupnp-0.13.2
-	!>=net-libs/gupnp-0.17
-	>=dev-libs/glib-2.16:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? ( >=dev-python/pygobject-2.16:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am"
-
-# The only existing test is broken
-RESTRICT="test"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-
-	# Disable byte-compilation of Python modules.
-	echo "#!/bin/sh" > py-compile
-
-	# Python bindings are built/installed manually.
-	sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_compile() {
-	# introspection is built in the same directory and libtool does not handle
-	# well dependency like this
-	MAKEOPTS="${MAKEOPTS} -j1" default
-
-	if use python; then
-		python_copy_sources python
-
-		building() {
-			emake \
-				PYTHON_INCLUDES="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS NEWS README TODO || die
-	find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize gupnp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup gupnp
-	fi
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild
deleted file mode 100644
index 959c55878820..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild,v 1.14 2012/05/05 02:54:30 jdhore Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit autotools eutils python
-
-DESCRIPTION="This is a library to handle UPnP IGD port mapping for GUPnP."
-HOMEPAGE="http://gupnp.org"
-SRC_URI="http://www.gupnp.org/sites/all/files/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="python"
-
-RDEPEND=">=net-libs/gupnp-0.13.2
-	!>=net-libs/gupnp-0.17
-	>=dev-libs/glib-2.16:2
-	python? ( >=dev-python/pygobject-2.16:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make-382.patch
-	epatch "${FILESDIR}"/${P}-disable_static_modules.patch
-
-	# Disable byte-compilation of Python modules.
-	echo "#!/bin/sh" > py-compile
-
-	# Python bindings are built/installed manually.
-	sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-gtk-doc \
-		$(use_enable python) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-
-		building() {
-			emake \
-				PYTHON_INCLUDES="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS NEWS README TODO || die
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize gupnp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup gupnp
-	fi
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.1.ebuild
deleted file mode 100644
index 5934ddd1050d..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.1.ebuild,v 1.9 2012/12/01 17:59:08 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit autotools eutils python
-
-DESCRIPTION="This is a library to handle UPnP IGD port mapping for GUPnP."
-HOMEPAGE="http://gupnp.org"
-SRC_URI="http://www.gupnp.org/sites/all/files/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="+introspection python"
-
-RDEPEND=">=net-libs/gupnp-0.18
-	>=dev-libs/glib-2.16:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? ( >=dev-python/pygobject-2.16:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am"
-
-# The only existing test is broken
-RESTRICT="test"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-
-	# Disable byte-compilation of Python modules.
-	echo "#!/bin/sh" > py-compile
-
-	# Python bindings are built/installed manually.
-	sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_compile() {
-	# introspection is built in the same directory and libtool does not handle
-	# well dependency like this
-	MAKEOPTS="${MAKEOPTS} -j1" default
-
-	if use python; then
-		python_copy_sources python
-
-		building() {
-			emake \
-				PYTHON_INCLUDES="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS NEWS README TODO || die
-	find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize gupnp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup gupnp
-	fi
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild
index 001c7782f85a..5bd9a2ce149f 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.2.ebuild,v 1.3 2012/11/25 17:22:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild,v 1.1 2014/02/06 22:14:39 eva Exp $
 
-EAPI="5"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+EAPI=5
 
-inherit autotools eutils gnome.org python
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
 
-DESCRIPTION="This is a library to handle UPnP IGD port mapping for GUPnP."
+inherit autotools-utils gnome.org python-r1
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
 HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2"
@@ -18,11 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection python"
 
 RDEPEND="
+	>=dev-libs/glib-2.26:2
+	net-libs/gssdp
 	>=net-libs/gupnp-0.18
-	>=dev-libs/glib-2.16:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-	python? ( >=dev-python/pygobject-2.16:2 )
-"
+	python? (
+		>=dev-libs/gobject-introspection-0.10
+		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	sys-devel/gettext
@@ -32,74 +35,55 @@ DEPEND="${RDEPEND}
 # The only existing test is broken
 RESTRICT="test"
 
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
-	eautoreconf
-
 	# Python bindings are built/installed manually.
 	if use python; then
 		sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die
-		python_clean_py-compile_files -q
 	fi
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
+	local myeconfargs=(
+		--disable-static
+		--disable-gtk-doc
+		$(use_enable introspection)
 		$(use_enable python)
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	default
+	autotools-utils_src_compile
 
 	if use python; then
-		python_copy_sources python
+		python_copy_sources
 
 		building() {
+			cd "${BUILD_DIR}"/python || die
 			emake \
 				PYTHON_INCLUDES="-I$(python_get_includedir)" \
 				pyexecdir="$(python_get_sitedir)"
 		}
-		python_execute_function -s --source-dir python building
+		python_foreach_impl building
 	fi
 }
 
 src_install() {
-	DOCS="AUTHORS NEWS README TODO"
-
-	default
+	autotools-utils_src_install
 
 	if use python; then
 		installation() {
+			cd "${BUILD_DIR}"/python || die
 			emake \
 				DESTDIR="${D}" \
 				pyexecdir="$(python_get_sitedir)" \
 				install
 		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize gupnp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup gupnp
+		python_foreach_impl installation
 	fi
 }