Fix patch for old versions. bug #369839

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

4 files changed, 28 insertions, 8 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/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";