gentoo auto-resync : 09:06:2024 - 00:08:13

3 files changed, 46 insertions, 12 deletions

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 546f2078571b..096382906a86 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,8 +1,8 @@
 AUX dia-0.97.0-gnome-doc.patch 1961 BLAKE2B 6b6835a487e4b1ada0a1e67cb3ce123b0b4b3e67c86e9478ac0f401ae70f8f1381ef068a2ca6e116313db42d09bdb7abb523bf9a34856a1a39f7e4b0c9c3a84f SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186
 AUX dia-0.97.2-underlinking.patch 969 BLAKE2B 00c56ce70b89e2e78c565ac106633e00601f917c9964f36812f3eddb3031df26c3446591e043b90da6890a0623c99bdf5d0bbd34b468d54bcdfeee8b6ae13bf2 SHA512 556bfd779c6487b20fdca5cd4b6de3d4855db87d68db17549a802719024130cad55a249f9db5329960622a0857b1b3ec009f7a8fd173c27bb5ed1953af9a4ee0
-AUX dia-0.97.3-configure-clang16.patch 760 BLAKE2B 4d0599ae1bd89d3f0b8e262e21fa69d0b552b195e9fed92ed14e7d84c06ef803bb0c9e01052a8a7f2fa13addda0305c076992ca5091a966a29ea39f2e3eb8145 SHA512 976a5f1486dc98f6d6515d8217ebc09148d9879a9d98c54159a526e6c6099f1690f44b0e2dd07c06f45f4dc8877357a7f7b76bf167f3f129a88e98f108ebe73d
+AUX dia-0.97.3-configure-clang16.patch 2023 BLAKE2B 301d6f35218db4f095b7aa5b1fa10c5bfe3d3007334cf402b26d9cbbf56b2431ce8f94057fe5207fb8f45a591e88ff607396137bf8c471bac0a97c47c2cfc0c4 SHA512 788aa004c2d5074e206a555bf8f8f35b7fa7657fb6186a5972acd9803e3d73c5a305f858740a85c35b32f72643bfe7fa2983a9e5c4d45984e910a25af3527118
 AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7
 AUX dia-0.97.3-slibtool.patch 316 BLAKE2B 8882a51ab33a81cb8df4180878996baa167b724328df61d55b742cf3c8750d3ce63be07c3631684ea76ef03f9802ecc1f3cda64c803bbe3f7bb87628d02c1e4d SHA512 2160eb2d7e9b2f5e3b4af5c227713e9001685d40f39181e24713049fba2b1bdf3899f7e7e8926ad9cf525c4848fb6206c26ccea7b22de8a578ae616aaab9a4e4
 DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-EBUILD dia-0.97.3-r1.ebuild 2666 BLAKE2B 3c0886d555d73808c9cce4283ee039d6e272489e412cb1be098e7a39f6eec405cee68cb2f498f86d2676016deb17b4e275d27a250bb20881df0438a8eefc2eb2 SHA512 0c0aa6384a7f05bb0b43c0645c6def419c9a5d9cd5d4bda7516a0971ed161de8ea5fa6e7bbc50f233994219b9e40777b0a7d32e02a48b26e7b2e81881107bf46
+EBUILD dia-0.97.3-r2.ebuild 2620 BLAKE2B 9d82927ec49ff8fc3e9167f2d61c76a3e39a2387f319773e2f41e000412de958863b3b36624ce1c626265f53f1c2c9da70301ce9c2d2f3eca6485b272679f7e7 SHA512 dc9b0039c9c310048c43e591dc311f35ca11c3b1cc6a137ce891eced0368644ec4c9a1e71f06d60af48e4f6dde77faf17bb9370757df7603179f881bc44616d2
 MISC metadata.xml 773 BLAKE2B c654cf30f7cac3a198911772f4af09dce74ead25e1b2e501f092929c5967640a1df80d110579a7ffc3777f735ca5f485a5348eb707243266af574ccd8f38f160 SHA512 949a675449bdd4533153d890d5d8106d4c447fce85b33624e9ae693d0dc485b8e764a8d52174c509077ab7c304093313a894d41ed267f100a31923a89356e72f
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/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|' \
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