fixed CFLAGS issue (see bug #147250), removed old versions.

(Portage version: 2.1.2_pre1)
 (Unsigned Manifest commit)

5 files changed, 8 insertions, 151 deletions

diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 1e19ca4f4542..f973c503f3eb 100644
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -1,31 +1,16 @@
-DIST qdvdauthor-0.1.0.tar.gz 3483254 RMD160 c0ea474c629857c97af79869cf08aa5ceecd3e58 SHA1 ca4ec43c8dcc97b0d84ee510eeb5dc45ab208965 SHA256 527fcdfa5bc1db3db5df07b258d13b2ca25b34a60ba3d8a50cf402e557efcd16
 DIST qdvdauthor-0.1.2.tar.gz 1776330 RMD160 fb21ec8757d826a9c331d5d7f59a87f406962a7d SHA1 025a918591972c4affcb6c8f0baadf5759e7b296 SHA256 29d005464d2279ef858ba2dd85507aa12b9fc497794bd145b5fe477b140a9da8
-EBUILD qdvdauthor-0.1.0.ebuild 1962 RMD160 656a9d0167c766d6430ddf99ea1de1d63de0bdde SHA1 2498c1b85446db5bf374782da721308e3e0cab13 SHA256 cd8d73662e00c55ae0971507ca63f52acfea2f1c85b66007505757b654ea8d67
-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 2497 RMD160 32b5af9489dcbf4439d60cc506bf0075d980029e SHA1 ecc88cd6f50e60fcbd2fcba30f49944acceb2e58 SHA256 0667e009861d938eb4fbdcaa6b9dabc6b1b65f5354aa4d8d128fc0c75c9253c7
-MD5 233e8c70c28994dc906700fd4d0c1303 qdvdauthor-0.1.2-r1.ebuild 2497
-RMD160 32b5af9489dcbf4439d60cc506bf0075d980029e qdvdauthor-0.1.2-r1.ebuild 2497
-SHA256 0667e009861d938eb4fbdcaa6b9dabc6b1b65f5354aa4d8d128fc0c75c9253c7 qdvdauthor-0.1.2-r1.ebuild 2497
-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 1799 RMD160 3034df1ff1120256b28ef0701cba1026d4ce1c18 SHA1 557adae3b546ba449923d820cd009d1ff1ed5943 SHA256 0744688de9b319b0c38f7a39c27118fef9ae856f4eb6de16474982221cd52d98
-MD5 63b3d1dfa2a5a31ea03658a064872208 ChangeLog 1799
-RMD160 3034df1ff1120256b28ef0701cba1026d4ce1c18 ChangeLog 1799
-SHA256 0744688de9b319b0c38f7a39c27118fef9ae856f4eb6de16474982221cd52d98 ChangeLog 1799
+EBUILD qdvdauthor-0.1.2-r1.ebuild 2572 RMD160 c6ea88f88959fbd6cf6aa54f114e31df070798e5 SHA1 ca94ff98a26fce91a7a7ea69919885566259821d SHA256 5764e1ad3e003ef55874186c82018da914d48e6bfdf531d0b3c71f794716b205
+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
+MISC ChangeLog 2001 RMD160 a73849e3cff33a5b76e1f14c8fb830f168510b96 SHA1 13b2dea14221dc04d1c6d7958111acb46f1bf0b1 SHA256 9be5750b75806d230f9de93e1a91deb08bfaa8caffcdbedd4b5d22e30551b88b
+MD5 e57a5853f86e8189940909ac11978ecc ChangeLog 2001
+RMD160 a73849e3cff33a5b76e1f14c8fb830f168510b96 ChangeLog 2001
+SHA256 9be5750b75806d230f9de93e1a91deb08bfaa8caffcdbedd4b5d22e30551b88b ChangeLog 2001
 MISC metadata.xml 371 RMD160 d56b2bd934b3a2196587c1e1a7aa5e2388c80546 SHA1 6dff8688f4d12784e393559b38714974907e0ea7 SHA256 4e408954db4502b24884dced0c0e5a0867f665598cdffde28c1a4cdd3f188cca
 MD5 5fcdbe92257f80de63c774815ce48851 metadata.xml 371
 RMD160 d56b2bd934b3a2196587c1e1a7aa5e2388c80546 metadata.xml 371
 SHA256 4e408954db4502b24884dced0c0e5a0867f665598cdffde28c1a4cdd3f188cca metadata.xml 371
-MD5 5236ce480f45938f8d14b31219a85fe3 files/digest-qdvdauthor-0.1.0 253
-RMD160 1352a7fdb009f47b2d02331a55e2c1fd9f83e87b files/digest-qdvdauthor-0.1.0 253
-SHA256 b239b0485cce252b3667b9887fb0309da227bcc91a2c0707578151cfa7f4e7a8 files/digest-qdvdauthor-0.1.0 253
-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.0 b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.0
deleted file mode 100644
index 44cfacbe9e70..000000000000
--- a/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6016cae51d2d2be1159c5fd2625d25d4 qdvdauthor-0.1.0.tar.gz 3483254
-RMD160 c0ea474c629857c97af79869cf08aa5ceecd3e58 qdvdauthor-0.1.0.tar.gz 3483254
-SHA256 527fcdfa5bc1db3db5df07b258d13b2ca25b34a60ba3d8a50cf402e557efcd16 qdvdauthor-0.1.0.tar.gz 3483254
diff --git a/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2 b/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2
deleted file mode 100644
index b63478d68e1e..000000000000
--- a/media-video/qdvdauthor/files/digest-qdvdauthor-0.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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.0.ebuild b/media-video/qdvdauthor/qdvdauthor-0.1.0.ebuild
deleted file mode 100644
index 23f9cd93571a..000000000000
--- a/media-video/qdvdauthor/qdvdauthor-0.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.0.ebuild,v 1.1 2006/01/11 02:29:50 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=""
-DEPEND=">=media-video/dvdauthor-0.6.11
-	>=media-gfx/imagemagick-6.1.8.8
-	>=media-video/mjpegtools-1.6.2
-	>=media-libs/xine-lib-1.1.0
-	>=media-video/dvd-slideshow-0.7.2
-	media-sound/sox
-	media-sound/lame
-	media-libs/libogg
-	$(qt_min_version 3.2)"
-
-# TODO:
-# xine-libs or mplayer or vlc-lib -> use flags
-# media-video/dvd-slideshow -> optional
-
-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() {
-	./configure --prefix=/usr --with-xine-support --build-qplayer --build-qslideshow || 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/q*
-	dodoc CHANGELOG INSTALL README TODO doc/*.{txt,sh}
-	domenu qdvdauthor.desktop
-	doicon qdvdauthor.png
-}
diff --git a/media-video/qdvdauthor/qdvdauthor-0.1.2.ebuild b/media-video/qdvdauthor/qdvdauthor-0.1.2.ebuild
deleted file mode 100644
index 3a3a93329d61..000000000000
--- a/media-video/qdvdauthor/qdvdauthor-0.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.ebuild,v 1.1 2006/09/15 02:43:39 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=""
-DEPEND=">=media-video/dvdauthor-0.6.11
-	>=media-gfx/imagemagick-6.1.8.8
-	>=media-video/mjpegtools-1.6.2
-	>=media-libs/xine-lib-1.1.0
-	>=media-video/dvd-slideshow-0.7.2
-	media-sound/sox
-	media-sound/lame
-	media-libs/libogg
-	$(qt_min_version 3.2)"
-
-# TODO:
-# xine-libs or mplayer or vlc-lib -> use flags
-# media-video/dvd-slideshow -> optional
-
-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() {
-	./configure --prefix=/usr --with-xine-support --build-qplayer --build-qslideshow || 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/q*
-	dodoc CHANGELOG INSTALL README TODO doc/*.{txt,sh}
-	domenu qdvdauthor.desktop
-	doicon qdvdauthor.png
-}