Migrate to new python eclasses, improve desktop file translations, drop unneeded libgnome* deps, let it compile with latest automake, don't mess with localedir, fix glib-2.36 compat, apply upstream patch to fix some warnings.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 250 insertions, 6 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index b126416c19ff..fbc7b8eddad9 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.156 2013/09/22 11:21:59 pacho Exp $
+
+*dia-0.97.2-r2 (22 Sep 2013)
+
+  22 Sep 2013; Pacho Ramos <pacho@gentoo.org> +dia-0.97.2-r2.ebuild,
+  +files/dia-0.97.2-glib2.36.patch,
+  +files/dia-0.97.2-implicit-declaration.patch:
+  Migrate to new python eclasses, improve desktop file translations, drop
+  unneeded libgnome* deps, let it compile with latest automake, don't mess with
+  localedir, fix glib-2.36 compat, apply upstream patch to fix some warnings.
 
   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,
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index d3459e15bd6d..76042d428307 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -3,15 +3,18 @@ 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-glib2.36.patch 3747 SHA256 8dd54b2c04faa53fd4a1740ee16c610c45bf5c0d4eb0370a538728bfdf05e3fe SHA512 bf7e987e8aab9645fa290424a3d3c0d6ff924d107630952b01284593550598125f66def7cf6bffc2dd626fdc6a7a1ae0de42af5efecae9e9981ed62b004fec8d WHIRLPOOL 7831e881f63f6d1895808901784f0d97dd45db6798f7cc8970240320732d3fe9ebf4b959a5b1d172f5139903a622d3c2e401578fcab92f267fcdf3caa8a54b9a
+AUX dia-0.97.2-implicit-declaration.patch 857 SHA256 4bd8958bb5e8a80b99905fb205d90917ce3ed43f826b1ef185fe98f24de0fbaa SHA512 3d48e779219d2d55befd3ac23e9a382d8cbd7d02377254176e8982df0123f2c420ab543c1d13f887d39a0ea4be47ccb4686b9e2b9e0ebebdbb0d27faa9a6d234 WHIRLPOOL d6e7628afeeda290cee9bd59fb6e760e1f2fc9348cffe09264022d7516f2dcbdcbce493e3ff016918b620fea792a4c275c9009f19387e2cc2e2d8ad189bb69b2
 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
+EBUILD dia-0.97.2-r2.ebuild 2765 SHA256 cfd62ba789c224462c1bd06aa66cd6d44c17388565b4a7fbccbe87402b42009c SHA512 06fc7ba56d0f1a21091090a0bfce6cb9ab2cb00db255bfae6142bf3736effcff46f5d65af1a0d17552670ec9af0b60675386470f9e32a32e8e0c1b82cf6a0407 WHIRLPOOL c96ceb81d72b25f1ebad0d793017411738a9a8fd7f203afd383a21c19cc98cb8694b943a29f3ea11de6b9ca4dae8895342745e7c34be297c0c763cc699834986
+MISC ChangeLog 20795 SHA256 1ad51d61a7517c479bc29e53553a5c7b39bbc86ecaba9bcaae9c972825d86539 SHA512 694f82c2b6ad4554f094d4d3abe3837c20f5f6f59ddf3e3a6be225af71a177b64525ff2be7fb843d2526f52b3bb7b7408c42a171a93c91bee33e7d57e21adfe4 WHIRLPOOL 5b8d8b1aa86824520cba5e3f56a4b8209f87cac4024378e2e146bc6b55462032454a5ca0ce7ed12a4fbd170bfa70407d4416ff2a911cabaac16752edcc9731ba
 MISC metadata.xml 578 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c SHA512 bc6988cb36508fde98810d60e99975bb626bf5f1d938bc289e010a2268da5a044c674bd0b626609358bd98c2e23ea91c1ca678e6ab181645fe4de1d610e0325f WHIRLPOOL d8827938a36ccf7fb2cbde3d0e9134c111e8bf9ab7640942e212964a6be51ff66da905017393ebcfb1a507e9c12be6425f323115d32f2bc6bbc93546a28ba26a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlE2eN4ACgkQ1fmVwcYIWAYxOwCgnb/KgOQdCKOGN32gILAtMthv
-cWUAnR1/29pL8z1Os28+To+7c7IQBI1Z
-=eEIt
+iEYEAREIAAYFAlI+0tgACgkQCaWpQKGI+9T+3gCfTHOCCW6IWxfKr7mZ2qX37OlS
+LqMAniz4qEabkFayRGqpcKJDrfGOuyc0
+=YqyS
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.2-r2.ebuild b/app-office/dia/dia-0.97.2-r2.ebuild
new file mode 100644
index 000000000000..0905892a1416
--- /dev/null
+++ b/app-office/dia/dia-0.97.2-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/09/22 11:21:59 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils gnome2 python-single-r1 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 python"
+
+RDEPEND="
+	>=dev-libs/glib-2: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 )
+	python? (
+		>=dev-python/pygtk-2
+		${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-apps/sed
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+	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
+	epatch "${FILESDIR}"/${PN}-0.97.2-implicit-declaration.patch #468166
+	epatch "${FILESDIR}"/${PN}-0.97.2-glib2.36.patch #469040
+
+	if use python; then
+		python_fix_shebang .
+		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
+
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+
+	sed -i -e "/localedir/d" configure.in || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --exec-prefix makes Python look for modules in the Prefix
+	gnome2_src_configure \
+		--exec-prefix=${EPREFIX}/usr \
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--enable-gnome \
+		--disable-libemf \
+		$(use_enable doc db2html) \
+		$(use_with cairo) \
+		$(use_with python) \
+		--without-swig \
+		--without-hardbooks
+}
+
+src_install() {
+	gnome2_src_install
+
+	# 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
+}
diff --git a/app-office/dia/files/dia-0.97.2-glib2.36.patch b/app-office/dia/files/dia-0.97.2-glib2.36.patch
new file mode 100644
index 000000000000..eab83b8801d0
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-glib2.36.patch
@@ -0,0 +1,100 @@
+From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Sat, 16 Mar 2013 16:56:58 +0000
+Subject: Bug 694025 - GLib drop support for adding interfaces after class_init
+
+Without this Dia crashes at startup with new GLib version and the
+DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
+follows the pattern also used for DiaCairoInteraciveRenderer. This should
+be functional equivalent to what was there before and should work for all
+current GLib versions.
+
+(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
+---
+diff --git a/app/render_gdk.c b/app/render_gdk.c
+index 60ccb7a..b1e7ba4 100644
+--- a/app/render_gdk.c
++++ b/app/render_gdk.c
+@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
+                 gpointer window,
+                 int x, int y, int width, int height);
+ 
+-static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
++typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
++struct _DiaGdkInteractiveRenderer
++{
++  DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
++};
++typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
++struct _DiaGdkInteractiveRendererClass
++{
++  DiaGdkRendererClass parent_class; /*!< the base class */
++};
++#define DIA_TYPE_GDK_INTERACTIVE_RENDERER           (dia_gdk_interactive_renderer_get_type ())
++#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
++
++static void
++dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+ {
+   iface->clip_region_clear = clip_region_clear;
+   iface->clip_region_add_rect = clip_region_add_rect;
+@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+   iface->set_size = set_size;
+ }
+ 
++G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
++			 G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
++
++static void
++dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
++{
++}
++static void
++dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
++{
++  DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
++  DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
++  DiaRenderer *dia_renderer = DIA_RENDERER(object);
++  
++  dia_renderer->is_interactive = 1;
++
++  renderer->gc = NULL;
++  renderer->pixmap = NULL;
++  renderer->clip_region = NULL;
++}
++
+ DiaRenderer *
+ new_gdk_renderer(DDisplay *ddisp)
+ {
+   DiaGdkRenderer *renderer;
+   GType renderer_type = 0;
+ 
+-  renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
++  renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
+   renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
+-  if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
+-    {
+-      static const GInterfaceInfo irenderer_iface_info = 
+-      {
+-        (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
+-        NULL,           /* iface_finalize */
+-        NULL            /* iface_data     */
+-      };
+-
+-      renderer_type = DIA_TYPE_GDK_RENDERER;
+-      /* register the interactive renderer interface */
+-      g_type_add_interface_static (renderer_type,
+-                                   DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
+-                                   &irenderer_iface_info);
+-
+-    }
+-  renderer->parent_instance.is_interactive = 1;
+-  renderer->gc = NULL;
+-
+-  renderer->pixmap = NULL;
+-  renderer->clip_region = NULL;
+ 
+   return DIA_RENDERER(renderer);
+ }
+--
+cgit v0.9.2
diff --git a/app-office/dia/files/dia-0.97.2-implicit-declaration.patch b/app-office/dia/files/dia-0.97.2-implicit-declaration.patch
new file mode 100644
index 000000000000..e37138a80bc7
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-implicit-declaration.patch
@@ -0,0 +1,30 @@
+From 8f363f6dd82f9fbf502fceaf1d73a258c17593db Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Sat, 06 Jun 2009 18:01:38 +0000
+Subject: Bug #585004 - implicit declaration of function 'finite' (2nd iteration)
+
+To get the definition either _BSD_SOURCE or _SVID_SOURCE needs to
+be defined before inclusion of <math.h>.
+Removed HAVE_CONFIG_H and chanegd inclusion order
+---
+diff --git a/objects/standard/arc.c b/objects/standard/arc.c
+index 28302a6..3a50838 100644
+--- a/objects/standard/arc.c
++++ b/objects/standard/arc.c
+@@ -16,13 +16,11 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#ifdef HAVE_CONFIG_H
+ #include <config.h>
+-#endif
+ 
+-#include <assert.h>
+ #define _BSD_SOURCE 1 /* to get finite */
+ #include <math.h>
++#include <assert.h>
+ 
+ #include "intl.h"
+ #include "object.h"
+--
+cgit v0.9.2