amd64 stable wrt #198550, thanks to Caleb for quickly fixing file collision problem

Package-Manager: portage-2.1.3.19

4 files changed, 21 insertions, 17 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index d3ae86e4cdf6..d8c1cd613b37 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.52 2007/11/14 18:57:41 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.53 2007/11/14 19:02:21 drac Exp $
+
+  14 Nov 2007; Samuli Suominen <drac@gentoo.org> qwt-4.2.0-r3.ebuild,
+  qwt-5.0.2-r1.ebuild:
+  amd64 stable wrt #198550
 
 *qwt-4.2.0-r3 (14 Nov 2007)
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index d78fd0e18c6e..5b8e337a1bba 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -8,22 +8,22 @@ EBUILD qwt-4.2.0-r2.ebuild 1790 RMD160 2045edf907d088ab3391f202d99d4cdc59291416
 MD5 875ee7a622f22af2f29487328084d7fd qwt-4.2.0-r2.ebuild 1790
 RMD160 2045edf907d088ab3391f202d99d4cdc59291416 qwt-4.2.0-r2.ebuild 1790
 SHA256 ef9a3df4f0a09872e3b5f38423506cdf3144b8e96f5bf9ec616d8e00ca5f3b89 qwt-4.2.0-r2.ebuild 1790
-EBUILD qwt-4.2.0-r3.ebuild 1734 RMD160 7915d8cfc1efd99e369785114549455b2562c140 SHA1 c7b93af5867d149182d0cbafca9277e93ea4923d SHA256 06c74e34c118d45539e6406a506fd1036daa86a9587f4c917cfcd1c8f903fda2
-MD5 6305c25855e3db689959e7718d6b5c98 qwt-4.2.0-r3.ebuild 1734
-RMD160 7915d8cfc1efd99e369785114549455b2562c140 qwt-4.2.0-r3.ebuild 1734
-SHA256 06c74e34c118d45539e6406a506fd1036daa86a9587f4c917cfcd1c8f903fda2 qwt-4.2.0-r3.ebuild 1734
+EBUILD qwt-4.2.0-r3.ebuild 1732 RMD160 d6a01c2827050cac67e7276862c9ddd21f6b1c27 SHA1 58301dab93ee8642a5362964524a8f75762956d3 SHA256 501a1836761fcc4f6e8fa5227ffc94e2fc935601a7ebce75e5a9150ed1d1cd7e
+MD5 c4651c50dbecc2a42ef86117bd0ece61 qwt-4.2.0-r3.ebuild 1732
+RMD160 d6a01c2827050cac67e7276862c9ddd21f6b1c27 qwt-4.2.0-r3.ebuild 1732
+SHA256 501a1836761fcc4f6e8fa5227ffc94e2fc935601a7ebce75e5a9150ed1d1cd7e qwt-4.2.0-r3.ebuild 1732
 EBUILD qwt-4.2.0.ebuild 1536 RMD160 52906808b4a5f849109e87a77bf75aed27a051cc SHA1 d732be95b231b0c9796b4b251b6e31c7502bb513 SHA256 2fb40ba1f1d3ecb8444e0366c298531fa2bc6bab63786f764b20ff7514b29360
 MD5 334a5ab200ac3b4363ab8333b75edb6e qwt-4.2.0.ebuild 1536
 RMD160 52906808b4a5f849109e87a77bf75aed27a051cc qwt-4.2.0.ebuild 1536
 SHA256 2fb40ba1f1d3ecb8444e0366c298531fa2bc6bab63786f764b20ff7514b29360 qwt-4.2.0.ebuild 1536
-EBUILD qwt-5.0.2-r1.ebuild 1225 RMD160 dda6dac876bdfd8b4585113d141680e92de1bcc6 SHA1 407cb77d5ee3815e2388b8d3940374a083e91af6 SHA256 0de4fcadd667daf273b801592061c642d8793aea7c4fe2ab8bc17bc93de579b5
-MD5 c558554b38943c5b2919db0037a03050 qwt-5.0.2-r1.ebuild 1225
-RMD160 dda6dac876bdfd8b4585113d141680e92de1bcc6 qwt-5.0.2-r1.ebuild 1225
-SHA256 0de4fcadd667daf273b801592061c642d8793aea7c4fe2ab8bc17bc93de579b5 qwt-5.0.2-r1.ebuild 1225
-MISC ChangeLog 7391 RMD160 bea3f473ebf983c67fd4f6179f9c74fdc9642605 SHA1 6a5b562241f1bc8658c7bfd1805ce42ba92a7123 SHA256 2f59a78d2a67812abbf6e1220762411d2ff7a40ea6915bd5921c380bbee48276
-MD5 cb1abc4af2378e1cc3aa35afe1533d64 ChangeLog 7391
-RMD160 bea3f473ebf983c67fd4f6179f9c74fdc9642605 ChangeLog 7391
-SHA256 2f59a78d2a67812abbf6e1220762411d2ff7a40ea6915bd5921c380bbee48276 ChangeLog 7391
+EBUILD qwt-5.0.2-r1.ebuild 1225 RMD160 2d8cc34b90cfd097f0d7bfecbaaa9ecf1d2d0f2c SHA1 2eaea5dd3af0237722a912033424af50788a0e36 SHA256 d693410810a0a9ceeaee8dfa237c42a3aadb44682638d4a6fe1fd55350ad62ab
+MD5 ec04d9c278366ac17bc0650100728390 qwt-5.0.2-r1.ebuild 1225
+RMD160 2d8cc34b90cfd097f0d7bfecbaaa9ecf1d2d0f2c qwt-5.0.2-r1.ebuild 1225
+SHA256 d693410810a0a9ceeaee8dfa237c42a3aadb44682638d4a6fe1fd55350ad62ab qwt-5.0.2-r1.ebuild 1225
+MISC ChangeLog 7511 RMD160 f46eeacf768a0c96abdbc9dc874dd9d3f75db6ab SHA1 20ce648e49de24bee19f9f4ae93294d5ce7cd435 SHA256 5bbb4a9b243f6e57cdd2f570281409b232fb82283cca32bdc7f43cae461d9300
+MD5 83ef009e3cea94c6f7e5a013e5505933 ChangeLog 7511
+RMD160 f46eeacf768a0c96abdbc9dc874dd9d3f75db6ab ChangeLog 7511
+SHA256 5bbb4a9b243f6e57cdd2f570281409b232fb82283cca32bdc7f43cae461d9300 ChangeLog 7511
 MISC metadata.xml 217 RMD160 e6d054499f7788f954fa7941c8083d3cb12be55a SHA1 97a424e615a1e5536b7666dbc716040de4208a0a SHA256 87a4f33db3485f493febd11c563b8f811b2eaeac8183a3e50183df6387eff4b9
 MD5 dcf56124acba6c6052ae83ecba3d43ef metadata.xml 217
 RMD160 e6d054499f7788f954fa7941c8083d3cb12be55a metadata.xml 217
diff --git a/x11-libs/qwt/qwt-4.2.0-r3.ebuild b/x11-libs/qwt/qwt-4.2.0-r3.ebuild
index 955e73b2e6c2..54d3ae83a8a5 100644
--- a/x11-libs/qwt/qwt-4.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0-r3.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/x11-libs/qwt/qwt-4.2.0-r3.ebuild,v 1.1 2007/11/14 18:57:41 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0-r3.ebuild,v 1.2 2007/11/14 19:02:21 drac Exp $
 
 inherit multilib qt3
 
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/qwt/${P}.tar.bz2"
 HOMEPAGE="http://qwt.sourceforge.net/"
 DESCRIPTION="2D plotting library for Qt"
 LICENSE="qwt"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/x11-libs/qwt/qwt-5.0.2-r1.ebuild b/x11-libs/qwt/qwt-5.0.2-r1.ebuild
index 51e9fcdc3898..030fd674ef36 100644
--- a/x11-libs/qwt/qwt-5.0.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-5.0.2-r1.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/x11-libs/qwt/qwt-5.0.2-r1.ebuild,v 1.6 2007/11/13 07:11:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.2-r1.ebuild,v 1.7 2007/11/14 19:02:21 drac Exp $
 
 inherit multilib qt4
 
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/qwt/${P}.tar.bz2"
 HOMEPAGE="http://qwt.sourceforge.net/"
 DESCRIPTION="2D plotting library for Qt4"
 LICENSE="qwt"
-KEYWORDS="~amd64 hppa sparc x86"
+KEYWORDS="amd64 hppa sparc x86"
 SLOT="5"
 IUSE="doc svg"