ebuild cleanup, adding videotrans dependency (bug #154694), fixed install errors...

Package-Manager: portage-2.1.2-r2

diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 08187d06d8ef8af1888af973fcaf5ec18575665e..71fef61ec434aa9032c286f70bd984aaba7b73bb 100644 (file)
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.13 2007/01/06 21:31:47 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.14 2007/02/10 23:45:51 sbriesen Exp $
+
+*qdvdauthor-0.1.4-r1 (10 Feb 2007)
+
+  10 Feb 2007; Stefan Briesenick <sbriesen@gentoo.org>
+  +qdvdauthor-0.1.4-r1.ebuild:
+  ebuild cleanup, adding videotrans dependency (bug #154694), fixed install
+  errors with non-standard PORTAGE_TMPDIR (bug #118697).
 
 *qdvdauthor-0.1.4 (06 Jan 2007)
 

diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 419cc9c2ec200aea91ced10b74f2de2f124adf8b..cdc8adda91e187c173115bbf5b83d84555ed1f2e 100644 (file)
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -4,14 +4,18 @@ EBUILD qdvdauthor-0.1.2-r1.ebuild 2572 RMD160 c6ea88f88959fbd6cf6aa54f114e31df07
 MD5 ce53e5116470a2b4f3d32da49014fa30 qdvdauthor-0.1.2-r1.ebuild 2572
 RMD160 c6ea88f88959fbd6cf6aa54f114e31df070798e5 qdvdauthor-0.1.2-r1.ebuild 2572
 SHA256 5764e1ad3e003ef55874186c82018da914d48e6bfdf531d0b3c71f794716b205 qdvdauthor-0.1.2-r1.ebuild 2572
+EBUILD qdvdauthor-0.1.4-r1.ebuild 2707 RMD160 cb924a1453cb9f1c56d89c1bbe035ee5ec36d4f1 SHA1 494afd907dbd71b156c5c7bafce2211fff68345d SHA256 1857a943b2fe5ee0594c24d5564575082b8fd3a3b0101d79d3bce06002cc6528
+MD5 3a525c55d5537c212cfd96952df5a9ab qdvdauthor-0.1.4-r1.ebuild 2707
+RMD160 cb924a1453cb9f1c56d89c1bbe035ee5ec36d4f1 qdvdauthor-0.1.4-r1.ebuild 2707
+SHA256 1857a943b2fe5ee0594c24d5564575082b8fd3a3b0101d79d3bce06002cc6528 qdvdauthor-0.1.4-r1.ebuild 2707
 EBUILD qdvdauthor-0.1.4.ebuild 2603 RMD160 36769a224b38f3d293bce0f7cab304007582a6de SHA1 820b25b720f609f0fae76c0482d3a85914340ca9 SHA256 2e2b6cfdff41a4696fe6599b358934d23256f7ee2eb8d4516a226f12308b124c
 MD5 fed11a5e34500ac45a550d28abacb04b qdvdauthor-0.1.4.ebuild 2603
 RMD160 36769a224b38f3d293bce0f7cab304007582a6de qdvdauthor-0.1.4.ebuild 2603
 SHA256 2e2b6cfdff41a4696fe6599b358934d23256f7ee2eb8d4516a226f12308b124c qdvdauthor-0.1.4.ebuild 2603
-MISC ChangeLog 2155 RMD160 cee7ae3791b1aacae3aef4c4817f4d0f4b67c2c8 SHA1 b66a0be248fdd324a71386dae132a05e62101be2 SHA256 19b97de6007e7c991221859bd91ad64722efee7d2de61e14282979dd5920553e
-MD5 206eee2d014de69655b35ab1cc9edac3 ChangeLog 2155
-RMD160 cee7ae3791b1aacae3aef4c4817f4d0f4b67c2c8 ChangeLog 2155
-SHA256 19b97de6007e7c991221859bd91ad64722efee7d2de61e14282979dd5920553e ChangeLog 2155
+MISC ChangeLog 2411 RMD160 2fb52c324f4e06b048a2bd88cffbdad8dd790fdf SHA1 2f8ba1473d02f2d15f13a58516e4f6cbfe7f09e0 SHA256 99a7ca055dbd9f08813df30fd58bc8371b5e0f89861fe15967d9716543aa322d
+MD5 406d44885e57ff8d45a1e5ee108330b9 ChangeLog 2411
+RMD160 2fb52c324f4e06b048a2bd88cffbdad8dd790fdf ChangeLog 2411
+SHA256 99a7ca055dbd9f08813df30fd58bc8371b5e0f89861fe15967d9716543aa322d ChangeLog 2411
 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 48f0e7b56d0cc5ec28b109f00e8547aea27b0b76d92d20d39e7988d5082f1084 files/di
 MD5 17b758096ddfd96498cd3845892dfc68 files/digest-qdvdauthor-0.1.4 253
 RMD160 beb5696109b2434cbd1b93a5fef84e8fc848c4e3 files/digest-qdvdauthor-0.1.4 253
 SHA256 1609aad62470f3cdc820ce3e5ad348fe79616eb4ccbf20a7a1f2b81551289581 files/digest-qdvdauthor-0.1.4 253
+MD5 17b758096ddfd96498cd3845892dfc68 files/digest-qdvdauthor-0.1.4-r1 253
+RMD160 beb5696109b2434cbd1b93a5fef84e8fc848c4e3 files/digest-qdvdauthor-0.1.4-r1 253
+SHA256 1609aad62470f3cdc820ce3e5ad348fe79616eb4ccbf20a7a1f2b81551289581 files/digest-qdvdauthor-0.1.4-r1 253

diff --git a/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.4-r1 b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.4-r1
new file mode 100644 (file)
index 0000000..84b984b
--- /dev/null
+++ b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.4-r1
@@ -0,0 +1,3 @@
+MD5 7f81f2f915a1a5709a584b839a750110 qdvdauthor-0.1.4.tar.gz 3405853
+RMD160 e38f21602abfc2aec09c782e376c6514be11d93a qdvdauthor-0.1.4.tar.gz 3405853
+SHA256 1ec3a9d2b609f5ee5da643b86beeb209bde43b2a03cb92fd7c6f660d941b4b54 qdvdauthor-0.1.4.tar.gz 3405853

diff --git a/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild b/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild
new file mode 100644 (file)
index 0000000..91be83d
--- /dev/null
+++ b/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild,v 1.1 2007/02/10 23:45:51 sbriesen Exp $
+
+inherit eutils flag-o-matic 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 ) )
+       $(qt_min_version 3.2)"
+
+RDEPEND="${DEPEND}
+       media-libs/netpbm
+       media-video/videotrans
+       media-sound/toolame
+       media-sound/lame
+       media-sound/sox"
+
+# TODO:
+# media-video/dvd-slideshow -> optional
+# installing further tools -> needs evaluation
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # do not over-optimize (see bug #147250)
+       replace-flags -O? -O2
+       filter-flags -finline-functions
+
+       # set our C(XX)FLAGS
+       for PRO in */*.pro */*/*.pro; do
+               echo "QMAKE_CFLAGS_RELEASE = ${CFLAGS}" >> "${PRO}"
+               echo "QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}" >> "${PRO}"
+       done
+
+       # full-qualify qmake in configure and append -nocache (see bug #118697)
+       sed -i -e "s:make;:make ${MAKEOPTS};:g" \
+               -e "s:qmake:\${QTDIR}/bin/qmake -nocache 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="--prefix=/usr --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 ${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 README TODO doc/{ISO_639,lookinto,render*,sound*,todo*}.txt
+       dohtml doc/html/en/*
+
+       domenu qdvdauthor.desktop
+       doicon qdvdauthor.png
+}