Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported by Blorby in bug #239563, patch stolen from Exherbo

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25.9 x86_64

4 files changed, 44 insertions, 7 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index ac9b5b0aeb22..ac178b2784a3 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.6 2008/09/14 18:46:32 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.7 2008/10/12 22:45:33 gentoofan23 Exp $
+
+  12 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/opencv-1.0.0-swiginvalidlinkingoptions.patch,
+  opencv-1.0.0-r1.ebuild:
+  Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported
+  by Blorby in bug #239563, patch stolen from Exherbo
 
   14 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Picking up maintainership as current maintainer is inactive.
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c4620cd95f18..b1b6788c1b74 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,14 +8,15 @@ AUX opencv-1.0.0-enableuseflags.patch 5107 RMD160 fb23cfe9ff83be4196f85448d46240
 AUX opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch 3076 RMD160 321211a9bfbe98875ced91c79f1744c7d9dd76d8 SHA1 9672cc37ba5bd6de0fcfc2b24e58d3d9347d1437 SHA256 844fd579d2379dc57b0e9d7ce97a36c6a6efafbae4e146c2a6d44c88b7e76222
 AUX opencv-1.0.0-fixpythonmultilib.patch 423 RMD160 a3cdb0c1a25b4f8ab8447ac6e4776ade2daad458 SHA1 f3d43b10b5cdfd77ce50cfea7cf9c1431479c5de SHA256 317750f75417b5e2434c09f8244d347c7340eebe721579c7f39639b526af61fb
 AUX opencv-1.0.0-havepngexrdefs.patch 1869 RMD160 477e487f34c9ebdc8e7666d2d6c7369a44bde7ed SHA1 9c7df4269887a5d5d3e2a4b17840f168098224f2 SHA256 5b077c9958d1699ec8b1d1c952f90d2830d4a4f9b0fe7a01a21747a6280f12d6
+AUX opencv-1.0.0-swiginvalidlinkingoptions.patch 1366 RMD160 7e8c981b2e68fb7d44e40f635ea5c9f0819a313b SHA1 c813390e053a8aced97958303319dd245692ed6a SHA256 7a0754ea8cfb4f1a7efafc3799fed4885a2c0fe7bf31cd3e007e64f7c411956c
 DIST opencv-1.0.0.tar.gz 11146334 RMD160 f041798ea63101b90e945957e0d0ad3f7497dcd4 SHA1 c7dd500703b0060cedfa049fcb33de0846e631fb SHA256 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
-EBUILD opencv-1.0.0-r1.ebuild 2592 RMD160 392950ff0dc1bb550d3e708200dc970b2f9a07e6 SHA1 863ef44bfa65c5a54086186e28b6d03e016157a1 SHA256 1bf4b9315c1090ac9b5a9d5c04e7bb9eaf8cc20320cfdf2a9f94902533d04824
-MISC ChangeLog 1550 RMD160 cc4c56f778da72756fb327ba1f536dc6e27f48f6 SHA1 6f6f05f9b4f044aa1ce566f1ca7213420d25d1a1 SHA256 7fe05f9f60767c89173da99a5ec98c396de8ec71bc52a32a418ceecd40934af8
+EBUILD opencv-1.0.0-r1.ebuild 2654 RMD160 b5e4f0224523e944931b48f5a0d1a594751241b5 SHA1 a5ceecc05ee683a1bab254d985665b527fdc4bd8 SHA256 01e535e80288820378a48abbe9a894919cdcc2706e884264ea6f51c002bfa244
+MISC ChangeLog 1821 RMD160 b5a4935d624cd23784a5877818acc750986bb4ca SHA1 240f3a4a9f280f0c8ae82d2637e6de8b57370f9a SHA256 fcd161621e5e1ac5ff013b7938b8760ecf7cb8cf0c27fe7555c32a79bc885bf4
 MISC metadata.xml 872 RMD160 8365fc7f0d5ecad7fa77f98c817fafebc9628aef SHA1 4c2a015507d8cdc117fdd660e90839c3fceb1e8a SHA256 8bf45696ca2b2e4f79d82dac735a89e7d526d1c4b9ef00343b574ff3eb841839
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjNX9EACgkQF6yMcaBxwHkZUwCfdPQXbUkAEpEGy0uupdMOaxwr
-FNcAmgPFftH0rYQc48ijCoMP5/OVbC9M
-=RCec
+iEYEARECAAYFAkjyfhgACgkQF6yMcaBxwHnvxwCgiHJncj2XELbKze6QpGdvx6XU
+dAMAn1rgoc4vZpro14vwgVbUnfIYdLUD
+=hIrt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
new file mode 100644
index 000000000000..02e100a4a0fa
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
@@ -0,0 +1,29 @@
+--- opencv-1.0.0-orig/autotools/aclocal/swig_complete.m4	2006-07-18 07:45:24.000000000 +0000
++++ opencv-1.0.0/autotools/aclocal/swig_complete.m4	2008-09-13 17:57:48.000000000 +0000
+@@ -163,7 +163,7 @@
+     if test x"$ac_version_at_least" = "xyes"; then
+       SWIG_PYTHON_LIBS=""
+     else
+-      SWIG_PYTHON_LIBS="$SWIG_RUNTIME_LIBS_DIR -lswigpy"
++      SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy"
+     fi
+   else
+     AC_MSG_ERROR([SWIG version number unknown - cannot set python libs])
+--- opencv-1.0.0-orig/interfaces/swig/python/Makefile.am	2006-08-10 13:29:20.000000000 +0000
++++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2008-09-13 17:59:46.000000000 +0000
+@@ -107,13 +107,13 @@
+ _cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
+ _cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
+ _cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+-                    -L$(SWIG_PYTHON_LIBS)
++                    $(SWIG_PYTHON_LIBS)
+ 
+ _highgui_la_SOURCES    = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+                          highgui.i
+ _highgui_la_CXXFLAGS     = $(PYTHON_CSPEC)
+ _highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la
+ _highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+-                           -L$(SWIG_PYTHON_LIBS)
++                           $(SWIG_PYTHON_LIBS)
+ 
+ endif
diff --git a/media-libs/opencv/opencv-1.0.0-r1.ebuild b/media-libs/opencv/opencv-1.0.0-r1.ebuild
index 9a130d4eb858..54a4d17db5c0 100644
--- a/media-libs/opencv/opencv-1.0.0-r1.ebuild
+++ b/media-libs/opencv/opencv-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.2 2008/06/29 14:41:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.3 2008/10/12 22:45:33 gentoofan23 Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic autotools
@@ -45,6 +45,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-addoptionalsamples.patch
 	epatch "${FILESDIR}"/${P}-cvcapffmpegundefinedsymbols.patch
 	epatch "${FILESDIR}"/${P}-ffmpeg-0.4.9_p20080326.patch
+	epatch "${FILESDIR}"/${P}-swiginvalidlinkingoptions.patch
 
 	eautoreconf || die "eautoreconf failed"
 }