summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2004-04-20 06:54:20 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2004-04-20 06:54:20 +0000
commitfc72c84eb802bed35c2598ce140fd6a91d59ff3e (patch)
tree0efc9c3f205b3cd420b706e469c4099a91f2f141 /media-video/camstream
parentrepoman: Trim trailing whitespace (Manifest recommit) (diff)
downloadgentoo-2-fc72c84eb802bed35c2598ce140fd6a91d59ff3e.tar.gz
gentoo-2-fc72c84eb802bed35c2598ce140fd6a91d59ff3e.tar.bz2
gentoo-2-fc72c84eb802bed35c2598ce140fd6a91d59ff3e.zip
Fixed what was broken by the last fixes, moved .3 to stable, cleanup.
Diffstat (limited to 'media-video/camstream')
-rw-r--r--media-video/camstream/ChangeLog8
-rw-r--r--media-video/camstream/camstream-0.26.2.ebuild33
-rw-r--r--media-video/camstream/camstream-0.26.3.ebuild17
-rw-r--r--media-video/camstream/files/digest-camstream-0.26.21
4 files changed, 19 insertions, 40 deletions
diff --git a/media-video/camstream/ChangeLog b/media-video/camstream/ChangeLog
index fa957f54d2de..e901336880ed 100644
--- a/media-video/camstream/ChangeLog
+++ b/media-video/camstream/ChangeLog
@@ -1,6 +1,10 @@
# 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.8 2004/01/04 02:26:04 caleb Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/ChangeLog,v 1.9 2004/04/20 06:54:20 phosphan Exp $
+
+ 20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
+ camstream-0.26.3.ebuild:
+ Fixed what was broken by the last fixes, moved .3 to stable, cleanup.
03 Jan 2004; Caleb Tennis <caleb@gentoo.org> camstream-0.26.2.ebuild,
camstream-0.26.3.ebuild:
diff --git a/media-video/camstream/camstream-0.26.2.ebuild b/media-video/camstream/camstream-0.26.2.ebuild
deleted file mode 100644
index df7d98922350..000000000000
--- a/media-video/camstream/camstream-0.26.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.8 2004/01/04 02:26:04 caleb Exp $
-
-DESCRIPTION="Collection of tools for webcams and other video devices"
-HOMEPAGE="http://www.smcc.demon.nl/camstream/"
-SRC_URI="http://www.smcc.demon.nl/camstream/download/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-IUSE="doc"
-
-# camstream configure script gets it wrong, sometimes
-DEPEND=">=x11-libs/qt-3"
-
-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 () {
- dobin camstream/camstream camstream/caminfo camstream/ftpput
- dodir /usr/share/${PN}/icons
- insinto /usr/share/${PN}/icons
- doins camstream/icons/*.png
- use doc && dohtml -r docs/*
-}
diff --git a/media-video/camstream/camstream-0.26.3.ebuild b/media-video/camstream/camstream-0.26.3.ebuild
index 82bb04be51d5..adfe453ea7e7 100644
--- a/media-video/camstream/camstream-0.26.3.ebuild
+++ b/media-video/camstream/camstream-0.26.3.ebuild
@@ -1,18 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.3.ebuild,v 1.2 2004/01/04 02:26:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.3.ebuild,v 1.3 2004/04/20 06:54:20 phosphan Exp $
DESCRIPTION="Collection of tools for webcams and other video devices"
HOMEPAGE="http://www.smcc.demon.nl/camstream/"
SRC_URI="http://www.smcc.demon.nl/camstream/download/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
SLOT="0"
IUSE="doc"
-# camstream configure script gets it wrong, sometimes
DEPEND=">=x11-libs/qt-3"
+src_compile () {
+ # Need to fake out Qt or we'll get sandbox problems
+ REALHOME="$HOME"
+ mkdir -p $T/fakehome/.qt
+ export HOME="$T/fakehome"
+ addwrite "${QTDIR}/etc/settings"
+ econf || die "configure failed"
+ emake || die "emake failed"
+}
+
src_install () {
dobin camstream/camstream camstream/caminfo camstream/ftpput
dodir /usr/share/${PN}/icons
diff --git a/media-video/camstream/files/digest-camstream-0.26.2 b/media-video/camstream/files/digest-camstream-0.26.2
deleted file mode 100644
index b91ee31b1e49..000000000000
--- a/media-video/camstream/files/digest-camstream-0.26.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f2f245f6c7c1255ee60a007527e2fd2 camstream-0.26.2.tar.gz 1582487