From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-office/dia/Manifest | 7 ++ app-office/dia/dia-0.97.3.ebuild | 103 +++++++++++++++++++++ app-office/dia/files/dia-0.97.0-gnome-doc.patch | 61 ++++++++++++ app-office/dia/files/dia-0.97.2-underlinking.patch | 27 ++++++ app-office/dia/metadata.xml | 16 ++++ 5 files changed, 214 insertions(+) create mode 100644 app-office/dia/Manifest create mode 100644 app-office/dia/dia-0.97.3.ebuild create mode 100644 app-office/dia/files/dia-0.97.0-gnome-doc.patch create mode 100644 app-office/dia/files/dia-0.97.2-underlinking.patch create mode 100644 app-office/dia/metadata.xml (limited to 'app-office/dia') diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest new file mode 100644 index 000000000000..c87b0684226b --- /dev/null +++ b/app-office/dia/Manifest @@ -0,0 +1,7 @@ +AUX dia-0.97.0-gnome-doc.patch 1961 SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186 WHIRLPOOL d60ea1f01be0a5823c5de654476528cba55fd3587dbf8abbf681e6de939033b3c70b7fc9ffe034b33cdd3344fc2cebe821eca12a635b766ed38169d268e7f910 +AUX dia-0.97.2-underlinking.patch 1024 SHA256 3b5cbe564c9a48453e4300b89fa24de7454268b388a56036afe187c56e46c951 SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e WHIRLPOOL 90ea84704a2a3f14730d54044075cae6339c5f21d1fff00567f0c9834bdeae187c83f4eedc7ae7839f0cccecc2caca7ca133968e914ab79333c3005e431c70a5 +DIST dia-0.97.3.tar.xz 5548500 SHA256 22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34 SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa WHIRLPOOL fd6b4c92cedce399705715b9726d3f5e2570c79108c241f34afaacd54b9318e6b79e6fedcb83502b948e1eaf2157cd4429cd8ffca24a854efd3c94db4f192798 +EBUILD dia-0.97.3.ebuild 2767 SHA256 f5785ea831d71d9b26faa850f4db09359105968f5715e7c337a1a6aca0592466 SHA512 9914d572214e965a5171c2b21793c634ce3d286b2d9a24738d0299d76e912d0964214e52ad21118837cb491d0db70001c671c0c9fabd25ea22376f4e8aabd58c WHIRLPOOL 4851e39e3f9df2f1031222b0293e552b58e30faf89dfd93a9e47398c5e618a9fb49998bb10a1c3591dd1c3fe0539c11c0875b1c0bd4b04377cf207c4bfe13637 +MISC ChangeLog 2893 SHA256 2738764d8cf8045ed1d0807d2fabf871b779d6c7456a95db0fcfe8fbbb1277b7 SHA512 c42e830af321b3867b70a55a49fdf8467e65fa35cdf8e89efecf132df3fa9275b3ba2c99eb87eae0d51d199e7d4eda0d12935bd961a5e6f88cf1ba9a9bde081c WHIRLPOOL d30bc1620744131b3c09c8d83d721e769440f650a8f4db5688b1725bfbf855597e5b231e6ffa9e500992c8b7815ea8272753f3657f6162812a57acf99cd0324d +MISC ChangeLog-2015 24007 SHA256 60dc1332afeda05bc81242ccda3b3a64681a85b1bd548945cc2d8bca2f135d41 SHA512 f47802b92f2b897a0885467903554f6215f9706fbb0f366d286b28a4688fc2934f99e6891b55f6de946c837fb2bb976780544703bfbf7e17266a89424bea5f12 WHIRLPOOL a2500dacdd652040f305d21b8bdd647b9461585ad15c18d16fb63e8262e1632ce56d410d89df2647981da1adf758920f505b0af403793f59a3d69e1f29f1d383 +MISC metadata.xml 662 SHA256 f3bc2b8c182266ce1ac45103a0cbd6b8950aff8ec676756436426cacdaa173b9 SHA512 7fb1c4469b79f932ff9a4e78259c76999d4795fb4f224c6692f447f620b745cd079880e5e2227f0f75ec93359be06c20404f4e52a808db8f1b7f0604766a358a WHIRLPOOL 68d88182da9259e12d5b6719ba95c6782fd55917e00fea98f2d4ac1138da350a748e7b940e608d1f6a19e610b0374ba93c7f56cf26203e3f7baca9043755601a diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild new file mode 100644 index 000000000000..844a72f7b20b --- /dev/null +++ b/app-office/dia/dia-0.97.3.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +GCONF_DEBUG=yes +GNOME2_LA_PUNT=yes +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils gnome2 python-single-r1 multilib + +DESCRIPTION="Diagram/flowchart creation program" +HOMEPAGE="https://wiki.gnome.org/Apps/Dia" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +# the doc USE flag doesn't seem to do anything without docbook2html +# cairo support is preferred as explained by upstream at: +# https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6 +IUSE="+cairo doc python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +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 #159381 , upstream #470812 #558690 + epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 + + if use python; then + python_fix_shebang . + 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, upstream bug #723869 + sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die + + # Upstream bug #737254 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die + + # Upstream bug #737255 + sed -i -e "/localedir/d" configure.in || die + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # --exec-prefix makes Python look for modules in the Prefix + # --enable-gnome only adds support for deprecated stuff, bug #442294 + # https://bugzilla.redhat.com/show_bug.cgi?id=996759 + gnome2_src_configure \ + --exec-prefix="${EPREFIX}/usr" \ + --disable-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, upstream #588208) + 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.0-gnome-doc.patch b/app-office/dia/files/dia-0.97.0-gnome-doc.patch new file mode 100644 index 000000000000..63e13deaf22f --- /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 +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-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch new file mode 100644 index 000000000000..903e077f23f4 --- /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?= +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 000000000000..ae30e3299f99 --- /dev/null +++ b/app-office/dia/metadata.xml @@ -0,0 +1,16 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + 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. + + -- cgit v1.2.3