public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2011-04-06 14:28 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-06 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5aaa77b553a7c0cf81459bdf4b444e34bb1dc96b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 14:10:45 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 14:28:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5aaa77b5

net-libs/libsoup: QAed

	* Use renamed USE flag in glib-networking

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 net-libs/libsoup/libsoup-2.34.0.ebuild |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.34.0.ebuild b/net-libs/libsoup/libsoup-2.34.0.ebuild
index 7a72a50..fda3480 100644
--- a/net-libs/libsoup/libsoup-2.34.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.34.0.ebuild
@@ -13,12 +13,12 @@ HOMEPAGE="http://live.gnome.org/LibSoup"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +introspection ssl test"
 
-RDEPEND=">=dev-libs/glib-2.27.5
-	>=dev-libs/libxml2-2
-	net-libs/glib-networking[gnutls]
+RDEPEND=">=dev-libs/glib-2.27.5:2
+	>=dev-libs/libxml2-2:2
+	net-libs/glib-networking[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -27,8 +27,9 @@ DEPEND="${RDEPEND}
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2]
-#		net-misc/curl )"
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
 
 pkg_setup() {
 	# Set invalid apache module dir until apache tests are ready, bug #326957



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-04-14  6:10 Alexandre Restovtsev
  0 siblings, 0 replies; 15+ messages in thread
From: Alexandre Restovtsev @ 2012-04-14  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2265bee00bf0e03ffad7c1ff37a2067fc0ee9afa
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 22:11:57 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 13 22:19:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2265bee0

net-libs/libsoup: 2.28.0 moved to gx86, sync 9999 with gx86

---
 net-libs/libsoup/libsoup-2.38.0.ebuild |   81 --------------------------------
 net-libs/libsoup/libsoup-9999.ebuild   |    6 +-
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.38.0.ebuild b/net-libs/libsoup/libsoup-2.38.0.ebuild
deleted file mode 100644
index b8e8f76..0000000
--- a/net-libs/libsoup/libsoup-2.38.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-IUSE="debug doc +introspection samba ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.7:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-	fi
-
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-}

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index b8e8f76..d3f236f 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -59,8 +59,6 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die
@@ -76,6 +74,8 @@ src_prepare() {
 	if use doc; then
 		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
 		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
+		[[ ${PV} != 9999 ]] && eautoreconf
 	fi
+
+	gnome2_src_prepare
 }



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-07-03 11:10 Priit Laes
  0 siblings, 0 replies; 15+ messages in thread
From: Priit Laes @ 2012-07-03 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a5a4b40c7ec11b62d5b8b3f19c74aa15d25f0f23
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jul  3 11:08:25 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jul  3 11:08:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a5a4b40c

net-libs/libsoup: Add 2.39.3 to overlay

---
 .../{libsoup-9999.ebuild => libsoup-2.39.3.ebuild} |    3 ++-
 net-libs/libsoup/libsoup-9999.ebuild               |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.39.3.ebuild
similarity index 97%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.39.3.ebuild
index 693bad1..110db63 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.3.ebuild
@@ -23,13 +23,14 @@ else
 fi
 IUSE="debug doc +introspection samba ssl test"
 
-RDEPEND=">=dev-libs/glib-2.31.7:2
+RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 693bad1..110db63 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -23,13 +23,14 @@ else
 fi
 IUSE="debug doc +introspection samba ssl test"
 
-RDEPEND=">=dev-libs/glib-2.31.7:2
+RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-07-22  5:22 Priit Laes
  0 siblings, 0 replies; 15+ messages in thread
From: Priit Laes @ 2012-07-22  5:22 UTC (permalink / raw
  To: gentoo-commits

commit:     f92f9386c6151ff9970ef8859bc98419528e5b37
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jul 22 05:20:56 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jul 22 05:20:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f92f9386

net-libs/libsoup: Use only Python2 during build

https://bugs.gentoo.org/show_bug.cgi?id=427278

---
 net-libs/libsoup/libsoup-2.39.4.1.ebuild |    4 +++-
 net-libs/libsoup/libsoup-9999.ebuild     |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.39.4.1.ebuild b/net-libs/libsoup/libsoup-2.39.4.1.ebuild
index 1fe51d9..62d12c1 100644
--- a/net-libs/libsoup/libsoup-2.39.4.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.4.1.ebuild
@@ -5,8 +5,9 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
 
-inherit autotools eutils gnome2
+inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -51,6 +52,7 @@ pkg_setup() {
 		--with-apache-module-dir="${T}"
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
+	python_set_active_version 2
 }
 
 src_configure() {

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 110db63..62d12c1 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -5,8 +5,9 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
 
-inherit autotools eutils gnome2
+inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -30,6 +31,7 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	dev-lang/python
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	doc? ( >=dev-util/gtk-doc-1.10 )"
@@ -50,6 +52,7 @@ pkg_setup() {
 		--with-apache-module-dir="${T}"
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
+	python_set_active_version 2
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-11-05  7:37 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-05  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     22722700cbfaae446e9cb406bd946d6522b84538
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 07:37:32 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 07:37:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=22722700

net-libs/libsoup: fix repoman warnings

---
 net-libs/libsoup/libsoup-2.40.1.ebuild |   13 +++++++------
 net-libs/libsoup/libsoup-9999.ebuild   |   13 +++++++------
 net-libs/libsoup/metadata.xml          |   11 +++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.40.1.ebuild b/net-libs/libsoup/libsoup-2.40.1.ebuild
index f8e8fed..a5c6522 100644
--- a/net-libs/libsoup/libsoup-2.40.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.40.1.ebuild
@@ -6,9 +6,9 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 python
+inherit gnome2 python
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit eutils gnome2-live
 fi
 
 DESCRIPTION="An HTTP library implementation in C"
@@ -45,6 +45,11 @@ DEPEND="${RDEPEND}
 #		net-libs/glib-networking[ssl])"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	DOCS="AUTHORS NEWS README"
 	G2CONF="${G2CONF}
@@ -54,11 +59,7 @@ pkg_setup() {
 		--without-apache-httpd
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-	python_set_active_version 2
-	python_pkg_setup
-}
 
-src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index f8e8fed..a5c6522 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -6,9 +6,9 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 python
+inherit gnome2 python
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit eutils gnome2-live
 fi
 
 DESCRIPTION="An HTTP library implementation in C"
@@ -45,6 +45,11 @@ DEPEND="${RDEPEND}
 #		net-libs/glib-networking[ssl])"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	DOCS="AUTHORS NEWS README"
 	G2CONF="${G2CONF}
@@ -54,11 +59,7 @@ pkg_setup() {
 		--without-apache-httpd
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-	python_set_active_version 2
-	python_pkg_setup
-}
 
-src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die

diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
new file mode 100644
index 0000000..b2d538b
--- /dev/null
+++ b/net-libs/libsoup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+    <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
+			Sign-On</flag>
+  </use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-11-22 22:25 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-22 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     29d450917c6d7380ac62bcef1383bb4a55786e6a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 22:20:55 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 22:20:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29d45091

net-libs/libsoup: 2.40.1 → 2.40.2

---
 ...libsoup-2.40.1.ebuild => libsoup-2.40.2.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.40.1.ebuild b/net-libs/libsoup/libsoup-2.40.2.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.40.1.ebuild
rename to net-libs/libsoup/libsoup-2.40.2.ebuild


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2012-12-17  8:21 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-17  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2fe1f2d7217b3a30d4856b9c4929c62f6059ea4a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 08:18:25 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 08:18:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2fe1f2d7

net-libs/libsoup: moved to gx86

    * Sync live ebuild with gx86 changes.
    * USE=introspection is now global

---
 net-libs/libsoup/libsoup-2.40.2.ebuild |   86 --------------------------------
 net-libs/libsoup/libsoup-9999.ebuild   |   37 +++++++------
 net-libs/libsoup/metadata.xml          |    2 -
 3 files changed, 20 insertions(+), 105 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.40.2.ebuild b/net-libs/libsoup/libsoup-2.40.2.ebuild
deleted file mode 100644
index a5c6522..0000000
--- a/net-libs/libsoup/libsoup-2.40.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit eutils gnome2-live
-fi
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-IUSE="debug +introspection samba ssl test"
-[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
-
-RDEPEND=">=dev-libs/glib-2.33.1:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	=dev-lang/python-2*
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-
-		# Patch *must* be applied conditionally (see patch for details)
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		use doc && epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-	fi
-
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index a5c6522..f1d960d 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -28,15 +28,19 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
 	=dev-lang/python-2*
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.10 )"
+fi
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -50,16 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die
@@ -79,6 +73,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-gnome
+		--without-apache-httpd
+		$(use_enable introspection)
+		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
+
 	# FIXME: we need addpredict to workaround bug #324779 until
 	# root cause (bug #249496) is solved
 	addpredict /usr/share/snmp/mibs/.index

diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index b2d538b..5e2dfbb 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
     <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
   </use>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2013-03-09 10:22 Priit Laes
  0 siblings, 0 replies; 15+ messages in thread
From: Priit Laes @ 2013-03-09 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5139da22d13bcd1ebd10be2c2ce452da9931b9f9
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Mar  9 10:21:10 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Mar  9 10:21:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5139da22

net-libs/libsoup: Bump net-libs/glib-networking dependency

---
 ...up-2.41.91.ebuild => libsoup-2.41.91-r1.ebuild} |    2 +-
 net-libs/libsoup/libsoup-9999.ebuild               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.41.91.ebuild b/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
similarity index 98%
rename from net-libs/libsoup/libsoup-2.41.91.ebuild
rename to net-libs/libsoup/libsoup-2.41.91-r1.ebuild
index a0efd38..6490704 100644
--- a/net-libs/libsoup/libsoup-2.41.91.ebuild
+++ b/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-db/sqlite:3=
     >=dev-libs/glib-2.35.0:2
 	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=net-libs/glib-networking-2.35.3[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index a0efd38..6490704 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-db/sqlite:3=
     >=dev-libs/glib-2.35.0:2
 	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=net-libs/glib-networking-2.35.3[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2013-11-19  8:18 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-19  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9453f227bdac32a9814cff0f70c5398bec014df0
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 07:51:03 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 08:17:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9453f227

net-libs/libsoup: 2.42.2-r1 → 2.44.2

---
 .../{libsoup-9999.ebuild => libsoup-2.44.2.ebuild} | 46 +++++++---------------
 net-libs/libsoup/libsoup-9999.ebuild               | 30 +++++++-------
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.44.2.ebuild
similarity index 65%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.44.2.ebuild
index 423756e..c93005a 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.44.2.ebuild
@@ -5,43 +5,33 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 python-any-r1
-if [[ ${PV} = 9999 ]]; then
-	inherit eutils gnome2-live
-fi
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
 LICENSE="LGPL-2+"
 SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-IUSE="debug +introspection samba ssl test gnome"
-[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-RDEPEND=">=dev-libs/glib-2.35.0:2
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
 	>=dev-libs/libxml2-2:2
 	dev-db/sqlite:3
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
+	virtual/pkgconfig
+"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -50,11 +40,6 @@ fi
 #		net-libs/glib-networking[ssl])"
 
 src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests (bug #226271)
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
@@ -65,17 +50,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
-		$(use_with gnome) \
+		--without-gnome \
 		--without-apache-httpd \
 		$(use_enable introspection) \
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
-
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
 }

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 423756e..ca74266 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -5,11 +5,11 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 python-any-r1
 if [[ ${PV} = 9999 ]]; then
-	inherit eutils gnome2-live
+	inherit gnome2-live
 fi
 
 DESCRIPTION="An HTTP library implementation in C"
@@ -17,26 +17,29 @@ HOMEPAGE="http://live.gnome.org/LibSoup"
 
 LICENSE="LGPL-2+"
 SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
+	IUSE="${IUSE} doc"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
-IUSE="debug +introspection samba ssl test gnome"
-[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
-RDEPEND=">=dev-libs/glib-2.35.0:2
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
 	>=dev-libs/libxml2-2:2
 	dev-db/sqlite:3
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -65,17 +68,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
-		$(use_with gnome) \
+		--without-gnome \
 		--without-apache-httpd \
 		$(use_enable introspection) \
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
-
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2014-04-25 22:26 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-25 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     46e4d9ef22d359f49f36a3019db0677d222e69dc
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 21:41:43 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 22:26:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=46e4d9ef

net-libs/libsoup: 2.44.2 → 2.46.0

---
 .../{libsoup-9999.ebuild => libsoup-2.46.0.ebuild} | 26 +++++-----------------
 net-libs/libsoup/libsoup-9999.ebuild               |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.46.0.ebuild
similarity index 76%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.46.0.ebuild
index 2c5cdcb..d962883 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.46.0.ebuild
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 python-any-r1
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/LibSoup"
@@ -18,15 +15,10 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection samba ssl test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
-	>=dev-libs/glib-2.36.0:2
+	>=dev-libs/glib-2.38:2
 	>=dev-libs/libxml2-2:2
 	dev-db/sqlite:3
 	>=net-libs/glib-networking-2.30.0[ssl?]
@@ -40,11 +32,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -53,17 +40,16 @@ fi
 #		net-libs/glib-networking[ssl])"
 
 src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests (bug #226271)
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed failed"
 	fi
 
+	# FIXME: does not behave as expected
+	sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+		-i tests/socket-test.c || die
+
 	gnome2_src_prepare
 }
 

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 2c5cdcb..db2012d 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.36.0:2
+	>=dev-libs/glib-2.38:2
 	>=dev-libs/libxml2-2:2
 	dev-db/sqlite:3
 	>=net-libs/glib-networking-2.30.0[ssl?]


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2014-10-12 23:19 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-12 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     65daf132cb660e21bd6eef739919f5c6fa8fc382
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 21:04:17 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:00 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=65daf132

net-libs/libsoup: 2.46.0-r1 → 2.48.0

---
 ...libsoup-2.46.0.ebuild => libsoup-2.48.0.ebuild} | 36 +++++++++++++++++-----
 net-libs/libsoup/libsoup-9999.ebuild               | 36 +++++++++++++++++-----
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.46.0.ebuild b/net-libs/libsoup/libsoup-2.48.0.ebuild
similarity index 64%
rename from net-libs/libsoup/libsoup-2.46.0.ebuild
rename to net-libs/libsoup/libsoup-2.48.0.ebuild
index d962883..24efa69 100644
--- a/net-libs/libsoup/libsoup-2.46.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.48.0.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/LibSoup"
@@ -15,13 +15,13 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection samba ssl test"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -38,6 +38,12 @@ DEPEND="${RDEPEND}
 #		dev-lang/php[apache2,xmlrpc]
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
 
 src_prepare() {
 	if ! use test; then
@@ -58,12 +64,26 @@ src_configure() {
 	# root cause (bug #249496) is solved
 	addpredict /usr/share/snmp/mibs/.index
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
 		--without-gnome \
 		--without-apache-httpd \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
 }

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index db2012d..21d1f43 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,14 +22,14 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 	IUSE="${IUSE} doc"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 if [[ ${PV} = 9999 ]]; then
@@ -51,6 +51,12 @@ fi
 #		dev-lang/php[apache2,xmlrpc]
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
 
 src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
@@ -72,12 +78,26 @@ src_configure() {
 	# root cause (bug #249496) is solved
 	addpredict /usr/share/snmp/mibs/.index
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
 		--without-gnome \
 		--without-apache-httpd \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2014-11-04  0:11 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-04  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     902059823b98a33b755aa7f193a377b33ddb42a1
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 23:47:50 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 23:47:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=90205982

net-libs/libsoup: enable build with python3, bug #527228

---
 net-libs/libsoup/libsoup-2.48.0.ebuild | 2 +-
 net-libs/libsoup/libsoup-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.48.0.ebuild b/net-libs/libsoup/libsoup-2.48.0.ebuild
index 24efa69..9b79840 100644
--- a/net-libs/libsoup/libsoup-2.48.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.48.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit gnome2 multilib-minimal python-any-r1
 

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 21d1f43..8de74d2 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit gnome2 multilib-minimal python-any-r1
 if [[ ${PV} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2014-12-07 21:27 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-07 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     597fc28f66ef15c4748c8a5758087f50ae3a26cc
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  7 18:51:33 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  7 18:51:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=597fc28f

net-libs/libsoup: 2.48.0 → 2.48.1

---
 net-libs/libsoup/{libsoup-2.48.0.ebuild => libsoup-2.48.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.48.0.ebuild b/net-libs/libsoup/libsoup-2.48.1.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.48.0.ebuild
rename to net-libs/libsoup/libsoup-2.48.1.ebuild


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2014-12-26 21:48 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-26 21:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9e5bab5c906008450ea0fe311b6039c6fd1af12c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 21:48:01 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 21:48:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e5bab5c

net-libs/libsoup: moved to gentoo-x86

---
 net-libs/libsoup/libsoup-2.48.1.ebuild | 89 ----------------------------------
 1 file changed, 89 deletions(-)

diff --git a/net-libs/libsoup/libsoup-2.48.1.ebuild b/net-libs/libsoup/libsoup-2.48.1.ebuild
deleted file mode 100644
index 9b79840..0000000
--- a/net-libs/libsoup/libsoup-2.48.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit gnome2 multilib-minimal python-any-r1
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection samba ssl test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: does not behave as expected
-	sed -e 's|\(g_test_add.*\)|/*\1*/|' \
-		-i tests/socket-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(multilib_native_use_enable introspection) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/
@ 2015-05-14 22:50 Gilles Dartiguelongue
  0 siblings, 0 replies; 15+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     94ddce218026f52b12c5d4395ab979c326333158
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 22:33:27 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:37:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=94ddce21

net-libs/libsoup: 2.48.1 → 2.50.0

 .../{libsoup-9999.ebuild => libsoup-2.50.0.ebuild} | 26 +++++-----------------
 net-libs/libsoup/libsoup-9999.ebuild               |  5 +++--
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.50.0.ebuild
similarity index 78%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.50.0.ebuild
index 8de74d2..32cdb8a 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 multilib-minimal python-any-r1
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/LibSoup"
@@ -18,12 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection samba ssl test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
@@ -39,18 +31,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
 "
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
 #		dev-lang/php[apache2,xmlrpc]
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
+
 RDEPEND="${RDEPEND}
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
@@ -59,11 +48,6 @@ RDEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests (bug #226271)
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 8de74d2..62e5150 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 multilib-minimal python-any-r1
 if [[ ${PV} = 9999 ]]; then
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
 "
 
 if [[ ${PV} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2015-05-14 22:50 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-14 22:50 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2014-12-26 21:48 Gilles Dartiguelongue
2014-12-07 21:27 Gilles Dartiguelongue
2014-11-04  0:11 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-25 22:26 Gilles Dartiguelongue
2013-11-19  8:18 Gilles Dartiguelongue
2013-03-09 10:22 Priit Laes
2012-12-17  8:21 Gilles Dartiguelongue
2012-11-22 22:25 Gilles Dartiguelongue
2012-11-05  7:37 Gilles Dartiguelongue
2012-07-22  5:22 Priit Laes
2012-07-03 11:10 Priit Laes
2012-04-14  6:10 Alexandre Restovtsev
2011-04-06 14:28 Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox