| 1 |
ssuominen 10/07/27 19:27:49 |
| 2 |
|
| 3 |
Modified: opencv-2.0.0.ebuild opencv-2.1.0.ebuild |
| 4 |
Removed: opencv-2.0.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix repoman issues |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 media-libs/opencv/opencv-2.0.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: opencv-2.0.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- opencv-2.0.0.ebuild 12 May 2010 11:33:38 -0000 1.7 |
| 23 |
+++ opencv-2.0.0.ebuild 27 Jul 2010 19:27:49 -0000 1.8 |
| 24 |
@@ -1,9 +1,12 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.7 2010/05/12 11:33:38 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.8 2010/07/27 19:27:49 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=2 |
| 31 |
-inherit cmake-utils |
| 32 |
+ |
| 33 |
+PYTHON_DEPEND="python? 2:2.6" |
| 34 |
+ |
| 35 |
+inherit cmake-utils python |
| 36 |
|
| 37 |
MY_P=OpenCV-${PV} |
| 38 |
|
| 39 |
@@ -18,8 +21,6 @@ |
| 40 |
mmx octave openmp png python sse sse2 sse3 test tiff v4l xine" |
| 41 |
|
| 42 |
RDEPEND="sys-libs/zlib |
| 43 |
- python? ( >=dev-lang/python-2.5 |
| 44 |
- deprecated? ( dev-lang/swig ) ) |
| 45 |
ieee1394? ( sys-libs/libraw1394 |
| 46 |
media-libs/libdc1394:2 ) |
| 47 |
ffmpeg? ( >=media-video/ffmpeg-0.5 ) |
| 48 |
@@ -30,9 +31,10 @@ |
| 49 |
png? ( media-libs/libpng ) |
| 50 |
tiff? ( media-libs/tiff ) |
| 51 |
xine? ( media-libs/xine-lib ) |
| 52 |
- octave? ( sci-mathematics/octave |
| 53 |
- dev-lang/swig )" |
| 54 |
+ octave? ( sci-mathematics/octave )" |
| 55 |
DEPEND="${RDEPEND} |
| 56 |
+ octave? ( dev-lang/swig ) |
| 57 |
+ python? ( deprecated? ( dev-lang/swig ) ) |
| 58 |
dev-util/pkgconfig" |
| 59 |
|
| 60 |
S=${WORKDIR}/${MY_P} |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.3 media-libs/opencv/opencv-2.1.0.ebuild |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild?rev=1.3&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild?rev=1.3&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild?r1=1.2&r2=1.3 |
| 69 |
|
| 70 |
Index: opencv-2.1.0.ebuild |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v |
| 73 |
retrieving revision 1.2 |
| 74 |
retrieving revision 1.3 |
| 75 |
diff -u -r1.2 -r1.3 |
| 76 |
--- opencv-2.1.0.ebuild 27 Jul 2010 19:24:09 -0000 1.2 |
| 77 |
+++ opencv-2.1.0.ebuild 27 Jul 2010 19:27:49 -0000 1.3 |
| 78 |
@@ -1,6 +1,6 @@ |
| 79 |
# Copyright 1999-2010 Gentoo Foundation |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.2 2010/07/27 19:24:09 ssuominen Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.3 2010/07/27 19:27:49 ssuominen Exp $ |
| 83 |
|
| 84 |
EAPI=3 |
| 85 |
|
| 86 |
@@ -21,7 +21,6 @@ |
| 87 |
|
| 88 |
RDEPEND="sys-libs/zlib |
| 89 |
ipp? ( sci-libs/ipp ) |
| 90 |
- python? ( deprecated? ( dev-lang/swig ) ) |
| 91 |
ieee1394? ( sys-libs/libraw1394 |
| 92 |
media-libs/libdc1394:2 ) |
| 93 |
ffmpeg? ( >=media-video/ffmpeg-0.5 ) |
| 94 |
@@ -32,9 +31,10 @@ |
| 95 |
png? ( >=media-libs/libpng-1.4 ) |
| 96 |
tiff? ( media-libs/tiff ) |
| 97 |
xine? ( media-libs/xine-lib ) |
| 98 |
- octave? ( sci-mathematics/octave |
| 99 |
- dev-lang/swig )" |
| 100 |
+ octave? ( sci-mathematics/octave )" |
| 101 |
DEPEND="${RDEPEND} |
| 102 |
+ octave? ( dev-lang/swig ) |
| 103 |
+ python? ( deprecated? ( dev-lang/swig ) ) |
| 104 |
dev-util/pkgconfig" |
| 105 |
|
| 106 |
S=${WORKDIR}/${MY_P} |
| 107 |
@@ -107,7 +107,7 @@ |
| 108 |
pkg_postinst() { |
| 109 |
use python && python_mod_optimize opencv |
| 110 |
} |
| 111 |
- |
| 112 |
+ |
| 113 |
pkg_postrm() { |
| 114 |
use python && python_mod_cleanup opencv |
| 115 |
} |
Archives