Fix bug #418455 - sci-mathematics/cvs3 license issues. Fix typos in sed.

(Portage version: 2.1.10.63/cvs/Linux x86_64)

3 files changed, 21 insertions, 6 deletions

diff --git a/sci-mathematics/cvc3/ChangeLog b/sci-mathematics/cvc3/ChangeLog
index ab598dc013e7..258445e1f657 100644
--- a/sci-mathematics/cvc3/ChangeLog
+++ b/sci-mathematics/cvc3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/cvc3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.2 2012/05/31 21:33:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.3 2012/06/01 02:12:45 gienah Exp $
+
+  01 Jun 2012; Mark Wright <gienah@gentoo.org> cvc3-2.4.1.ebuild, metadata.xml:
+  Fix bug #418455 - sci-mathematics/cvs3 license issues. Fix typos in sed.
 
   31 May 2012; Ulrich Müller <ulm@gentoo.org> files/50cvc3-gentoo.el:
   Remove spurious comment from site-init file for Emacs.
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild b/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
index 8a53f5932de7..4728e96192d4 100644
--- a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
+++ b/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.1 2012/05/30 00:51:22 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.2 2012/06/01 02:12:45 gienah Exp $
 
 EAPI="4"
 
@@ -10,7 +10,8 @@ DESCRIPTION="CVC3 is an automatic theorem prover for Satisfiability Modulo Theor
 HOMEPAGE="http://www.cs.nyu.edu/acsys/cvc3/index.html"
 SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz"
 
-LICENSE="CVC3"
+LICENSE="BSD MIT as-is zchaff? ( zchaff )"
+RESTRICT="mirror zchaff? ( bindist )"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc emacs isabelle static-libs zchaff"
@@ -32,8 +33,8 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	sed -e 's/prefix=@prefix@/prefix=${DESTDIR}@prefix/' \
-		-e 's/libdir=@libdir@/libdir=${DESTDIR}@libdir/' \
+	sed -e 's/prefix=@prefix@/prefix=${DESTDIR}@prefix@/' \
+		-e 's/libdir=@libdir@/libdir=${DESTDIR}@libdir@/' \
 		-e 's/mandir=@mandir@/mandir=${DESTDIR}@mandir@/' \
 		-i "${S}/Makefile.local.in" \
 		|| die "Could not set DESTDIR in Makefile.local.in"
@@ -128,6 +129,16 @@ pkg_postinst() {
 			EOF
 		fi
 	fi
+	if use zchaff; then
+		einfo "This copy of CVC3 is also configured to use the SAT solver zchaff whose"
+		einfo "copyright is owned by Princeton University and is more restrictive."
+		einfo "Specifically, it may be used for internal, noncommercial, research purposes"
+		einfo "only. See the copyright notices from the zchaff source files which are"
+		einfo "included in the LICENSE file."
+		einfo "To build CVC3 without these files, please build cvc3 without the zchaff"
+		einfo "use flag (note: zchaff is disabled by default):"
+		einfo "USE=-zchaff emerge sci-mathemathematics/cvc3"
+	fi
 }
 
 pkg_postrm() {
diff --git a/sci-mathematics/cvc3/metadata.xml b/sci-mathematics/cvc3/metadata.xml
index db25562598fb..db1bc6cd9c5e 100644
--- a/sci-mathematics/cvc3/metadata.xml
+++ b/sci-mathematics/cvc3/metadata.xml
@@ -34,7 +34,8 @@ and has a wide variety of features including:
   <flag name='isabelle'>Add integration support for the Isabelle/HOL
   theorem prover.</flag>
   <flag name='zchaff'>Use the SAT solver zchaff whose copyright is
-  owned by Princeton University and is more restrictive (see license).
+  owned by Princeton University and is more restrictive (see zchaff
+  license).
   </flag>
 </use>
 </pkgmetadata>