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 1Q8z1A-0000Uq-0O for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A5251C0CE; Sun, 10 Apr 2011 18:04:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E1FFA1C0CE for ; Sun, 10 Apr 2011 18:04:50 +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 9C2D21B40A2 for ; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 078D480065 for ; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <9be05c7c839ae7d4bd7b181687fc90e6683e9671.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-power-manager/gnome-power-manager-3.0.0.ebuild gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild X-VCS-Directories: gnome-extra/gnome-power-manager/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 9be05c7c839ae7d4bd7b181687fc90e6683e9671 Date: Sun, 10 Apr 2011 18:04:50 +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: a0cf7e75df0e93556f10307d9e877cdb commit: 9be05c7c839ae7d4bd7b181687fc90e6683e9671 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Apr 9 18:04:10 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 18:03:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D9be05c7c gnome-extra/gnome-power-manager: QAed * split phases * change docbook2man hack to avoid sed usage * minor other changes (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- .../gnome-power-manager-3.0.0.ebuild | 26 +++++++++-----= ----- .../gnome-power-manager-9999.ebuild | 26 +++++++++-----= ----- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.0.eb= uild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.0.ebuild index 207da7b..ebc171e 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.0.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.0.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" =20 -inherit autotools eutils gnome2 virtualx +inherit gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -15,12 +15,12 @@ HOMEPAGE=3D"http://www.gnome.org/projects/gnome-power= -manager/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"doc test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi +IUSE=3D"doc test" =20 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic) RESTRICT=3D"test" @@ -31,7 +31,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dgnome-base/gnome-keyring-0.6.0 >=3Dx11-libs/libnotify-0.7.0 >=3Dx11-libs/cairo-1.0.0 - >=3Dgnome-base/gconf-2.31.1 + >=3Dgnome-base/gconf-2.31.1:2 >=3Dgnome-base/gnome-control-center-2.31.4 >=3Dmedia-libs/libcanberra-0.26-r2[gtk3] >=3Dsys-power/upower-0.9.1 @@ -64,9 +64,7 @@ DEPEND=3D"${COMMON_DEPEND} # (files under ${S}/man). # docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/do= cs. =20 -src_prepare() { - gnome2_src_prepare - +pkg_setup() { G2CONF=3D"${G2CONF} $(use_enable test tests) $(use_enable doc docbook-docs) @@ -75,19 +73,19 @@ src_prepare() { --disable-schemas-compile" DOCS=3D"AUTHORS ChangeLog NEWS README TODO" =20 + if ! use doc; then + G2CONF=3D"${G2CONF} DOCBOOK2MAN=3D$(type -p false)" + fi +} + +src_prepare() { + gnome2_src_prepare + # Drop debugger CFLAGS from configure # XXX: touch configure.ac only if running eautoreconf, otherwise # maintainer mode gets triggered -- even if the order is correct sed -e 's:^CPPFLAGS=3D"$CPPFLAGS -g"$::g' \ -i configure || die "debugger sed failed" - - if ! use doc; then - # Remove the docbook2man rules here since it's not handled by a proper - # parameter in configure.in. - sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \ - -i man/Makefile.am man/Makefile.in \ - || die "docbook sed failed" - fi } =20 src_test() { diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebu= ild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild index 207da7b..ebc171e 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" =20 -inherit autotools eutils gnome2 virtualx +inherit gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -15,12 +15,12 @@ HOMEPAGE=3D"http://www.gnome.org/projects/gnome-power= -manager/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"doc test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi +IUSE=3D"doc test" =20 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic) RESTRICT=3D"test" @@ -31,7 +31,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dgnome-base/gnome-keyring-0.6.0 >=3Dx11-libs/libnotify-0.7.0 >=3Dx11-libs/cairo-1.0.0 - >=3Dgnome-base/gconf-2.31.1 + >=3Dgnome-base/gconf-2.31.1:2 >=3Dgnome-base/gnome-control-center-2.31.4 >=3Dmedia-libs/libcanberra-0.26-r2[gtk3] >=3Dsys-power/upower-0.9.1 @@ -64,9 +64,7 @@ DEPEND=3D"${COMMON_DEPEND} # (files under ${S}/man). # docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/do= cs. =20 -src_prepare() { - gnome2_src_prepare - +pkg_setup() { G2CONF=3D"${G2CONF} $(use_enable test tests) $(use_enable doc docbook-docs) @@ -75,19 +73,19 @@ src_prepare() { --disable-schemas-compile" DOCS=3D"AUTHORS ChangeLog NEWS README TODO" =20 + if ! use doc; then + G2CONF=3D"${G2CONF} DOCBOOK2MAN=3D$(type -p false)" + fi +} + +src_prepare() { + gnome2_src_prepare + # Drop debugger CFLAGS from configure # XXX: touch configure.ac only if running eautoreconf, otherwise # maintainer mode gets triggered -- even if the order is correct sed -e 's:^CPPFLAGS=3D"$CPPFLAGS -g"$::g' \ -i configure || die "debugger sed failed" - - if ! use doc; then - # Remove the docbook2man rules here since it's not handled by a proper - # parameter in configure.in. - sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \ - -i man/Makefile.am man/Makefile.in \ - || die "docbook sed failed" - fi } =20 src_test() {