Add Dia

8 files changed, 1621 insertions, 0 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
new file mode 100644
index 0000000..b126416
--- /dev/null
+++ b/app-office/dia/ChangeLog
@@ -0,0 +1,577 @@
+# ChangeLog for app-office/dia
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.155 2013/03/05 22:59:41 eva Exp $
+
+  05 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.97.1.ebuild,
+  -files/dia-0.97.1-libpng15.patch, -dia-0.97.2.ebuild,
+  -files/dia-0.97-acinclude-python-fixes.patch:
+  Clean up old revisions.
+
+  28 Oct 2012; Raúl Porcel <armin76@gentoo.org> dia-0.97.2-r1.ebuild:
+  ia64/sparc stable wrt #427544
+
+  16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> dia-0.97.2-r1.ebuild:
+  stable ppc, bug #427544
+
+  16 Oct 2012; Matt Turner <mattst88@gentoo.org> dia-0.97.2-r1.ebuild:
+  Stable on alpha, bug 427544.
+
+  07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> dia-0.97.2-r1.ebuild:
+  stable ppc64, bug #427544
+
+  04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> dia-0.97.2-r1.ebuild:
+  Stable for amd64, wrt bug #427544
+
+  03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> dia-0.97.2-r1.ebuild:
+  x86 stable wrt bug #427544
+
+  02 Oct 2012; Jeroen Roovers <jer@gentoo.org> dia-0.97.2-r1.ebuild:
+  Stable for HPPA (bug #427544).
+
+  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> dia-0.97.2.ebuild:
+  alpha/ia64/sparc stable wrt #410611
+
+  07 Jul 2012; Michał Górny <mgorny@gentoo.org>
+  +files/dia-0.97.2-underlinking.patch, dia-0.97.2-r1.ebuild:
+  Fix underlinking (bug #420685). Also remove intltoolize call which is
+  redundant with newer eautoreconf.
+
+  09 Jun 2012; Justin Lecher <jlec@gentoo.org> dia-0.97.2-r1.ebuild:
+  Prefix fix
+
+  02 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> dia-0.97.2-r1.ebuild:
+  Pull in correct SLOT of media-libs/libpng for headers and symlink.
+
+*dia-0.97.2-r1 (02 Jun 2012)
+
+  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> +dia-0.97.2-r1.ebuild:
+  Install second desktop file for integrated mode (bug #415495)
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> dia-0.97.2.ebuild:
+  ppc stable wrt #410611
+
+  16 May 2012; Jeroen Roovers <jer@gentoo.org> dia-0.97.2.ebuild:
+  Stable for HPPA (bug #410611).
+
+  08 May 2012; Mike Frysinger <vapier@gentoo.org> dia-0.97.2.ebuild:
+  Add arm love.
+
+  03 May 2012; Jeff Horelick <jdhore@gentoo.org> dia-0.97.1.ebuild,
+  dia-0.97.2.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  29 Apr 2012; Markus Meier <maekke@gentoo.org> dia-0.97.2.ebuild:
+  x86 stable, bug #410611
+
+  19 Apr 2012; Brent Baude <ranger@gentoo.org> dia-0.97.2.ebuild:
+  Marking dia-0.97.2 ppc64 stable for bug 410611
+
+  18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> dia-0.97.2.ebuild:
+  Stable for amd64, wrt bug #410611
+
+  08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> dia-0.97.2.ebuild,
+  +files/dia-0.97.2-glib-2.31.patch:
+  Fix building against >=glib-2.31 (bug #401331, thanks to Maciej Piechotka for
+  reporting).
+
+*dia-0.97.2 (22 Dec 2011)
+
+  22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +dia-0.97.2.ebuild:
+  Version bump.
+
+  15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> dia-0.97.1.ebuild:
+  QA: eautoreconf should be before gnome2_src_prepare.
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> dia-0.97.1.ebuild,
+  +files/dia-0.97.1-libpng15.patch:
+  Fix building with libpng15 wrt #373871 by Stuart Longland. Remove automagic
+  USE="png zlib" and always depend on libpng and zlib.
+
+  14 Apr 2011; Jonathan Callen <abcd@gentoo.org> dia-0.97.1.ebuild:
+  Add prefix support and keywords
+
+  26 Jan 2011; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
+  Let it compile when python3 is main interpreter. Bump to eapi3.
+
+  09 Sep 2010; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
+  Don't use -DGTK_DISABLE_DEPRECATED (bug #333439) and RDEPEND on gtk+:2.
+
+  16 May 2010; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.97-r1.ebuild,
+  dia-0.97.1.ebuild, -files/dia-0.97-automagic-libemf.patch,
+  -files/dia-0.97-fix-bashism.patch:
+  Fix homepage URL, bug #319797. Also remove unneeded *.la files. Clean up
+  old revision.
+
+  09 Mar 2010; Joseph Jezak <josejx@gentoo.org> dia-0.97.1.ebuild:
+  Marked ppc stable for bug #257020.
+
+  07 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.95.1.ebuild,
+  -dia-0.96.1-r1.ebuild, -files/dia-0.96.1-64bit-fixes.patch,
+  -files/dia-0.96.1-gnome-doc.patch, -files/dia-0.96.1-xml-fixes.patch,
+  -dia-0.97.ebuild, dia-0.97-r1.ebuild, metadata.xml:
+  Clean up old revisions, bug #277869.
+
+  28 Feb 2010; Tobias Heinlein <keytoaster@gentoo.org> dia-0.97.1.ebuild:
+  amd64 stable, security bug #257020
+
+  25 Feb 2010; Raúl Porcel <armin76@gentoo.org> dia-0.97.1.ebuild:
+  alpha/ia64/sparc stable wrt #257020
+
+  23 Feb 2010; Brent Baude <ranger@gentoo.org> dia-0.97.1.ebuild:
+  Marking dia-0.97.1 ppc64 for bug 257020
+
+  21 Feb 2010; Christian Faulhammer <fauli@gentoo.org> dia-0.97.1.ebuild:
+  stable x86, bug 257020
+
+  17 Feb 2010; Jeroen Roovers <jer@gentoo.org> dia-0.97.1.ebuild:
+  Stable for HPPA (bug #257020).
+
+*dia-0.97.1 (16 Feb 2010)
+
+  16 Feb 2010; Romain Perier <mrpouet@gentoo.org> +dia-0.97.1.ebuild:
+  Version bump, Many bugsfixes, Fix a security issue (CVE-2008-5984). Per
+  bug #257020.
+
+  03 Aug 2009; Jeroen Roovers <jer@gentoo.org> dia-0.97-r1.ebuild:
+  Stable for HPPA (bug #277843).
+
+  02 Aug 2009; Raúl Porcel <armin76@gentoo.org> dia-0.97-r1.ebuild:
+  alpha/ia64/sparc stable wrt #277843
+
+  31 Jul 2009; Christian Faulhammer <fauli@gentoo.org> dia-0.97-r1.ebuild:
+  stable x86, bug 277843
+
+  27 Jul 2009; nixnut <nixnut@gentoo.org> dia-0.97-r1.ebuild:
+  ppc stable #277843
+
+  26 Jul 2009; Brent Baude <ranger@gentoo.org> dia-0.97-r1.ebuild:
+  Marking dia-0.97-r1 ppc64 for bug 277843
+
+  25 Jul 2009; Jeremy Olexa <darkside@gentoo.org> dia-0.97-r1.ebuild:
+  amd64 stable, bug 277843
+
+*dia-0.97-r1 (14 Jul 2009)
+
+  14 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> +dia-0.97-r1.ebuild,
+  +files/dia-0.97-automagic-libemf.patch, +files/dia-0.97-fix-bashism.patch:
+  Version bump. Fix inverted test to build documentation, bug #271047. Fix
+  bashism in configure.ac. Fix automagic libemf detection, bug #276148.
+
+  27 Jun 2009; Romain Perier <mrpouet@gentoo.org> dia-0.97.ebuild:
+  Fix bug #275468 -- automake failure for doc/*/Makefile.am to a bad sed
+  expression which skiped an if block without skip the endif
+
+  21 Jun 2009; <mrpouet@gentoo.org> dia-0.97.ebuild,
+  +files/dia-0.97-acinclude-python-fixes.patch:
+  Fix compilation error with USE="python", bug #271855, and fix missing EAPI="2"
+
+*dia-0.97 (18 May 2009)
+
+  18 May 2009; Gilles Dartiguelongue <eva@gentoo.org> +dia-0.97.ebuild,
+  +files/dia-0.97.0-gnome-doc.patch:
+  Bump to 0.97. Bug fixes, user GtkPrint for printing, and more, bug
+  #270306.
+
+  04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.96.1.ebuild,
+  dia-0.96.1-r1.ebuild:
+  Add python_need_rebuild, bug #244749.
+
+  03 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Add USE flag description to metadata wrt GLEP 56.
+
+  28 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/dia-0.96.1-64bit-fixes.patch, dia-0.96.1-r1.ebuild:
+  add 64 bit compilation fix patch, bug #191673.
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> dia-0.96.1-r1.ebuild:
+  python_mod_optimize is ROOT aware.
+
+  07 May 2008; Markus Rothe <corsair@gentoo.org> dia-0.96.1-r1.ebuild:
+  Stable on ppc64; bug #191673
+
+  06 May 2008; Jeroen Roovers <jer@gentoo.org> dia-0.96.1-r1.ebuild:
+  Stable for HPPA (bug #191673).
+
+  01 May 2008; Markus Meier <maekke@gentoo.org> dia-0.96.1-r1.ebuild:
+  amd64/x86 stable, bug #191673
+
+  01 May 2008; Raúl Porcel <armin76@gentoo.org> dia-0.96.1-r1.ebuild:
+  alpha/ia64/sparc stable wrt #191673
+
+  01 May 2008; nixnut <nixnut@gentoo.org> dia-0.96.1-r1.ebuild:
+  Stable on ppc wrt bug 191673
+
+*dia-0.96.1-r1 (03 Apr 2008)
+
+  03 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/dia-0.96.1-gnome-doc.patch, +files/dia-0.96.1-xml-fixes.patch,
+  +dia-0.96.1-r1.ebuild:
+  Remove man generation if USE="-doc", fix bug #205067. Always install
+  documentation where gnome can find it. Conditional destination doesn't do
+  any good anyway, fix #159381.
+
+  09 Mar 2008; Mart Raudsepp <leio@gentoo.org> dia-0.95.1.ebuild,
+  dia-0.96.1.ebuild:
+  Fix build with newer intltool, bug 199598
+
+  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)
+
+  10 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> -dia-0.96_pre3.ebuild,
+  +dia-0.96.1.ebuild:
+  Replace pre3 with the final of 0.96 now that it is available. ~mips dropped
+  due to new libgnomeprint dependancy.
+
+  10 Mar 2007; Peter Weller <welp@gentoo.org> dia-0.95.1.ebuild:
+  Keyworded ~x86-fbsd
+
+  05 Feb 2007; Jeroen Roovers <jer@gentoo.org> dia-0.95.1.ebuild:
+  Stable for HPPA (inkscape).
+
+*dia-0.96_pre3 (02 Feb 2007)
+
+  02 Feb 2007; Robin H. Johnson <robbat2@gentoo.org> +dia-0.96_pre3.ebuild:
+  Version bump to prerelease, fixes glitches with text overflow in exports
+  that I need.
+
+  27 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  -files/dia-0.94-db2man.patch, -files/dia-0.94-help.patch,
+  -files/0.94-disable_python_gtk_import.patch, -files/dia-0.94-gcc4.patch,
+  -files/dia-0.94-no_font_cache.patch, -files/dia-0.94-pkgconfig.patch,
+  -files/dia-0.94-png.patch, -files/dia-0.94-secure-eval.patch,
+  -files/dia-0.94_xfigoverflowfix.patch, -dia-0.94-r3.ebuild,
+  -dia-0.94-r4.ebuild, -dia-0.94-r5.ebuild:
+  Cleanup wrt #140499
+
+  15 Oct 2006; Aron Griffis <agriffis@gentoo.org> dia-0.95.1.ebuild:
+  Mark 0.95.1 stable on ia64. #140499
+
+  28 Jun 2006; Jeroen Roovers <jer@gentoo.org> dia-0.95.1.ebuild:
+  Marked ~hppa (for media-gfx/inkscape).
+
+  07 Jun 2006; John N. Laliberte <allanonjl@gentoo.org> dia-0.94-r4.ebuild,
+  dia-0.94-r5.ebuild:
+  mirrors to mirror, fixes #135898
+
+  31 May 2006; Thomas Cort <tcort@gentoo.org> dia-0.95.1.ebuild:
+  Stable on alpha wrt security Bug #133699.
+
+  30 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.95.1.ebuild:
+  Stable on sparc wrt security #133699
+
+  30 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> dia-0.95.1.ebuild:
+  Stable on amd64 and x86 wrt bug #133699.
+
+  30 May 2006; Markus Rothe <corsair@gentoo.org> dia-0.95.1.ebuild:
+  Stable on ppc64; bug #133699
+
+  30 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> dia-0.95.1.ebuild:
+  ppc stable, bug #133699
+
+*dia-0.95.1 (30 May 2006)
+
+  30 May 2006; John N. Laliberte <allanonjl@gentoo.org> +dia-0.95.1.ebuild:
+  new version.  fixes #133699 and #130742.  cleanup of ebuild.
+
+  22 Apr 2006; Thomas Cort <tcort@gentoo.org> dia-0.94-r5.ebuild:
+  Stable on amd64 wrt security Bug #128107.
+
+  22 Apr 2006; Markus Rothe <corsair@gentoo.org> dia-0.94-r5.ebuild:
+  Stable on ppc64; bug #128107
+
+  21 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> dia-0.94-r5.ebuild:
+  ppc stable, bug #128107
+
+  21 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> dia-0.94-r5.ebuild:
+  Stable on x86 wrt bug #128107.
+
+  21 Apr 2006; Jason Wever <weeve@gentoo.org> dia-0.94-r5.ebuild:
+  Stable on SPARC wrt security bug #128107.
+
+  21 Apr 2006; Thomas Cort <tcort@gentoo.org> dia-0.94-r5.ebuild:
+  Stable on alpha wrt security Bug #128107.
+
+*dia-0.94-r5 (20 Apr 2006)
+
+  20 Apr 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/dia-0.94_xfigoverflowfix.patch, +dia-0.94-r5.ebuild:
+  add patch for #128107
+
+  22 Mar 2006; Marinus Schraal <foser@gentoo.org> -files/dia-0.94-sheets-png.tar.bz2 :
+  Move png sheets to mirrors (#120627)
+
+  17 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/dia-0.94-pkgconfig.patch, dia-0.94-r4.ebuild:
+  Fix gnome compilation #118591.  Mark 0.94-r4 stable on ia64
+
+*dia-0.94-r4 (02 Nov 2005)
+
+  02 Nov 2005; Mike Gardiner <obz@gentoo.org> +files/dia-0.94-png.patch,
+  +files/dia-0.94-sheets-png.tar.bz2, +dia-0.94-r4.ebuild:
+  Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome
+  Bug, #154079 for more information.
+
+  04 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on ppc.
+
+  03 Oct 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on ppc64 (bug #107916)
+
+  03 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> dia-0.94-r3.ebuild:
+  stable on alpha wrt bug #107916
+
+  03 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on sparc wrt #107916
+
+  03 Oct 2005; <mkay@gentoo.org> dia-0.94-r3.ebuild:
+  Marked stable on x86
+
+  03 Oct 2005; <dang@gentoo.org> dia-0.94-r3.ebuild:
+  Marked stable on amd64
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r3.ebuild:
+  Mark 0.94-r3 stable on ia64 #107916
+
+*dia-0.94-r3 (03 Oct 2005)
+
+  03 Oct 2005; <dang@gentoo.org> +files/dia-0.94-secure-eval.patch,
+  +dia-0.94-r3.ebuild:
+  Fix insecure python eval. Bug #107916
+
+  03 Oct 2005; Hardave Riar <hardave@gentoo.org> dia-0.94-r2.ebuild:
+  Keyworded ~mips.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  Mark 0.94-r2 stable on ia64
+
+  09 Sep 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  Mark 0.94-r2 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on ppc.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  add ~ia64
+
+  24 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on amd64, closes bug 103540.
+
+  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on sparc
+
+  23 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on x86.
+
+*dia-0.94-r2 (12 Jul 2005)
+
+  12 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r2.ebuild,
+  files/dia-0.94-db2man.patch:
+  New revision. Added patch from upstream's CVS repository to correctly
+  generate the man page, resolves bug #98610.
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> dia-0.94-r1.ebuild:
+  alpha stable
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  27 May 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild:
+  Added dependency to docbook-xml-dtd-4.2. Resolves bug #93967.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/0.94-disable_python_gtk_import.patch, dia-0.94-r1.ebuild:
+  taking out python gtk check to avoid problems for people building with X
+  (#31589)
+
+  17 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/dia-0.94-gcc4.patch,
+  dia-0.94-r1.ebuild:
+  Adding patch to fix GCC4 compilation issues.
+
+  11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on sparc
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on ppc.
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> dia-0.94-r1.ebuild:
+  stable on amd64
+
+  09 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild:
+  Marked stable on x86.
+
+*dia-0.94-r1 (17 Mar 2005)
+
+  17 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild,
+  files/dia-0.94-no_font_cache.patch, files/dia-0.94-help.patch:
+  New revision. Added the `static' use flag. Added a patch to fix incorrect
+  font display due to a buggy cache implementation. Resolves bug #81227 and
+  possibly #67999. Thanks to Markus Luisser for his help on bug #81227.
+  Added a patch to fix the Help->Manual action under gnome. See bug #83726.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.93.ebuild:
+  Stable on alpha.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dia-0.93.ebuild:
+  stable on amd64.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dia-0.93.ebuild:
+  Masked dia-0.93.ebuild stable for ppc
+
+*dia-0.94 (03 Sep 2004)
+
+  03 Sep 2004; L. Boshell <leonardop@gentoo.org> dia-0.94.ebuild:
+  New release.
+
+  20 Aug 2004; foser <foser@gentoo.org> dia-0.92.2.ebuild :
+  Added patch by Benoit Boissinot fixing the FT includes (#44113)
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.93.ebuild:
+  Stable on sparc
+
+  26 Jul 2004; Mike Gardiner <obz@gentoo.org> dia-0.93.ebuild:
+  Marked 0.93 x86, as requested in bug #57564
+
+  14 Jun 2004; L. Boshell <leonardop@gentoo.org> dia-0.93.ebuild:
+  Inherit from eutils.
+
+*dia-0.93 (07 Jun 2004)
+
+  07 Jun 2004; L. Boshell <leonardop@gentoo.org> dia-0.93.ebuild,
+  files/dia-0.93-fix_py_prefix.patch:
+  New release, resolves bug #50144. Dependencies corrections. Patch that
+  fixes python-related checks in the configure script.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.92.2.ebuild:
+  Stable on alpha.
+
+  03 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.92.2.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> dia-0.92.2.ebuild:
+  added amd64 keyword.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> dia-0.92.2.ebuild:
+  set ppc in keywords
+
+  10 Nov 2003; Aron Griffis <agriffis@gentoo.org> dia-0.92.2.ebuild:
+  Add ~alpha
+
+*dia-0.92.2 (07 Nov 2003)
+
+  07 Nov 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92.2.ebuild:
+  version bump
+
+*dia-0.92.1 (28 Oct 2003)
+
+  28 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92.1.ebuild:
+  bugfix release that solves a couple show stopping font bugs
+
+*dia-0.92 (21 Oct 2003)
+
+  21 Oct 2003; foser <foser@gentoo.org> dia-0.92.ebuild :
+  New stable release, remove some obsolete cruft and smoothen deps
+
+*dia-0.92_pre7 (15 Oct 2003)
+
+  15 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre7.ebuild:
+  preemptive version bump because _pre4 had problems with non latin chars
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre4.ebuild:
+  re-add cisco shapes patch
+
+*dia-0.92_pre4 (10 Oct 2003)
+
+  10 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre4.ebuild:
+  version bump. this is more stable than 0.91 and also fixes the pango text
+  problem with >=1.2.4
+
+*dia-0.91 (26 Mar 2003)
+
+  21 Sep 2003; foser <foser@gentoo.org> dia-0.91.ebuild :
+  Add gcc33 patch as supplied by brandy@gentoo.org (#21940)
+  Fix pango dep (#29121)
+  Use gnome2 eclass
+
+  31 Mar 2003; Alastair Tse <liquidx@gentoo.org> dia-0.91.ebuild:
+  fix dia menu desktop entry. python, pygtk and gnome dep fixes.
+
+  30 Mar 2003; Martin Holzer <mholzer@gentoo.org> dia-0.91.ebuild:
+  fixed pango dependency. closes #18480.
+
+  26 Mar 2003: Jungmin Seo <seo@gentoo.org> dia-0.91.ebuild :
+  Fixed 'SRC_URI'
+
+  26 Mar 2003; Jungmin Seo <seo@gentoo.org> dia-0.91.ebuild :
+  New version. now supports gtk+-2. 
+
+*dia-0.90-r2 (22 Oct 2002)
+
+  13 Feb 2003; Mark Guertin <gerk@gentoo.org> dia-0.90-r2.ebuild :
+  set ppc in keywords
+
+  11 Jan 2003; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Fixed png deps (bug #13408)
+
+  15 Dev 2002; Jack Morgan <jmorgan@gentoo.org> dia-0.90-r2.ebuild :
+  Added ~sparc keyword
+
+  23 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added libart_lgpl dep for png USE
+  Thanks go to Ryan Tolboom <rxt1077@njit.edu> for notifying
+
+  22 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added truetype and png USE flags (bug #8916)
+
+*dia-0.90-r1 (21 Jun 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> dia-0.90-r1.ebuild :
+
+  LFH compliance and massive cleanup
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.90.ebuild :
+  Added KEYWORDS.
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.90-r1.ebuild :
+  Added KEYWORDS.
+
+  21 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
+
+  Added missing dep to dev-libs/libunicode. Fixes bug #3959
+
+
+*dia-0.90 (20 Jun 2002)
+
+  20 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
+
+  New version, SLOT, LICENSE added, and updated dependencies.
+
+
+*dia-0.88.1-r1 (1 Feb 2002)
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.88.1-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
new file mode 100644
index 0000000..d3459e1
--- /dev/null
+++ b/app-office/dia/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dia-0.97.0-gnome-doc.patch 1961 SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186 WHIRLPOOL d60ea1f01be0a5823c5de654476528cba55fd3587dbf8abbf681e6de939033b3c70b7fc9ffe034b33cdd3344fc2cebe821eca12a635b766ed38169d268e7f910
+AUX dia-0.97.2-glib-2.31.patch 1553 SHA256 23fedf222d154e7b3565e419e5ba40f12366b47772de49342e6eb2862271f3f4 SHA512 d47f87f73185781136f8c55ba67a326d32408c511e18b6b82afb6e069d380bedfa689c8bd4ef426aa577f008394a651ad570e66344db3733be6677dea2683d24 WHIRLPOOL a7a9b7bd7cbb31edd89e2158ef69b2185dc62c30d315369c1369a6073b5083c7953ddeb2eb9779dae7bca7aaef9c3bc8328ef1ae40b49d88ac8832500a808ef2
+AUX dia-0.97.2-underlinking.patch 1024 SHA256 3b5cbe564c9a48453e4300b89fa24de7454268b388a56036afe187c56e46c951 SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e WHIRLPOOL 90ea84704a2a3f14730d54044075cae6339c5f21d1fff00567f0c9834bdeae187c83f4eedc7ae7839f0cccecc2caca7ca133968e914ab79333c3005e431c70a5
+DIST dia-0.97.2.tar.xz 5507004 SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1 SHA512 493510d038213a50141998e2af29ddcc5e98495c287417dcb6a0880b4e16cad8f1b47d0948e0a5727d88d5640664e8b28d4af3f219dd0343069aaa9895d945ba WHIRLPOOL 600f7f7d8c5707a4b0174fce6db1bdbb48b77ba6390b6c659708f4e10d0e5b33f265e1edfb6dc8e982e39a8d7a72d2645d747b4043ea79544a6812325a8e8f33
+EBUILD dia-0.97.2-r1.ebuild 2747 SHA256 bb7de361bcdd12850e2e041d91c3d106bbb85b49565736030b8aefc74659e339 SHA512 1dd596e9f246dd5e9dc7895be5e2f253cfe12cf9951ad2f6a022ed5cc4e0df5606c0050d3ade1ce8e4f8c676b3c968383a7f6336f59aa947fa5deae7ff440d7f WHIRLPOOL f5c636b24b9f8624fb7964dc28134022eca1c54e9aac3fb7ffa2ab0842c0ed9fcdb41994c920c0816afe11e49a77ed4be47e3b2f60452967eaeed275c97a0a6f
+MISC ChangeLog 20377 SHA256 47213b06172de2d145b7187d5f56fcb1688143a7244581b620e509f111e73c9d SHA512 8afb79a9a0e972a18a3727a32ccd61fe8440ebbd9bf9a631b82d7b45f094ce7eaeff61fc25d255d5c8910d032ad01884b1cbff0a2e244f0c1ca6bfecd6d6873b WHIRLPOOL fe2562d615cb1209c5ddc8870a3a287bb1c80f4c6230fdd613c40280b23cdbd3aac733725d1e1cd31e68593d2475d796547c0924ae0ecef873cca78fc933ca5a
+MISC metadata.xml 578 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c SHA512 bc6988cb36508fde98810d60e99975bb626bf5f1d938bc289e010a2268da5a044c674bd0b626609358bd98c2e23ea91c1ca678e6ab181645fe4de1d610e0325f WHIRLPOOL d8827938a36ccf7fb2cbde3d0e9134c111e8bf9ab7640942e212964a6be51ff66da905017393ebcfb1a507e9c12be6425f323115d32f2bc6bbc93546a28ba26a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlE2eN4ACgkQ1fmVwcYIWAYxOwCgnb/KgOQdCKOGN32gILAtMthv
+cWUAnR1/29pL8z1Os28+To+7c7IQBI1Z
+=eEIt
+-----END PGP SIGNATURE-----
diff --git a/app-office/dia/configure.in b/app-office/dia/configure.in
new file mode 100644
index 0000000..3890d1d
--- /dev/null
+++ b/app-office/dia/configure.in
@@ -0,0 +1,752 @@
+dnl Process this -*- autoconf -*- file with autoconf to produce a 
+dnl configure script.
+AC_INIT(dia, 0.97+git, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_CONFIG_SRCDIR(app/diagram.c)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_PREREQ(2.50)
+AC_REVISION($Revision: 1.288 $)
+
+dnl Specify a header configuration file
+AC_CONFIG_HEADERS(config.h)
+
+AC_CANONICAL_HOST
+
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    NO_UNDEFINED=-no-undefined
+    ;;
+  *)
+    os_win32=no
+    NO_UNDEFINED=
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+AC_SUBST(NO_UNDEFINED)
+
+dnl do this check now, to keep autogen quiet.
+AC_PROG_CC
+dnl also c++
+AC_PROG_CXX
+
+dnl Initialize maintainer mode
+AM_MAINTAINER_MODE
+
+dnl Initialize libtool
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+
+dnl Build time sanity check
+AM_SANITY_CHECK
+
+dnl Checks for programs.
+dnl AC_PROG_CC # already done 
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_ISC_POSIX
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(stddef.h fcntl.h unistd.h utime.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(select strcspn strdup strtol)
+
+dnl stuff for intltool
+IT_PROG_INTLTOOL([0.35.0]) 
+
+APP_LIBS=""
+AC_SUBST(APP_LIBS)
+
+dnl Checks for libraries
+
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0)
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+GTK_MODULES="gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.20.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
+PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.20.0, , 
+                  AC_MSG_ERROR([Need Pango version 1.20.0 or higher]))
+
+AC_ARG_WITH(freetype,
+[  --without-freetype        compile without FreeType support],,with_freetype=yes)
+if test "x$with_freetype" = "xyes"; then
+PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
+if test "$have_pangoft2" = "true"; then
+  dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
+  dnl It's not enough that -lpangoft2 implicitly pulls it in.
+  have_freetype=false
+  AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`)
+  if test "$have_freetype" = "true"; then
+    dnl Need 2.0.9, as a bug was fixed for us there.
+    dnl However, freetype-config doesn't give a meaningful version, so we must
+    dnl do it like this.
+    AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher])
+    old_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
+    AC_TRY_CPP([#include <ft2build.h>
+#include FT_FREETYPE_H
+#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
+#error Freetype version too low.
+#endif
+],
+        [AC_MSG_RESULT(yes)
+	 FREETYPE_LIBS=`freetype-config --libs`
+	 AC_SUBST(FREETYPE_LIBS)
+	 FREETYPE_CFLAGS=`freetype-config --cflags`
+	 AC_SUBST(FREETYPE_CFLAGS)
+	 GTK_MODULES="$GTK_MODULES pangoft2"
+	 AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])]
+    ,
+	[AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
+    CPPFLAGS="$old_CPPFLAGS"
+  else
+    AC_MSG_ERROR(Can't find FreeType library)
+  fi
+else
+  AC_MSG_ERROR(Can't find PangoFT2 library)
+fi
+fi
+AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
+
+CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
+
+dnl Try for libart
+PKG_CHECK_MODULES(LIBART,libart-2.0,have_libart=yes,have_libart=no)
+if test "$have_libart" = "yes" ; then
+   GTK_MODULES="$GTK_MODULES libart-2.0"
+   AC_DEFINE(HAVE_LIBART,1,[Define if building with LIBART support])
+fi
+
+AC_MSG_CHECKING([whether GNOME specific code should be used])
+AC_ARG_ENABLE(gnome,
+	      AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
+              enable_gnome=no)
+if test x"$enable_gnome" = "xyes" ; then
+    GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
+    AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
+    AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
+    have_gnome=yes
+else
+    have_gnome=no
+fi
+AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
+AC_MSG_RESULT($GNOME)
+
+dnl GTK2:     libgnomecanvas-2.0 ?
+
+PKG_CHECK_MODULES(GTK,$GTK_MODULES)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
+
+dnl Look for Cairo
+AC_ARG_WITH(cairo,
+[  --with-cairo           compile cairo plug-in],,with_cairo=yes)
+if test "x$with_cairo" != "xno"; then
+  PKG_CHECK_MODULES(CAIROVERSION, cairo >= 1.6.0, , 
+                    AC_MSG_ERROR([Need Cairo version 1.6.0 or higher]))
+  PKG_CHECK_MODULES(CAIRO, cairo,have_cairo=yes,have_cairo=no)
+  AC_SUBST(CAIRO_LIBS)
+  AC_SUBST(CAIRO_CFLAGS)
+  AC_DEFINE(HAVE_CAIRO,1,[Define if building with Cairo support])
+fi
+AM_CONDITIONAL(WITH_CAIRO, test "x$with_cairo" != "xno")
+
+dnl with gtk+ >= 2.8 this is no longer optional
+PKG_CHECK_MODULES(PANGOCAIRO,pangocairo, pangocairo_ok=yes, pangocairo_ok=no)
+if test "x$pangocairo_ok" = "xyes"; then
+  AC_DEFINE(HAVE_PANGOCAIRO_H,1,[Defined to render text with pangocairo not cairos toy API])
+fi
+
+dnl XSLT
+
+# Check if XSLT is available at all
+XSLT_DIR=""
+PKG_CHECK_MODULES(XSLT, libxslt, have_xslt=true, have_xslt=false)
+AM_CONDITIONAL(HAVE_XSLT, $have_xslt)
+if test "$have_xslt" = "true"; then
+  XSLT_DIR="xslt"
+  XSLT_LIBS="`$PKG_CONFIG --libs libxslt`"
+  XSLT_CFLAGS="`$PKG_CONFIG --cflags libxslt`"
+fi
+
+AC_SUBST(XSLT_DIR)
+AC_SUBST(XSLT_LIBS)
+AC_SUBST(XSLT_CFLAGS)
+
+# Figure out a prefix for where to find libxslt at runtime.
+AC_ARG_WITH(xslt-prefix, 
+            [  --with-xslt-prefix=DIR     Specify where to find the optional XSLT libraries
+                             (default=/usr/lib)], 
+	    libxslt_prefix=$withval,
+	    libxslt_prefix=/usr/lib)
+AC_DEFINE_UNQUOTED(LIBXSLT_PREFIX,"$libxslt_prefix", [Place to look for XSLT libs])
+
+dnl
+dnl libpng
+dnl
+dnl this likely already comes from GTK
+
+dnl Something in here pollutes $LIBS with -lpng.  Make sure to
+dnl avoid that.
+
+old_LIBS="${LIBS}"
+
+png_ok=no
+AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)
+AC_CHECK_LIB(png, png_read_info, ,png_ok=no, -lz -lm)
+if test "$png_ok" = yes; then
+  AC_MSG_CHECKING([for png_structp in png.h])
+  dnl Why can't AC_LINK_IFELSE take extra libs?
+  old_LDFLAGS="${LDFLAGS}"
+  LDFLAGS="${LDFLAGS} -lz -lm"
+  AC_LINK_IFELSE([#include <png.h>
+                  png_structp pp;
+		  png_infop info; 
+		  png_colorp cmap; 
+		  main() { void*foo = png_create_read_struct; }],
+                 png_ok=yes,
+                 png_ok=no)
+  LDFLAGS="${old_LDFLAGS}"
+  AC_MSG_RESULT($png_ok)
+  if test "$png_ok" = yes; then
+    PNG_LIBS='-lpng -lz -lm'
+    AC_DEFINE(HAVE_LIBPNG,,[PNG library available])
+  fi
+fi
+AC_SUBST(PNG_LIBS)
+
+LIBS="${old_LIBS} ${PNG_LIBS}"
+
+dnl AC_PROG_CXX does behave a bit strange, it is setting CXX=g++ as "last resort"
+dnl but that does not solve the missing g++ issue. Make C++ optional:
+cxx_ok=yes
+if test "$CXX" = "g++"; then
+  if test "$GXX" != "yes"; then
+    cxx_ok=no
+  fi
+fi
+AM_CONDITIONAL(HAVE_CPLUSPLUS, test "$cxx_ok" = yes)
+
+dnl check for libEMF to provide Windows Metafile plug-in on Linux
+AC_ARG_ENABLE([libemf],
+	AS_HELP_STRING([--enable-libemf], [enable plugin for windows metafile support]),
+	,
+	enable_libemf=yes)
+
+if test "$enable_libemf" = "yes"; then
+	old_CPPFLAGS="${CPPFLAGS}"
+	old_CFLAGS="${CFLAGS}"
+	old_LIBS="${LIBS}"
+
+	CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF"
+	AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no)
+	AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++)
+
+	if test "$emf_ok" = yes; then
+		LIBEMF_CFLAGS='-I /usr/include/libEMF'
+		LIBEMF_LIBS='-lEMF -lstdc++'
+		AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available])
+	fi
+
+	CPPFLAGS="${old_CPPFLAGS}"
+	CFLAGS="${old_CFLAGS}"
+	LIBS="${old_LIBS}"
+else
+	emf_ok=no
+fi
+AC_SUBST(LIBEMF_CFLAGS)
+AC_SUBST(LIBEMF_LIBS)
+AM_CONDITIONAL(WITH_LIBEMF, test "$emf_ok" = yes)
+
+dnl Not necessarily installed somewhere in a typical place
+AC_ARG_ENABLE([ogdf],
+	AS_HELP_STRING([--enable-ogdf], [enable plugin using OGDF (www.ogdf.net)]),
+	,
+	enable_ogdf=yes)
+if test "$enable_ogdf" = "yes"; then
+	dnl FIXME: get prefix from command line
+	ogdf_prefix=~/devel/OGDF
+	CPPFLAGS="${CPPFLAGS} -I $ogdf_prefix"
+	AC_LANG_PUSH([C++])
+	AC_CHECK_HEADER(ogdf/basic/Graph.h, ogdf_ok=yes, ogdf_ok=no)
+	AC_LANG_POP([C++])
+	if test "$ogdf_ok" = yes; then
+		OGDF_CFLAGS="-I ${ogdf_prefix}"
+		if test "x$enable_debug" = "xno"; then
+			OGDF_LIBS="-L${ogdf_prefix}/_release -lOGDF -lstdc++"
+		else
+			OGDF_LIBS="-L${ogdf_prefix}/_debug -lOGDF -lstdc++"
+		fi
+		AC_DEFINE(HAVE_OGDF,1,[OGDF library available])
+	fi
+else
+	ogdf_ok=no
+fi
+AC_SUBST(OGDF_CFLAGS)
+AC_SUBST(OGDF_LIBS)
+AM_CONDITIONAL(HAVE_OGDF, test "$ogdf_ok" = yes)
+
+dnl
+dnl Debugging
+dnl
+AC_ARG_ENABLE(debug, 
+[  --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],
+  ,
+  enable_debug=minimum)
+
+if test "x$enable_debug" = "xyes"; then
+  DEBUG_FLAGS="-g -DENABLE_DEBUG"
+else
+  if test "x$enable_debug" = "xno"; then
+    DEBUG_FLAGS=""
+  else
+    DEBUG_FLAGS=""
+  fi
+fi
+
+dnl
+dnl Deprecation
+dnl
+AC_ARG_ENABLE(deprecation, 
+[  --enable-deprecation=[no,glib,pango,gtk,yes] turn on glib/pango/gtk deprecations [default=no]],
+   ,
+   enable_deprecation=no)
+if test "x$enable_deprecation" != "xno"; then
+  if test "x$enable_deprecation" = "xglib"; then 
+    DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_DEPRECATED"
+  else
+    if test "x$enable_deprecation" = "xpango"; then 
+      DEBUG_FLAGS="$DEBUG_FLAGS -DPANGO_DISABLE_DEPRECATED"
+    else
+      if test "x$enable_deprecation" = "xgtk"; then 
+        DEBUG_FLAGS="$DEBUG_FLAGS -DGTK_DISABLE_DEPRECATED"
+      else
+        DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+      fi
+    fi
+  fi
+  enable_deprecation=yes
+fi
+
+dnl Used for both
+AC_SUBST(DEBUG_FLAGS)
+
+dnl
+dnl i18n
+dnl
+
+GETTEXT_PACKAGE=dia
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Needed for glib gettext])
+
+AC_CHECK_PROG(XGETTEXT, xgettext, xgettext, none)
+if test "$XGETTEXT" = none ; then
+   AC_MSG_ERROR([xgettext program not found: $XGETTEXT.])
+fi
+
+AM_GLIB_GNU_GETTEXT
+
+
+dnl INTLOBJS doesn't seem to always get subst'ed, but I believe it's
+dnl idempotent
+AC_SUBST(INTLOBJS)
+
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
+
+dnl
+dnl Locate the gnome-xml library
+dnl
+dnl GTK2: remove support for libxml1. move check for libxml2 in 
+dnl AM_PATH_GTK_2_0's fourth argument (module is libxml-2.0)
+
+found_libxml=false
+if test $found_libxml = false; then
+  AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
+  if test "x$XML2_CONFIG" != x ; then
+    AC_MSG_CHECKING(for libxml >= 2.3.9)
+    vers=`$XML2_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+
+    if test "$vers" -ge 2003009; then
+      AC_MSG_RESULT(found)
+      found_libxml=true
+      XML_LIBS="`$XML2_CONFIG --libs`"
+      XML_CFLAGS="`$XML2_CONFIG --cflags`"
+
+      if test "$enable_gnome_print" = "yes"; then
+          gnome-config --cflags print | \
+          grep gnome-xml 2>&1 >/dev/null && \
+          AC_MSG_ERROR(libxml2 found but gnome-print uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable gnome-print.)
+      fi
+      echo $GNOME_CFLAGS | \
+      grep gnome-xml 2>&1 >/dev/null && \
+      AC_MSG_ERROR(libxml2 found but one GNOME component uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable the offending GNOME component.)
+        
+    else
+      AC_MSG_RESULT(not found)
+    fi
+  fi
+fi
+
+if test $found_libxml = false; then
+AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config)
+if test "x$XML_CONFIG" != x ; then
+  AC_MSG_CHECKING(for libxml >= 1.8.14)
+  vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+
+  dnl 1.18.14 is required for xmlUseNewParser()    
+  if test "$vers" -ge 1008014; then
+    AC_MSG_RESULT(found)
+    found_libxml=true
+    XML_LIBS="`$XML_CONFIG --libs`"
+    XML_CFLAGS="`$XML_CONFIG --cflags`"
+  else
+    AC_MSG_RESULT(not found)
+  fi
+fi
+fi
+
+if test $found_libxml = false; then
+    AC_MSG_ERROR(Neither libxml1 or libxml2 found. You must install one (libxml1, preferably))
+fi
+
+AC_SUBST(XML_LIBS)
+AC_SUBST(XML_CFLAGS)
+
+CFLAGS="$XML_CFLAGS $CFLAGS"
+
+dnl LibZ
+AC_CHECK_HEADERS(zlib.h,
+    AC_CHECK_LIB(z, gzread,[
+        AC_DEFINE(HAVE_LIBZ,, we have the libz compression library)
+        if test "x${Z_DIR}" != "x"; then
+            Z_CFLAGS="-I${Z_DIR}/include"
+            Z_LIBS="-L${Z_DIR}/lib -lz"
+        else
+            Z_LIBS="-lz"
+        fi]))
+
+AC_SUBST(Z_LIBS)
+
+CFLAGS="${CFLAGS} ${Z_CFLAGS}"
+LIBS="${LIBS} ${Z_LIBS}"
+
+
+dnl Path to UI resources
+AC_SUBST(uidatadir, '${pkgdatadir}/ui')
+
+dnl Platform-specific fixes.
+dnl
+
+if test "$os_win32" = "no"; then
+
+  dnl Sun Forte C provides isinf() in the unbundled -lsunmath. Solaris
+  dnl declares finite() in ieeefp.h. It's preferrable not to link
+  dnl to -lsunmath as it's not present on all machines.
+  have_isinf=no
+  AC_CHECK_HEADERS(math.h,
+          AC_CHECK_LIB(m,isinf,
+                  have_isinf=yes))
+
+  if test "$have_isinf" = "no"; then
+      AC_CHECK_HEADER(ieeefp.h,
+               [AC_CHECK_FUNC(finite,
+                         AC_DEFINE(HAVE_IEEEFP_H,1,
+                                 [Define if finite() is defined in ieeefp.h]),
+                         AC_MSG_ERROR([Can't find a definition of neither
+                                       finite nor isinf]))],
+               [AC_MSG_ERROR(Can't find neither a definition of
+	                     isinf nor ieeefp.h)])
+  else
+      AC_DEFINE([HAVE_ISINF], 1,
+                [Define if the isinf() function is available])
+  fi
+
+fi
+
+dnl Alpha needs -mieee or we get a segfault
+dnl This shouldn't be needed but is here until a real solution is found
+case "$host" in
+  alpha*-*-linux*)
+    CFLAGS="$CFLAGS -mieee"
+    ;;
+esac
+
+if test "$GCC" = yes; then
+  dnl Relieve register pressure on i386. Other architectures may become unable
+  dnl to debug, and usually have more registers anyway.
+  dnl case "$host" in 
+  dnl  i?86-pc-*)
+  dnl    DIA_CHECK_CFLAG(-fomit-frame-pointer)
+  dnl    ;;
+  dnl esac
+  dnl (it looks like gdb is very confused by this now even on x86. We might be
+  dnl getting poor stack traces with bug-buddy because of this)
+
+  DIA_CHECK_CFLAG(-Wall)
+  dnl DIA_CHECK_CFLAG(-Wunused)
+  DIA_CHECK_CFLAG(--std=c89)
+  DIA_CHECK_CFLAG(-Wdeclaration-after-statement)
+  dnl I'd rather like to enable this but it fails on isnan() with -std=c89
+  dnl DIA_CHECK_CFLAG(-Werror-implicit-function-declaration)
+  dnl Premature optimization is the root of all evil.  Uncomment this if
+  dnl you want ti figure out functions that should have been inlined but aint.
+  dnl DIA_CHECK_CFLAG(-Winline)
+  DIA_CHECK_CFLAG(-Wmissing-prototypes)
+  DIA_CHECK_CFLAG(-Wmissing-declarations)
+  DIA_CHECK_CFLAG(-finline-functions)
+  DIA_CHECK_CFLAG(-fstrict-aliasing)
+  dnl DIA_CHECK_CFLAG(-Wshadow)
+  DIA_CHECK_CFLAG(-Wpointer-arith)
+  dnl DIA_CHECK_CFLAG(-Wswitch-enum)
+  dnl For Dia the following warning is producing pure noise, switch it off
+  DIA_CHECK_CFLAG(-Wno-enum-compare)
+  DIA_CHECK_CFLAG(-Winit-self)
+  DIA_CHECK_CFLAG(-Wformat-nonliteral)
+fi
+
+AM_CONDITIONAL(HAVE_GCC, test "$GCC" = yes)
+
+dnl Do we have the db2html script to build the documentation?
+AC_ARG_ENABLE(db2html,
+[  --enable-db2html        don't rebuild documentation],,enable_db2html=no)
+AC_PATH_PROG(DB2HTML, db2html, no)
+AM_CONDITIONAL(HAVE_DB2HTML, 
+               test "x$enable_db2html" != xno && test "x$DB2HTML" != xno)
+
+dnl Only enable man page generation if we have db2man (in maintainer mode)
+
+
+dnl Have to have the nwalsh docbook.xsl, which does manpages.
+dnl RedHat installs it in a version-numbered place.  Grumpf.
+AC_PATH_PROG(XSLTPROC, xsltproc, no)
+AM_CONDITIONAL(HAVE_DB2MAN, test "x$XSLTPROC" != xno)
+if test "x$XSLTPROC" != "xno" ; then
+  xsltproc=true
+else
+  xsltproc=false
+fi
+AM_CONDITIONAL(HAVE_XSLTPROC, $xsltproc)
+AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
+
+dnl Handling for Python
+AC_ARG_WITH(python,
+[  --with-python           compile python plug-in],,with_python=no)
+
+if test "x$with_python" != xno; then
+  AM_PATH_PYTHON(2.3.0)
+  AM_CHECK_PYMOD(gtk,,,[AC_MSG_RESULT(could not find pygtk module)])
+  AM_CHECK_PYTHON_HEADERS
+  AM_CHECK_PYTHON_LIB
+
+  if test -z "$PYTHON_INCLUDES" || test -z "$PYTHON_LIBS"; then
+    AC_MSG_ERROR([could not find files required to build python plugin])
+  fi
+fi
+AM_CONDITIONAL(WITH_PYTHON, test "x$with_python" != "xno")
+
+dnl Handling of Python bindings with SWIG
+AC_ARG_WITH(swig,
+[  --with-swig          generate python bindings with swig],,with_swig=no)
+
+if test "x$with_swig" != "xno"; then
+  AC_PROG_SWIG(1.3.31)
+  if test -z "$SWIG_LIB"; then
+    AC_MSG_ERROR([could not find SWIG required to generate the bindings])
+  else
+    AC_MSG_RESULT([SWIG at $SWIG_LIB])
+  fi
+fi
+AM_CONDITIONAL(WITH_SWIG, test "x$with_swig" != "xno")
+
+
+
+dnl
+dnl html, pdf and postscript documentation
+dnl
+AC_ARG_WITH(hardbooks,
+[  --with-hardbooks	compile html, pdf and postscript documentation],,with_hardbooks=no)
+AC_PATH_PROG(DBLATEX,dblatex,no)
+
+dnl
+dnl use jw only if we don't find dblatex
+dnl
+AC_PATH_PROG(JW,jw,no)
+if  test "x$dblatex" = "xno"; then
+ AM_CONDITIONAL(WITH_JW, test "x$jw" != "xno")	
+else
+ AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+fi
+hardbook_ok=no
+xsltproc_ok=no
+if test "x$with_hardbooks" = "xno"; then
+  AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
+else
+  AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
+  AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno")
+  AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno")
+  if test "x$dblatex" != "xno" ; then
+    hardbook_ok=yes
+  else 
+    if test "x$jw" != "xno" ; then
+      hardbook_ok=yes
+    fi
+  fi
+  if test "x$xsltproc" != "xno" ; then
+    xsltproc_ok=yes
+  fi
+fi
+
+
+AC_OUTPUT(
+Makefile
+lib/Makefile
+lib/pixmaps/Makefile
+po/Makefile.in
+objects/Makefile
+objects/AADL/Makefile
+objects/chronogram/Makefile
+objects/custom/Makefile
+objects/custom_lines/Makefile
+objects/ER/Makefile
+objects/flowchart/Makefile
+objects/FS/Makefile
+objects/GRAFCET/Makefile
+objects/Istar/Makefile
+objects/Jackson/Makefile
+objects/KAOS/Makefile
+objects/Misc/Makefile
+objects/network/Makefile
+objects/SADT/Makefile
+objects/standard/Makefile
+objects/UML/Makefile
+objects/Database/Makefile
+shapes/Makefile
+shapes/Assorted/Makefile
+shapes/BPMN/Makefile
+shapes/ChemEng/Makefile
+shapes/Circuit/Makefile
+shapes/Cisco/Makefile
+shapes/Civil/Makefile
+shapes/Contact/Makefile
+shapes/Cybernetics/Makefile
+shapes/Electric/Makefile
+shapes/flowchart/Makefile
+shapes/Gane_and_Sarson/Makefile
+shapes/jigsaw/Makefile
+shapes/Lights/Makefile
+shapes/Logic/Makefile
+shapes/Map/Makefile
+shapes/Map/Isometric/Makefile
+shapes/Misc/Makefile
+shapes/MSE/Makefile
+shapes/network/Makefile
+shapes/Pneumatic/Makefile
+shapes/SDL/Makefile
+shapes/Shape_Design/Makefile
+shapes/sybase/Makefile
+app/Makefile
+app/pixmaps/Makefile
+bindings/Makefile
+samples/Makefile
+sheets/Makefile
+sheets/ER/Makefile
+sheets/GRAFCET/Makefile
+sheets/Istar/Makefile
+sheets/Jackson/Makefile
+sheets/KAOS/Makefile
+sheets/UML/Makefile
+plug-ins/Makefile
+plug-ins/cgm/Makefile
+plug-ins/cairo/Makefile
+plug-ins/drs/Makefile
+plug-ins/dxf/Makefile
+plug-ins/hpgl/Makefile
+plug-ins/layout/Makefile
+plug-ins/libart/Makefile
+plug-ins/metapost/Makefile
+plug-ins/pixbuf/Makefile
+plug-ins/postscript/Makefile
+plug-ins/pstricks/Makefile
+plug-ins/pgf/Makefile
+plug-ins/python/Makefile
+plug-ins/shape/Makefile
+plug-ins/stress/Makefile
+plug-ins/svg/Makefile
+plug-ins/vdx/Makefile
+plug-ins/wmf/Makefile
+plug-ins/wpg/Makefile
+plug-ins/xfig/Makefile
+plug-ins/xslt/Makefile
+tests/Makefile
+tests/exports/Makefile
+data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/apps/Makefile
+data/icons/22x22/Makefile
+data/icons/22x22/apps/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/apps/Makefile
+data/icons/32x32/Makefile
+data/icons/32x32/apps/Makefile
+data/icons/48x48/Makefile
+data/icons/48x48/apps/Makefile
+data/icons/scalable/Makefile
+data/icons/scalable/apps/Makefile
+doc/Makefile
+doc/de/Makefile
+doc/en/Makefile
+doc/eu/Makefile
+doc/pl/Makefile
+doc/fr/Makefile
+installer/Makefile
+installer/macosx/Makefile
+installer/macosx/Resources/Makefile
+installer/macosx/Resources/etc/Makefile
+installer/macosx/Resources/etc/fonts/Makefile
+installer/macosx/Resources/themes/Makefile
+installer/macosx/Resources/themes/CL/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/Makefile
+installer/win32/Makefile
+installer/win32/locale/Makefile
+dia.keys
+)
+
+dnl GTK2: simplify this, we will have much less options.
+echo "
+
+Configuration:
+	Source code location:	${srcdir}
+	Compiler:		${CC}
+	can C++:		${cxx_ok}
+
+	Gnome support:				 ${have_gnome}
+	Python support:				 ${with_python}
+	Libart support (PNG export):		 ${have_libart}
+	Cairo support (PNG, PDF, print):	 ${with_cairo}
+	Dia Python bindings with SWIG		 ${with_swig}
+	WMF plug-in with libEMF:                 ${emf_ok}
+	html doc:                                ${xsltproc_ok}
+	pdf and ps doc:                          ${hardbook_ok}
+	Enable deprecations (disable deprecated) ${enable_deprecation}
+"
+
+echo "Now type make to build dia..."
diff --git a/app-office/dia/dia-0.97.2-r1.ebuild b/app-office/dia/dia-0.97.2-r1.ebuild
new file mode 100644
index 0000000..6e440f0
--- /dev/null
+++ b/app-office/dia/dia-0.97.2-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r1.ebuild,v 1.11 2012/10/28 15:22:42 armin76 Exp $
+
+EAPI=4
+
+GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
+
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils gnome2 python multilib
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://live.gnome.org/Dia"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+# the doc USE flag doesn't seem to do anything without docbook2html
+IUSE="cairo doc gnome python"
+
+RDEPEND=">=dev-libs/glib-2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/popt
+	>=media-libs/freetype-2
+	>=media-libs/libart_lgpl-2
+	media-libs/libpng:0
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	x11-libs/pango
+	cairo? ( x11-libs/cairo )
+	doc? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		)
+	gnome? (
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		)
+	python? ( >=dev-python/pygtk-2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-apps/sed
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+	# --exec-prefix makes Python look for modules in the Prefix
+	G2CONF="--exec-prefix=${EPREFIX}/usr
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
+		$(use_enable gnome)
+		--disable-libemf
+		$(use_enable doc db2html)
+		$(use_with cairo)
+		$(use_with python)
+		--without-swig
+		--without-hardbooks"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
+	epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331
+	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
+
+	if use python; then
+		python_convert_shebangs -r 2 .
+		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
+	fi
+
+	if ! use doc; then
+		# Skip man generation
+		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
+	fi
+
+	# Fix naming conflict on Darwin/OSX
+	sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	default
+
+	# Install second desktop file for integrated mode (bug #415495)
+	sed -e 's|^Exec=dia|Exec=dia --integrated|' \
+			-e '/^Name=/ s|$| (integrated mode)|' \
+			"${ED}"/usr/share/applications/dia.desktop \
+			> "${ED}"/usr/share/applications/dia-integrated.desktop || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/share/dia
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	use python && python_mod_cleanup /usr/share/dia
+}
diff --git a/app-office/dia/files/dia-0.97.0-gnome-doc.patch b/app-office/dia/files/dia-0.97.0-gnome-doc.patch
new file mode 100644
index 0000000..63e13de
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.0-gnome-doc.patch
@@ -0,0 +1,61 @@
+From 9d40692b695b30f80b263814bdd351c0dbe67733 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 18 May 2009 22:19:35 +0200
+Subject: [PATCH] Fix compilation in a gnome environment, gentoo bug #159831
+
+---
+ configure.in |   19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d27ee6e..d9c0bf4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -110,17 +110,19 @@ if test "$have_libart" = "yes" ; then
+ fi
+ 
+ AC_MSG_CHECKING([whether GNOME specific code should be used])
+-AC_ARG_ENABLE(gnome,[  --enable-gnome          enable gnome code],
+-              GNOME=$enableval, GNOME=no)
+-if test "$GNOME" = "yes" ; then
++AC_ARG_ENABLE(gnome,
++	      AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
++	      enable_gnome=no)
++if test "x$enable_gnome" = "xyes" ; then
+     GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
+     AC_DEFINE(GNOME,1,[Define if building with GNOME support])
++    AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
+     AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
+-    have_gnome=true
++    have_gnome=yes
+ else
+-    have_gnome=false
++    have_gnome=no
+ fi
+-AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
++AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
+ AC_MSG_RESULT($GNOME)
+ 
+ dnl GTK2:     libgnomecanvas-2.0 ?
+@@ -129,7 +131,8 @@ PKG_CHECK_MODULES(GTK,$GTK_MODULES)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-AM_CONDITIONAL(HAVE_BONOBO,false)
++#AM_CONDITIONAL(HAVE_BONOBO,false)
++AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
+ 
+ dnl Look for Cairo
+ AC_ARG_WITH(cairo,
+@@ -627,7 +630,7 @@ Configuration:
+ 	Source code location:	${srcdir}
+ 	Compiler:		${CC}
+ 
+-	Gnome support:				${GNOME}
++	Gnome support:				${have_gnome}
+ 	Python support:				${with_python}
+ 	Libart support (PNG export):		${have_libart}
+ 	Cairo support (PNG, PDF, print):	${with_cairo}
+-- 
+1.6.3
+
diff --git a/app-office/dia/files/dia-0.97.2-glib-2.31.patch b/app-office/dia/files/dia-0.97.2-glib-2.31.patch
new file mode 100644
index 0000000..7429cd2
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-glib-2.31.patch
@@ -0,0 +1,59 @@
+From e3d41e6dd3488a29d23f53c57526871a9b79e9bf Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 20:43:27 -0400
+Subject: [PATCH] Do not include glib subheaders directly
+
+Otherwise, dia cannot build against >=glib-2.31
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673712
+---
+ objects/custom/shape_typeinfo.c |    2 +-
+ tests/test-boundingbox.c        |    3 ---
+ tests/test-objects.c            |    4 ----
+ 3 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
+index c6133b1..3fb3d73 100644
+--- a/objects/custom/shape_typeinfo.c
++++ b/objects/custom/shape_typeinfo.c
+@@ -27,7 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ #include <libxml/parser.h>
+ 
+diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
+index 7adaab5..a13d018 100644
+--- a/tests/test-boundingbox.c
++++ b/tests/test-boundingbox.c
+@@ -28,9 +28,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+ #include "dialib.h"
+ 
+ /*
+diff --git a/tests/test-objects.c b/tests/test-objects.c
+index 57d5675..c5980a5 100644
+--- a/tests/test-objects.c
++++ b/tests/test-objects.c
+@@ -28,10 +28,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+-
+ #include "object.h"
+ #include "plug-ins.h"
+ #include "dialib.h"
+-- 
+1.7.8.5
+
diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch
new file mode 100644
index 0000000..903e077
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-underlinking.patch
@@ -0,0 +1,27 @@
+From 2f853bab67b087605a10f544a7df780ac98b8583 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Sat, 7 Jul 2012 17:28:59 +0200
+Subject: [PATCH] Fix missing linkage with gmodule-2.0.
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
+---
+ dia-0.97.2/configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
+index 72830de..6b7394a 100644
+--- a/dia-0.97.2/configure.in
++++ b/dia-0.97.2/configure.in
+@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ 
+-GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
++GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
+ PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, , 
+                   AC_MSG_ERROR([Need Pango version 1.8.0 or higher]))
+ 
+-- 
+1.7.11.1
+
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
new file mode 100644
index 0000000..a257c23
--- /dev/null
+++ b/app-office/dia/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome-office</herd>
+<longdescription>
+  Dia is a gtk+ based diagram creation program. It can be used to
+  draw many different kinds of diagrams. It currently has special
+  objects to help draw entity relationship diagrams, UML diagrams,
+  flowcharts, network diagrams, and simple circuits. It is also
+  possible to add support for new shapes by writing simple XML
+  files, using a subset of SVG to draw the shape.
+</longdescription>
+</pkgmetadata>