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

Package-Manager: portage-2.1_rc3-r2

5 files changed, 132 insertions, 7 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/Manifest b/app-office/dia/Manifest
index fbb4fc3772f6..4cc799172ebb 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,17 +1,75 @@
-MD5 3ecf4f6e8631f51cbfb54aa9dc1b3872 ChangeLog 10183
-MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
-MD5 89e3745db7606051a56915fc427f803f dia-0.94-r4.ebuild 2191
-MD5 283aa721473b2cee7483d56dac50bc7d dia-0.94-r5.ebuild 2259
+AUX 0.94-disable_python_gtk_import.patch 313 RMD160 01592615b8983621a9b22e934e10fe70aa9d25b2 SHA1 9e28377808829af8f7d37b6e8bf2120f68562a20 SHA256 8bbd4151586e302fdb35635469a640b82c4f4fa9b1a3595599d8bffc5f4d6989
 MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
+RMD160 01592615b8983621a9b22e934e10fe70aa9d25b2 files/0.94-disable_python_gtk_import.patch 313
+SHA256 8bbd4151586e302fdb35635469a640b82c4f4fa9b1a3595599d8bffc5f4d6989 files/0.94-disable_python_gtk_import.patch 313
+AUX dia-0.94-db2man.patch 901 RMD160 dd68e88b0a2130b3cb186eea5b90aaead397d73d SHA1 c9873ada338f8c163d95fa8fef21e1785d1c9ba6 SHA256 35ec88f147ac00052f04b3707004198466a453115ee2735a75a00705ca8ca6f9
 MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
+RMD160 dd68e88b0a2130b3cb186eea5b90aaead397d73d files/dia-0.94-db2man.patch 901
+SHA256 35ec88f147ac00052f04b3707004198466a453115ee2735a75a00705ca8ca6f9 files/dia-0.94-db2man.patch 901
+AUX dia-0.94-gcc4.patch 934 RMD160 2a876c7362845bdeeeb0468b2984b456bed75d5a SHA1 76da842695a5ac06ce14b07de988c938cf95dd25 SHA256 a3d24a60044fb0a5570634b39ccaaa16e299aa915178b2ea2764af558cf5c64a
 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
+RMD160 2a876c7362845bdeeeb0468b2984b456bed75d5a files/dia-0.94-gcc4.patch 934
+SHA256 a3d24a60044fb0a5570634b39ccaaa16e299aa915178b2ea2764af558cf5c64a files/dia-0.94-gcc4.patch 934
+AUX dia-0.94-help.patch 2766 RMD160 2f98abc9472219278802786861a217bbf404c866 SHA1 8a7da33631ad70c1a213ad237d74d5d40ae049f9 SHA256 e72c7f673572e83677dc8168890f9240f617c1df1089036702088deeefb952ed
 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
+RMD160 2f98abc9472219278802786861a217bbf404c866 files/dia-0.94-help.patch 2766
+SHA256 e72c7f673572e83677dc8168890f9240f617c1df1089036702088deeefb952ed files/dia-0.94-help.patch 2766
+AUX dia-0.94-no_font_cache.patch 473 RMD160 e8e9dc24fe95f6563d1180fd2ba4df7e332a000d SHA1 c7a7017f63f0d864054521118068c9bef0c91de4 SHA256 d4d523c894ca13326e34d2aa9f60df8718d50781988722ba1a53e4fb999e1634
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+RMD160 e8e9dc24fe95f6563d1180fd2ba4df7e332a000d files/dia-0.94-no_font_cache.patch 473
+SHA256 d4d523c894ca13326e34d2aa9f60df8718d50781988722ba1a53e4fb999e1634 files/dia-0.94-no_font_cache.patch 473
+AUX dia-0.94-pkgconfig.patch 296 RMD160 83f99edc0c3ef8f84b2ee34bb569a2bf5e6488ad SHA1 4683f342d20ea26bcbf98196585cb2108676a051 SHA256 e5bcf7c038e5a8e657d3aabc4acec50c6f80b036fe567d1084aa5580c789fff0
 MD5 b7b66d45324f178764257ee9d06e9b1a files/dia-0.94-pkgconfig.patch 296
+RMD160 83f99edc0c3ef8f84b2ee34bb569a2bf5e6488ad files/dia-0.94-pkgconfig.patch 296
+SHA256 e5bcf7c038e5a8e657d3aabc4acec50c6f80b036fe567d1084aa5580c789fff0 files/dia-0.94-pkgconfig.patch 296
+AUX dia-0.94-png.patch 3093 RMD160 c6ef542b8b3bcd914b85b424bd55332b25c7aa5f SHA1 89f14fdc49121438f4acc6560ecd0c7c14827eca SHA256 06794ba39eb526e6de4b0f706d00f1ef0377dd3890eded73606dee81ba3bb86c
 MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093
+RMD160 c6ef542b8b3bcd914b85b424bd55332b25c7aa5f files/dia-0.94-png.patch 3093
+SHA256 06794ba39eb526e6de4b0f706d00f1ef0377dd3890eded73606dee81ba3bb86c files/dia-0.94-png.patch 3093
+AUX dia-0.94-secure-eval.patch 1940 RMD160 7344d197e440361963c41a5707de66077550cdc0 SHA1 6c2461faac4b0584ce1e9cb374dec0ccc7ef3c78 SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89
 MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940
+RMD160 7344d197e440361963c41a5707de66077550cdc0 files/dia-0.94-secure-eval.patch 1940
+SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89 files/dia-0.94-secure-eval.patch 1940
+AUX dia-0.94_xfigoverflowfix.patch 5903 RMD160 45af56cf313bb04f8eced280f1afde2f518b6129 SHA1 a3e15228ccecd8f80fbc07b6e4be17b61798f115 SHA256 c7c99a44448b504929699f7c2449da09519ca724eb5a7dcb5d8f3450773c8a93
 MD5 bac280ec7e2d2c5ad790838679cba3b3 files/dia-0.94_xfigoverflowfix.patch 5903
-MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62
+RMD160 45af56cf313bb04f8eced280f1afde2f518b6129 files/dia-0.94_xfigoverflowfix.patch 5903
+SHA256 c7c99a44448b504929699f7c2449da09519ca724eb5a7dcb5d8f3450773c8a93 files/dia-0.94_xfigoverflowfix.patch 5903
+DIST dia-0.94-sheets-png.tar.bz2 5449 RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc SHA1 2e0006396af4851844dfc7cd053dadba720a5dd5 SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629
+DIST dia-0.94.tar.bz2 3348869 RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 SHA1 5d8467738f386d3e908cdb588240dc9a9aa4584a SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259
+DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
+EBUILD dia-0.94-r3.ebuild 1738 RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 SHA1 bdd94d3c3ecde1c6207331ab65885126a8a8ea58 SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a
+MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
+RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 dia-0.94-r3.ebuild 1738
+SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a dia-0.94-r3.ebuild 1738
+EBUILD dia-0.94-r4.ebuild 2191 RMD160 b27ce542918919e9c31db60a99bb8930d4fd147c SHA1 45776802d2218ebf5045fa9b826dea94bfb4f8fb SHA256 c2aa4a3edf9bd4d32c474e7aaacc9808f480941fcdb4b90a07dd388a20713844
+MD5 89e3745db7606051a56915fc427f803f dia-0.94-r4.ebuild 2191
+RMD160 b27ce542918919e9c31db60a99bb8930d4fd147c dia-0.94-r4.ebuild 2191
+SHA256 c2aa4a3edf9bd4d32c474e7aaacc9808f480941fcdb4b90a07dd388a20713844 dia-0.94-r4.ebuild 2191
+EBUILD dia-0.94-r5.ebuild 2259 RMD160 b66911c76c7ab860f4b3c0af77e85e505293b2df SHA1 f0ddb903d125d76dcd03d71867a60b324769d14a SHA256 1fdffc2abb38fa295d5b2c8933f9ef3de3b7df51f83226100f306049c4b7bc12
+MD5 283aa721473b2cee7483d56dac50bc7d dia-0.94-r5.ebuild 2259
+RMD160 b66911c76c7ab860f4b3c0af77e85e505293b2df dia-0.94-r5.ebuild 2259
+SHA256 1fdffc2abb38fa295d5b2c8933f9ef3de3b7df51f83226100f306049c4b7bc12 dia-0.94-r5.ebuild 2259
+EBUILD dia-0.95.1.ebuild 1677 RMD160 3512d2fdf1fbdce383292d64f61cc9e82d7ee285 SHA1 db511d9d7bf570112edd367807605b083599605e SHA256 601c9310b220b4598d96e9d0f881e7ae978c9c80ac354129b32d9e6f65e14a9d
+MD5 ee84773bb91692ace2d1ac96a7f86763 dia-0.95.1.ebuild 1677
+RMD160 3512d2fdf1fbdce383292d64f61cc9e82d7ee285 dia-0.95.1.ebuild 1677
+SHA256 601c9310b220b4598d96e9d0f881e7ae978c9c80ac354129b32d9e6f65e14a9d dia-0.95.1.ebuild 1677
+MISC ChangeLog 10354 RMD160 0d7c9ba6ba484fff28a4c7b4437c82c975943f11 SHA1 fa399389c0900de05fc3d2127effc21d7c502baf SHA256 5fdc9a028658baa8a8afd524d7a77c9a2dcc0b06017d5b531368f4fe994d849d
+MD5 6796bd83e961f995173157caafbb8aa4 ChangeLog 10354
+RMD160 0d7c9ba6ba484fff28a4c7b4437c82c975943f11 ChangeLog 10354
+SHA256 5fdc9a028658baa8a8afd524d7a77c9a2dcc0b06017d5b531368f4fe994d849d ChangeLog 10354
+MISC metadata.xml 596 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 SHA1 457717e2ae12542ee6a135ee884af2b428feefa8 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3
+MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
+RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
+SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3 metadata.xml 596
+MD5 ab3d07265b315d730fca27480ded9696 files/digest-dia-0.94-r3 232
+RMD160 67be87c91e3cd94aa49d9fad91dac57c2803f15c files/digest-dia-0.94-r3 232
+SHA256 8aa68103c81d99ce80f755e7346495b8b4be634913b52d594240f49656a5631a files/digest-dia-0.94-r3 232
 MD5 d6db5d92d74a6b9ef5c2f55493e7de4e files/digest-dia-0.94-r4 488
+RMD160 24563351a93bd15b36bfab7173107ad7e20177e5 files/digest-dia-0.94-r4 488
+SHA256 7b383bc183866d1227210ea7b1f90511e18387d2f13d764e1ff183d7ea058388 files/digest-dia-0.94-r4 488
 MD5 d6db5d92d74a6b9ef5c2f55493e7de4e files/digest-dia-0.94-r5 488
-MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
+RMD160 24563351a93bd15b36bfab7173107ad7e20177e5 files/digest-dia-0.94-r5 488
+SHA256 7b383bc183866d1227210ea7b1f90511e18387d2f13d764e1ff183d7ea058388 files/digest-dia-0.94-r5 488
+MD5 30dc3948e6f3de8197c055bcc0b48996 files/digest-dia-0.95.1 238
+RMD160 282d00f25653bfa0ba3ba375b1f5e1353add697d files/digest-dia-0.95.1 238
+SHA256 82a5d7c4b760fe506a71919ef875114ceb30ce5ebe4ad4ff0159a37e073c4ede files/digest-dia-0.95.1 238
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