summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-09-24 11:54:02 +0000
committerPacho Ramos <pacho@gentoo.org>2014-09-24 11:54:02 +0000
commit721854e6192a5bfa75ad7d494fdc02ec764848c3 (patch)
treec47ca9e3bd3318bdf3d9293b2133a69150786bb5 /app-office/dia
parentVersion bump (diff)
downloadgentoo-2-721854e6192a5bfa75ad7d494fdc02ec764848c3.tar.gz
gentoo-2-721854e6192a5bfa75ad7d494fdc02ec764848c3.tar.bz2
gentoo-2-721854e6192a5bfa75ad7d494fdc02ec764848c3.zip
Version bump, drop old
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-office/dia')
-rw-r--r--app-office/dia/ChangeLog8
-rw-r--r--app-office/dia/dia-0.97.3.ebuild (renamed from app-office/dia/dia-0.97.3_pre20140417.ebuild)16
2 files changed, 14 insertions, 10 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 5792ed121795..4d3588c9b36d 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-office/dia
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.173 2014/08/07 17:53:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.174 2014/09/24 11:54:02 pacho Exp $
+
+*dia-0.97.3 (24 Sep 2014)
+
+ 24 Sep 2014; Pacho Ramos <pacho@gentoo.org> +dia-0.97.3.ebuild,
+ -dia-0.97.3_pre20140417.ebuild:
+ Version bump, drop old
07 Aug 2014; Jeroen Roovers <jer@gentoo.org>
dia-0.97.3_pre20140417-r1.ebuild:
diff --git a/app-office/dia/dia-0.97.3_pre20140417.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 352df092376a..89ae24342fb1 100644
--- a/app-office/dia/dia-0.97.3_pre20140417.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.6 2014/06/12 18:00:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3.ebuild,v 1.1 2014/09/24 11:54:02 pacho Exp $
EAPI=5
GCONF_DEBUG=yes
@@ -12,12 +12,9 @@ inherit autotools eutils gnome2 python-single-r1 multilib
DESCRIPTION="Diagram/flowchart creation program"
HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
-SRC_URI="http://dev.gentoo.org/~pacho/gnome/${PN}-0.97.3_pre20140417.tar.xz"
-S="${WORKDIR}/${PN}-0.97.2"
-
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 ~x86-freebsd ~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
@@ -56,8 +53,7 @@ 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
- epatch "${FILESDIR}"/${PN}-0.97.2-disable-cairo.patch #509636
+ epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
if use python; then
python_fix_shebang .
@@ -69,11 +65,13 @@ src_prepare() {
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
fi
- # Fix naming conflict on Darwin/OSX, upstream bug #????
+ # 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
@@ -98,7 +96,7 @@ src_configure() {
src_install() {
gnome2_src_install
- # Install second desktop file for integrated mode (bug #415495)
+ # 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 \