Version bump, drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 31 insertions, 66 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/Manifest b/net-libs/gssdp/Manifest
index 318d92666823..36d0ecccb21b 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gssdp-0.14.7.tar.xz 283112 SHA256 02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5 SHA512 94e1c35eb14ba176c2134f93dfc0598898e8308dd5f70c5f7d9e1afdf83c272974769b7b9fa7ac47a92bc851b5b0c1dfff52005c5ac5096b34ee3aa0401e8ffa WHIRLPOOL b96cbc9fcf47db5be29440292c6b5214432ffe698bc5f38ae059b539fe70075e38449391293f929d7230a8bb793ce9f772c414826c28fea19498b9ab9fb18706
+DIST gssdp-0.14.10.tar.xz 291236 SHA256 b9b3be6354d6a0dcc7c29a7da4120847350011e5614383626552e15c28f3058c SHA512 ee974794fa82388f305c24802ca2a42fe8d3abcfff98a7e810470f772a8adec596b7d81a5e991763043f37b7cac7e6b4a16642e58d440adef2989b7ca27fc489 WHIRLPOOL f37ca8b781fdc442a8a9b08a57efce95563fa96d350d4aee4f9f71fa9f425a65aefdf5561f35dc5dbd7d590212d533175380631629fce5fd998d91e42676ac1e
 DIST gssdp-0.14.8.tar.xz 290756 SHA256 4c3ffa01435e84dc31c954e669e1ca0749b962f76a333e74f5c2cb0de5803a13 SHA512 9c1cb1474d9c80e053492cb6e2a46d1d0710d96a34024d997807a09d9f915a5791ca5a871f08365f5df8ede67e18b3942205fb86d10f98c8ed36f2b3b4740851 WHIRLPOOL 7212f68da959ac13c4d2dabbae588a6e2cf7b9e8c97003904db2a7def17604371ad07f679a9ad247abe8a47d588508352cacb4d4bf63e08ac15ad3501bd8128a
-EBUILD gssdp-0.14.7.ebuild 1272 SHA256 db36bd2514cbd3eb630a4d618e39d4be42b832c7bafc482c0fd1e070f8a7c83f SHA512 98d60c17e32ea20a874fe5415b4dc5d58ae22e1164a48adfacdf3325f9e4c41e0d6e68e429621e32cfccb509e8931ba7745b62cf0b0b1404db661b85eacb345d WHIRLPOOL 1c501ec0afa46835b24aae6a46abaca3019d966d2e9708f2ff12186a0956b632b0aa979f5da002444c05e96cf1a772c822387f9d16506642c098009399a1b372
+EBUILD gssdp-0.14.10.ebuild 1587 SHA256 ced845677d3fe5175c3a8093fb538cda8cda0de2d80b8c125a028cfe30300179 SHA512 54aeb5ebffb8f4e729dae3525cff9af47871f04b3dfbdc0920b7a044229ce1017f4a445bde381782375ef4aae7bb58db9e4ffd47fd950001a0af9b7398775e58 WHIRLPOOL d1039bb5cc8d8ec601f584ded9e1ea7c4e1176f0378143742fea2bafc208115f3847f58537f22ca6b4dfbd185f9e0eed0213b58e14f8758f43e5ed22606bfc27
 EBUILD gssdp-0.14.8-r1.ebuild 1584 SHA256 7572ee13331ce2ffa9deaaf5b017d0ed1785216b34f4f92ed1154cc0e2434e1b SHA512 99e8277261dd93ba2e687b6a97218b6c527ce4bd6966a0d7cf344cd5f631b63ece2daab193b727128f183d43e080c75e07abebb0777f835ae446b0f44bbc7d0b WHIRLPOOL 41aa0442d37a61b12a22fc4c02a735363ba1b067e358466d81fa8edeabd368035e4c62cf375f72a27cb9089717ba9792b8ca61e50bd7c51b9c5afb8641bbbdd9
-EBUILD gssdp-0.14.8.ebuild 1297 SHA256 3f9f750f0304f9dbd221a6f39d1841783f5c11fbcd356baff0b9af16eacb045e SHA512 cbc2e6885d4cc7a697ed1906832cc52d3c60235a5ab9816fdf1aa815fc0de8ee5a4a7c42dd6955ac1edf5232843df5a19e3eb9d61244057ce3c767068ac89c07 WHIRLPOOL 3ed64a747b273b4c2c9b7d26b8eb24e74f5eafabcf6311cc9f0c3261c1880531e840d45a5cd49bbfd7f4f45cd89a425596ef681a0b6a5f6ca4dc2622ded19b2f
-MISC ChangeLog 9434 SHA256 7434a5d7f5c171afe71f7a7e0e64d9d6361b2fcc2dcdf700440c0e03e8c5795a SHA512 8343ed8938f6a6e1c7b7e305be3233941f816fb84d5b2ff3e8fb8aa069234ee0539807734ef43b098c9dc280df5251d3d5c5a82f3ced7094b8bfc4e6a606344f WHIRLPOOL a4ce0b8e1da4a0b3698428931a88ae66b939243504ba43481c38e74046b641995a3ffd5350a9df7a74c8a09ea25130ad8d11136e5dbafd59dd335292b388eaae
+MISC ChangeLog 9607 SHA256 d826640ac111c856595bf3513b7fc8257c4efb67585a67cf1334bd41e26d56a2 SHA512 130180889cf4c09ac177ade682dbecd0d201aac4b75145d7915efb41c2a3cf6de18d40ccf90fa8d20a4040ba9ee6362cc4ad9d7ce92b5e3719378dabf04aef8d WHIRLPOOL 906dac936dbf8008c4d35e2c3f386400aee0f550dc351a9a596340a4b11207f3b83891c8f3e9f949ccd776d32fe3d5b081e74634eac763825d3095c79a2d341c
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPj1P4ACgkQVWmRsqeSphM/1QCcDxfa58oRX2jANe0FBTEmddCb
-U/IAn00PLDiyj8WI6AcKOofzXaD9CoJ3
-=Z+u3
+iEYEAREIAAYFAlQF4IEACgkQCaWpQKGI+9TJngCcDV29kYKd5tucq03U144/WZnK
+qx0An0KBuyNJF90xMDqXLcD6TTg6bTkI
+=SLH/
 -----END PGP SIGNATURE-----
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
-}