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
commitf840782529d5fe7d2541693a96a63b09912eb134 (patch)
treed1e6bced70156f0ca6372f68521291bd93210169 /media-libs/opencv
parentEbuild cleanup, closing bug #299417 (diff)
downloadhistorical-f840782529d5fe7d2541693a96a63b09912eb134.tar.gz
historical-f840782529d5fe7d2541693a96a63b09912eb134.tar.bz2
historical-f840782529d5fe7d2541693a96a63b09912eb134.zip
Fix LICENSE, bug 301123.
Package-Manager: portage-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/Manifest14
-rw-r--r--media-libs/opencv/opencv-2.0.0-r1.ebuild4
-rw-r--r--media-libs/opencv/opencv-2.0.0.ebuild6
4 files changed, 17 insertions, 13 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/Manifest b/media-libs/opencv/Manifest
index 27082670bb13..3dd4787348bb 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777
DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
-EBUILD opencv-2.0.0-r1.ebuild 2279 RMD160 0d0677133994ae9fd5e2f03542a31fbb5cb2eba7 SHA1 046646d1ae9bb539969d751b9b32f01f43076597 SHA256 4a7f7eb7d3fd369229d27b0892658577f62ead0388a936ce4e627684cee073c5
-EBUILD opencv-2.0.0.ebuild 2291 RMD160 1f47e9476e06be41da29bd258df1dfc2f85cd52f SHA1 35f3517308f46b51dbd061d40d5f1f9d8a9864bd SHA256 0122d72698a1fd56c73774fdab2db15f75505f0f6206f5ab889f6bea71821dcf
-MISC ChangeLog 3361 RMD160 cec191b01c96d7b1c6b1c32523cb9b4531a42f6d SHA1 cefe7ab12c6edb28e72137841b7c286a9ffa87b2 SHA256 06145f45dd5dfe6359f01d25ff0e195d4ed8642011d6cd8806130f3b6d0b0e20
+EBUILD opencv-2.0.0-r1.ebuild 2274 RMD160 8e8753ef59ab170564539c61c9e9cfc5e8140394 SHA1 0f606afa3b68fd6c00f130f5e055694e1be88098 SHA256 905944541ac0ef2d3bb3c240aad3cc47550df7d01075d3a579041f131046d5c0
+EBUILD opencv-2.0.0.ebuild 2286 RMD160 45f4291003b6f1e2ae3a6ea3be7b401b6f52d774 SHA1 83d55bc3b6d402d7691ece9f714ebc41b364de21 SHA256 3d79b5439874bae02a6a503b2f21acb8a50a36702d601e14f865c6a7cf5516b0
+MISC ChangeLog 3480 RMD160 bac3f08b76f0da10686ef9eec1c9bf34bbd922c8 SHA1 4e092789cd9aa7a934bc2ba35daa12b802324d08 SHA256 894c47e5b2462b7e17d76a025f0ce8344c7404b77a0167b91e89673236710289
MISC metadata.xml 959 RMD160 531c61b88ecf1af6829078553580f7025d369bc0 SHA1 ce297f8ddef36af86f1e711a958a5f9873e1df7d SHA256 7f676e603c47c6182fe0b333395f735993743c22b2989b11e71fed579f7aa359
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAktFITkACgkQcsIHjyDViGQT9ACgixLUgTnyI775Hi+zRJ9pgvsx
-TlYAoJRv+3je92CsEEXjl/FpBl+npv22
-=5uJe
+iEYEARECAAYFAkttTR8ACgkQOeoy/oIi7uwiJwCffo5EPjtlqv9WeTMSlGM78FlK
+FGcAn27c8af/9OvIfUWI38tPswQBsjkG
+=6E5f
-----END PGP SIGNATURE-----
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