summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2007-11-17 18:30:06 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2007-11-17 18:30:06 +0000
commitbb25b91613ccc4cbcc308f6e87595b4a5ecadcd5 (patch)
treed292f0103f3178f04b9dac0138653cc833877cfd /app-office
parentStable for HPPA (bug #199454). (diff)
downloadgentoo-2-bb25b91613ccc4cbcc308f6e87595b4a5ecadcd5.tar.gz
gentoo-2-bb25b91613ccc4cbcc308f6e87595b4a5ecadcd5.tar.bz2
gentoo-2-bb25b91613ccc4cbcc308f6e87595b4a5ecadcd5.zip
fix bug #199412
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/dia/ChangeLog5
-rw-r--r--app-office/dia/dia-0.96.1.ebuild21
2 files changed, 18 insertions, 8 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index efae11e6cbac..2c93d11328f6 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/dia
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.97 2007/04/10 09:07:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.98 2007/11/17 18:30:06 eva Exp $
+
+ 17 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org> dia-0.96.1.ebuild:
+ added conditional doc generation, fix bug #199412
*dia-0.96.1 (10 Apr 2007)
diff --git a/app-office/dia/dia-0.96.1.ebuild b/app-office/dia/dia-0.96.1.ebuild
index 1c060b7da731..7b419d3a614f 100644
--- a/app-office/dia/dia-0.96.1.ebuild
+++ b/app-office/dia/dia-0.96.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.96.1.ebuild,v 1.1 2007/04/10 09:07:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.96.1.ebuild,v 1.2 2007/11/17 18:30:06 eva Exp $
inherit eutils gnome2 libtool autotools versionator
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${P}.tar.bz2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnome png python zlib cairo gnome-print"
+IUSE="doc gnome png python zlib cairo gnome-print"
RDEPEND=">=x11-libs/gtk+-2.6.0
>=dev-libs/glib-2.6.0
@@ -32,18 +32,25 @@ RDEPEND=">=x11-libs/gtk+-2.6.0
cairo? ( x11-libs/cairo )
python? ( >=dev-lang/python-1.5.2
>=dev-python/pygtk-1.99 )
- ~app-text/docbook-xml-dtd-4.2
- app-text/docbook-xsl-stylesheets"
+ doc? (
+ ~app-text/docbook-xml-dtd-4.2
+ app-text/docbook-xsl-stylesheets )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.21
dev-util/pkgconfig"
-G2CONF="${G2CONF} $(use_enable gnome) $(use_with gnome-print gnomeprint)"
-G2CONF="${G2CONF} $(use_with python) $(use_with cairo)"
-
DOCS="AUTHORS ChangeLog COPYING KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+pkg_setup() {
+ G2CONF="${G2CONF}
+ $(use_enable gnome)
+ $(use_with gnome-print gnomeprint)
+ $(use_with python)
+ $(use_with cairo)
+ $(use_enable doc db2html)"
+}
+
src_unpack() {
gnome2_src_unpack