[gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alexandre Rostovtsev" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
Date: Wed, 10 Oct 2012 05:42:19 +0000 (UTC)	[thread overview]
Message-ID: <1349847661.c672dac1174f6b7c8828f165ed62431b603c97a8.tetromino@gentoo> (raw)

commit:     c672dac1174f6b7c8828f165ed62431b603c97a8
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 05:37:20 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 05:41:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c672dac1

net-libs/libsoup{,-gnome}: 2.39.92 → 2.40.0 and sync with gx86

Drop useless USE=doc for non-live ebuilds.
Depend on python only at build time (tld-parser.py is not installed).
Fix libsoup-gnome[introspection] dep (bug #437762, thanks to Vicente
Olivert Riera).
Update license.

---
 ...-2.39.92.ebuild => libsoup-gnome-2.40.0.ebuild} |   15 ++++-----
 net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild   |   15 ++++-----
 ...ibsoup-2.39.92.ebuild => libsoup-2.40.0.ebuild} |   29 +++++++++----------
 net-libs/libsoup/libsoup-9999.ebuild               |   30 +++++++++----------
 4 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild
similarity index 78%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild
index 6c8fb86..19a4d60 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -19,25 +19,24 @@ DESCRIPTION="GNOME plugin for libsoup"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 SRC_URI="${SRC_URI//-gnome}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
-IUSE="debug doc +introspection"
+IUSE="debug +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
 fi
 
-RDEPEND="~net-libs/libsoup-${PV}
+RDEPEND="~net-libs/libsoup-${PV}[introspection?]
 	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index 6c8fb86..19a4d60 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -19,25 +19,24 @@ DESCRIPTION="GNOME plugin for libsoup"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 SRC_URI="${SRC_URI//-gnome}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
-IUSE="debug doc +introspection"
+IUSE="debug +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
 fi
 
-RDEPEND="~net-libs/libsoup-${PV}
+RDEPEND="~net-libs/libsoup-${PV}[introspection?]
 	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/net-libs/libsoup/libsoup-2.39.92.ebuild b/net-libs/libsoup/libsoup-2.40.0.ebuild
similarity index 77%
rename from net-libs/libsoup/libsoup-2.39.92.ebuild
rename to net-libs/libsoup/libsoup-2.40.0.ebuild
index f6075a2..3b1b583 100644
--- a/net-libs/libsoup/libsoup-2.39.92.ebuild
+++ b/net-libs/libsoup/libsoup-2.40.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 
 inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
@@ -15,14 +14,15 @@ fi
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+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"
+	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 doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
+[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
 RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
@@ -32,9 +32,10 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	dev-lang/python
+	=dev-lang/python-2*
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
+	>=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,
@@ -54,6 +55,7 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_configure() {
@@ -67,6 +69,10 @@ src_prepare() {
 	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
@@ -75,12 +81,5 @@ src_prepare() {
 			|| 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"
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-
 	gnome2_src_prepare
 }

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index d25d35d..3b1b583 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 
 inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
@@ -15,14 +14,15 @@ fi
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+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"
+	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 doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
+[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
 RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
@@ -32,9 +32,10 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	dev-lang/python
+	=dev-lang/python-2*
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
+	>=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,
@@ -54,6 +55,7 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_configure() {
@@ -67,6 +69,10 @@ src_prepare() {
 	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
@@ -75,13 +81,5 @@ src_prepare() {
 			|| 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"
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	epatch "${FILESDIR}/${P}-avoid-double-free.patch"
-
 	gnome2_src_prepare
 }

next             reply	other threads:[~2012-10-10  5:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-10  5:42 Alexandre Rostovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-10-20  6:26 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/ Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-07-18  7:09 Priit Laes
2012-04-02  7:30 Nirbheek Chauhan
2011-02-22  2:57 Nirbheek Chauhan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6c8fb86 dfblob:19a4d60 dfblob:6c8fb86 dfblob:19a4d60
dfblob:f6075a2 dfblob:3b1b583 dfblob:d25d35d dfblob:3b1b583 )
 OR (
bs:"[gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349847661.c672dac1174f6b7c8828f165ed62431b603c97a8.tetromino@gentoo \
    --to=tetromino@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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