Version bump, Many bugsfixes, Fix a security issue (CVE-2008-5984). Per bug #257020.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 109 insertions, 3 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 7be5e15c0a57..0ff72a1d32d9 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/dia
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.119 2009/08/03 03:48:46 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.120 2010/02/16 20:45:27 mrpouet Exp $
+
+*dia-0.97.1 (16 Feb 2010)
+
+  16 Feb 2010; Romain Perier <mrpouet@gentoo.org> +dia-0.97.1.ebuild:
+  Version bump, Many bugsfixes, Fix a security issue (CVE-2008-5984). Per
+  bug #257020.
 
   03 Aug 2009; Jeroen Roovers <jer@gentoo.org> dia-0.97-r1.ebuild:
   Stable for HPPA (bug #277843).
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index bc7d2954b76d..be699a7a637d 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -7,10 +7,12 @@ AUX dia-0.97-fix-bashism.patch 2108 RMD160 1aea51e0f753de6d61c8431cfac07de955ff7
 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
 DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
 DIST dia-0.96.1.tar.bz2 4445553 RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 SHA1 e3d8f16f50dbbd03c1ce0235dba28c3e9612bb6e SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
+DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
 DIST dia-0.97.tar.bz2 6736670 RMD160 1b2869e2ebdd2f37b908ab3166e529aec1862af6 SHA1 1c5a727e9e4f59b823a4616fc881055006eb8b96 SHA256 9083382bd5435b6d6324fc601f359a7c759504e48adbcece0a7d5c45a76ccf5a
 EBUILD dia-0.95.1.ebuild 1730 RMD160 d55dd6661fee0332bd35fece05d58a49d5d4b982 SHA1 14e67aa90cf656077d23b8355603e794ee52959f SHA256 fbfe966d794f813c4e836181853556f1348dc6dcf439519fb1198bd319ebe8ae
 EBUILD dia-0.96.1-r1.ebuild 2561 RMD160 e4f8bbff497cc77e3cd97c36c3871705d23f3694 SHA1 a79a26bb4b1ddf09e84ba5adf3ef738418f0bff6 SHA256 492e32f4360b095094f04a850d0434213a57518d1662e20174810f6aacc92efe
 EBUILD dia-0.97-r1.ebuild 2585 RMD160 7aacd2b553f09dec6aabba5c95967acb1ddef353 SHA1 1856aa2a3dd190b7dfa811cda15a13eb7b52c29c SHA256 ccfd5d186905a0e1e4d9d0413461ccbe10bfe0126bab0761e599abaee40ad9a1
+EBUILD dia-0.97.1.ebuild 2453 RMD160 564f7de2c74f780bb4aece5e5b28e3c2a4497508 SHA1 3c0b786e4ab76a70e918ff8b52ff6debd1578c98 SHA256 1c4b4e017bd5022d605e2918eb6ded465001d0bb5bdcff45933339cbe6cc3a3f
 EBUILD dia-0.97.ebuild 2471 RMD160 892c2bb18ac744a76e2f89cb6443d72b7b5ba7a8 SHA1 a38bfd49a597706f7b98ca78c5c7154ba3fb8b17 SHA256 70c1c360c56e495e1e8bcc0b682282c1d029b7d8403b6e671638ab7970f91ee8
-MISC ChangeLog 15511 RMD160 68cd931e0cf52098f80ef89740ac77408b536133 SHA1 49ba60e8f30d5fb196af274c5845cac5d04d7dcd SHA256 ccc69a052e5bed266c8510520693401c6b27cf1affdac7f047dccef5d942b065
+MISC ChangeLog 15702 RMD160 7718c0482b1607d2c396f02fb8b5836d5cb448c4 SHA1 4f3ab9190280d14e53546c9a5e1cc48ecb0665cb SHA256 10d067c9cfa93adb3b3c876c750a39e67ded95c3d39414528125d3dd312ff4c4
 MISC metadata.xml 687 RMD160 061a68c1fb154961a49f0e477c60e5622203ee9c SHA1 04993b30fa3d405bb573fb1590063b7300b2bbfe SHA256 bdcc845e385aea41bab345156554851037e00f1d268801d05e922f375ab97145
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
new file mode 100644
index 000000000000..46102295f2f3
--- /dev/null
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2010/02/16 20:45:27 mrpouet Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 libtool autotools versionator python
+
+MY_P=${P/_/-}
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://www.gnome.org/projects/dia/"
+LICENSE="GPL-2"
+
+# dia used -1 instead of .1 for the new version.
+MY_PV_MM=$(get_version_component_range 1-2)
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# the doc USE flag doesn't seem to do anything without docbook2html
+# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...)
+IUSE="cairo doc gnome png python zlib"
+
+RDEPEND=">=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=x11-libs/pango-1.8
+	>=dev-libs/libxml2-2.3.9
+	>=dev-libs/libxslt-1
+	>=media-libs/freetype-2.0.95
+	dev-libs/popt
+	zlib? ( sys-libs/zlib )
+	png? (
+		  media-libs/libpng
+		>=media-libs/libart_lgpl-2 )
+	gnome? (
+		>=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0 )
+	cairo? ( >=x11-libs/cairo-1 )
+	python? (
+		>=dev-lang/python-1.5.2
+		>=dev-python/pygtk-1.99 )
+	doc? (
+		~app-text/docbook-xml-dtd-4.5
+		 app-text/docbook-xsl-stylesheets )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	  dev-util/pkgconfig
+	doc? ( dev-libs/libxslt )"
+
+DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with cairo)
+		$(use_with python)
+		$(use_enable doc db2html)
+		$(use_enable gnome)
+		--disable-libemf
+		--without-swig
+		--without-hardbooks
+		--disable-static
+		--docdir=/usr/share/doc/${PF}"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation in a gnome environment, bug #159831
+	epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch"
+
+	# Fix compilation with USE="python", bug #271855
+	if use python; then
+		epatch "${FILESDIR}/${PN}-0.97-acinclude-python-fixes.patch"
+	fi
+
+	# Skip man generation
+	if ! use doc; then
+		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am \
+			|| die "sed 2 failed"
+	fi
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/share/dia
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/share/dia
+}