minor ebuild cleanup, adding optional mplayer support (solving bug #119756 and #141063).

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 97 insertions, 5 deletions

diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 850959b3f834..f8d63790424c 100644
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.9 2006/09/15 02:43:39 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.10 2006/09/15 13:42:16 sbriesen Exp $
+
+*qdvdauthor-0.1.2-r1 (15 Sep 2006)
+
+  15 Sep 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +qdvdauthor-0.1.2-r1.ebuild:
+  minor ebuild cleanup, adding optional mplayer support (solving bug #119756
+  and #141063).
 
 *qdvdauthor-0.1.2 (15 Sep 2006)
 
diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 2dc1cfb1a043..63b0c3be289f 100644
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -4,14 +4,18 @@ EBUILD qdvdauthor-0.1.0.ebuild 1962 RMD160 656a9d0167c766d6430ddf99ea1de1d63de0b
 MD5 3d28c56f464fdbbe92d664dd936a1cbc qdvdauthor-0.1.0.ebuild 1962
 RMD160 656a9d0167c766d6430ddf99ea1de1d63de0bdde qdvdauthor-0.1.0.ebuild 1962
 SHA256 cd8d73662e00c55ae0971507ca63f52acfea2f1c85b66007505757b654ea8d67 qdvdauthor-0.1.0.ebuild 1962
+EBUILD qdvdauthor-0.1.2-r1.ebuild 2476 RMD160 e5fd279464299da19a8fac3e57a99c7b40e28207 SHA1 4815438f2372043881ea77756c6ff6d7598636d4 SHA256 362cdb9097f2235df064a8063089eec764b4b88d7392e9a9369e054104d3f720
+MD5 082c286936ae1e5acb527ed790b72b7a qdvdauthor-0.1.2-r1.ebuild 2476
+RMD160 e5fd279464299da19a8fac3e57a99c7b40e28207 qdvdauthor-0.1.2-r1.ebuild 2476
+SHA256 362cdb9097f2235df064a8063089eec764b4b88d7392e9a9369e054104d3f720 qdvdauthor-0.1.2-r1.ebuild 2476
 EBUILD qdvdauthor-0.1.2.ebuild 1962 RMD160 a7d05b7b0d9b703d1c78c933c69d273b79b4ce8e SHA1 61a0f6de34a41a2d5fcefd95d2a5c30e8bfe2981 SHA256 4ad4a354f57b568e66ec38216014d2eadef09135d0bb84a8754304b559e158d0
 MD5 a99f63fdaf05270e45ca912fa5198ecb qdvdauthor-0.1.2.ebuild 1962
 RMD160 a7d05b7b0d9b703d1c78c933c69d273b79b4ce8e qdvdauthor-0.1.2.ebuild 1962
 SHA256 4ad4a354f57b568e66ec38216014d2eadef09135d0bb84a8754304b559e158d0 qdvdauthor-0.1.2.ebuild 1962
-MISC ChangeLog 1468 RMD160 ce9173ba4a418c67babb2841c82593ad6a9bff84 SHA1 1120a54ef812bf2740dcceb4a7cd43be6a091469 SHA256 5d87733f74176bcf05e60ca111547074b62ab9474b860574e93fb697d69de2f6
-MD5 53cef0936ccb4996b60c8efce1b8d96b ChangeLog 1468
-RMD160 ce9173ba4a418c67babb2841c82593ad6a9bff84 ChangeLog 1468
-SHA256 5d87733f74176bcf05e60ca111547074b62ab9474b860574e93fb697d69de2f6 ChangeLog 1468
+MISC ChangeLog 1685 RMD160 382c43719b77bdf90074616266899df578c894e2 SHA1 ae9b24ceb5ca481d5764683b66037f0bdb3bb34d SHA256 35e467933466bc000875697fe4e308c600a6a902d41c0650e0fa92a9e9a3337c
+MD5 572f169685bcc153fa7326bfb9fd9692 ChangeLog 1685
+RMD160 382c43719b77bdf90074616266899df578c894e2 ChangeLog 1685
+SHA256 35e467933466bc000875697fe4e308c600a6a902d41c0650e0fa92a9e9a3337c ChangeLog 1685
 MISC metadata.xml 371 RMD160 d56b2bd934b3a2196587c1e1a7aa5e2388c80546 SHA1 6dff8688f4d12784e393559b38714974907e0ea7 SHA256 4e408954db4502b24884dced0c0e5a0867f665598cdffde28c1a4cdd3f188cca
 MD5 5fcdbe92257f80de63c774815ce48851 metadata.xml 371
 RMD160 d56b2bd934b3a2196587c1e1a7aa5e2388c80546 metadata.xml 371
@@ -22,3 +26,6 @@ SHA256 b239b0485cce252b3667b9887fb0309da227bcc91a2c0707578151cfa7f4e7a8 files/di
 MD5 9a9f39b80300a0375ff3da5eee2d5cc8 files/digest-qdvdauthor-0.1.2 253
 RMD160 0e0ab13731e37594fbc071870f65157ccd301f93 files/digest-qdvdauthor-0.1.2 253
 SHA256 48f0e7b56d0cc5ec28b109f00e8547aea27b0b76d92d20d39e7988d5082f1084 files/digest-qdvdauthor-0.1.2 253
+MD5 9a9f39b80300a0375ff3da5eee2d5cc8 files/digest-qdvdauthor-0.1.2-r1 253
+RMD160 0e0ab13731e37594fbc071870f65157ccd301f93 files/digest-qdvdauthor-0.1.2-r1 253
+SHA256 48f0e7b56d0cc5ec28b109f00e8547aea27b0b76d92d20d39e7988d5082f1084 files/digest-qdvdauthor-0.1.2-r1 253
diff --git a/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2-r1 b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2-r1
new file mode 100644
index 000000000000..b63478d68e1e
--- /dev/null
+++ b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2-r1
@@ -0,0 +1,3 @@
+MD5 c0034c2e432299dd62154d0b4f230b7f qdvdauthor-0.1.2.tar.gz 1776330
+RMD160 fb21ec8757d826a9c331d5d7f59a87f406962a7d qdvdauthor-0.1.2.tar.gz 1776330
+SHA256 29d005464d2279ef858ba2dd85507aa12b9fc497794bd145b5fe477b140a9da8 qdvdauthor-0.1.2.tar.gz 1776330
diff --git a/media-video/qdvdauthor/qdvdauthor-0.1.2-r1.ebuild b/media-video/qdvdauthor/qdvdauthor-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..5143836e4cb8
--- /dev/null
+++ b/media-video/qdvdauthor/qdvdauthor-0.1.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.1.2-r1.ebuild,v 1.1 2006/09/15 13:42:16 sbriesen Exp $
+
+inherit eutils qt3
+
+DESCRIPTION="'Q' DVD-Author is a GUI frontend for dvdauthor written in Qt"
+HOMEPAGE="http://qdvdauthor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qdvdauthor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xine mplayer"
+DEPEND=">=media-video/dvdauthor-0.6.11
+	>=media-gfx/imagemagick-6.1.8.8
+	>=media-video/mjpegtools-1.6.2
+	>=media-video/dvd-slideshow-0.7.2
+	xine? ( >=media-libs/xine-lib-1.1.0 )
+	mplayer? ( media-video/mplayer )
+	!xine? ( !mplayer? ( >=media-libs/xine-lib-1.1.0 ) )
+	media-sound/sox
+	media-sound/lame
+	media-libs/libogg
+	$(qt_min_version 3.2)"
+
+# TODO:
+# media-video/dvd-slideshow -> optional
+# installing further tools -> needs evaluation
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# set our C(XX)FLAGS
+	for PRO in qdvdauthor/*.pro qdvdauthor/*/*.pro; do
+		echo "QMAKE_CFLAGS_RELEASE = ${CFLAGS}" >> ${PRO}
+		echo "QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}" >> ${PRO}
+	done
+
+	# full-qualify qmake in configure
+	sed -i -e "s:make;:make ${MAKEOPTS};:g" \
+		-e "s:qmake:\${QTDIR}/bin/qmake QMAKE=\${QTDIR}/bin/qmake:g" configure
+
+	# fixing defaults from /usr/local/bin to gentoo default /usr/bin
+	sed -i "s:/usr/local/bin:/usr/bin:g" qdvdauthor/qdvdauthor.cpp \
+		qdvdauthor/dialog*.cpp qdvdauthor/qslideshow/dialog*.cpp doc/sound.txt
+}
+
+src_compile() {
+	local myconf="--build-qplayer --build-qslideshow"
+
+	# select backend (VLC is currently broken)
+	#use vlc && myconf="${myconf} --with-vlc-support"
+	use xine && myconf="${myconf} --with-xine-support"
+	use mplayer && myconf="${myconf} --with-mplayer-support"
+
+	# if no backend selected, use XINE as default
+	if ! use xine && ! use mplayer; then
+		myconf="${myconf} --with-xine-support"
+	fi
+
+	./configure --prefix=/usr ${myconf} || die "configure failed"
+}
+
+src_install() {
+	make -C qdvdauthor            INSTALL_ROOT="${D}" install || die "qdvdauthor install failed"
+	make -C qdvdauthor/qslideshow INSTALL_ROOT="${D}" install || die "qslideshow install failed"
+	make -C qdvdauthor/qplayer    INSTALL_ROOT="${D}" install || die "qplayer install failed"
+
+	dobin bin/{qdvdauthor,qslideshow,qplayer}
+	dodoc CHANGELOG INSTALL README TODO doc/{bugs,ISO_639,render*,sound*,todo*}.txt
+	domenu qdvdauthor.desktop
+	doicon qdvdauthor.png
+}