Replace pre3 with the final of 0.96 now that it is available. ~mips dropped due to new libgnomeprint dependancy.

(Portage version: 2.1.2.3)

4 files changed, 14 insertions, 11 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index bd4d1a22f91f..efae11e6cbac 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.96 2007/03/10 12:16:06 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.97 2007/04/10 09:07:08 robbat2 Exp $
+
+*dia-0.96.1 (10 Apr 2007)
+
+  10 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> -dia-0.96_pre3.ebuild,
+  +dia-0.96.1.ebuild:
+  Replace pre3 with the final of 0.96 now that it is available. ~mips dropped
+  due to new libgnomeprint dependancy.
 
   10 Mar 2007; Peter Weller <welp@gentoo.org> dia-0.95.1.ebuild:
   Keyworded ~x86-fbsd
diff --git a/app-office/dia/dia-0.96_pre3.ebuild b/app-office/dia/dia-0.96.1.ebuild
index e13d9a3211cb..1c060b7da731 100644
--- a/app-office/dia/dia-0.96_pre3.ebuild
+++ b/app-office/dia/dia-0.96.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.96_pre3.ebuild,v 1.1 2007/02/02 10:22:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.96.1.ebuild,v 1.1 2007/04/10 09:07:08 robbat2 Exp $
 
 inherit eutils gnome2 libtool autotools versionator
 
@@ -9,13 +9,11 @@ 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"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnome png python zlib cairo gnome-print"
 
 RDEPEND=">=x11-libs/gtk+-2.6.0
@@ -46,8 +44,6 @@ G2CONF="${G2CONF} $(use_with python) $(use_with cairo)"
 
 DOCS="AUTHORS ChangeLog COPYING KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
 
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	gnome2_src_unpack
 
diff --git a/app-office/dia/files/digest-dia-0.96.1 b/app-office/dia/files/digest-dia-0.96.1
new file mode 100644
index 000000000000..6d26517489bf
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.96.1
@@ -0,0 +1,3 @@
+MD5 7b81b22baa2df55efe4845865dddc7b6 dia-0.96.1.tar.bz2 4445553
+RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 dia-0.96.1.tar.bz2 4445553
+SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237 dia-0.96.1.tar.bz2 4445553
diff --git a/app-office/dia/files/digest-dia-0.96_pre3 b/app-office/dia/files/digest-dia-0.96_pre3
deleted file mode 100644
index 1f95d5694ad8..000000000000
--- a/app-office/dia/files/digest-dia-0.96_pre3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 abcb045a4f0c88d9d91ca2dbcdc7be37 dia-0.96-pre3.tar.bz2 4422788
-RMD160 c9b4feb603a4685d43e836738e4d677b26a23f5e dia-0.96-pre3.tar.bz2 4422788
-SHA256 f8db0d529eb441d0726f1ff07650a5f84e68862098a90604f4ef8aa6b5b9e187 dia-0.96-pre3.tar.bz2 4422788