fix bug #199412

Package-Manager: portage-2.1.3.19

3 files changed, 36 insertions, 16 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/Manifest b/app-office/dia/Manifest
index 9e69f2ca635d..5d6c23a17736 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
 DIST dia-0.96.1.tar.bz2 4445553 RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 SHA1 e3d8f16f50dbbd03c1ce0235dba28c3e9612bb6e SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
 EBUILD dia-0.95.1.ebuild 1681 RMD160 d733a6be8f5c7f8bd1c48764b1332bdb6687cae7 SHA1 6178a68084107e05cb1da3a7a13554605bd526da SHA256 75fbd18e5f30d15327f6a0565d6f9dfff0b64734abac884c7fd33e190700441e
 MD5 2bed2965b37a92da1b3a7255a2c8d152 dia-0.95.1.ebuild 1681
 RMD160 d733a6be8f5c7f8bd1c48764b1332bdb6687cae7 dia-0.95.1.ebuild 1681
 SHA256 75fbd18e5f30d15327f6a0565d6f9dfff0b64734abac884c7fd33e190700441e dia-0.95.1.ebuild 1681
-EBUILD dia-0.96.1.ebuild 1737 RMD160 18fe346b4bd6544cfec8aab62ab21d0f6f9b7afe SHA1 80a2945cf96e17645961cf4d9ae051b0ff57df46 SHA256 5331334f1add9ae56cc997302b5afd1607f8d23f943a1a5771c84bc8fc261d97
-MD5 4037b74f7c58a871645b09ec92e10a8b dia-0.96.1.ebuild 1737
-RMD160 18fe346b4bd6544cfec8aab62ab21d0f6f9b7afe dia-0.96.1.ebuild 1737
-SHA256 5331334f1add9ae56cc997302b5afd1607f8d23f943a1a5771c84bc8fc261d97 dia-0.96.1.ebuild 1737
-MISC ChangeLog 12323 RMD160 a8b6db1af0e06797c63a808935f5ff7888ee4f3d SHA1 385591689647c5be47e8324a4937b00f4646c1ba SHA256 af607cba3f85d3e930776da914a786769cbf4efe9d9b2491c84f60233d4a47e4
-MD5 a4dde14b7e783b0318f8facf66466941 ChangeLog 12323
-RMD160 a8b6db1af0e06797c63a808935f5ff7888ee4f3d ChangeLog 12323
-SHA256 af607cba3f85d3e930776da914a786769cbf4efe9d9b2491c84f60233d4a47e4 ChangeLog 12323
+EBUILD dia-0.96.1.ebuild 1783 RMD160 a7ef58474841adeb35041d713cae7cc8b06f241b SHA1 cbc4ad28258aabc0a1f28d274044e6177a9ad031 SHA256 9e75c7fdedce8398a08cf8da94641669d26738ab38dd1caed6190c3e9c2f6b05
+MD5 4af82621740769315d93c60ba2904002 dia-0.96.1.ebuild 1783
+RMD160 a7ef58474841adeb35041d713cae7cc8b06f241b dia-0.96.1.ebuild 1783
+SHA256 9e75c7fdedce8398a08cf8da94641669d26738ab38dd1caed6190c3e9c2f6b05 dia-0.96.1.ebuild 1783
+MISC ChangeLog 12445 RMD160 2c55d4010626c39fe977b35d847214a3a2428069 SHA1 ab9c3a7d31f90f0aca9556bb628897353defc342 SHA256 5a89f75e6f3767d7ceb5cd9ea941fed5439f17a60bb054533fc8af6eb0feb621
+MD5 6db773cff7cd7788197a12aeec10aafa ChangeLog 12445
+RMD160 2c55d4010626c39fe977b35d847214a3a2428069 ChangeLog 12445
+SHA256 5a89f75e6f3767d7ceb5cd9ea941fed5439f17a60bb054533fc8af6eb0feb621 ChangeLog 12445
 MISC metadata.xml 596 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 SHA1 457717e2ae12542ee6a135ee884af2b428feefa8 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3
 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
@@ -22,3 +25,10 @@ SHA256 82a5d7c4b760fe506a71919ef875114ceb30ce5ebe4ad4ff0159a37e073c4ede files/di
 MD5 94697c1e01913f18a51969569ee0ce99 files/digest-dia-0.96.1 238
 RMD160 489fb7ed6c245ca8bb94f2614ffec6b0fb871e94 files/digest-dia-0.96.1 238
 SHA256 65f7cbe3a405a292c1760a49c21dd27f54fdf5709a1f2d59541c0ebb0e3aac66 files/digest-dia-0.96.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHPzM01fmVwcYIWAYRAsxvAJ9qbuXV+DMoiQm6a8SmH6CbLuAUtwCfWa1N
+HxRmreFD3mIQbzMcwzN4bbY=
+=vz4W
+-----END PGP SIGNATURE-----
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