| 1 |
jlec 14/01/02 18:31:08 |
| 2 |
|
| 3 |
Modified: qwt-5.2.1.ebuild qwt-6.1.0.ebuild ChangeLog |
| 4 |
Removed: qwt-6.0.2-r2.ebuild qwt-6.0.2-r1.ebuild |
| 5 |
qwt-6.0.2.ebuild qwt-5.2.3-r1.ebuild |
| 6 |
qwt-5.2.3.ebuild |
| 7 |
Log: |
| 8 |
x11-libs/qwt: Add blocker to avoid file collision, #496714 |
| 9 |
|
| 10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.18 x11-libs/qwt/qwt-5.2.1.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.18&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.18&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?r1=1.17&r2=1.18 |
| 18 |
|
| 19 |
Index: qwt-5.2.1.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v |
| 22 |
retrieving revision 1.17 |
| 23 |
retrieving revision 1.18 |
| 24 |
diff -u -r1.17 -r1.18 |
| 25 |
--- qwt-5.2.1.ebuild 9 Dec 2013 08:32:59 -0000 1.17 |
| 26 |
+++ qwt-5.2.1.ebuild 2 Jan 2014 18:31:07 -0000 1.18 |
| 27 |
@@ -1,6 +1,6 @@ |
| 28 |
-# Copyright 1999-2013 Gentoo Foundation |
| 29 |
+# Copyright 1999-2014 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.17 2013/12/09 08:32:59 jlec Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.18 2014/01/02 18:31:07 jlec Exp $ |
| 33 |
|
| 34 |
EAPI=4 |
| 35 |
|
| 36 |
@@ -16,6 +16,7 @@ |
| 37 |
IUSE="doc examples svg" |
| 38 |
|
| 39 |
DEPEND=" |
| 40 |
+ !>=x11-libs/qwt-6.1.0 |
| 41 |
dev-qt/qtgui:4 |
| 42 |
doc? ( !<media-libs/coin-3.1.3[doc] ) |
| 43 |
svg? ( dev-qt/qtsvg:4 )" |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.9 x11-libs/qwt/qwt-6.1.0.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild?rev=1.9&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild?rev=1.9&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild?r1=1.8&r2=1.9 |
| 52 |
|
| 53 |
Index: qwt-6.1.0.ebuild |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v |
| 56 |
retrieving revision 1.8 |
| 57 |
retrieving revision 1.9 |
| 58 |
diff -u -r1.8 -r1.9 |
| 59 |
--- qwt-6.1.0.ebuild 29 Dec 2013 20:36:39 -0000 1.8 |
| 60 |
+++ qwt-6.1.0.ebuild 2 Jan 2014 18:31:07 -0000 1.9 |
| 61 |
@@ -1,6 +1,6 @@ |
| 62 |
-# Copyright 1999-2013 Gentoo Foundation |
| 63 |
+# Copyright 1999-2014 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.8 2013/12/29 20:36:39 ago Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.9 2014/01/02 18:31:07 jlec Exp $ |
| 67 |
|
| 68 |
EAPI=5 |
| 69 |
|
| 70 |
@@ -18,6 +18,7 @@ |
| 71 |
IUSE="doc examples mathml static-libs svg" |
| 72 |
|
| 73 |
DEPEND=" |
| 74 |
+ !<x11-libs/qwt-5.2.3 |
| 75 |
|| ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) |
| 76 |
doc? ( !<media-libs/coin-3.1.3[doc] ) |
| 77 |
svg? ( dev-qt/qtsvg:4 )" |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.126 x11-libs/qwt/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.126&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.126&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.125&r2=1.126 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v |
| 90 |
retrieving revision 1.125 |
| 91 |
retrieving revision 1.126 |
| 92 |
diff -u -r1.125 -r1.126 |
| 93 |
--- ChangeLog 29 Dec 2013 20:36:39 -0000 1.125 |
| 94 |
+++ ChangeLog 2 Jan 2014 18:31:07 -0000 1.126 |
| 95 |
@@ -1,6 +1,11 @@ |
| 96 |
# ChangeLog for x11-libs/qwt |
| 97 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.125 2013/12/29 20:36:39 ago Exp $ |
| 99 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 100 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.126 2014/01/02 18:31:07 jlec Exp $ |
| 101 |
+ |
| 102 |
+ 02 Jan 2014; Justin Lecher <jlec@g.o> qwt-5.2.1.ebuild, |
| 103 |
+ -qwt-5.2.3.ebuild, -qwt-5.2.3-r1.ebuild, -qwt-6.0.2.ebuild, |
| 104 |
+ -qwt-6.0.2-r1.ebuild, -qwt-6.0.2-r2.ebuild, qwt-6.1.0.ebuild: |
| 105 |
+ Add blocker to avoid file collision, #496714 |
| 106 |
|
| 107 |
29 Dec 2013; Agostino Sarubbo <ago@g.o> qwt-5.2.3-r2.ebuild, |
| 108 |
qwt-6.1.0.ebuild: |
Archives