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 8E670138200 for ; Sat, 20 Oct 2012 06:26:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57896E05FA; Sat, 20 Oct 2012 06:26:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9F8E7E05FA for ; Sat, 20 Oct 2012 06:26:17 +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 CECD233D78F for ; Sat, 20 Oct 2012 06:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 24ABEE5436 for ; Sat, 20 Oct 2012 06:26:15 +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: <1350713979.495b053ef58155a329d644ae990d7f3aef733d55.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.40.0.ebuild net-libs/libsoup-gnome/libsoup-gnome-2.40.1.ebuild net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild net-libs/libsoup/libsoup-2.40.0.ebuild net-libs/libsoup/libsoup-2.40.1.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: 495b053ef58155a329d644ae990d7f3aef733d55 X-VCS-Branch: master Date: Sat, 20 Oct 2012 06:26:15 +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: 65f08679-715e-4b77-98c2-6b3b24e1e06b X-Archives-Hash: bd8f482d4fd45899e6fc55fd71898e92 commit: 495b053ef58155a329d644ae990d7f3aef733d55 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat Oct 20 06:19:39 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Sat Oct 20 06:19:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=495b053e net-libs/libsoup{,-gnome}: 2.40.0 → 2.40.1 + QA Bump, disable apache tests in a cleaner way, reorder src_prepare and src_configure. --- ...e-2.40.0.ebuild => libsoup-gnome-2.40.1.ebuild} | 18 ++++++++++-------- net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 18 ++++++++++-------- ...libsoup-2.40.0.ebuild => libsoup-2.40.1.ebuild} | 18 +++++++++--------- net-libs/libsoup/libsoup-9999.ebuild | 18 +++++++++--------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.40.1.ebuild similarity index 93% rename from net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild rename to net-libs/libsoup-gnome/libsoup-gnome-2.40.1.ebuild index 19a4d60..ee2a1bf 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-2.40.0.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.40.1.ebuild @@ -41,25 +41,27 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} pkg_setup() { + # Disable apache tests until they are usable on Gentoo, bug #326957 G2CONF="${G2CONF} --disable-static --disable-tls-check $(use_enable introspection) --with-libsoup-system - --with-gnome" + --with-gnome + --without-apache-httpd" DOCS="AUTHORS NEWS README" } -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() { # Use lib present on the system epatch "${FILESDIR}"/${PN}-system-lib.patch [[ ${PV} != 9999 ]] && eautoreconf 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-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild index 19a4d60..ee2a1bf 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild @@ -41,25 +41,27 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} pkg_setup() { + # Disable apache tests until they are usable on Gentoo, bug #326957 G2CONF="${G2CONF} --disable-static --disable-tls-check $(use_enable introspection) --with-libsoup-system - --with-gnome" + --with-gnome + --without-apache-httpd" DOCS="AUTHORS NEWS README" } -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() { # Use lib present on the system epatch "${FILESDIR}"/${PN}-system-lib.patch [[ ${PV} != 9999 ]] && eautoreconf 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-2.40.0.ebuild b/net-libs/libsoup/libsoup-2.40.1.ebuild similarity index 95% rename from net-libs/libsoup/libsoup-2.40.0.ebuild rename to net-libs/libsoup/libsoup-2.40.1.ebuild index 3b1b583..f8e8fed 100644 --- a/net-libs/libsoup/libsoup-2.40.0.ebuild +++ b/net-libs/libsoup/libsoup-2.40.1.ebuild @@ -45,26 +45,19 @@ DEPEND="${RDEPEND} # net-libs/glib-networking[ssl])" pkg_setup() { - # Set invalid apache module dir until apache tests are ready, bug #326957 + # Disable apache tests until they are usable on Gentoo, bug #326957 DOCS="AUTHORS NEWS README" G2CONF="${G2CONF} --disable-static --disable-tls-check --without-gnome - --with-apache-module-dir="${T}" + --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_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() { if [[ ${PV} = 9999 ]]; then # prevent SOUP_MAINTAINER_FLAGS from getting set @@ -83,3 +76,10 @@ src_prepare() { 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 3b1b583..f8e8fed 100644 --- a/net-libs/libsoup/libsoup-9999.ebuild +++ b/net-libs/libsoup/libsoup-9999.ebuild @@ -45,26 +45,19 @@ DEPEND="${RDEPEND} # net-libs/glib-networking[ssl])" pkg_setup() { - # Set invalid apache module dir until apache tests are ready, bug #326957 + # Disable apache tests until they are usable on Gentoo, bug #326957 DOCS="AUTHORS NEWS README" G2CONF="${G2CONF} --disable-static --disable-tls-check --without-gnome - --with-apache-module-dir="${T}" + --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_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() { if [[ ${PV} = 9999 ]]; then # prevent SOUP_MAINTAINER_FLAGS from getting set @@ -83,3 +76,10 @@ src_prepare() { 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 +}