some cleaups + removed old versions.

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 275 deletions

diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 38e7d7b3b6fa..64efc72555a7 100644
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.19 2008/03/16 22:31:44 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.20 2008/03/17 22:16:28 sbriesen Exp $
+
+  17 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  -qdvdauthor-0.1.4-r1.ebuild, -qdvdauthor-1.0.0_rc1.ebuild,
+  -qdvdauthor-1.0.0_rc2.ebuild, qdvdauthor-1.0.0.ebuild:
+  some cleaups + removed old versions.
 
 *qdvdauthor-1.0.0 (16 Mar 2008)
 
diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 7e83090a7d9a..c31520e9662c 100644
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -1,11 +1,6 @@
-DIST qdvdauthor-0.1.4.tar.gz 3405853 RMD160 e38f21602abfc2aec09c782e376c6514be11d93a SHA1 84270bb6c8e431e265fc51f560ce4eae98682bc9 SHA256 1ec3a9d2b609f5ee5da643b86beeb209bde43b2a03cb92fd7c6f660d941b4b54
-DIST qdvdauthor-1.0.0-2.tar.gz 4078842 RMD160 243f94e8a72e38b69f2625ff99c39d768434f5d9 SHA1 7ce9d0071f2f00334fa69a712781d8d1f86171ed SHA256 572b6cd4a02457c927b6637a6b3b2ceff5c347d12dd42820fad2877fe6c3af0a
 DIST qdvdauthor-1.0.0-3.tar.gz 4069413 RMD160 0bd5d3c7ea2799c930208ca03b7b1e4df575ca90 SHA1 821eb02ca8ed768198dac3949d187dc84add94e1 SHA256 17073ef414d5ccd8d1e746ab0c3ab9280fae36f737616483a07a95f3c01b63c9
 DIST qdvdauthor-1.0.0.tar.gz 3988006 RMD160 0684b6ab4356ded7eca5cb8eaf1c0cd89f450186 SHA1 ea317f1d6ec009ef0bedcae3727110cfc21405fb SHA256 e03a2cb6f06433caa1fd9735c6329fd15db098da143c76e72a6190a61571fc81
-EBUILD qdvdauthor-0.1.4-r1.ebuild 2707 RMD160 cb924a1453cb9f1c56d89c1bbe035ee5ec36d4f1 SHA1 494afd907dbd71b156c5c7bafce2211fff68345d SHA256 1857a943b2fe5ee0594c24d5564575082b8fd3a3b0101d79d3bce06002cc6528
-EBUILD qdvdauthor-1.0.0.ebuild 2675 RMD160 eb708225944c52ab34623a157991b74429cfb46e SHA1 56d32753878e41caa748ff8e3b4057428423d045 SHA256 fd8a67afa04766d31b9b1b92b97e481fabdfbb1a6a2032ce9e26f0046a39f650
-EBUILD qdvdauthor-1.0.0_rc1.ebuild 2725 RMD160 1e6360e98433f1c90f119991807ed83d0edf0ba4 SHA1 29c0bfcf5f3dbc8b46efdcbc2427ed768f9282b9 SHA256 0f90f56d51d6374485c45a3b6477e000d966226ccf65e534878f18c35b18c527
-EBUILD qdvdauthor-1.0.0_rc2.ebuild 2712 RMD160 d1daef11003f1459da08b4e6ace3ab49636ba473 SHA1 055d0dae57ef88b8b44838a8e45426183d334cc4 SHA256 6da6622155726c133e5dfb3b087aa2297c936f0f8370eb56a34dad765a0f63c1
+EBUILD qdvdauthor-1.0.0.ebuild 2681 RMD160 1b56e92c002e637cbfbce927823c72e17abb5572 SHA1 406a8fce4f77e6485eea1571afa388a2f6fde1a2 SHA256 c06a7744f164c54f1e410764cc43a81a8eb631c417c302cd2a3e74fab1b992b1
 EBUILD qdvdauthor-1.0.0_rc3.ebuild 2712 RMD160 8a5845ab6690b6c445ccf64b815f48ae020d2702 SHA1 b9ae725f2809dbb859f696809281a5fcc7bb3633 SHA256 7ee1561358e601bda44064f89b749f4c912647a72fd016943f239b6301caf063
-MISC ChangeLog 3166 RMD160 282a4da0104d9767c46915ba01c77f4ddd6219f9 SHA1 8a0b88aa754d8fd94712d897d8c493d71ddee18e SHA256 ba9b9bfff87bc2432518ae1fdca078e4a88a12707bff018d46845a08221991cf
+MISC ChangeLog 3379 RMD160 a8cf5a63d4893f4dbf4439a2237d5e03474f536f SHA1 bdfdf983116fd0d15d531ae386365d22d124673e SHA256 45c6499a09f240a25cc374127152888d3de4d51725f3390ae079d251edb7a26a
 MISC metadata.xml 371 RMD160 d56b2bd934b3a2196587c1e1a7aa5e2388c80546 SHA1 6dff8688f4d12784e393559b38714974907e0ea7 SHA256 4e408954db4502b24884dced0c0e5a0867f665598cdffde28c1a4cdd3f188cca
diff --git a/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild b/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild
deleted file mode 100644
index 91be83d20403..000000000000
--- a/media-video/qdvdauthor/qdvdauthor-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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
-}
diff --git a/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild b/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild
index 582e96efedf7..e5f941ed36b3 100644
--- a/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild
+++ b/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild,v 1.1 2008/03/16 22:31:44 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-1.0.0.ebuild,v 1.2 2008/03/17 22:16:28 sbriesen Exp $
 
 inherit eutils flag-o-matic qt3
 
@@ -38,7 +38,7 @@ src_unpack() {
 	cd "${S}"
 
 	# do not over-optimize (see bug #147250)
-	replace-flags -O? -O2
+	replace-flags -O[s3] -O2
 	filter-flags -finline-functions
 
 	# set our C(XX)FLAGS
@@ -73,9 +73,9 @@ src_compile() {
 }
 
 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"
+	emake -C qdvdauthor            INSTALL_ROOT="${D}" install || die "qdvdauthor install failed"
+	emake -C qdvdauthor/qslideshow INSTALL_ROOT="${D}" install || die "qslideshow install failed"
+	emake -C qdvdauthor/qplayer    INSTALL_ROOT="${D}" install || die "qplayer install failed"
 
 	dobin bin/{qdvdauthor,qslideshow,qplayer}
 	dodoc CHANGELOG README TODO doc/{ISO*,look*,sound*,todo*,render*}.txt
diff --git a/media-video/qdvdauthor/qdvdauthor-1.0.0_rc1.ebuild b/media-video/qdvdauthor/qdvdauthor-1.0.0_rc1.ebuild
deleted file mode 100644
index 236c38c9a06b..000000000000
--- a/media-video/qdvdauthor/qdvdauthor-1.0.0_rc1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-1.0.0_rc1.ebuild,v 1.1 2007/05/16 06:10:56 sbriesen Exp $
-
-inherit eutils flag-o-matic qt3
-
-MY_P="${P/_rc*/}"
-
-DESCRIPTION="'Q' DVD-Author is a GUI frontend for dvdauthor written in Qt"
-HOMEPAGE="http://qdvdauthor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qdvdauthor/${MY_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"
-
-S="${WORKDIR}/${MY_P}"
-
-# 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;\?[[:space:]]*\$:make ${MAKEOPTS};:g" \
-		-e "s:\(/qmake\):\1 -nocache QMAKE=\$QTDIR/bin/qmake:g" configure
-
-	# fixing defaults from /usr/local/bin to gentoo default /usr/bin
-	sed -i -e "s:/usr/local/bin:/usr/bin:g" doc/sound.txt \
-		qdvdauthor/dialog*.cpp qdvdauthor/qslideshow/dialog*.cpp
-}
-
-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 --qt-dir="${QTDIR}" ${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*,look*,sound*,todo*,render*}.txt
-
-	domenu qdvdauthor.desktop
-	doicon qdvdauthor.png
-}
diff --git a/media-video/qdvdauthor/qdvdauthor-1.0.0_rc2.ebuild b/media-video/qdvdauthor/qdvdauthor-1.0.0_rc2.ebuild
deleted file mode 100644
index 0833441fae68..000000000000
--- a/media-video/qdvdauthor/qdvdauthor-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-1.0.0_rc2.ebuild,v 1.1 2007/11/18 01:38:47 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/_rc/-}.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"
-
-S="${WORKDIR}/${P/_rc*/}"
-
-# 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;\?[[:space:]]*\$:make ${MAKEOPTS};:g" \
-		-e "s:\(/qmake\):\1 -nocache QMAKE=\$QTDIR/bin/qmake:g" configure
-
-	# fixing defaults from /usr/local/bin to gentoo default /usr/bin
-	sed -i -e "s:/usr/local/bin:/usr/bin:g" doc/sound.txt \
-		qdvdauthor/dialog*.cpp qdvdauthor/qslideshow/dialog*.cpp
-}
-
-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 --qt-dir="${QTDIR}" ${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*,look*,sound*,todo*,render*}.txt
-
-	domenu qdvdauthor.desktop
-	doicon qdvdauthor.png
-}