public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2023-01-03  2:53 WANG Xuerui
  0 siblings, 0 replies; 15+ messages in thread
From: WANG Xuerui @ 2023-01-03  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     aad9ddad5996e6eb088ff79e2230c6025e9f8fdc
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 03:41:09 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 02:52:29 2023 +0000
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 <xen0n <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2024-10-30  2:27 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-10-30  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ceb0cc01eea5c404e0720234a8450cff0b12be98
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 02:26:41 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 02:26:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb0cc01

app-office/dia: Stabilize 0.97.3-r3 x86, #942459

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2024-10-29 19:08 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-10-29 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     1a819196a6399c9ea89d6fcbfa90c3790b5a9f26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 19:08:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 19:08:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a819196

app-office/dia: Stabilize 0.97.3-r3 amd64, #942459

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2024-10-29 19:08 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-10-29 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     5425fa51c2d90d48f1a5dfa40b15901310ee0bf5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 19:08:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 19:08:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5425fa51

app-office/dia: Stabilize 0.97.3-r3 ppc64, #942459

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2024-06-08 12:01 David Seifert
  0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2024-06-08 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d98d762ae5da207ee36b87d7aa04700d786f76ff
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 12:01:26 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 12:01:26 2024 +0000
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 <soap <AT> 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|' \


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2022-11-11 20:17 Matt Turner
  0 siblings, 0 replies; 15+ messages in thread
From: Matt Turner @ 2022-11-11 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     545544ae9c8bd72de6bdcf273e24c10782bb72db
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 20:17:30 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 20:17:30 2022 +0000
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 <mattst88 <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2022-10-29 22:33 Matt Turner
  0 siblings, 0 replies; 15+ messages in thread
From: Matt Turner @ 2022-10-29 22:33 UTC (permalink / raw
  To: gentoo-commits

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

app-office/dia: Set remote-id

Signed-off-by: Matt Turner <mattst88 <AT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-		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.
-	</longdescription>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>
+    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.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/dia</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2021-08-12  3:10 Yixun Lan
  0 siblings, 0 replies; 15+ messages in thread
From: Yixun Lan @ 2021-08-12  3:10 UTC (permalink / raw
  To: gentoo-commits

commit:     7cdc7eca3eda8d14d5d9bf4d43978993b4f5ab5a
Author:     Alex Fan <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Wed Aug 11 11:02:15 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 02:53:18 2021 +0000
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 <alexfanqi <AT> yahoo.com>
Signed-off-by: Yixun Lan <dlan <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2020-04-30 15:10 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     053ec7a4b70736f611851120ea2c1a637fe66825
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 11:42:44 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 15:10:06 2020 +0000
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 <asturm <AT> 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..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2020-04-30 15:10 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a23b25d8a07660b451d83ac5f2cf305251885568
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 11:42:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 15:10:05 2020 +0000
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 <leio <AT> gentoo.org>
Closes: https://bugs.gentoo.org/710180
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 00000000000..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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2020-02-09 12:24 Mart Raudsepp
  0 siblings, 0 replies; 15+ messages in thread
From: Mart Raudsepp @ 2020-02-09 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     0de6862e6201ef608a5f6bd6bd95a58947b42826
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 10:48:56 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 12:23:01 2020 +0000
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 <leio <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2017-11-25 19:55 David Seifert
  0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2017-11-25 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b45b88809c157dc048c026d0cacc95b173634444
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 18:01:57 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 19:52:59 2017 +0000
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
-  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.
-</longdescription>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>
+		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.
+	</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2017-06-10 11:44 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-06-10 11:44 UTC (permalink / raw
  To: gentoo-commits

commit:     54c68619441745c64a92a4e039b48b494795db06
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 11:44:10 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 11:44:10 2017 +0000
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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2017-04-20  7:59 David Seifert
  0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2017-04-20  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     740b47534407abb67a8d125ebe23b7432ca71875
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 07:41:12 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 07:58:49 2017 +0000
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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/
@ 2017-01-29 14:59 Fabian Groffen
  0 siblings, 0 replies; 15+ messages in thread
From: Fabian Groffen @ 2017-01-29 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c6b79db16e3feec63752966551c20650bfe3f295
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 14:57:39 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 14:57:39 2017 +0000
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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-10-30  2:27 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-03  2:53 [gentoo-commits] repo/gentoo:master commit in: app-office/dia/ WANG Xuerui
  -- strict thread matches above, loose matches on Subject: below --
2024-10-30  2:27 Sam James
2024-10-29 19:08 Sam James
2024-10-29 19:08 Sam James
2024-06-08 12:01 David Seifert
2022-11-11 20:17 Matt Turner
2022-10-29 22:33 Matt Turner
2021-08-12  3:10 Yixun Lan
2020-04-30 15:10 Andreas Sturmlechner
2020-04-30 15:10 Andreas Sturmlechner
2020-02-09 12:24 Mart Raudsepp
2017-11-25 19:55 David Seifert
2017-06-10 11:44 Jeroen Roovers
2017-04-20  7:59 David Seifert
2017-01-29 14:59 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox