summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-09-09 16:50:19 +0000
committerPacho Ramos <pacho@gentoo.org>2010-09-09 16:50:19 +0000
commitb94a89a0bb71f8198bef3d9e793b48e2cd628849 (patch)
tree6ffbae7b0dafd499111d0d1f75ad44e957b067e6
parentEAPI=2 (diff)
downloadgentoo-2-b94a89a0bb71f8198bef3d9e793b48e2cd628849.tar.gz
gentoo-2-b94a89a0bb71f8198bef3d9e793b48e2cd628849.tar.bz2
gentoo-2-b94a89a0bb71f8198bef3d9e793b48e2cd628849.zip
Don't use -DGTK_DISABLE_DEPRECATED (bug #333439) and RDEPEND on gtk+:2.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
-rw-r--r--app-office/dia/ChangeLog5
-rw-r--r--app-office/dia/dia-0.97.1.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 1e67b4951e4f..42729c34ced2 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/dia
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.128 2010/05/16 09:40:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.129 2010/09/09 16:50:19 pacho Exp $
+
+ 09 Sep 2010; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
+ Don't use -DGTK_DISABLE_DEPRECATED (bug #333439) and RDEPEND on gtk+:2.
16 May 2010; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.97-r1.ebuild,
dia-0.97.1.ebuild, -files/dia-0.97-automagic-libemf.patch,
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
index 72510f271cdd..781853cbd6f9 100644
--- a/app-office/dia/dia-0.97.1.ebuild
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.9 2010/05/16 09:40:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.10 2010/09/09 16:50:19 pacho Exp $
EAPI="2"
@@ -21,7 +21,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...)
IUSE="cairo doc gnome png python zlib"
-RDEPEND=">=x11-libs/gtk+-2.6.0
+RDEPEND=">=x11-libs/gtk+-2.6.0:2
>=dev-libs/glib-2.6.0
>=x11-libs/pango-1.8
>=dev-libs/libxml2-2.3.9
@@ -80,6 +80,9 @@ src_prepare() {
|| die "sed 2 failed"
fi
+ # Don't use -DGTK_DISABLE_DEPRECATED, bug #333439
+ sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed"
+
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf
}