[gentoo-commits] repo/gentoo:master commit in: app-office/dia/, app-office/dia/files/

2024-06-11 Thread Sam James 
commit: 36ad21f76fa99146973a7635f30226458534913f
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 12 05:07:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 12 05:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ad21f7

app-office/dia: fix various modern C issues

... with backports, although via Fedora.

Closes: https://bugs.gentoo.org/883069
Signed-off-by: Sam James  gentoo.org>

 app-office/dia/dia-0.97.3-r3.ebuild   |  93 ++
 app-office/dia/files/dia-0.97.3-c99.patch | 284 ++
 2 files changed, 377 insertions(+)

diff --git a/app-office/dia/dia-0.97.3-r3.ebuild 
b/app-office/dia/dia-0.97.3-r3.ebuild
new file mode 100644
index ..fa2c9290e428
--- /dev/null
+++ b/app-office/dia/dia-0.97.3-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~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"
+
+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:=
+   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
+   )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/intltool
+   virtual/pkgconfig
+   doc? ( dev-libs/libxslt )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 
#558690
+   "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
+   "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream 
https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+   "${FILESDIR}"/${PN}-0.97.3-slibtool.patch
+   "${FILESDIR}"/${PN}-0.97.3-configure-clang16.patch
+   "${FILESDIR}"/${PN}-0.97.3-c99.patch
+)
+
+src_prepare() {
+   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
+
+   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) \
+   --without-python \
+   --without-swig \
+   --without-hardbooks
+}
+
+src_install() {
+   gnome2_src_install
+   dodoc KNOWN_BUGS RELEASE-PROCESS
+
+   # 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.3-c99.patch 
b/app-office/dia/files/dia-0.97.3-c99.patch
new file mode 100644
index ..6ee2cb2df322
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-c99.patch
@@ -0,0 +1,284 @@
+https://bugs.gentoo.org/883069
+https://src.fedoraproject.org/rpms/dia/raw/rawhide/f/dia-0.97.3-const-ft_vector.patch
+https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_1.patch
+https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_2.patch
+https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-get_data_size.patch
+
+From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001
+From: Hans Breuer 
+Date: Sat, 4 May 2013 15:20:15 +0200
+Subject: [PATCH] [warningectomy] initialization from incompatible pointer type
+
+FT_Outline_Funcs take const FT_Vector* nowadays.
+--- a/plug-ins/postscript/diapsft2renderer.c

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/

2024-06-08 Thread David Seifert 
commit: 6e4a96b9954d6a16f2cec19162a1881a00d0ea7a
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun  8 12:01:27 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun  8 12:01:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4a96b9

app-office/dia: fix build on musl

Closes: https://bugs.gentoo.org/651522
Signed-off-by: David Seifert  gentoo.org>

 .../dia/files/dia-0.97.3-configure-clang16.patch   | 38 --
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/app-office/dia/files/dia-0.97.3-configure-clang16.patch 
b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
index 75b6f003ca3f..0cf797a4ad0d 100644
--- a/app-office/dia/files/dia-0.97.3-configure-clang16.patch
+++ b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
@@ -8,9 +8,12 @@ type declarations.
 Upstream has switched to Meson, and it does not seem to use this
 particular check anymore.
 
+https://bugs.gentoo.org/651522
+Remove the insane check for isinf(), since every sane compiler nowadays 
supports it.
+
 --- a/configure.in
 +++ b/configure.in
-@@ -197,7 +197,7 @@ if test "$png_ok" = yes; then
+@@ -183,7 +183,7 @@
png_structp pp;
  png_infop info; 
  png_colorp cmap; 
@@ -19,4 +22,35 @@ particular check anymore.
   png_ok=yes,
   png_ok=no)
LDFLAGS="${old_LDFLAGS}"
-
+@@ -378,28 +378,9 @@
+ 
+ dnl Platform-specific fixes.
+ dnl 
+-
+-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
++dnl every modern compiler supports C99's isinf()
++AC_DEFINE([HAVE_ISINF], 1, 
++  [Define if the isinf() function is available])
+ 
+ dnl Alpha needs -mieee or we get a segfault
+ dnl This shouldn't be needed but is here until a real solution is found

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2024-06-08 Thread David Seifert 
commit: d98d762ae5da207ee36b87d7aa04700d786f76ff
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun  8 12:01:26 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun  8 12:01:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98d762a

app-office/dia: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/530478
Closes: https://bugs.gentoo.org/841860
Signed-off-by: David Seifert  gentoo.org>

 .../dia/{dia-0.97.3-r1.ebuild => dia-0.97.3-r2.ebuild}   | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r2.ebuild
similarity index 91%
rename from app-office/dia/dia-0.97.3-r1.ebuild
rename to app-office/dia/dia-0.97.3-r2.ebuild
index 840d9aaaca77..dc5d778a673a 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 GNOME2_EAUTORECONF="yes"
 inherit gnome2
@@ -24,22 +24,21 @@ RDEPEND="
dev-libs/popt
>=media-libs/freetype-2
>=media-libs/libart_lgpl-2
-   media-libs/libpng:0
+   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 )
-"
-DEPEND="${RDEPEND}
+   app-text/docbook-xsl-stylesheets
+   )"
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/intltool
virtual/pkgconfig
doc? ( dev-libs/libxslt )"
 
-DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS 
THANKS TODO )
-
 PATCHES=(
"${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 
#558690
"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
@@ -83,6 +82,7 @@ src_configure() {
 
 src_install() {
gnome2_src_install
+   dodoc KNOWN_BUGS RELEASE-PROCESS
 
# Install second desktop file for integrated mode (bug #415495, 
upstream #588208)
sed -e 's|^Exec=dia|Exec=dia --integrated|' \

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2023-01-02 Thread WANG Xuerui 
commit: aad9ddad5996e6eb088ff79e2230c6025e9f8fdc
Author: WANG Xuerui  gentoo  org>
AuthorDate: Mon Jan  2 03:41:09 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Jan  3 02:52:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad9ddad

app-office/dia: keyword 0.97.3-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index ad9e09cccb10..b4bee603a01c 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 
~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

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/, app-office/dia/files/

2022-12-02 Thread Sam James 
commit: a761f21ace81b036dce7d80416a33a2b3e9685c5
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 05:30:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 06:06:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a761f21a

app-office/dia: fix build w/ clang 16

Closes: https://bugs.gentoo.org/874729
Signed-off-by: Sam James  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild|  3 ++-
 .../dia/files/dia-0.97.3-configure-clang16.patch   | 22 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index 7b6401a9959c..1a963358eaaf 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
"${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream 
https://gitlab.gnome.org/GNOME/dia/merge_requests/1
"${FILESDIR}"/${PN}-0.97.3-slibtool.patch
+   "${FILESDIR}"/${PN}-0.97.3-configure-clang16.patch
 )
 
 src_prepare() {

diff --git a/app-office/dia/files/dia-0.97.3-configure-clang16.patch 
b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
new file mode 100644
index ..75b6f003ca3f
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/874729
+https://src.fedoraproject.org/rpms/dia/blob/0a14169fc36b959598074065678e0126830317f8/f/dia-configure-c99.patch
+
+C99 removes support for implicit ints, so declare the return type
+of main explicitly.  Future compilers are likely to require explicit
+type declarations.
+
+Upstream has switched to Meson, and it does not seem to use this
+particular check anymore.
+
+--- a/configure.in
 b/configure.in
+@@ -197,7 +197,7 @@ if test "$png_ok" = yes; then
+   png_structp pp;
+ png_infop info; 
+ png_colorp cmap; 
+-main() { void*foo = png_create_read_struct; }],
++int main(void) { void*foo = png_create_read_struct; }],
+  png_ok=yes,
+  png_ok=no)
+   LDFLAGS="${old_LDFLAGS}"
+

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2022-11-11 Thread Matt Turner 
commit: 545544ae9c8bd72de6bdcf273e24c10782bb72db
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Nov 11 20:17:30 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Nov 11 20:17:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545544ae

app-office/dia: Fix license to be GPL-2+

Closes: https://bugs.gentoo.org/880177
Signed-off-by: Matt Turner  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index e23acda9374e..7b6401a9959c 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit gnome2
 DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2022-10-29 Thread Matt Turner 
commit: 9e537edbe8ee8b7967bffa55c2e257f25d6a1dce
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct 29 21:19:37 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct 29 22:32:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e537edb

app-office/dia: Set remote-id

Signed-off-by: Matt Turner  gentoo.org>

 app-office/dia/metadata.xml | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index 174329ca7d6a..595bd9c2d63f 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -1,16 +1,19 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   gn...@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.
-   
+  
+gn...@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.
+  
+  
+GNOME/dia
+

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2021-08-11 Thread Yixun Lan 
commit: 7cdc7eca3eda8d14d5d9bf4d43978993b4f5ab5a
Author: Alex Fan  yahoo  com>
AuthorDate: Wed Aug 11 11:02:15 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Aug 12 02:53:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdc7eca

app-office/dia: keyword 0.97.3-r1 for ~riscv

Signed-off-by: Alex Fan  yahoo.com>
Signed-off-by: Yixun Lan  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index 156200bf149..e23acda9374 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 
~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

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/

2021-01-20 Thread Lars Wendler 
commit: 345a48ea7c81b50f16cd224d34efbda35211c92a
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 20 10:50:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 20 10:50:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345a48ea

app-office/dia: Fixed build with sys-devel/slibtool

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild|  4 ++--
 app-office/dia/files/dia-0.97.3-slibtool.patch | 13 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index fc0207a5f05..156200bf149 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 
#558690
"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
"${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream 
https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+   "${FILESDIR}"/${PN}-0.97.3-slibtool.patch
 )
 
 src_prepare() {
@@ -62,7 +63,6 @@ src_prepare() {
# Upstream bug #737255
sed -i -e "/localedir/d" configure.in || die
 
-   eautoreconf
gnome2_src_prepare
 }
 

diff --git a/app-office/dia/files/dia-0.97.3-slibtool.patch 
b/app-office/dia/files/dia-0.97.3-slibtool.patch
new file mode 100644
index 000..1efdbc1490b
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-slibtool.patch
@@ -0,0 +1,13 @@
+This fixes build with sys-devel/slibtool
+
+--- a/lib/Makefile.am
 b/lib/Makefile.am
+@@ -178,7 +178,7 @@ libdia_la_SOURCES =  \
+ # render.h \
+ # render.c 
+ 
+-libdia_la_LDFLAGS = -avoid-version --export-dynamic
++libdia_la_LDFLAGS = -avoid-version -export-dynamic
+ libdia_la_LIBADD = $(GTK_LIBS)
+ 
+ AM_CPPFLAGS = \

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2020-04-30 Thread Andreas Sturmlechner 
commit: a23b25d8a07660b451d83ac5f2cf305251885568
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 30 11:42:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 30 15:10:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23b25d8

app-office/dia: Drop python plugin

There are no revdeps registered for the plugin (at least not via python usedeps)

Acked-by: Mart Raudsepp  gentoo.org>
Closes: https://bugs.gentoo.org/710180
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild | 91 +
 1 file changed, 91 insertions(+)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
new file mode 100644
index 000..f697cd004ba
--- /dev/null
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
+
+inherit autotools eutils gnome2 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 ~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"
+
+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 )
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   sys-apps/sed
+   virtual/pkgconfig
+   doc? ( dev-libs/libxslt )"
+
+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
+   epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, 
upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+
+   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) \
+   --without-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
+}

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2020-04-30 Thread Andreas Sturmlechner 
commit: 053ec7a4b70736f611851120ea2c1a637fe66825
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 30 11:42:44 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 30 15:10:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053ec7a4

app-office/dia: Drop 0.97.3 (r0)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/dia/dia-0.97.3.ebuild | 104 ---
 1 file changed, 104 deletions(-)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
deleted file mode 100644
index d39f9d30be2..000
--- a/app-office/dia/dia-0.97.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~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
-   epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, 
upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/

2020-04-30 Thread Andreas Sturmlechner 
commit: 5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 30 12:39:19 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 30 15:10:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5363d5bb

app-office/dia: EAPI-6 bump

Acked-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/dia/dia-0.97.3-r1.ebuild| 19 ++-
 app-office/dia/files/dia-0.97.2-underlinking.patch |  8 
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app-office/dia/dia-0.97.3-r1.ebuild 
b/app-office/dia/dia-0.97.3-r1.ebuild
index f697cd004ba..fc0207a5f05 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
+EAPI=6
 
-inherit autotools eutils gnome2 multilib
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
 
 DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
@@ -40,13 +39,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( dev-libs/libxslt )"
 
-src_prepare() {
-   DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README 
RELEASE-PROCESS THANKS TODO"
+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
-   epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, 
upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 
#558690
+   "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
+   "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream 
https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+)
 
+src_prepare() {
if ! use doc; then
# Skip man generation
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die

diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch 
b/app-office/dia/files/dia-0.97.2-underlinking.patch
index 903e077f23f..297888cc9b6 100644
--- a/app-office/dia/files/dia-0.97.2-underlinking.patch
+++ b/app-office/dia/files/dia-0.97.2-underlinking.patch
@@ -6,13 +6,13 @@ 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 +-
+ 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
+diff --git a/configure.in b/configure.in
 index 72830de..6b7394a 100644
 a/dia-0.97.2/configure.in
-+++ b/dia-0.97.2/configure.in
+--- a/configure.in
 b/configure.in
 @@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
  AC_SUBST(GMODULE_LIBS)
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2020-02-09 Thread Mart Raudsepp 
commit: 0de6862e6201ef608a5f6bd6bd95a58947b42826
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Feb  9 10:48:56 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Feb  9 12:23:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de6862e

app-office/dia: drop to ~hppa

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-office/dia/dia-0.97.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 64574167263..d39f9d30be2 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dia;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~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

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/

2018-07-02 Thread Lars Wendler 
commit: b743707ba1ffdfbf44f1bd9ad0accd61334a
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul  2 09:48:12 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul  2 09:48:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b743707b

app-office/dia: Use pkg-config instead of freetype-config

Commit permission kindly granted by leio.

Closes: https://bugs.gentoo.org/654814
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-office/dia/dia-0.97.3.ebuild   |  3 +-
 .../dia/files/dia-0.97.3-freetype_pkgconfig.patch  | 66 ++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 844a72f7b20..a8a9ae6b6c0 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -54,6 +54,7 @@ src_prepare() {
 
epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream 
#470812 #558690
epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream 
#678761
+   epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, 
upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
 
if use python; then
python_fix_shebang .

diff --git a/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch 
b/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
new file mode 100644
index 000..c48b5ba66fb
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
@@ -0,0 +1,66 @@
+--- dia-0.97.3/configure.in
 dia-0.97.3/configure.in
+@@ -62,43 +62,26 @@
+ 
+ AC_ARG_WITH(freetype,
+ [  --without-freetypecompile 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 
+-#include FT_FREETYPE_H
+-#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 209
+-#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
++AS_IF([test "x$with_freetype" = "xyes"],[
++  dnl freetype2.pc uses the libtool specific version number and not the
++  dnl package version. See
++  dnl 
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
++  dnl Let's raise minimum dependency to freetype-2.4.0 because that's the
++  dnl lowest freetype libtool version I could find.
++  dnl freetype-2.4.0 is from July 2010 and should be reasonably old
++  dnl enough.
++  PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5,
++  [
++  CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
++  AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the 
FreeType2 library])
++  ],
++  AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher])
++  )
++  PKG_CHECK_MODULES(PANGOFT2,pangoft2,
++  GTK_MODULES="$GTK_MODULES pangoft2",
++  AC_MSG_ERROR(Can't find PangoFT2 library)
++  )
++])
+ AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
+ 
+ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2017-11-25 Thread David Seifert 
commit: b45b88809c157dc048c026d0cacc95b17363
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 25 18:01:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 25 19:52:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45b8880

app-office/dia: [QA] Consistent whitespace in metadata.xml

 app-office/dia/metadata.xml | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index ae30e3299f9..0d9bb7d4ae1 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -1,16 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   gn...@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.
-
+   
+   gn...@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.
+

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2017-06-10 Thread Jeroen Roovers 
commit: 54c68619441745c64a92a4e039b48b494795db06
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 10 11:44:10 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 10 11:44:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c68619

app-office/dia: Drop obsolete sed script.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-office/dia/dia-0.97.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 8b66b83857f..844a72f7b20 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -57,7 +57,6 @@ src_prepare() {
 
if use python; then
python_fix_shebang .
-   sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
fi
 
if ! use doc; then

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2017-04-20 Thread David Seifert 
commit: 740b47534407abb67a8d125ebe23b7432ca71875
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 20 07:41:12 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 20 07:58:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740b4753

app-office/dia: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-office/dia/dia-0.97.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 1331f221840..8b66b83857f 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 
~x86-fbsd ~amd64-li
 # 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

[gentoo-commits] repo/gentoo:master commit in: app-office/dia/

2017-01-29 Thread Fabian Groffen 
commit: c6b79db16e3feec63752966551c20650bfe3f295
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 29 14:57:39 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 29 14:57:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b79db1

app-office/dia: dropped ~x86-freebsd

Package-Manager: portage-2.3.3

 app-office/dia/dia-0.97.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index a3cf667..081fdbf 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/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"
+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