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 92DA6138247 for ; Tue, 19 Nov 2013 08:18:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 164CFE0A40; Tue, 19 Nov 2013 08:18:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BFB1E0A40 for ; Tue, 19 Nov 2013 08:18:09 +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 5A75333F2C5 for ; Tue, 19 Nov 2013 08:18:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 055DFE5459 for ; Tue, 19 Nov 2013 08:18:07 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1384849073.9453f227bdac32a9814cff0f70c5398bec014df0.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup/libsoup-2.44.2.ebuild net-libs/libsoup/libsoup-9999.ebuild X-VCS-Directories: net-libs/libsoup/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 9453f227bdac32a9814cff0f70c5398bec014df0 X-VCS-Branch: master Date: Tue, 19 Nov 2013 08:18:07 +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: 1ded32e6-bf8c-462b-9e13-0ad340e83b11 X-Archives-Hash: 664c5f87199f98cec1ec99c5b61cc9df commit: 9453f227bdac32a9814cff0f70c5398bec014df0 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Nov 19 07:51:03 2013 +0000 Commit: Gilles Dartiguelongue gentoo 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) }