Added fortran-2.eclass support

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 20 insertions, 15 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7a41e80ddabe..d09763f7c0c9 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.37 2011/06/09 16:28:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.38 2011/06/21 10:30:56 jlec Exp $
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> opencv-2.1.0.ebuild,
+  opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild:
+  Added fortran-2.eclass support
 
   09 Jun 2011; Jeroen Roovers <jer@gentoo.org> opencv-2.1.0.ebuild:
   Drop HPPA keywording (bug #365451).
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 55bac80b3051..dabe3b292ee8 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,15 +17,15 @@ AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216
 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.1.0.ebuild 2921 RMD160 edc3c3545a2bba0c8bba460161c3a20aac142135 SHA1 e747152762728de53c4c964f39a69faf4dc11ba6 SHA256 3ab63df3922009e8abfc0c028fd956338fa9817faae97d4dceaf5f735e7268a6
-EBUILD opencv-2.2.0-r10.ebuild 4395 RMD160 3a6f2fc6752ec38e83da63e7b3b63f67810801e6 SHA1 203ffcc7dfd013c963f494515e0cda12f334f133 SHA256 b301eb7e0e4b3cb2e738c583a326f8a3192ecac1a70139cee07ee4de9ec92da2
-EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6539 RMD160 88621d5c9c767f0d7d06ad6cf3a57ea02c3eeb02 SHA1 bccec9a677055b839c4c34266eae31d66db707ca SHA256 ec9049b018922aaaf05576c2b2571d2ff60d8370ad73a235a1d2a2346e27f810
+EBUILD opencv-2.1.0.ebuild 2943 RMD160 683b3bdbbae189e318f0fe10448ce5167b2bc016 SHA1 0a09bf675b72b6a8bb476ddb22fa3711343171ce SHA256 8568a9107d8b215a9a4b2e818c068f5fa0fcf4a05ab8dbcd3c919848587d165d
+EBUILD opencv-2.2.0-r10.ebuild 4397 RMD160 2bf2fa62e11d3ed4f43f8275c04d906b0042e76b SHA1 46267d062f1179bd4f66c2cfde6da3497f4886e7 SHA256 7eb0131f0ab1bd1090d07432e0b0423821033a48c8df5969e934a1f4919f2a5c
+EBUILD opencv-2.2.0.ebuild 4132 RMD160 3bb7c8352b7269aaac0620e68bf4ecf68cccaaaa SHA1 192bc4d4aa4b19b9159cb6aea87a33c0fae25eff SHA256 d3773048bf5f21ad2b16c9799ad971523aa40c8244df9102a5cc1de48fb57649
+MISC ChangeLog 6690 RMD160 f4cc91e877d0dd35b5fae69554fee168f871ac7c SHA1 0e69114bc5457f60fa1afc0b10831eb17134737f SHA256 bc2f0f5c69514996514dbbdce03cb6c82b531db0ecac520b561341aa9b727e83
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3w9MIACgkQVWmRsqeSphOkWQCfUXnA2n3ebEIK4YcktDcXlOor
-tWAAnR9y/W8idbBOLLMDvsiN6pZnT2Rr
-=vusx
+iEYEARECAAYFAk4AcuYACgkQgAnW8HDreRazVQCgmkj850gVC+/XtM/6/3EwtD3k
+a3cAoLTnio5db1yVVmYGH5VW6m6ekxkS
+=5Cuu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
index 0c5957bf6650..1d8571fa39fd 100644
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.8 2011/06/09 16:28:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.9 2011/06/21 10:30:56 jlec Exp $
 
 EAPI=3
 
@@ -42,6 +42,7 @@ S=${WORKDIR}/${MY_P}
 RESTRICT="test" #296681
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index a0cab960f1cc..a1931544c32f 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.3 2011/05/15 16:42:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.4 2011/06/21 10:30:56 jlec Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}
 
@@ -25,7 +25,6 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
-	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
@@ -85,6 +84,7 @@ CMAKE_BUILD_TYPE="Release"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 99f7d1deb557..ca8303e985a5 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.7 2011/06/21 10:30:56 jlec Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}
 
@@ -25,7 +25,6 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
-	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
@@ -79,6 +78,7 @@ CMAKE_BUILD_TYPE="Release"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup