summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2015-04-12 20:49:19 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2015-04-12 20:49:19 +0000
commit84f77f259cba1a89584a50af84fe59113d100c65 (patch)
treee7421b5e0555c1beb493a2016fa9f2840ce09420 /media-libs
parentVersion bump (diff)
downloadgentoo-2-84f77f259cba1a89584a50af84fe59113d100c65.tar.gz
gentoo-2-84f77f259cba1a89584a50af84fe59113d100c65.tar.bz2
gentoo-2-84f77f259cba1a89584a50af84fe59113d100c65.zip
Pin slots
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0B08240A96F66571)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/ChangeLog6
-rw-r--r--media-libs/opencv/opencv-2.4.10.ebuild8
-rw-r--r--media-libs/opencv/opencv-2.4.9.ebuild8
3 files changed, 13 insertions, 9 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 29b23bfc8325..d9dbf367bd67 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.121 2015/04/12 20:46:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.122 2015/04/12 20:49:19 dilfridge Exp $
+
+ 12 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.9.ebuild,
+ opencv-2.4.10.ebuild:
+ Pin slots
*opencv-2.4.10 (12 Apr 2015)
diff --git a/media-libs/opencv/opencv-2.4.10.ebuild b/media-libs/opencv/opencv-2.4.10.ebuild
index 5a0598375e97..8a07ed935c67 100644
--- a/media-libs/opencv/opencv-2.4.10.ebuild
+++ b/media-libs/opencv/opencv-2.4.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.10.ebuild,v 1.1 2015/04/12 20:46:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.10.ebuild,v 1.2 2015/04/12 20:49:19 dilfridge Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -43,8 +43,8 @@ RDEPEND="
x11-libs/gtk+:2
opengl? ( x11-libs/gtkglext )
)
- java? ( >=virtual/jre-1.6 )
- jpeg? ( virtual/jpeg )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
ieee1394? (
media-libs/libdc1394
@@ -62,7 +62,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:4 )
)
threads? ( dev-cpp/tbb )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
v4l? ( >=media-libs/libv4l-0.8.3 )
vtk? ( sci-libs/vtk[rendering] )
xine? ( media-libs/xine-lib )
diff --git a/media-libs/opencv/opencv-2.4.9.ebuild b/media-libs/opencv/opencv-2.4.9.ebuild
index aeda0d3d6797..e43b354626f4 100644
--- a/media-libs/opencv/opencv-2.4.9.ebuild
+++ b/media-libs/opencv/opencv-2.4.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.11 2015/04/08 17:59:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.12 2015/04/12 20:49:19 dilfridge Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -43,8 +43,8 @@ RDEPEND="
x11-libs/gtk+:2
opengl? ( x11-libs/gtkglext )
)
- java? ( >=virtual/jre-1.6 )
- jpeg? ( virtual/jpeg )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
ieee1394? (
media-libs/libdc1394
@@ -62,7 +62,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:4 )
)
threads? ( dev-cpp/tbb )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
v4l? ( >=media-libs/libv4l-0.8.3 )
vtk? ( sci-libs/vtk[rendering] )
xine? ( media-libs/xine-lib )