From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E68C51381F3 for ; Wed, 19 Dec 2012 08:39:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACAC021C003; Wed, 19 Dec 2012 08:38:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 161F3E06AF for ; Wed, 19 Dec 2012 08:38:27 +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 812E533DBBC for ; Wed, 19 Dec 2012 08:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0FC76E5442 for ; Wed, 19 Dec 2012 08:38:22 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1355904835.b36a752b14cf378324927fe62f7b4070e7d642c4.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/yelp/yelp-3.6.2.ebuild gnome-extra/yelp/yelp-9999.ebuild X-VCS-Directories: gnome-extra/yelp/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: b36a752b14cf378324927fe62f7b4070e7d642c4 X-VCS-Branch: master Date: Wed, 19 Dec 2012 08:38:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 50685550-1d59-4230-bddd-8dcd9520d68a X-Archives-Hash: 786086959a442e1bcae854aff4d0804e commit: b36a752b14cf378324927fe62f7b4070e7d642c4 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Dec 19 08:12:57 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Dec 19 08:13:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b36a752b gnome-extra/yelp: moved to gx86 Sync live ebuild with gx86. --- gnome-extra/yelp/yelp-3.6.2.ebuild | 72 ------------------------------------ gnome-extra/yelp/yelp-9999.ebuild | 20 ++++------ 2 files changed, 8 insertions(+), 84 deletions(-) diff --git a/gnome-extra/yelp/yelp-3.6.2.ebuild b/gnome-extra/yelp/yelp-3.6.2.ebuild deleted file mode 100644 index 2304dbb..0000000 --- a/gnome-extra/yelp/yelp-3.6.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Help browser for GNOME" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -# FIXME: gtk-doc scanner fails assertion in gtk_icon_theme_get_for_screen(). -# How? Why? -IUSE="doc" # doc -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -fi - -RDEPEND=" - app-arch/bzip2 - >=app-arch/xz-utils-4.9 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.71 - >=dev-libs/glib-2.25.11:2 - >=dev-libs/libxml2-2.6.5:2 - >=dev-libs/libxslt-1.1.4 - >=gnome-extra/yelp-xsl-3.6.1 - >=net-libs/webkit-gtk-1.3.2:3 - >=x11-libs/gtk+-2.91.8:3 - x11-themes/gnome-icon-theme-symbolic" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.41.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - gnome-base/gnome-common - doc? ( >=dev-util/gtk-doc-1.13 )" -# If eautoreconf: -# gnome-base/gnome-common - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - dev-util/itstool - gnome-base/gnome-common" -fi - -src_prepare() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --disable-static - --disable-schemas-compile - --enable-bz2 - --enable-lzma" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - # Fix compatibility with Gentoo's sys-apps/man - # https://bugzilla.gnome.org/show_bug.cgi?id=648854 - epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch" - - [[ ${PV} != 9999 ]] && eautoreconf - - gnome2_src_prepare -} diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild index 98bb032..2b5177b 100644 --- a/gnome-extra/yelp/yelp-9999.ebuild +++ b/gnome-extra/yelp/yelp-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" @@ -14,11 +14,9 @@ fi DESCRIPTION="Help browser for GNOME" HOMEPAGE="http://www.gnome.org/" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -# FIXME: gtk-doc scanner fails assertion in gtk_icon_theme_get_for_screen(). -# How? Why? -IUSE="doc" # doc +IUSE="" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -26,10 +24,9 @@ else fi RDEPEND=" - app-arch/bzip2 - >=app-arch/xz-utils-4.9 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.71 + app-arch/bzip2:= + >=app-arch/xz-utils-4.9:= + dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 @@ -38,11 +35,11 @@ RDEPEND=" >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic" DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig - gnome-base/gnome-common - doc? ( >=dev-util/gtk-doc-1.13 )" + gnome-base/gnome-common" # If eautoreconf: # gnome-base/gnome-common @@ -54,7 +51,6 @@ if [[ ${PV} = 9999 ]]; then fi src_prepare() { - DOCS="AUTHORS ChangeLog NEWS README TODO" G2CONF="${G2CONF} --disable-static --disable-schemas-compile