From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SIwBr-0007Mj-S5 for garchives@archives.gentoo.org; Sat, 14 Apr 2012 06:10:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEA75E0D07; Sat, 14 Apr 2012 06:10:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B1A2AE0D07 for ; Sat, 14 Apr 2012 06:10:19 +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 D4F6E1B4032 for ; Sat, 14 Apr 2012 06:10:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C264DE5402 for ; Sat, 14 Apr 2012 06:10:16 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1334355578.2265bee00bf0e03ffad7c1ff37a2067fc0ee9afa.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup/libsoup-2.38.0.ebuild net-libs/libsoup/libsoup-9999.ebuild X-VCS-Directories: net-libs/libsoup/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 2265bee00bf0e03ffad7c1ff37a2067fc0ee9afa X-VCS-Branch: master Date: Sat, 14 Apr 2012 06:10:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 85a2e4ef-3bba-4d06-a09c-3e10b9f2903b X-Archives-Hash: 058e5a90be6888c7673a1c46467a6888 commit: 2265bee00bf0e03ffad7c1ff37a2067fc0ee9afa Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Apr 13 22:11:57 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Apr 13 22:19:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D2265bee0 net-libs/libsoup: 2.28.0 moved to gx86, sync 9999 with gx86 --- net-libs/libsoup/libsoup-2.38.0.ebuild | 81 --------------------------= ------ net-libs/libsoup/libsoup-9999.ebuild | 6 +- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/net-libs/libsoup/libsoup-2.38.0.ebuild b/net-libs/libsoup/li= bsoup-2.38.0.ebuild deleted file mode 100644 index b8e8f76..0000000 --- a/net-libs/libsoup/libsoup-2.38.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2011 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.ebuil= d,v 1.5 2011/07/15 11:08:46 xarthisius Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"yes" -GNOME2_LA_PUNT=3D"yes" - -inherit autotools eutils gnome2 -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"An HTTP library implementation in C" -HOMEPAGE=3D"http://live.gnome.org/LibSoup" - -LICENSE=3D"LGPL-2" -SLOT=3D"2.4" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco= s ~x86-macos ~sparc-solaris ~x86-solaris" -fi -IUSE=3D"debug doc +introspection samba ssl test" - -RDEPEND=3D">=3Ddev-libs/glib-2.31.7:2 - >=3Ddev-libs/libxml2-2:2 - >=3Dnet-libs/glib-networking-2.30.0[ssl?] - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) - samba? ( net-fs/samba )" -DEPEND=3D"${RDEPEND} - >=3Ddev-util/pkgconfig-0.9 - >=3Ddev-util/gtk-doc-am-1.10 - doc? ( >=3Ddev-util/gtk-doc-1.10 )" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_mod= ules_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])" - -pkg_setup() { - # Set invalid apache module dir until apache tests are ready, bug #3269= 57 - DOCS=3D"AUTHORS NEWS README" - G2CONF=3D"${G2CONF} - --disable-static - --disable-tls-check - --without-gnome - --with-apache-module-dir=3D"${T}" - $(use_enable introspection) - $(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)" -} - -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() { - gnome2_src_prepare - - if [[ ${PV} =3D 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 =3D.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.i= n \ - || 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.patc= h" - eautoreconf - fi -} diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libs= oup-9999.ebuild index b8e8f76..d3f236f 100644 --- a/net-libs/libsoup/libsoup-9999.ebuild +++ b/net-libs/libsoup/libsoup-9999.ebuild @@ -59,8 +59,6 @@ src_configure() { } =20 src_prepare() { - gnome2_src_prepare - if [[ ${PV} =3D 9999 ]]; then # prevent SOUP_MAINTAINER_FLAGS from getting set mv .git .git-bck || die @@ -76,6 +74,8 @@ src_prepare() { 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.patc= h" - eautoreconf + [[ ${PV} !=3D 9999 ]] && eautoreconf fi + + gnome2_src_prepare }