* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2011-02-22 2:57 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-02-22 2:57 UTC (permalink / raw
To: gentoo-commits
commit: 9e436ee4aceb06a7ffc554a543d3ff30da868ce3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 02:49:10 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 02:56:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e436ee4
net-libs/libsoup{,-gnome}: 2.33.6 -> 2.33.90
* Don't check for glib-networking[tls] at build-time
---
...-2.33.6.ebuild => libsoup-gnome-2.33.90.ebuild} | 1 +
...ibsoup-2.33.6.ebuild => libsoup-2.33.90.ebuild} | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.33.6.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild
similarity index 98%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.33.6.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild
index 383ca0a..0873142 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.33.6.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild
@@ -36,6 +36,7 @@ S=${WORKDIR}/${MY_P}
pkg_setup() {
G2CONF="${G2CONF}
--disable-static
+ --disable-tls-check
$(use_enable introspection)
--with-libsoup-system
--with-gnome"
diff --git a/net-libs/libsoup/libsoup-2.33.6.ebuild b/net-libs/libsoup/libsoup-2.33.90.ebuild
similarity index 97%
rename from net-libs/libsoup/libsoup-2.33.6.ebuild
rename to net-libs/libsoup/libsoup-2.33.90.ebuild
index 4c11126..7a72a50 100644
--- a/net-libs/libsoup/libsoup-2.33.6.ebuild
+++ b/net-libs/libsoup/libsoup-2.33.90.ebuild
@@ -18,7 +18,7 @@ IUSE="debug doc +introspection test"
RDEPEND=">=dev-libs/glib-2.27.5
>=dev-libs/libxml2-2
- net-libs/glib-networking
+ net-libs/glib-networking[gnutls]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
@@ -35,6 +35,7 @@ pkg_setup() {
DOCS="AUTHORS NEWS README"
G2CONF="${G2CONF}
--disable-static
+ --disable-tls-check
--without-gnome
--with-apache-module-dir="${T}"
$(use_enable introspection)"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2012-04-02 7:30 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2012-04-02 7:30 UTC (permalink / raw
To: gentoo-commits
commit: f7cd096d5603e0a297a7cf0e10dd2ab0f10cbd11
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 07:17:29 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 07:30:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7cd096d
net-libs/libsoup{,-gnome}: bump to 2.38.0
---
...-2.37.91.ebuild => libsoup-gnome-2.38.0.ebuild} | 0
...ibsoup-2.37.91.ebuild => libsoup-2.38.0.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.91.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.38.0.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.91.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.38.0.ebuild
diff --git a/net-libs/libsoup/libsoup-2.37.91.ebuild b/net-libs/libsoup/libsoup-2.38.0.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.37.91.ebuild
rename to net-libs/libsoup/libsoup-2.38.0.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2012-07-18 7:09 Priit Laes
0 siblings, 0 replies; 6+ messages in thread
From: Priit Laes @ 2012-07-18 7:09 UTC (permalink / raw
To: gentoo-commits
commit: c7f3084fd7d6c4bf8001c46c84af7550bcc093fe
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Jul 18 07:07:52 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Jul 18 07:07:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c7f3084f
net-libs/libsoup{,-gnome}: 2.39.4 → 2.39.4.1
---
...2.39.4.ebuild => libsoup-gnome-2.39.4.1.ebuild} | 0
...bsoup-2.39.4.ebuild => libsoup-2.39.4.1.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.4.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.4.1.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.4.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.4.1.ebuild
diff --git a/net-libs/libsoup/libsoup-2.39.4.ebuild b/net-libs/libsoup/libsoup-2.39.4.1.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.39.4.ebuild
rename to net-libs/libsoup/libsoup-2.39.4.1.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2012-09-22 15:54 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2012-09-22 15:54 UTC (permalink / raw
To: gentoo-commits
commit: e8c47c591b61f112b756405fe418d0e8132eb409
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 05:44:00 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8c47c59
net-libs/libsoup,-gnome: 2.39.91 → 2.39.92
---
...2.39.91.ebuild => libsoup-gnome-2.39.92.ebuild} | 0
...bsoup-2.39.91.ebuild => libsoup-2.39.92.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.91.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.91.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.92.ebuild
diff --git a/net-libs/libsoup/libsoup-2.39.91.ebuild b/net-libs/libsoup/libsoup-2.39.92.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.39.91.ebuild
rename to net-libs/libsoup/libsoup-2.39.92.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2012-10-10 5:42 Alexandre Rostovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-10 5:42 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/
@ 2012-10-20 6:26 Alexandre Rostovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-20 6:26 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-20 6:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 2:57 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2012-04-02 7:30 Nirbheek Chauhan
2012-07-18 7:09 Priit Laes
2012-09-22 15:54 Nirbheek Chauhan
2012-10-10 5:42 Alexandre Rostovtsev
2012-10-20 6:26 Alexandre Rostovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox