Add missing inherit, should fix bug 390983

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

5 files changed, 32 insertions, 177 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index e6a693d4b23d..94f9824dd369 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.59 2011/11/14 04:53:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.60 2011/11/22 22:38:59 dilfridge Exp $
+
+  22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+  -opencv-2.3.0-r1.ebuild, opencv-2.3.1a.ebuild:
+  Add missing inherit, should fix bug 390983
 
   14 Nov 2011; Luca Barbato <lu_zero@gentoo.org> opencv-2.3.1a.ebuild,
   +files/opencv-2.3.1a-libav-0.7.patch:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 1386c13168d5..2663931f47c3 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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
 AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
@@ -9,8 +12,24 @@ 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-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7
-EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7
-EBUILD opencv-2.3.1a.ebuild 4179 RMD160 0ba8dbaa4ac15f06ac41fdd76cf8ae41ace4bb03 SHA1 dd2e9163aee5e402154eaae66a410c175e8c4dca SHA256 44497a217fe2cee268c51e1341ee0e1daff5b5a8fe7aa7cbc3c2be1c163896f8
-MISC ChangeLog 10614 RMD160 5f20099079ef57cc3145be2bf5300a752c7aad23 SHA1 95013ec39b33a831bf2b35b2d30b8c315c9e94f8 SHA256 92dfe22912ea1707dd0ee09e523a8534820ff281db0e0efa8ce721f437d0ed7d
+EBUILD opencv-2.3.0.ebuild 4166 RMD160 505fa5edf33e9035b341c6e9629a0e6eb79222a5 SHA1 adf050ca2678d21d4f354612edab4f014903e324 SHA256 9efe9a986c378f0e9fa826fa0bd5c91f891e0a82b161e5e4949d31137f9c6983
+EBUILD opencv-2.3.1a.ebuild 4197 RMD160 6c7b7cbf8cc6605dab23ecf1eb3fb8a997132512 SHA1 414e98fce2eed96865e1b6ae1effabc281e2c65d SHA256 b46f602ed5fbcf6174df029995106aa935222b3a8658ced701d36c0561476fcd
+MISC ChangeLog 10789 RMD160 183e2fc3fc6f63185dafc2add00d69af32d183e6 SHA1 99838139ef3341917e311ce94872e6ef38b83f0c SHA256 a4bd5ebe32f40112a39d6fa3ba325b22a9102b25a8a1fa7a49a39e9649c4a6c4
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOzCSJAAoJENwGBM22xffenP0QAKv5YQ3a49Uh5k0ID3zMSXvR
+PysJEFMuenakHp2HekusAxyNq7tGd+SHgXBylPwW3fjeAE17WSNM/iYdMZ1CzPmV
+2+TwlvCP9EOsFrJ/DC609/hb+xss4VnHC3+uXdXUGxr7bXcHjKcwggdSFkxtnP8l
+encxFqkMLmEEaDkHQU887QFM7vG8M8V1JEZeqzZj+FE6CPTP0uKfTTAwK5+S/Qlo
+kY9vzBd4zI4jPvwKnZe15z1O5KWaGaA1AbiYRYBv6AYKMZGMNqje5V3JGk0wZUhT
+mbO2CWPfEOSCDENAUqAA8UhkuAbeZKBesYFTO6Zu4SOIs7F3udfLgr8uKl9/ZQ6F
+IvYeDRwsb634EHGx7gIjB+bX5dS19TNjjMZDQFL1ffmvNcb+LRNl50Au7giOYnlo
+lED8iuz/NRpg82C0sn5QnYoln0sgaD6AgUW3WUlRhKWKX/FyX49rXvRK+Qq2Jo55
+sJ5ciqD2x/Kp6jBfm1En7L9ChN0S2F52TfQVx5uvp85TCt4kh74ngItwyrVPftbF
++Ip0qHat0cAu3ZHVeCMWgeVFXZKJj6OytFseOejq+1mAWUlQUY2bLcr6hwohDkgl
+zsdatiGlBz/KP157c8+KNPhN269hH5geVC1n71/PquFEz9OXTkLySXicytceAi2H
+oyYjAbNzgMVhs81BHVFu
+=6hEg
+-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0-r1.ebuild b/media-libs/opencv/opencv-2.3.0-r1.ebuild
deleted file mode 100644
index 8fbeaca9eca2..000000000000
--- a/media-libs/opencv/opencv-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.3.0-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	ipp? ( sci-libs/ipp )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-test:4
-		opengl? ( x11-libs/qt-opengl:4 )
-	)
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
-	"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
-	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
-	"${FILESDIR}/${PN}-2.3.0-symlink.patch"
-	"${FILESDIR}/${PN}-2.3.0-libpng15.patch"
-)
-
-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
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_enable sse SSE)
-		$(cmake-utils_use_enable sse2 SSE2)
-		$(cmake-utils_use_enable sse3 SSE3)
-		$(cmake-utils_use_enable ssse3 SSSE3)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with ieee1394 1394)
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4 QT)
-		$(cmake-utils_use_with opengl QT_OPENGL)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with v4l V4L)
-		$(cmake-utils_use_with xine)
-	)
-
-	if use cuda; then
-		if [ "$(gcc-version)" > "4.4" ]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-	fi
-
-	if use python && use examples; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	# unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
-	# openni: ???
-	mycmakeargs+=(
-		"-DUSE_OMIT_FRAME_POINTER=OFF"
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DENABLE_POWERPC=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-		"-DUSE_O2=OFF"
-		"-DUSE_O3=OFF"
-		"-DUSE_FAST_MATH=OFF"
-		"-DENABLE_SSE41=OFF"
-		"-DENABLE_SSE42=OFF"
-		"-DWITH_PVAPI=OFF"
-		"-DWITH_UNICAP=OFF"
-		"-DWITH_TBB=OFF"
-		"-DWITH_OPENNI=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index fcc1d4e632fb..19a458f9fdef 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
 # 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.10 2011/10/15 23:14:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.11 2011/11/22 22:38:59 dilfridge Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils fortran-2 python
+inherit base toolchain-funcs cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}
 
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index b30e15ab4ed0..c086523fff0a 100644
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.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.3.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.4 2011/11/22 22:38:59 dilfridge Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils fortran-2 python
+inherit base toolchain-funcs cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}