Fixing bug 31940

5 files changed, 44 insertions, 12 deletions

diff --git a/media-video/camstream/ChangeLog b/media-video/camstream/ChangeLog
index 57c441089737..eb50d5bdc835 100644
--- a/media-video/camstream/ChangeLog
+++ b/media-video/camstream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/camstream
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/ChangeLog,v 1.5 2003/11/14 09:14:18 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/ChangeLog,v 1.6 2003/11/19 11:18:30 phosphan Exp $
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
+  files/camstream-0.26.2-gcc33-multiline-string-fix.patch,
+  files/uicmocpath.patch:
+  Now really fixing bug 31940 (uic/moc not found error)
 
   14 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
   files/camstream-0.26.2-fix-qt-dir.patch:
diff --git a/media-video/camstream/Manifest b/media-video/camstream/Manifest
index 03eeb8c90102..489a1267d1b8 100644
--- a/media-video/camstream/Manifest
+++ b/media-video/camstream/Manifest
@@ -1,5 +1,6 @@
-MD5 c0346c12a2711ec180276610cac3dbbd camstream-0.26.2.ebuild 932
-MD5 ac641fea5cff2782b9873ff4ee9ed0a6 ChangeLog 1204
+MD5 c4108adf67a9c64b0834e736cd50e52b camstream-0.26.2.ebuild 1092
+MD5 03fea4debeb4c2746c66178f4ced8111 ChangeLog 1424
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
-MD5 442c06ba3d78db581784e3f1e3410fce files/camstream-0.26.2-gcc33-multiline-string-fix.patch 922
+MD5 e44f9499a8044ecb7eb25cc6aa60f587 files/uicmocpath.patch 692
+MD5 fa77f9f938f5a434d5732389213b7b5a files/camstream-0.26.2-gcc33-multiline-string-fix.patch 888
 MD5 16c80fafcb4c0feffe28ec968596af68 files/digest-camstream-0.26.2 69
diff --git a/media-video/camstream/camstream-0.26.2.ebuild b/media-video/camstream/camstream-0.26.2.ebuild
index bd61f6ef29c5..9f6c059dc5dc 100644
--- a/media-video/camstream/camstream-0.26.2.ebuild
+++ b/media-video/camstream/camstream-0.26.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.2.ebuild,v 1.6 2003/11/14 09:14:18 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.2.ebuild,v 1.7 2003/11/19 11:18:30 phosphan Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Collection of tools for webcams and other video devices"
 HOMEPAGE="http://www.smcc.demon.nl/camstream/"
@@ -10,17 +12,21 @@ KEYWORDS="x86"
 SLOT="0"
 IUSE="doc"
 
-DEPEND="virtual/x11
-	virtual/glibc
-	>=x11-libs/qt-2.2.2*
-	"
+need-qt 3
+
+# camstream configure script gets it wrong, sometimes
+
+DEPEND="virtual/x11"
 
 src_unpack() {
 	unpack ${A}
-
+	cd ${S}
 	# Patch to fix an instance of a multi-line string which gcc-3.3.x dislikes greatly.
 	# Closes Bug #30292
 	epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch
+
+	# configure script sometimes can't fund uic/moc, see bug 31940
+	epatch ${FILESDIR}/uicmocpath.patch
 }
 
 src_install () {
diff --git a/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
index ded6899887d2..d56eb4de22a6 100644
--- a/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
+++ b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
@@ -1,5 +1,5 @@
---- ./camstream-0.26.2/camstream/ftpput.cc	2002-05-01 01:23:20.000000000 +0100
-+++ ./camstream-0.26.2/camstream/ftpput.cc.patched	2003-10-04 05:26:00.000000000 +0100
+--- ./camstream/ftpput.cc	2002-05-01 01:23:20.000000000 +0100
++++ ./camstream/ftpput.cc.patched	2003-10-04 05:26:00.000000000 +0100
 @@ -35,18 +35,19 @@
  
  void CFTPPut::Usage()
diff --git a/media-video/camstream/files/uicmocpath.patch b/media-video/camstream/files/uicmocpath.patch
new file mode 100644
index 000000000000..fbe1269312da
--- /dev/null
+++ b/media-video/camstream/files/uicmocpath.patch
@@ -0,0 +1,20 @@
+--- camstream/configure	2003-11-19 11:08:18.000000000 +0100
++++ camstream/configure.new	2003-11-19 11:29:49.000000000 +0100
+@@ -2731,7 +2731,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/lib/qt2/bin:/usr/lib/qt3/bin:/usr/local/qt/bin
++for as_dir in ${QTDIR}/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -2772,7 +2773,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/lib/qt2/bin:/usr/lib/qt3/bin:/usr/local/qt/bin
++for as_dir in ${QTDIR}/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.