new version. fixes #133699 and #130742. cleanup of ebuild.

(Portage version: 2.1_rc3-r2)

4 files changed, 68 insertions, 1 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index c58df3d8f586..6d0e84890090 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.83 2006/04/22 11:59:25 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.84 2006/05/30 16:05:48 allanonjl Exp $
+
+*dia-0.95.1 (30 May 2006)
+
+  30 May 2006; John N. Laliberte <allanonjl@gentoo.org> +dia-0.95.1.ebuild:
+  new version.  fixes #133699 and #130742.  cleanup of ebuild.
 
   22 Apr 2006; Thomas Cort <tcort@gentoo.org> dia-0.94-r5.ebuild:
   Stable on amd64 wrt security Bug #128107.
diff --git a/app-office/dia/dia-0.95.1.ebuild b/app-office/dia/dia-0.95.1.ebuild
new file mode 100644
index 000000000000..f28b24081f27
--- /dev/null
+++ b/app-office/dia/dia-0.95.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.95.1.ebuild,v 1.1 2006/05/30 16:05:48 allanonjl Exp $
+
+inherit eutils gnome2 libtool autotools versionator
+
+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=$(replace_version_separator 2 '-' )
+MY_PV_MM=$(get_version_component_range 1-2 )
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${PN}-${MY_PV}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome png python zlib"
+
+RDEPEND=">=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=x11-libs/pango-1.1.5
+	>=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 )
+	python? ( >=dev-lang/python-1.5.2
+		>=dev-python/pygtk-1.99 )
+	~app-text/docbook-xml-dtd-4.2
+	app-text/docbook-xsl-stylesheets"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.21
+	dev-util/pkgconfig"
+
+G2CONF="${G2CONF} $(use_enable gnome) $(use_with python)"
+
+DOCS="AUTHORS ChangeLog COPYING KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Disable python -c 'import gtk' during compile to prevent using
+	# X being involved (#31589)
+	# changed the patch to a sed to make it a bit more portable - AllanonJL
+	sed -i -e '/AM_CHECK_PYMOD/d' configure.in
+
+	eautoreconf
+}
diff --git a/app-office/dia/files/digest-dia-0.94-r3 b/app-office/dia/files/digest-dia-0.94-r3
index a4366b0c6a35..bf65aff6064c 100644
--- a/app-office/dia/files/digest-dia-0.94-r3
+++ b/app-office/dia/files/digest-dia-0.94-r3
@@ -1 +1,3 @@
 MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869
+RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869
+SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869
diff --git a/app-office/dia/files/digest-dia-0.95.1 b/app-office/dia/files/digest-dia-0.95.1
new file mode 100644
index 000000000000..ab3242c89fc2
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.95.1
@@ -0,0 +1,3 @@
+MD5 bd4d5bd71b60b9ce11610256534e4d82 dia-0.95-1.tar.bz2 4203188
+RMD160 680102d2da144c1a720a61e5b85c030f353000cc dia-0.95-1.tar.bz2 4203188
+SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5 dia-0.95-1.tar.bz2 4203188