Upgraded the dia Portage package

Upgraded app-office/dia to version 0.97.2 on amd64

Needed for building documentation with some packages.

BUG=None
TEST=`emerge dia` worked

Change-Id: I47d808faaee023b816f03f15c244ee00f7af6984
Reviewed-on: https://gerrit.chromium.org/gerrit/22160
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

sdk_container/src/third_party/portage-stable/app-office/dia/Manifest

@@ -0,0 +1 @@
+DIST dia-0.97.2.tar.xz 5507004 RMD160 f9270f1f2cb6ad505219463827d02e3759693796 SHA1 dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1

sdk_container/src/third_party/portage-stable/app-office/dia/dia-0.97.2.ebuild

@@ -0,0 +1,104 @@
+# 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.ebuild,v 1.7 2012/05/03 20:00:39 jdhore 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 ~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
+	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
+	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
+
+	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
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+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
+}

sdk_container/src/third_party/portage-stable/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch

@@ -0,0 +1,51 @@
+ acinclude.m4 |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 57a2188..1bf3ad0 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -128,7 +128,7 @@ else:
+   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+     [am_cv_python_pythondir],
+     [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
++     echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
+   AC_SUBST([pythondir], [$am_cv_python_pythondir])
+ 
+   dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+@@ -145,7 +145,7 @@ else:
+   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+     [am_cv_python_pyexecdir],
+     [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
++     echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
+   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+ 
+   dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+@@ -202,6 +202,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
++py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+@@ -225,7 +226,7 @@ AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ 
+ AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
+ 
+-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
++py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
+ 
+ py_makefile="${py_config_dir}/Makefile"
+ if test -f "$py_makefile"; then
+@@ -235,7 +236,7 @@ dnl extra required libs
+   py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
+ 
+ dnl now the actual libpython
+-  if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
++  if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
+     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
+     AC_MSG_RESULT(found)
+   else

sdk_container/src/third_party/portage-stable/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
+

sdk_container/src/third_party/portage-stable/app-office/dia/files/dia-0.97.1-libpng15.patch

@@ -0,0 +1,24 @@
+From 59f67782b9e382b2d71aeabbd493799b179bdec0 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Sun, 27 Feb 2011 20:32:47 +0000
+Subject: Bug 642764 - use png_jmpbuf() rather than direct member access
+
+Fix from Hanno Boeck to make Dia compile with libpng 1.5
+https://bugzilla.gnome.org/show_bug.cgi?id=642764
+(cherry picked from commit 8e28086b95578d17386c3be9aea132064be829a0)
+---
+diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
+index f8bbdc1..33ea6c3 100644
+--- a/plug-ins/libart/export_png.c
++++ b/plug-ins/libart/export_png.c
+@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointer userdata)
+   }
+ 
+   /* set error handling ... */
+-  if (setjmp(png->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png))) {
+     fclose(fp);
+     png_destroy_write_struct(&png, &info);
+     message_error(_("Error occurred while writing PNG"));
+--
+cgit v0.9

sdk_container/src/third_party/portage-stable/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
+

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-office/dia-0.97.2

@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=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 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 ) dev-util/intltool virtual/pkgconfig doc? ( dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+DESCRIPTION=Diagram/flowchart creation program
+EAPI=4
+HOMEPAGE=http://live.gnome.org/Dia
+IUSE=cairo doc gnome python debug
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+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 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 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.2.tar.xz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	33ef77a15337022e05342d2c772a7a5a	fdo-mime	9c46e30acd923ff12e325dbe96bb98b9	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	e766f648c9d51ea0afabaf25bddb1ad9	gnome2-utils	0067e2e4dc66e2ff223a9c527e329407	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	python	6bbd984910e27780e5d0ea543d83ef84	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed
+_md5_=2db60ffb4930d47d82b037f4be70d861