1 |
gienah 12/06/01 02:12:45 |
2 |
|
3 |
Modified: metadata.xml cvc3-2.4.1.ebuild ChangeLog |
4 |
Log: |
5 |
Fix bug #418455 - sci-mathematics/cvs3 license issues. Fix typos in sed. |
6 |
|
7 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 sci-mathematics/cvc3/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/metadata.xml?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/metadata.xml?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/metadata.xml?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/metadata.xml,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- metadata.xml 30 May 2012 00:51:22 -0000 1.1 |
23 |
+++ metadata.xml 1 Jun 2012 02:12:45 -0000 1.2 |
24 |
@@ -34,7 +34,8 @@ |
25 |
<flag name='isabelle'>Add integration support for the Isabelle/HOL |
26 |
theorem prover.</flag> |
27 |
<flag name='zchaff'>Use the SAT solver zchaff whose copyright is |
28 |
- owned by Princeton University and is more restrictive (see license). |
29 |
+ owned by Princeton University and is more restrictive (see zchaff |
30 |
+ license). |
31 |
</flag> |
32 |
</use> |
33 |
</pkgmetadata> |
34 |
|
35 |
|
36 |
|
37 |
1.2 sci-mathematics/cvc3/cvc3-2.4.1.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: cvc3-2.4.1.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- cvc3-2.4.1.ebuild 30 May 2012 00:51:22 -0000 1.1 |
50 |
+++ cvc3-2.4.1.ebuild 1 Jun 2012 02:12:45 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.1 2012/05/30 00:51:22 gienah Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.2 2012/06/01 02:12:45 gienah Exp $ |
56 |
|
57 |
EAPI="4" |
58 |
|
59 |
@@ -10,7 +10,8 @@ |
60 |
HOMEPAGE="http://www.cs.nyu.edu/acsys/cvc3/index.html" |
61 |
SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz" |
62 |
|
63 |
-LICENSE="CVC3" |
64 |
+LICENSE="BSD MIT as-is zchaff? ( zchaff )" |
65 |
+RESTRICT="mirror zchaff? ( bindist )" |
66 |
SLOT="0" |
67 |
KEYWORDS="~x86 ~amd64" |
68 |
IUSE="doc emacs isabelle static-libs zchaff" |
69 |
@@ -32,8 +33,8 @@ |
70 |
SITEFILE=50${PN}-gentoo.el |
71 |
|
72 |
src_prepare() { |
73 |
- sed -e 's/prefix=@prefix@/prefix=${DESTDIR}@prefix/' \ |
74 |
- -e 's/libdir=@libdir@/libdir=${DESTDIR}@libdir/' \ |
75 |
+ sed -e 's/prefix=@prefix@/prefix=${DESTDIR}@prefix@/' \ |
76 |
+ -e 's/libdir=@libdir@/libdir=${DESTDIR}@libdir@/' \ |
77 |
-e 's/mandir=@mandir@/mandir=${DESTDIR}@mandir@/' \ |
78 |
-i "${S}/Makefile.local.in" \ |
79 |
|| die "Could not set DESTDIR in Makefile.local.in" |
80 |
@@ -128,6 +129,16 @@ |
81 |
EOF |
82 |
fi |
83 |
fi |
84 |
+ if use zchaff; then |
85 |
+ einfo "This copy of CVC3 is also configured to use the SAT solver zchaff whose" |
86 |
+ einfo "copyright is owned by Princeton University and is more restrictive." |
87 |
+ einfo "Specifically, it may be used for internal, noncommercial, research purposes" |
88 |
+ einfo "only. See the copyright notices from the zchaff source files which are" |
89 |
+ einfo "included in the LICENSE file." |
90 |
+ einfo "To build CVC3 without these files, please build cvc3 without the zchaff" |
91 |
+ einfo "use flag (note: zchaff is disabled by default):" |
92 |
+ einfo "USE=-zchaff emerge sci-mathemathematics/cvc3" |
93 |
+ fi |
94 |
} |
95 |
|
96 |
pkg_postrm() { |
97 |
|
98 |
|
99 |
|
100 |
1.3 sci-mathematics/cvc3/ChangeLog |
101 |
|
102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/ChangeLog?rev=1.3&view=markup |
103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/ChangeLog?rev=1.3&content-type=text/plain |
104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/cvc3/ChangeLog?r1=1.2&r2=1.3 |
105 |
|
106 |
Index: ChangeLog |
107 |
=================================================================== |
108 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v |
109 |
retrieving revision 1.2 |
110 |
retrieving revision 1.3 |
111 |
diff -u -r1.2 -r1.3 |
112 |
--- ChangeLog 31 May 2012 21:33:02 -0000 1.2 |
113 |
+++ ChangeLog 1 Jun 2012 02:12:45 -0000 1.3 |
114 |
@@ -1,6 +1,9 @@ |
115 |
# ChangeLog for sci-mathematics/cvc3 |
116 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.2 2012/05/31 21:33:02 ulm Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.3 2012/06/01 02:12:45 gienah Exp $ |
119 |
+ |
120 |
+ 01 Jun 2012; Mark Wright <gienah@g.o> cvc3-2.4.1.ebuild, metadata.xml: |
121 |
+ Fix bug #418455 - sci-mathematics/cvs3 license issues. Fix typos in sed. |
122 |
|
123 |
31 May 2012; Ulrich Müller <ulm@g.o> files/50cvc3-gentoo.el: |
124 |
Remove spurious comment from site-init file for Emacs. |