Fix patch for old versions. bug #369839

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

5 files changed, 47 insertions, 16 deletions

diff --git a/media-video/2mandvd/2mandvd-1.3.5.ebuild b/media-video/2mandvd/2mandvd-1.3.5.ebuild
index e0aca9879c5e..b56f3bbfacca 100644
--- a/media-video/2mandvd/2mandvd-1.3.5.ebuild
+++ b/media-video/2mandvd/2mandvd-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.3.5.ebuild,v 1.4 2010/09/12 07:10:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.3.5.ebuild,v 1.5 2012/02/15 18:14:59 hwoarang Exp $
 
 EAPI="2"
 LANGS="de en he it pl pt ru"
@@ -33,7 +33,7 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-const-char-concatenation.patch"
+	"${FILESDIR}/${PN}-fix-const-char-concatenation.old.patch"
 )
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/media-video/2mandvd/2mandvd-1.4.ebuild b/media-video/2mandvd/2mandvd-1.4.ebuild
index 1dfbb53360c7..13a661aad3d5 100644
--- a/media-video/2mandvd/2mandvd-1.4.ebuild
+++ b/media-video/2mandvd/2mandvd-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.4.ebuild,v 1.1 2010/10/05 22:15:07 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.4.ebuild,v 1.2 2012/02/15 18:14:59 hwoarang Exp $
 
 EAPI="2"
 LANGS="de en he it pl pt ru"
@@ -33,7 +33,7 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-const-char-concatenation.patch"
+	"${FILESDIR}/${PN}-fix-const-char-concatenation.old.patch"
 )
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index 881e5cd81c8b..226f35aa9a05 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2011/11/24 12:51:53 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.19 2012/02/15 18:14:59 hwoarang Exp $
+
+  15 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/2mandvd-fix-const-char-concatenation.old.patch, 2mandvd-1.3.5.ebuild,
+  2mandvd-1.4.ebuild:
+  Fix patch for old versions. bug #369839
 
   24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #290906
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 4eacffe97db1..09c8cd8c08a6 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX 2mandvd-fix-const-char-concatenation.old.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.3.5.ebuild 1972 RMD160 52d223e97bcd848356db0a39ba13c571c24a2758 SHA1 fdc90ba094d07596646c37a3c832580472e1175c SHA256 e8b8ee6dc2a320813dc4ef39b554008e7ef99ac8dd59dc44a21db3e8149c3f31
+EBUILD 2mandvd-1.4.ebuild 1972 RMD160 7e3c667ba8b56fe0bf739bfd86f8839950d2fc34 SHA1 cf96eff8de4c8f98032c92ac74652dbba1e18c6b SHA256 d4ac3b98eddd54526590f71f47217ca839857dd4eca076687db4ab3b87f62620
 EBUILD 2mandvd-1.5.5.ebuild 2655 RMD160 f85069af416ac55d084fbc29b9dd19c6d1bd93c8 SHA1 0d7b05da571769819df776892980e612e250cef0 SHA256 08249b57788331811834e367aa7d090ce70f2e40e6b3ed44b747d6d724fa2ec4
-MISC ChangeLog 2996 RMD160 648864afcccf987c8efef9e86701b9d5cfb35b20 SHA1 0d480526ce45e788aa8bf5e86ff6a915b01209c6 SHA256 449121f1cea4992d9cff669d712ce5bfa9be41220dc513841d1aa583bc589453
+MISC ChangeLog 3196 RMD160 2eb7a4eb9e7c4de5374e481f9d7e4722e6bbf049 SHA1 d576e0adfaf265c2d0639eb4cfabd0a558ffcf7f SHA256 4d8b075d31b7a13729e9acdbac57d19632cb7a3f5e11af675b316aaad6d7f335
 MISC metadata.xml 206 RMD160 cf308c9bcfc7d65bbdc0d440db1ba1ff8444c397 SHA1 70f2489dffdfdacd3f17a429b4125e3f3beebdb7 SHA256 07a9435d849cc356574c9b0a46fd41b86c83258ab4dec70a6b3ce6840382566c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7OPe4ACgkQCaWpQKGI+9SiPgCbBKsASqKScb5Nyu1XCh5FgrSR
-vQ0An1e82KgDyjol5dNfelNg1fIFHx/B
-=CMR/
+iQIcBAEBCgAGBQJPO/X7AAoJEPqDWhW0r/LCvygP/Av71jd4mOIT33pfl/vogHQm
+5ZIDkcuzz6bhoDqi+vV7ICP5QuTnh5iCWyhf7LI1McqQAZ69bVNHgUzbO1/0vUWf
+Abtfwn2O0mLsy5rMyeEoBrhvq10IzLd3IUwbcXEZhmYf9nomRrn+C5Pkf1X33Gbp
+YEV4sH83vV3d6VOTgPihgNyF+ujLhj3hW1GpiNWuxnl9Kk3OMrM5ZnQjHg5S4kqo
+M+lubJDWHvkvt2w1QNj+bgrBbb88vXFOWt0QERmPl+leher0goPMH+39Ik9CLPPt
+Cdn1HJvJ8RhRZmPhQpSlYYJP9wr/n0pQsbbdHaDCRtUj+Z89fBqzloiOmoTTRBjm
+FBdSttwLEhN6QmpWHcbuVWzkCFxFsV5um2+gUD2eiQhJqqRYJhnwUYGpJ0WQx78N
+rY48X/mKbrzarR3muMeO7P45kUpSQh6uxWqEIhMYVh9/7mqE9yfK7GZectrZwWmr
+L2HQFFopoHM5TZkDaEZsZrYLAuy2t9EcK1rdarp8JFibc9S2Jh79FBZ3m8/xQvGK
+3+p5NirSs5+bWw7Z60cRZz6IXPMk0m0qFdzwwsRRAAAhSNP/IzwqcagmDAUqFKTb
+EFGx8C6Cy9yyjDR92qnaBLbstOtuxh7chYDRt4i3M+fch7Na0BppUbRG16CEhvI7
+DeYEtBPlXsBJbfwKhbY/
+=b9z5
 -----END PGP SIGNATURE-----
diff --git a/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.old.patch b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.old.patch
new file mode 100644
index 000000000000..b8d01e50a280
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.old.patch
@@ -0,0 +1,15 @@
+Index: 2ManDVD/mainfrm.cpp
+===================================================================
+--- 2ManDVD.orig/mainfrm.cpp
++++ 2ManDVD/mainfrm.cpp
+@@ -1045,8 +1045,8 @@ mainfrm::mainfrm(QWidget *parent) : QMai
+ 	outext << "growisofs" << endl;
+ 	outext << "mpeg2enc" << endl;
+         outext << "jpegtopnm /dev/null" << 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";