From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0E1EC138010 for ; Wed, 10 Oct 2012 05:42:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFD1FE027D; Wed, 10 Oct 2012 05:42:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 45503E027D for ; Wed, 10 Oct 2012 05:42:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86EEB33D790 for ; Wed, 10 Oct 2012 05:42:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3D07AE5436 for ; Wed, 10 Oct 2012 05:42:19 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1349847661.c672dac1174f6b7c8828f165ed62431b603c97a8.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild net-libs/libsoup/libsoup-2.39.92.ebuild net-libs/libsoup/libsoup-2.40.0.ebuild net-libs/libsoup/libsoup-9999.ebuild X-VCS-Directories: net-libs/libsoup/ net-libs/libsoup-gnome/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: c672dac1174f6b7c8828f165ed62431b603c97a8 X-VCS-Branch: master Date: Wed, 10 Oct 2012 05:42:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7fedf041-afa1-4756-8822-7e1c01e5c815 X-Archives-Hash: 241347c9836d12ef76ed8cbf5a205f4e commit: c672dac1174f6b7c8828f165ed62431b603c97a8 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Oct 10 05:37:20 2012 +0000 Commit: Alexandre Rostovtsev gentoo 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 =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 =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 }