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: Sat, 20 Oct 2012 06:26:15 +0000 (UTC) [thread overview]
Message-ID: <1350713979.495b053ef58155a329d644ae990d7f3aef733d55.tetromino@gentoo> (raw)
commit: 495b053ef58155a329d644ae990d7f3aef733d55
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 06:19:39 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> 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
+}
next reply other threads:[~2012-10-20 6:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-20 6:26 Alexandre Rostovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-10 5:42 [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
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=1350713979.495b053ef58155a329d644ae990d7f3aef733d55.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