Fix patch and unpack output wrt bug 364553

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 25 insertions, 17 deletions

diff --git a/media-video/2mandvd/2mandvd-1.5.5.ebuild b/media-video/2mandvd/2mandvd-1.5.5.ebuild
index 62b45d28110c..a70414e75a9d 100644
--- a/media-video/2mandvd/2mandvd-1.5.5.ebuild
+++ b/media-video/2mandvd/2mandvd-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.5.5.ebuild,v 1.1 2011/04/22 16:00:01 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.5.5.ebuild,v 1.2 2011/05/08 01:51:38 chiiph Exp $
 
 EAPI="2"
 LANGS="cs de en it"
@@ -37,9 +37,14 @@ RDEPEND="${DEPEND}
 	media-video/mjpegtools
 	media-video/mplayer[encode]"
 
+S="${WORKDIR}/${MY_PN}"
+
 PATCHES=( "${FILESDIR}/2mandvd-fix-const-char-concatenation.patch" )
 
-S="${WORKDIR}/${MY_PN}"
+src_unpack() {
+	# Filter alot of noisy messages (differences between bsd tar and gnu one):
+	unpack ${A} 2> "/dev/null"
+}
 
 src_prepare() {
 	# Cleaning old backup files:
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index fb4d4d9390f4..19abe577aad2 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/2mandvd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.16 2011/04/22 16:00:01 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.17 2011/05/08 01:51:38 chiiph Exp $
+
+  08 May 2011; Tomas Touceda <chiiph@gentoo.org>
+  files/2mandvd-fix-const-char-concatenation.patch, 2mandvd-1.5.5.ebuild:
+  Fix patch and unpack output wrt bug 364553
 
 *2mandvd-1.5.5 (22 Apr 2011)
 
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 0a5cecd3d2a0..3d482fffafe9 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2mandvd-fix-const-char-concatenation.patch 679 RMD160 2b8932af378ea5cad4c490930eb250d87008270e SHA1 3dee58f9a059e0bb8bbfb30a110b01a71a73f9f8 SHA256 9441dbbd162edf4df8cb0b181ba6286515352a2d253101ea97ee6baa4b746f9e
+AUX 2mandvd-fix-const-char-concatenation.patch 671 RMD160 2ca16e111dcd9a3ec74b4e5dd58ccac2804ddca7 SHA1 6b12dc5a11326b8fe8f22ee0d5e89b8a7aa2f9a0 SHA256 4799eb928497642b5440224667af2eb52fd31505d48e075dd7deb234d7ee69f0
 DIST 2ManDVD-1.3.5.tar.gz 18259008 RMD160 ffb575c8dbb3631583986365fbce6020a42a2eec SHA1 3cf6429d1b7ac35d78f7f56431208443e866d9e6 SHA256 b1b79ccae2ad45dbc0865b0d8c899bad7b272dc4d89f726ab7b350fc5a3ee18a
 DIST 2ManDVD-1.4.tar.gz 19655985 RMD160 3459bd40363c01dae68a9e19b930d81ae9ee9846 SHA1 cec04936994732a6bce13d2078f225b64fb5f4c8 SHA256 848960b59b346d7fa708b7708e45bc2f65cb3a22cc92957ea4f80e4188a83912
 DIST 2ManDVD-1.5.5.tar.gz 28454114 RMD160 1c0491a11ef0223cc1cd7b1a6a106097b627eebe SHA1 e0b25c890857fbbe914bb2efaa2a566a15a8ca43 SHA256 36412caef75d84fa9f528f29559898bbed39742ece5313c8599ac5d723e0a894
 EBUILD 2mandvd-1.3.5.ebuild 1964 RMD160 340e7778a40cec802c7d0eaa56550252063f66cf SHA1 7e9a428e3e17e90f43555da88d28f088b8423f2e SHA256 712cb1eb2d8d9653e71a9be593cef3669f37e1371cf9d4d150b5f928f3afade1
 EBUILD 2mandvd-1.4.ebuild 1966 RMD160 f451cc98f132be0f6aecae296c86ea8adeb6db41 SHA1 a9547086854deeb9120619ff85984bfa1200a114 SHA256 5a41f572e9264937386b42452b3fd352375fd8020b430b01949feb84945be7e7
-EBUILD 2mandvd-1.5.5.ebuild 2533 RMD160 42aace882aed3545e24a00d14b7dc3f80744d4c4 SHA1 db4e5773d7866541751c6a3a95e906b9dc7c2ac8 SHA256 cf541ab49a3110b7597a62091506560eb6899eb3f1b89098cf72c886f1b918b6
-MISC ChangeLog 2721 RMD160 ab71e7de56270a46dae9a2955496ee19613fb3c7 SHA1 a211f0229b774d67c73da709a696d6ae70f6d64c SHA256 1fe23523fb7cf20fdf02d9171714d1b9f7481f87143779d3f6e5525bc0d453c0
+EBUILD 2mandvd-1.5.5.ebuild 2655 RMD160 f85069af416ac55d084fbc29b9dd19c6d1bd93c8 SHA1 0d7b05da571769819df776892980e612e250cef0 SHA256 08249b57788331811834e367aa7d090ce70f2e40e6b3ed44b747d6d724fa2ec4
+MISC ChangeLog 2890 RMD160 49237be86f5d7ce6cadccdba1e91871bc3d2e752 SHA1 baea659092b64806fbb6a5a92efbdd6534da34d9 SHA256 c9cf343fea470f0f23fa535f782015c1c0630627be32862f15feeafca20b3744
 MISC metadata.xml 299 RMD160 39842e097ccae632772df03308ac27a00edcb436 SHA1 666acedd870694e2e20b9ef6d4e06cb789fe04f5 SHA256 eff976964ceb1309172d8d3283f540cb7cf05c83efcaa9846c62a44def2be3a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2xpg8ACgkQleOIHZp1OmvOUACdEUHYJj4H3msaMF+/0KDeNF66
-IHEAni32u+ADzAojhPZIGEpu7pQasYeq
-=bFHF
+iEYEARECAAYFAk3F90YACgkQleOIHZp1Omt9FACggkOuQtR7nKljlaLrrTsSh3Pm
+kkAAn07HaA5WLSvD7esYAcOhoENLbx6M
+=Jc+0
 -----END PGP SIGNATURE-----
diff --git a/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch
index b8d01e50a280..8d5177c0eaa7 100644
--- a/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch
+++ b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch
@@ -1,15 +1,14 @@
-Index: 2ManDVD/mainfrm.cpp
-===================================================================
---- 2ManDVD.orig/mainfrm.cpp
-+++ 2ManDVD/mainfrm.cpp
-@@ -1045,8 +1045,8 @@ mainfrm::mainfrm(QWidget *parent) : QMai
+diff -Naur 2ManDVD.orig/mainfrm.cpp 2ManDVD/mainfrm.cpp
+--- 2ManDVD.orig/mainfrm.cpp	2011-05-07 22:29:20.049000080 -0300
++++ 2ManDVD/mainfrm.cpp	2011-05-07 22:30:30.055000081 -0300
+@@ -1403,8 +1403,8 @@
  	outext << "growisofs" << endl;
  	outext << "mpeg2enc" << endl;
          outext << "jpegtopnm /dev/null" << endl;
--        outext << "cat " + "/usr/share/2mandvd//fake.pl" << endl;
+-        outext << "cat " + "/usr/share/2mandvd/fake.pl" << endl;
 -        outext << "rm -f " + homeDir.path() + "/.mdvdep.sh" << endl;
-+        outext << "cat " << "/usr/share/2mandvd//fake.pl" << endl;
-+        outext << "rm -f " << homeDir.path()<<"/.mdvdep.sh" << endl;
++        outext << "cat " << "/usr/share/2mandvd/fake.pl" << endl;
++        outext << "rm -f " << homeDir.path() << "/.mdvdep.sh" << endl;
  	outext << "exit" << endl;
  	wmyficext.close();
  	QString programf = "bash";