Version bump, drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 25 insertions, 59 deletions

diff --git a/net-libs/gssdp/ChangeLog b/net-libs/gssdp/ChangeLog
index 13d3119c4952..a0493817986b 100644
--- a/net-libs/gssdp/ChangeLog
+++ b/net-libs/gssdp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gssdp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.77 2014/08/07 19:35:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.78 2014/09/02 15:21:36 pacho Exp $
+
+*gssdp-0.14.10 (02 Sep 2014)
+
+  02 Sep 2014; Pacho Ramos <pacho@gentoo.org> +gssdp-0.14.10.ebuild,
+  -gssdp-0.14.7.ebuild, -gssdp-0.14.8.ebuild:
+  Version bump, drop old
 
   07 Aug 2014; Jeroen Roovers <jer@gentoo.org> gssdp-0.14.8-r1.ebuild:
   Stable for HPPA (bug #512012).
diff --git a/net-libs/gssdp/gssdp-0.14.8.ebuild b/net-libs/gssdp/gssdp-0.14.10.ebuild
index 3e600a3904d9..50eef13a50e7 100644
--- a/net-libs/gssdp/gssdp-0.14.8.ebuild
+++ b/net-libs/gssdp/gssdp-0.14.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.14.8.ebuild,v 1.1 2014/05/31 09:46:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.14.10.ebuild,v 1.1 2014/09/02 15:21:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 vala
+inherit gnome2 multilib-minimal vala
 
 DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
 HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
@@ -18,8 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+introspection +gtk"
 
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-libs/libsoup-2.26.1:2.4[introspection?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
 	introspection? (
 		$(vala_depend)
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 src_prepare() {
@@ -42,9 +42,19 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_with gtk) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with gtk) \
 		--disable-static
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
 }
diff --git a/net-libs/gssdp/gssdp-0.14.7.ebuild b/net-libs/gssdp/gssdp-0.14.7.ebuild
deleted file mode 100644
index 06ccd1b1a4de..000000000000
--- a/net-libs/gssdp/gssdp-0.14.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.14.7.ebuild,v 1.6 2014/03/28 02:33:04 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="+introspection +gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-libs/libsoup-2.26.1:2.4[introspection?]
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	introspection? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.6.7 )
-	!<net-libs/gupnp-vala-0.10.3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Disable functional test as it requires port that might be used by rygel to
-	# be free of use
-	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
-		-i "${S}"/tests/gtest/Makefile.in || die
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_with gtk) \
-		--disable-static
-}