app-office/dia: Install second desktop file for integrated mode (bug #415495)

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

3 files changed, 126 insertions, 9 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index d32815791d1c..b9ec71ca3efa 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.142 2012/05/24 13:29:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.143 2012/06/02 21:59:31 sping Exp $
+
+*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
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 7ede99792bd2..69d0d00cd5b8 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -8,17 +8,14 @@ AUX dia-0.97.2-glib-2.31.patch 1553 RMD160 8ea107d54e545c3efb5da9e9189d013926577
 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
 DIST dia-0.97.2.tar.xz 5507004 RMD160 f9270f1f2cb6ad505219463827d02e3759693796 SHA1 dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
 EBUILD dia-0.97.1.ebuild 3109 RMD160 28de4a70bf81e7b5b34846b3ceaf4f5e102fa393 SHA1 6739e0ad1e32274bfe464f88eb6c43eef445a09a SHA256 ea8e3e57d2a3b002538a4b4af81c6fed216eaceea74eeade63818cb32f77b5f3
+EBUILD dia-0.97.2-r1.ebuild 2732 RMD160 2e4900a61aa8a0a528d04f109a4ae931fc3dd6ae SHA1 b2c66de03c1ca9f8a83279dbc2c482e116ac84ce SHA256 d5588b8e4cab96b0be303dda04fe13acfacab870b7c542599547bd5685ea164f
 EBUILD dia-0.97.2.ebuild 2419 RMD160 d3eb199bd51d441ca5c9ff427ee49b46a36b9021 SHA1 663a05e78152a9f8170c80d5dbceb2bb6a732ed0 SHA256 26d4f3648ad4319048019736fba36a255cfe1ca452605ca8913029c72ac11575
-MISC ChangeLog 18716 RMD160 b20f51d4d8fbbf18ccb08d81e3ebdd547bb0763a SHA1 d4f40ab91bd0b6747e68f353227f48d2c39f7e76 SHA256 bb5eddb1d8d0a67a0854cc441bf55dd3ec9fbdc8fd09beac1dd82c5aab6b1e7a
+MISC ChangeLog 18882 RMD160 f18b2540907d0439a5a21fb7e75be0f714ecd122 SHA1 1b4864116f3ed8f9e161aec91763f2e51d6c1ba6 SHA256 3a4cd00dd5712a6c658102e0db0963da63736f581bfdecdd9fbb144580b86b69
 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvjfYAAoJEEdUh39IaPFNDWoIAJqy3fsQm3Tem+Adf1BCkv95
-n6Rewy0JK7LeZThwFy3IPn0hHpmaYf8SZGkzxfQhjhNJfcFroqcOoMxfATkjBjVu
-h79ufneyhb80jW2p/MpapaXfQwt3vH6tp70FmrzdZkUA55FgobO2qo3vNRRf1lfe
-gboGfuaicX2XM65qTM5Uy/s7bfbyxktgvKlIc/1qVQg0mwM7K9xWIeCRCh6YLkSZ
-4OypFoCGQdBKkFVmDJk1PUcnt8wHVScJ5zxMtWd3oGvbm0fAvCRraWlcVCWt34KQ
-L99fyYmPjOM/go1Tunhh3UA4KrNMi8C4ATN70CECk2D8Y3CuN7019KkkmY9srk8=
-=zucs
+iEYEARECAAYFAk/KjLAACgkQsAvGakAaFgCm0wCg2YQog2JAxhcYOUupEHDIiaqa
+ohoAoIAxSX9EK9BGIdr4US1nfW1DlRKX
+=Cq6S
 -----END PGP SIGNATURE-----
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 000000000000..75689e789699
--- /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.1 2012/06/02 21:59:31 sping 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
+	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
+	sys-apps/sed
+	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
+}
+
+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)|' \
+			"${D}"/usr/share/applications/dia.desktop \
+			> "${D}"/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
+}