interactivity removed - bug #104793

(Portage version: 2.0.51.22-r2)

4 files changed, 39 insertions, 8 deletions

diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 4b41ba7353c7..09c637d2490f 100644
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.5 2005/07/28 11:03:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.6 2005/09/04 12:55:19 dragonheart Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/qdvdauthor-0.0.9-nointeractive.patch, qdvdauthor-0.0.9.ebuild:
+  interactivity removed - bug #104793 thanks to Patrick Lauer
 
   28 Jul 2005; David Holm <dholm@gentoo.org> qdvdauthor-0.0.9.ebuild:
   Added to ~ppc.
diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 4abf19277b2e..1f3d12eab9df 100644
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -1,4 +1,5 @@
 MD5 d69cd84e6c42d186e3ea11426ed4ddcb ChangeLog 689
 MD5 59aae5dcb06a68bd02cec60c627dbe53 metadata.xml 253
-MD5 27d652120631ae65a31df4eaf67b22a2 qdvdauthor-0.0.9.ebuild 2147
+MD5 a7e7898f5c92e5725ac5f3d3889dc31c qdvdauthor-0.0.9.ebuild 2261
 MD5 6d09c05eb5f5caa3cd56c0a70a2fc21d files/digest-qdvdauthor-0.0.9 68
+MD5 cce352b8695bcf9ae6b0d8f5afcbfadd files/qdvdauthor-0.0.9-nointeractive.patch 632
diff --git a/media-video/qdvdauthor/files/qdvdauthor-0.0.9-nointeractive.patch b/media-video/qdvdauthor/files/qdvdauthor-0.0.9-nointeractive.patch
new file mode 100644
index 000000000000..5e89e9dd7ce9
--- /dev/null
+++ b/media-video/qdvdauthor/files/qdvdauthor-0.0.9-nointeractive.patch
@@ -0,0 +1,21 @@
+--- ./qdvdauthor/qdvdauthor.pro.orig	2005-09-04 22:24:32.000000000 +1000
++++ ./qdvdauthor/qdvdauthor.pro	2005-09-04 22:25:41.000000000 +1000
+@@ -14,18 +14,6 @@
+ WHICH_DEBUG = $$(DEBUG_QDVDAUTHOR)
+ 
+ # Sanity check if at least one library is set ...
+-isEmpty(HAS_MPLAYER_SUPPORT) {
+-	isEmpty(HAS_XINE_SUPPORT) {
+-		isEmpty(HAS_VLC_SUPPORT) {
+-			exists (../bin/configurator)	{
+-				system (../bin/configurator &)
+-			} else {
+-				system (cd ..; ./configure &)
+-			}
+-			error ( "Please use configurator or set all neccesary environment variables before calling qmake" )
+-		}
+-	}
+-}
+ isEmpty(WHICH_PREFIX)	{
+ 	WHICH_PREFIX = /usr
+ }
diff --git a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild b/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
index ef6c5be7799f..f8bbec8e4aec 100644
--- a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
+++ b/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.4 2005/07/28 11:03:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.5 2005/09/04 12:55:19 dragonheart Exp $
 
-inherit kde-functions
+inherit qt3 eutils
 
 DESCRIPTION="QDVDAuthor, the GUI frontend for dvdauthor and other related tools."
 HOMEPAGE="http://qdvdauthor.sourceforge.net/"
@@ -19,14 +19,19 @@ DEPEND=">=media-video/dvdauthor-0.6.10
 	>=media-video/dvd-slideshow-0.6.0
 	media-sound/sox
 	media-sound/lame
-	media-libs/libogg"
+	media-libs/libogg
+	$(qt_min_version 3.2)"
 
 # xine-libs or mplayer libs or media-video/vlc - mplayer use flags?
 
-need-qt 3.2
-
 # >=media-video/dvd-slideshow-0.6.0 -> optional
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nointeractive.patch
+}
+
 src_compile() {
 
 	./configure --with-xine-support || die "config fault"
@@ -36,7 +41,7 @@ src_compile() {
 	#export QT_LIB="$QTDIR"
 	sed -i "s|/usr/local/bin|/usr/bin|g" qdvdauthor/qdvdauthor.cpp qdvdauthor/dialogexecute.cpp doc/sound.txt
 	cd qdvdauthor
-	${QTDIR}/bin/qmake qdvdauthor.pro
+	${QTDIR}/bin/qmake qdvdauthor.pro || die 'qmake failed'
 
 	# fixing Makefile, so that we can use our CFLAGS
 	sed -i -e "s|^CFLAGS.*-O2|CFLAGS = ${CFLAGS} |g" -e "s|^CXXFLAGS.*-O2|CXXFLAGS = ${CXXFLAGS} |g" Makefile