From ece1521a19813b5b0e39a22a3d0b6ab20fe5dc35 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 12 Jan 2012 16:03:33 +0000
Subject: [PATCH] Also drop fortran from 2.3.0 ebuild #392297.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---
 media-libs/opencv/ChangeLog           |  7 ++++--
 media-libs/opencv/Manifest            | 34 +++++++++++++--------------
 media-libs/opencv/opencv-2.3.0.ebuild |  7 +++---
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 34190cdb1a3a..a28866484add 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
 # 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.63 2011/12/31 22:17:19 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.64 2012/01/12 16:03:33 vapier Exp $
+
+  12 Jan 2012; Mike Frysinger <vapier@gentoo.org> opencv-2.3.0.ebuild:
+  Also drop fortran from 2.3.0 ebuild #392297.
 
 *opencv-2.3.1a-r1 (31 Dec 2011)
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a035cc6e6987..b0845ae648c0 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
 AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
@@ -13,25 +13,25 @@ AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be1
 AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
 DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
 DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008cde5 SHA1 9784e6824c5f677fac82ae83a2f366743adb3299 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
-EBUILD opencv-2.3.0.ebuild 4166 RMD160 505fa5edf33e9035b341c6e9629a0e6eb79222a5 SHA1 adf050ca2678d21d4f354612edab4f014903e324 SHA256 9efe9a986c378f0e9fa826fa0bd5c91f891e0a82b161e5e4949d31137f9c6983
+EBUILD opencv-2.3.0.ebuild 4132 RMD160 aab0b193dd67a36b81d6f6829fd8097a2b868d6f SHA1 d7f99e0fa51847c0b464497925a472d742df53d2 SHA256 e1194175a71749044c5dacf20aa54fd82c910ce39ba8c7e39ed47617c5ab3383
 EBUILD opencv-2.3.1a-r1.ebuild 4208 RMD160 aeb14ca73bd0d14519125ba297c198e4cb0b3716 SHA1 3a24483b95a6426298b03a9b96d1732b2a6d8787 SHA256 2823e5dfe41d7346604314bde8b45158ca1e428f8709ec8edd138080a66abb31
 EBUILD opencv-2.3.1a.ebuild 4168 RMD160 b01928a220ed028fb983b675c714e1d7f4fdb68f SHA1 6491a5cab7d2cfb1b3c465053bb9b42fbe372fa8 SHA256 57ce4152e4dbb3f0dc501745d8bd4784499889d9f147b5aadec928ad2dbc42bf
-MISC ChangeLog 11286 RMD160 61a7ae1fd9a79473afc58e5a8398007f04d14922 SHA1 750d46c9f44585f67933b615ac1f1f5bdcade8e0 SHA256 c1e01c1878fc282795787a7c392730186db48a85b62ce426570ade4bffad3e02
+MISC ChangeLog 11402 RMD160 552cb76cb7eeac2c0a6908dc2b5c72cb67fb5c96 SHA1 48e976a7f02986e762a537c6c4d5ce50a8163285 SHA256 a04d8eac5eff183ef154ce2e59b74fab6cbff6d46c3db8d8b971de10217ca4fd
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO/4pwAAoJEEb+UGWnxTyH4fAQAI8Vv8Z/I19H7lz4aWj8gIQz
-I63l7r4U7He/8P/0G8OAEJZJLuGXRRb6Km4RJRXkeocNZoPcRJS+dZtbvbbkkYVk
-q9pc7IPEr9YP2NjvTQkqt3ZbpUIMqtt0mY2dJ7KMSXgw462SY2zGDzKb+jWy/ohT
-39HnoEXzUi+pw8jRqIDmLKxmj1lWzjoHyd7kZHGvidmNoZvSpU+bCI0Z4wtJ+h9R
-hS/iwy59ZkDCVnopBMSEF1uzHT3Pz49eMQPbAt8WmdVmqM/Uc4ysj9uZB9+aaOoU
-ihfphUcx84YpolX2LD+1AKeqVQG0xRQjkuoPAJm8KOiHkVYb0WPTOj7SIoo+2TpM
-laD6dtqI//ewdtohV6DhNJ16kqaPXzzHQTc6FmG+uhJi6HnyiqA1LxeH+N+5WrQ3
-W2v88CIjhjvyCNHwF9ATKKymiz++tfwaGtWKAbV92z932q+eqv9c0gPmyRTHQFfW
-zOiIRADD69jzRZ0yKywgPcSw8BheiKwoLNirWMfJQEvuPEsQnm/ga+uw8bG2Lf7m
-b5hWjtCuUc7eG47vUgAVBQv0E6vpyQDdfQZ/G5YiIa+1+J7hL0fB7R4UXXrnaDAD
-uMYvZGG7HhPtk+lSnzlRfbGgxVaJt9M2HTCyieSNgj4U11hWDeVVBMO8hNGmq79f
-p7shNh4YbpiZpuudVAEX
-=08Xb
+iQIcBAEBAgAGBQJPDwRjAAoJELEHsLL7fEFWOEsP/AjbMPn8KmjIqK6MNjYZh5L5
+eQdsQZO27rDiL7AxDJXX+Tn2oOvG/1TKwk2X3WL5Am/c1b/HLEaPV/4+v5ZzrFmM
+ToyqOmBM2nSFKUeXfgjUIjeWsMmNSIu/jc6r4uSdH12PPuLUqYrz2qiBhnqwIw+m
+KSpjhykJl1Q8EnG6M9TWUKBbaVuz/0P35++tkMxoVAkLwCE09PX/PSLi0x0gIndw
+cMpLEabS7kyxQytveLX0VmC/rbuKc/Clzjw0i4DDaVK6HpxPgZRALxliS5E0l4IA
+8GpqukUcdpBj2jmQH5rVhtS5QeUcwFpa+cg7ALOzMaIiB4vkJHTCLQqkGzVBWjVh
+MsThm8s40KFGQoekPcefNiq5bEgNOZVckkFp0exvBIojFbjy0+Q1+WPujI9QijLf
+dNGkvAq9WvfqqjSHawfZm1I76yBm5XBx5ECWB9XaLLq7PCcpNH5f4AV/aoHV87Yi
+/iBt0DL2BuCT+hqHvsxh0aMDi91cRX21twe6WGi1lfRNaRbL2IoT+9jEYbCMTND8
+TEA1eHiEaog41wJWyHAm9sfXTTvlCKkFZ0wQDrSx7tNdfN0FU2VMILn3LQKiSBb+
+TYVhi7eYxY8fS0Fa8Rt0whnxxmPpWgLvBav4BtP8moVuKFOMTaZLCNx/gYzoW1Pi
+qyxzn+tAM95DzDRIFyVZ
+=/e6L
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 19a458f9fdef..40adba589cee 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.11 2011/11/22 22:38:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.12 2012/01/12 16:03:33 vapier Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base toolchain-funcs cmake-utils fortran-2 python
+inherit base toolchain-funcs cmake-utils python
 
 MY_P=OpenCV-${PV}
 
@@ -68,7 +68,6 @@ 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
-- 
2.26.2