summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-02-06 11:05:42 +0000
committerUlrich Müller <ulm@gentoo.org>2010-02-06 11:05:42 +0000
commit36c1bfe184a0fe47b41546a171df61a5b45ece08 (patch)
tree1d818755f69502073ed8bd1c848bea722364298e /media-libs/opencv
parentEbuild cleanup, closing bug #299417 (diff)
downloadgentoo-2-36c1bfe184a0fe47b41546a171df61a5b45ece08.tar.gz
gentoo-2-36c1bfe184a0fe47b41546a171df61a5b45ece08.tar.bz2
gentoo-2-36c1bfe184a0fe47b41546a171df61a5b45ece08.zip
Fix LICENSE, bug 301123.
(Portage version: 2.2_rc62/cvs/Linux i686)
Diffstat (limited to 'media-libs/opencv')
-rw-r--r--media-libs/opencv/ChangeLog6
-rw-r--r--media-libs/opencv/opencv-2.0.0-r1.ebuild4
-rw-r--r--media-libs/opencv/opencv-2.0.0.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7402dd3180ce..49b5353aa8db 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.17 2010/01/06 23:49:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.18 2010/02/06 11:05:42 ulm Exp $
+
+ 06 Feb 2010; Ulrich Mueller <ulm@gentoo.org> opencv-2.0.0.ebuild,
+ opencv-2.0.0-r1.ebuild:
+ Fix LICENSE, bug 301123.
06 Jan 2010; Joseph Jezak <josejx@gentoo.org> opencv-2.0.0-r1.ebuild:
Marked ~ppc64.
diff --git a/media-libs/opencv/opencv-2.0.0-r1.ebuild b/media-libs/opencv/opencv-2.0.0-r1.ebuild
index 842cbf331bbd..107f64af0682 100644
--- a/media-libs/opencv/opencv-2.0.0-r1.ebuild
+++ b/media-libs/opencv/opencv-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.2 2010/01/06 23:49:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.3 2010/02/06 11:05:42 ulm Exp $
EAPI=2
inherit cmake-utils
@@ -11,7 +11,7 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis
HOMEPAGE="http://opencv.willowgarage.com"
SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel"
+LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index cab707d83af1..275d17549329 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.5 2009/12/07 23:32:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.6 2010/02/06 11:05:42 ulm Exp $
EAPI=2
inherit cmake-utils
@@ -11,7 +11,7 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis
HOMEPAGE="http://opencv.willowgarage.com"
SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel"
+LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k