commit: 65daf132cb660e21bd6eef739919f5c6fa8fc382
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 21:04:17 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:00 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=65daf132
net-libs/libsoup: 2.46.0-r1 → 2.48.0
---
...libsoup-2.46.0.ebuild => libsoup-2.48.0.ebuild} | 36 +++++++++++++++++-----
net-libs/libsoup/libsoup-9999.ebuild | 36 +++++++++++++++++-----
2 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/net-libs/libsoup/libsoup-2.46.0.ebuild
b/net-libs/libsoup/libsoup-2.48.0.ebuild
similarity index 64%
rename from net-libs/libsoup/libsoup-2.46.0.ebuild
rename to net-libs/libsoup/libsoup-2.48.0.ebuild
index d962883..24efa69 100644
--- a/net-libs/libsoup/libsoup-2.46.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.48.0.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_6,2_7} )
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
DESCRIPTION="An HTTP library implementation in C"
HOMEPAGE="https://wiki.gnome.org/LibSoup";
@@ -15,13 +15,13 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup";
LICENSE="LGPL-2+"
SLOT="2.4"
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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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.38:2
- >=dev-libs/libxml2-2:2
- dev-db/sqlite:3
- >=net-libs/glib-networking-2.30.0[ssl?]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )
"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
sys-devel/gettext
- virtual/pkgconfig
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
"
# 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,
@@ -38,6 +38,12 @@ DEPEND="${RDEPEND}
# dev-lang/php[apache2,xmlrpc]
# net-misc/curl
# net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
src_prepare() {
if ! use test; then
@@ -58,12 +64,26 @@ src_configure() {
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
gnome2_src_configure \
--disable-static \
--disable-tls-check \
--without-gnome \
--without-apache-httpd \
- $(use_enable introspection) \
+ $(multilib_native_use_enable introspection) \
$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild
b/net-libs/libsoup/libsoup-9999.ebuild
index db2012d..21d1f43 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_6,2_7} )
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,14 +22,14 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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
RDEPEND="
- >=dev-libs/glib-2.38:2
- >=dev-libs/libxml2-2:2
- dev-db/sqlite:3
- >=net-libs/glib-networking-2.30.0[ssl?]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )
"
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
sys-devel/gettext
- virtual/pkgconfig
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
"
if [[ ${PV} = 9999 ]]; then
@@ -51,6 +51,12 @@ fi
# dev-lang/php[apache2,xmlrpc]
# net-misc/curl
# net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
src_prepare() {
if [[ ${PV} = 9999 ]]; then
@@ -72,12 +78,26 @@ src_configure() {
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
gnome2_src_configure \
--disable-static \
--disable-tls-check \
--without-gnome \
--without-apache-httpd \
- $(use_enable introspection) \
+ $(multilib_native_use_enable introspection) \
$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
}
