non-maintainer commit: add missing dependency on x11-libs/qt-svg:4, fix building on hardened/with gcc-4.6 wrt #380439, drop redundant src_configure(), use qt4-r2.eclass

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 55 insertions, 11 deletions

diff --git a/media-video/videocut/ChangeLog b/media-video/videocut/ChangeLog
index e83520ca1c13..e5931afeb201 100644
--- a/media-video/videocut/ChangeLog
+++ b/media-video/videocut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/videocut
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/videocut/ChangeLog,v 1.1 2009/11/05 13:34:48 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/videocut/ChangeLog,v 1.2 2011/11/16 17:28:14 xarthisius Exp $
+
+  16 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/01-fix-hardened-ftbfs.diff, videocut-0.2.0.ebuild:
+  non-maintainer commit: add missing dependency on x11-libs/qt-svg:4, fix
+  building on hardened/with gcc-4.6 wrt #380439, drop redundant
+  src_configure(), use qt4-r2
 
 *videocut-0.2.0 (05 Nov 2009)
 
diff --git a/media-video/videocut/Manifest b/media-video/videocut/Manifest
index aa9224ff8e9e..e564dcc79f00 100644
--- a/media-video/videocut/Manifest
+++ b/media-video/videocut/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 01-fix-hardened-ftbfs.diff 430 RMD160 b3c762a80136eba12837becb71ba1b74e5e27f7b SHA1 70b85005cd797bfdbc9a397657c764d500671ad8 SHA256 237d16f4a6156f7500da221d0db0785dd4112eb7bf45e3522793be8f48856379
 AUX videocut 60 RMD160 2825677aee54f87f0e3e0faa51472d610f85531d SHA1 ba4dec92f3bcf74aeb695235fc07e8876011c250 SHA256 cc70d4d53acaca4dcdbb5d14b83687c73081759c9253ea25f6c9663d2a279fef
 DIST videocut_0.2.0.tar.gz 146915 RMD160 d88260138961b0e64072a99a8875bf3c4cb55b5d SHA1 274421ab79bd5e64f5dddb04d54dbf39c9d5116e SHA256 234abbf01848150a1a74cb3b886a6021ec77c7f936991db26c082778c93ce1e1
-EBUILD videocut-0.2.0.ebuild 883 RMD160 58dbb5d2bbcfab98d04be44a7c4f4ccb1b76c1c1 SHA1 1ebed340debb1fac8fec06223f7292de8b80bfb0 SHA256 3bb562b1adc1738aaa93492690600d0d75b43e10554796558d948b351e9aef0c
-MISC ChangeLog 422 RMD160 1513b4bec2f7d2e20e81b207758ac42d01ef1890 SHA1 89af718fc2ae37f1fe85986daff7102e3eb245e5 SHA256 aca04e1a2d06ab62cf64a08ecbe114c5897235c651f6493b09624c705c298d57
+EBUILD videocut-0.2.0.ebuild 948 RMD160 d78221a41ea455163c85138756e80806cc757c25 SHA1 b8845296f73b0e803e065547ed2f382564992dbe SHA256 e6d13050ec29444f481230959cc2dd4eaf9b226dd1eca6a43678a1cfccf4f489
+MISC ChangeLog 706 RMD160 df24ec6cd07505332a7bc840ac53a246ed446614 SHA1 1c37349a6fa1ea7e68545f233f720e16851c4930 SHA256 6c03aa23465ad3ed169868ce4974d39a5d8dac25a2d90f11f4ce3bec6cd1fa62
 MISC metadata.xml 251 RMD160 8c1c2c878016222ba3b4ec56552b18ffdc5622fb SHA1 a3dc8c0dfc4bb0d9bd2592730b56e46986be4cbd SHA256 bdda2c9bb1def64022996197d133fa8dcd53aced78b1e2b927961ca242fa1fef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOw/K6AAoJEF0huFKJUZL5OMEP/RvE0tjA7bgaPCqfuBSVQYQ9
+8Eu1T6M5kEQp7BjTsZw/sM/llNHzlxaw/sS8W/DnOv6zMHLxYieQLfTxJTPam5kQ
+0E09gOSllQC5Q+sq/a874wpMtKPbiprncrn7dX1XkqZB7EDuXthNS1uAdOkqZZKG
+XfEBCGwRIa4IRVgoUOKgJqE6i3Fg4Lt8Lc0RIJIkAjyWKIkfWK93k+K//oBFrcq+
+2VMUPlOkldOSjSsJb0bIaHBjVCsTzSPMV5W09r95vCXTTmjNqKTWM4qBICnAims2
+sSdxsoQUclC8vD9kAA77i5JZ0bKYR5cw+b7GLqGjj5srHfCDqPLbCjd8x3clCkMJ
+lvskyhOWbltSa/yGLOggg2Qsc5wFB2hsGnrC8Tti2HqNz9ThRPEQhrSI8QHMMFMC
+HNYyqArF1UyRToiRE7kn660ewWp3JLvBVvwktC5xnwtU/hP/LhmHzkVXT8RLUa/V
+Jebkn6/sW2d9k8P5QLwHG7XwkkHk1QR3bDmFmyoPHkw3dLfY3K1l/LHOfz6FUjVd
+0DBo8bkn0Flh0iiHjq+gCxOqEWeyDr3h9Vdkt7BlumG9e6Voy620zn1bB3lgExbK
+Uqm0Gj1M3b3guReZRn4mbps+QdYqH/Y4tTxuQ6OdgLPkvRhxF4M1Yx1XBsYj70Nk
+AZ9mE+T/QlIqNYWJR6sD
+=5RyK
+-----END PGP SIGNATURE-----
diff --git a/media-video/videocut/files/01-fix-hardened-ftbfs.diff b/media-video/videocut/files/01-fix-hardened-ftbfs.diff
new file mode 100644
index 000000000000..47fe7f97842c
--- /dev/null
+++ b/media-video/videocut/files/01-fix-hardened-ftbfs.diff
@@ -0,0 +1,16 @@
+# Fix FTBFS with enabled hardened flags and gcc-4.6 failure
+# https://bugs.gentoo.org/show_bug.cgi?id=380439
+
+--- a/src/TPreviewPanel/TPreviewPanel.cpp
++++ b/src/TPreviewPanel/TPreviewPanel.cpp
+@@ -167,7 +167,9 @@
+ 
+ void TPreviewPanel::adjustItems()
+ {
+-	backgroundRect->setSize(&QRectF(0, 0, 1, 1));
++	QRectF myRect(0, 0, 1, 1);
++	backgroundRect->setSize(&myRect);
++
+ 	logo->setSize(QRect(0, 0, 1, 1));
+ 	
+ 	// adjust meta text
diff --git a/media-video/videocut/videocut-0.2.0.ebuild b/media-video/videocut/videocut-0.2.0.ebuild
index e4705f41b8e8..56b12a149f74 100644
--- a/media-video/videocut/videocut-0.2.0.ebuild
+++ b/media-video/videocut/videocut-0.2.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/videocut/videocut-0.2.0.ebuild,v 1.1 2009/11/05 13:34:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/videocut/videocut-0.2.0.ebuild,v 1.2 2011/11/16 17:28:14 xarthisius Exp $
 
 EAPI=2
-inherit eutils qt4
+
+inherit eutils qt4-r2
 
 DESCRIPTION="A program to create compositions from video files"
 HOMEPAGE="http://code.google.com/p/videocut/"
-SRC_URI="http://videocut.googlecode.com/files/${PN}_${PV}.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,13 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
 	media-libs/xine-lib"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}.orig
 
-src_configure() {
-	eqmake4
-}
+PATCHES=( "${FILESDIR}"/01-fix-hardened-ftbfs.diff )
 
 src_compile() {
 	emake || die