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

Package-Manager: portage-2.1.2.3

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index bd4d1a22f91fd0fad78c00133b3afdc4be6d0451..efae11e6cbacb0504083edb45d27a45094d0e519 100644 (file)
--- 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/Manifest b/app-office/dia/Manifest
index bb39c4afaba736d3938b389cc09206242802eed1..9e69f2ca635d973f575788751392f98453dd8801 100644 (file)
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,17 +1,17 @@
 DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
-DIST dia-0.96-pre3.tar.bz2 4422788 RMD160 c9b4feb603a4685d43e836738e4d677b26a23f5e SHA1 378a019c853b7fcc96b7ad6f3a2cd15ddb1bdfaf SHA256 f8db0d529eb441d0726f1ff07650a5f84e68862098a90604f4ef8aa6b5b9e187
+DIST dia-0.96.1.tar.bz2 4445553 RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 SHA1 e3d8f16f50dbbd03c1ce0235dba28c3e9612bb6e SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
 EBUILD dia-0.95.1.ebuild 1681 RMD160 d733a6be8f5c7f8bd1c48764b1332bdb6687cae7 SHA1 6178a68084107e05cb1da3a7a13554605bd526da SHA256 75fbd18e5f30d15327f6a0565d6f9dfff0b64734abac884c7fd33e190700441e
 MD5 2bed2965b37a92da1b3a7255a2c8d152 dia-0.95.1.ebuild 1681
 RMD160 d733a6be8f5c7f8bd1c48764b1332bdb6687cae7 dia-0.95.1.ebuild 1681
 SHA256 75fbd18e5f30d15327f6a0565d6f9dfff0b64734abac884c7fd33e190700441e dia-0.95.1.ebuild 1681
-EBUILD dia-0.96_pre3.ebuild 1844 RMD160 ab49f268ac05af38eaa2683fcab2c8d18dbbff56 SHA1 48013e09b546e61697afa580b6e0cfad68355b08 SHA256 f4914df47c17d0bf785cadfcc5fd7fc369e59c10fd06b1e79eb30154824ae329
-MD5 0f6e6abedac51e9e57b1145c3c5f12eb dia-0.96_pre3.ebuild 1844
-RMD160 ab49f268ac05af38eaa2683fcab2c8d18dbbff56 dia-0.96_pre3.ebuild 1844
-SHA256 f4914df47c17d0bf785cadfcc5fd7fc369e59c10fd06b1e79eb30154824ae329 dia-0.96_pre3.ebuild 1844
-MISC ChangeLog 12077 RMD160 0e225f13b2dee5cc72386121f09c63dc5bd14b2d SHA1 21a3cd529dcb74e562cee7fb276e39d5b53306ce SHA256 b9dc96eb14010b6103d43571017a20a34643369e2753703caae89ce5432fd6a3
-MD5 50107998edc22274d2c7b3c562eaeed1 ChangeLog 12077
-RMD160 0e225f13b2dee5cc72386121f09c63dc5bd14b2d ChangeLog 12077
-SHA256 b9dc96eb14010b6103d43571017a20a34643369e2753703caae89ce5432fd6a3 ChangeLog 12077
+EBUILD dia-0.96.1.ebuild 1737 RMD160 18fe346b4bd6544cfec8aab62ab21d0f6f9b7afe SHA1 80a2945cf96e17645961cf4d9ae051b0ff57df46 SHA256 5331334f1add9ae56cc997302b5afd1607f8d23f943a1a5771c84bc8fc261d97
+MD5 4037b74f7c58a871645b09ec92e10a8b dia-0.96.1.ebuild 1737
+RMD160 18fe346b4bd6544cfec8aab62ab21d0f6f9b7afe dia-0.96.1.ebuild 1737
+SHA256 5331334f1add9ae56cc997302b5afd1607f8d23f943a1a5771c84bc8fc261d97 dia-0.96.1.ebuild 1737
+MISC ChangeLog 12323 RMD160 a8b6db1af0e06797c63a808935f5ff7888ee4f3d SHA1 385591689647c5be47e8324a4937b00f4646c1ba SHA256 af607cba3f85d3e930776da914a786769cbf4efe9d9b2491c84f60233d4a47e4
+MD5 a4dde14b7e783b0318f8facf66466941 ChangeLog 12323
+RMD160 a8b6db1af0e06797c63a808935f5ff7888ee4f3d ChangeLog 12323
+SHA256 af607cba3f85d3e930776da914a786769cbf4efe9d9b2491c84f60233d4a47e4 ChangeLog 12323
 MISC metadata.xml 596 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 SHA1 457717e2ae12542ee6a135ee884af2b428feefa8 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3
 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
@@ -19,6 +19,6 @@ SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3 metadata
 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
-MD5 1583dac712d27df204bd91d4fee52dce files/digest-dia-0.96_pre3 247
-RMD160 4c2b33c61b6bc81aaf0a49d0d1a98ea30c20347c files/digest-dia-0.96_pre3 247
-SHA256 76c894a1e4c86cf837eacb772bc4727f9c38fe3b15412ff9778543f77ee9b040 files/digest-dia-0.96_pre3 247
+MD5 94697c1e01913f18a51969569ee0ce99 files/digest-dia-0.96.1 238
+RMD160 489fb7ed6c245ca8bb94f2614ffec6b0fb871e94 files/digest-dia-0.96.1 238
+SHA256 65f7cbe3a405a292c1760a49c21dd27f54fdf5709a1f2d59541c0ebb0e3aac66 files/digest-dia-0.96.1 238

diff --git a/app-office/dia/dia-0.96_pre3.ebuild b/app-office/dia/dia-0.96.1.ebuild
similarity index 81%
rename from app-office/dia/dia-0.96_pre3.ebuild
rename to app-office/dia/dia-0.96.1.ebuild
index e13d9a3211cbbb45004593cbd24cc3ecbe4ec10d..1c060b7da731c9a01cf9879af75e05fcfcc61a6f 100644 (file)
--- 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 (file)
index 0000000..6d26517
--- /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 (file)
index 1f95d56..0000000
--- 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