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 4065A138200 for ; Sat, 27 Oct 2012 23:02:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A5A0E056C; Sat, 27 Oct 2012 23:02:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 99CEDE0540 for ; Sat, 27 Oct 2012 23:02:40 +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 03CC533D90C for ; Sat, 27 Oct 2012 23:02:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8E3C8E5446 for ; Sat, 27 Oct 2012 23:02:38 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1351378937.dcef6d97f6c96a3ae40d83f90e09e1ad6495eac5.eva@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.1.ebuild gnome-extra/yelp/yelp-9999.ebuild X-VCS-Directories: gnome-extra/yelp/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: dcef6d97f6c96a3ae40d83f90e09e1ad6495eac5 X-VCS-Branch: master Date: Sat, 27 Oct 2012 23:02:38 +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: 22059cd9-199b-4f39-9a48-70da819db49c X-Archives-Hash: 9f98151f435bfd532bb2d61de0124cd8 commit: dcef6d97f6c96a3ae40d83f90e09e1ad6495eac5 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Oct 27 23:02:17 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Oct 27 23:02:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dcef6d97 gnome-extra/yelp: 3.5.92 → 3.6.1 --- .../yelp/{yelp-9999.ebuild => yelp-3.6.1.ebuild} | 6 ++---- gnome-extra/yelp/yelp-9999.ebuild | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-3.6.1.ebuild similarity index 97% copy from gnome-extra/yelp/yelp-9999.ebuild copy to gnome-extra/yelp/yelp-3.6.1.ebuild index b46642f..98bb032 100644 --- a/gnome-extra/yelp/yelp-9999.ebuild +++ b/gnome-extra/yelp/yelp-3.6.1.ebuild @@ -39,7 +39,6 @@ RDEPEND=" x11-themes/gnome-icon-theme-symbolic" DEPEND="${RDEPEND} >=dev-util/intltool-0.41.0 - dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common @@ -50,10 +49,11 @@ DEPEND="${RDEPEND} if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} app-text/yelp-tools + dev-util/itstool gnome-base/gnome-common" fi -pkg_setup() { +src_prepare() { DOCS="AUTHORS ChangeLog NEWS README TODO" G2CONF="${G2CONF} --disable-static @@ -61,9 +61,7 @@ pkg_setup() { --enable-bz2 --enable-lzma" [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" -} -src_prepare() { # 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" diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild index b46642f..98bb032 100644 --- a/gnome-extra/yelp/yelp-9999.ebuild +++ b/gnome-extra/yelp/yelp-9999.ebuild @@ -39,7 +39,6 @@ RDEPEND=" x11-themes/gnome-icon-theme-symbolic" DEPEND="${RDEPEND} >=dev-util/intltool-0.41.0 - dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common @@ -50,10 +49,11 @@ DEPEND="${RDEPEND} if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} app-text/yelp-tools + dev-util/itstool gnome-base/gnome-common" fi -pkg_setup() { +src_prepare() { DOCS="AUTHORS ChangeLog NEWS README TODO" G2CONF="${G2CONF} --disable-static @@ -61,9 +61,7 @@ pkg_setup() { --enable-bz2 --enable-lzma" [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" -} -src_prepare() { # 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"