commit: 94ddce218026f52b12c5d4395ab979c326333158
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 22:33:27 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:37:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=94ddce21
net-libs/libsoup: 2.48.1 → 2.50.0
.../{libsoup-9999.ebuild => libsoup-2.50.0.ebuild} | 26 +++++-----------------
net-libs/libsoup/libsoup-9999.ebuild | 5 +++--
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/net-libs/libsoup/libsoup-9999.ebuild
b/net-libs/libsoup/libsoup-2.50.0.ebuild
similarity index 78%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.50.0.ebuild
index 8de74d2..32cdb8a 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit gnome2 multilib-minimal python-any-r1
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="An HTTP library implementation in C"
HOMEPAGE="https://wiki.gnome.org/LibSoup";
@@ -18,12 +15,7 @@ HOMEPAGE="https://wiki.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 ~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
+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.34.3:2[${MULTILIB_USEDEP}]
@@ -39,18 +31,15 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.10
sys-devel/gettext
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
# 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]
# 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
@@ -59,11 +48,6 @@ RDEPEND="${RDEPEND}
"
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 \
diff --git a/net-libs/libsoup/libsoup-9999.ebuild
b/net-libs/libsoup/libsoup-9999.ebuild
index 8de74d2..62e5150 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit gnome2 multilib-minimal python-any-r1
if [[ ${PV} = 9999 ]]; then
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.10
sys-devel/gettext
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
"
if [[ ${PV} = 9999 ]]; then
