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 1Q2GXa-0005MW-Ve for garchives@archives.gentoo.org; Wed, 23 Mar 2011 05:23:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11E031C0BE; Wed, 23 Mar 2011 05:20:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4B321C0BE for ; Wed, 23 Mar 2011 05:20:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82D962AC01E for ; Wed, 23 Mar 2011 05:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F0AC88006D for ; Wed, 23 Mar 2011 05:20:46 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/libgweather/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/libgweather/libgweather-2.30.3-r200.ebuild dev-libs/libgweather/libgweather-2.91.6.ebuild dev-libs/libgweather/libgweather-9999.ebuild X-VCS-Directories: dev-libs/libgweather/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: e1658fddaeff8bce5b32cb2776e22adc8f23b4a4 Date: Wed, 23 Mar 2011 05:20:46 +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: X-Archives-Hash: e516bded85941df956dcad5dff86b56a commit: e1658fddaeff8bce5b32cb2776e22adc8f23b4a4 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Mar 23 05:11:25 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 23 05:11:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De1658fdd dev-libs/libgweather: don't slot, fix automagic introspection * slotmove done in portage --- .../libgweather/libgweather-2.30.3-r200.ebuild | 68 --------------= ------ dev-libs/libgweather/libgweather-2.91.6.ebuild | 8 +- dev-libs/libgweather/libgweather-9999.ebuild | 8 +- 3 files changed, 8 insertions(+), 76 deletions(-) diff --git a/dev-libs/libgweather/libgweather-2.30.3-r200.ebuild b/dev-li= bs/libgweather/libgweather-2.30.3-r200.ebuild deleted file mode 100644 index 1cbe889..0000000 --- a/dev-libs/libgweather/libgweather-2.30.3-r200.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30= .3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $ - -EAPI=3D"2" -GCONF_DEBUG=3D"no" -PYTHON_DEPEND=3D"python? 2" - -inherit autotools gnome2 python - -DESCRIPTION=3D"Library to access weather information from online service= s" -HOMEPAGE=3D"http://www.gnome.org/" - -LICENSE=3D"GPL-2" -SLOT=3D"2" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd" -IUSE=3D"python doc" - -# libsoup-gnome is to be used because libsoup[gnome] might not -# get libsoup-gnome installed by the time ${P} is built -RDEPEND=3D">=3Dx11-libs/gtk+-2.11:2 - >=3Ddev-libs/glib-2.13 - >=3Dgnome-base/gconf-2.8 - >=3Dnet-libs/libsoup-gnome-2.25.1:2.4 - >=3Ddev-libs/libxml2-2.6.0 - >=3Dsys-libs/timezone-data-2010k - python? ( - >=3Ddev-python/pygobject-2 - >=3Ddev-python/pygtk-2 ) - !=3Ddev-util/intltool-0.40.3 - >=3Ddev-util/pkgconfig-0.19 - >=3Ddev-util/gtk-doc-am-1.9 - doc? ( >=3Ddev-util/gtk-doc-1.9 )" -PDEPEND=3D"dev-libs/libgweather:3" -DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS" - -pkg_setup() { - G2CONF=3D"${G2CONF} - --enable-locations-compression - --disable-all-translations-in-one-xml - --disable-static - $(use_enable python)" - use python && python_set_active_version 2 -} - -src_prepare() { - gnome2_src_prepare - - # Fix building -python, Gnome bug #596660. - epatch "${FILESDIR}/${PN}-2.30.0-fix-automagic-python-support.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install - - # Don't install these here, libgweather:2 also provides them - # IMPORTANT: Don't let the files diverge - rm -rf "${D}"/usr/share/icons || die "Removing icons failed" - rm -rf "${D}"/usr/share/libgweather || die "Removing locations failed" - rm -rf "${D}"/etc/gconf/schemas/gweather.schemas || die "Removing schem= as failed" - - python_clean_installation_image -} diff --git a/dev-libs/libgweather/libgweather-2.91.6.ebuild b/dev-libs/li= bgweather/libgweather-2.91.6.ebuild index 2f991f9..0302cdb 100644 --- a/dev-libs/libgweather/libgweather-2.91.6.ebuild +++ b/dev-libs/libgweather/libgweather-2.91.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30= .3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $ =20 @@ -12,7 +12,7 @@ DESCRIPTION=3D"Library to access weather information fr= om online services" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" -SLOT=3D"3" +SLOT=3D"2" IUSE=3D"+introspection doc" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live @@ -32,7 +32,6 @@ RDEPEND=3D">=3Dx11-libs/gtk+-2.90.0:3[introspection?] =20 introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) =20 - !=3Ddev-util/intltool-0.40.3 @@ -47,4 +46,5 @@ G2CONF=3D"${G2CONF} --enable-locations-compression --disable-maintainer-mode --disable-all-translations-in-one-xml - --disable-static" + --disable-static + $(use_enable introspection)" diff --git a/dev-libs/libgweather/libgweather-9999.ebuild b/dev-libs/libg= weather/libgweather-9999.ebuild index 2f991f9..0302cdb 100644 --- a/dev-libs/libgweather/libgweather-9999.ebuild +++ b/dev-libs/libgweather/libgweather-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30= .3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $ =20 @@ -12,7 +12,7 @@ DESCRIPTION=3D"Library to access weather information fr= om online services" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" -SLOT=3D"3" +SLOT=3D"2" IUSE=3D"+introspection doc" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live @@ -32,7 +32,6 @@ RDEPEND=3D">=3Dx11-libs/gtk+-2.90.0:3[introspection?] =20 introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) =20 - !=3Ddev-util/intltool-0.40.3 @@ -47,4 +46,5 @@ G2CONF=3D"${G2CONF} --enable-locations-compression --disable-maintainer-mode --disable-all-translations-in-one-xml - --disable-static" + --disable-static + $(use_enable introspection)"