Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 106 insertions, 2 deletions

diff --git a/media-video/2mandvd/2mandvd-1.3.5.ebuild b/media-video/2mandvd/2mandvd-1.3.5.ebuild
new file mode 100644
index 000000000000..885e04a300ed
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.3.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 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.1 2010/06/14 00:02:28 hwoarang Exp $
+
+EAPI="2"
+LANGS="de en he it pl pt ru"
+
+inherit qt4-r2
+
+MY_PN="2ManDVD"
+
+DESCRIPTION="The successor of ManDVD"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=99450"
+SRC_URI="http://download.tuxfamily.org/${PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-lang/perl
+	media-video/dvdauthor
+	media-video/ffmpegthumbnailer
+	media-fonts/dejavu
+	media-sound/sox
+	media-video/mplayer
+	media-libs/netpbm
+	media-video/mjpegtools
+	|| ( app-cdr/cdrkit app-cdr/cdrtools )
+	media-libs/xine-lib
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-const-char-concatenation.patch"
+)
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	# fix installation path
+	for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
+		sed -i "s:qApp->applicationDirPath().\?+.\?\":\"/usr/share/${PN}/:" \
+			${file} || die "sed failed"
+	done
+
+	sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
+		mainfrm.cpp || die "sed failed"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro
+}
+
+src_install() {
+	newbin 2ManDVD ${PN} || die "newbin failed"
+	dodoc README.txt || die "dodoc failed"
+	insinto /usr/share/${PN}/
+	doins -r Bibliotheque || die "failed to install Bibliotheque"
+	doins -r Interface || die "failed to install Interface"
+	#bug 305625
+	doins fake.pl || "failed to install fake.pl"
+	doicon Interface/mandvdico.png || die "doicon failed"
+	# Desktop icon
+	make_desktop_entry ${PN} 2ManDVD mandvdico "Qt;AudioVideo;Video" \
+		|| die "make_desktop_entry failed"
+	insinto /usr/share/${PN}
+	for lang in ${LINGUAS}; do
+		for x in ${LANGS}; do
+			[[ ${lang} == ${x} ]] && doins ${PN}_${x}.qm
+		done
+	done
+	[[ -z ${LINGUAS} ]] && doins ${PN}_en.qm
+}
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index 8bc1212cc478..ed1c5301f184 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/2mandvd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.8 2010/04/29 08:00:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.9 2010/06/14 00:02:28 hwoarang Exp $
+
+  14 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/2mandvd-fix-const-char-concatenation.patch, +2mandvd-1.3.5.ebuild:
+  Version bump
+
+*2mandvd-1.3.5 (13 Jun 2010)
+
+  13 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +2mandvd-1.3.5.ebuild:
+  Version bump
 
   29 Apr 2010; Markos Chandras <hwoarang@gentoo.org> 2mandvd-1.1.1.ebuild,
   2mandvd-1.2-r1.ebuild:
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index e03c95e7a7b9..72111461708b 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,12 +1,15 @@
+AUX 2mandvd-fix-const-char-concatenation.patch 679 RMD160 2b8932af378ea5cad4c490930eb250d87008270e SHA1 3dee58f9a059e0bb8bbfb30a110b01a71a73f9f8 SHA256 9441dbbd162edf4df8cb0b181ba6286515352a2d253101ea97ee6baa4b746f9e
 DIST 2ManDVD-1.1.1.tar.gz 31756514 RMD160 5e3df26d483aa833bdb528e73a8e8cdc690393d1 SHA1 447f6b1b39a1b88a1d59634f79aeb4a2d3e00ea2 SHA256 d2761346755928f7695d4d70b7989f65ff699daf98ea884c17ccd0689e62520f
 DIST 2ManDVD-1.2.tar.gz 31760677 RMD160 f96ba9b9f044ab5c5d840becc66da9218d05da16 SHA1 c46b6c87d1ceff692e1ee567718edb63650fb5bd SHA256 969c4fdedb69e8c5becd9843db3053a12271897e889df58fd2d913d14ef70508
 DIST 2ManDVD-1.3.1.tar.gz 17929154 RMD160 2f840d744436a58c27bed686be3cae339639b92b SHA1 981aa26af74063277033a52a6612006fe129f897 SHA256 882891e0575c53ab4423b286184156750a14a79d7f606a66f392f003b7afcef4
 DIST 2ManDVD-1.3.2.tar.gz 17961801 RMD160 cf32a144da29cbe394b9eb359a5438dcfd023b46 SHA1 e9532019a6d61a17607bc892c56a0058d05e602c SHA256 33bb6ea5b83f5820bfae67988b54d8497150ec217afa0231d70d209a2d453614
 DIST 2ManDVD-1.3.3.tar.gz 17962170 RMD160 073a37dfd26146277a808fcc7fd605d5de1866a6 SHA1 a2170df61fddfb1ed6f3fa2d8a17b52c3ad8b6ce SHA256 57d6c12797c671d3550864b5ae904e8f112b7f865297d7e595acaa6d6c6c6a87
+DIST 2ManDVD-1.3.5.tar.gz 18259008 RMD160 ffb575c8dbb3631583986365fbce6020a42a2eec SHA1 3cf6429d1b7ac35d78f7f56431208443e866d9e6 SHA256 b1b79ccae2ad45dbc0865b0d8c899bad7b272dc4d89f726ab7b350fc5a3ee18a
 EBUILD 2mandvd-1.1.1.ebuild 1710 RMD160 7225872c73eff6d89b35d1ec0a626ca2dfb41ea1 SHA1 20343a3976f3152fd7a34750f1a21b1b1c332894 SHA256 d2b04471a4c99f5c14ab3df02bb2fd8143589360b98194d307096a36fa9f58eb
 EBUILD 2mandvd-1.2-r1.ebuild 1853 RMD160 792af510d0591927be55f09eeefc0b13a1e8c2b7 SHA1 adfc9eac2e97b5278cec95165d21b36f35530133 SHA256 0918112b3f25ed92591ea35766d668ec89a8a22507e884b6ba8cff185317c606
 EBUILD 2mandvd-1.3.1-r1.ebuild 1894 RMD160 aac7c05525cd8b87483e5ca4ed003225b2569f89 SHA1 c2d2a48aaf3cb6e79e478b209be88cbfa5c2677f SHA256 68fd24db51243f107e49ea04eda1626ac546457922637413a7c58292791f6b23
 EBUILD 2mandvd-1.3.2.ebuild 1891 RMD160 af3e434eae566aa01ca670ff244bb620c4a7d0e1 SHA1 616bc5fe60d3e88d9df33143cde553b30dc049d9 SHA256 71516ce65cddf4723d87ccae076b4496707a1439e15548738ebb9634a8ec9555
 EBUILD 2mandvd-1.3.3.ebuild 1891 RMD160 7cb865faffca67d8a5f5082ea870a4e773d92415 SHA1 1c73760db091a222506f4ffca84a01bd3df5ef82 SHA256 10bfdf9b3a3b10de15f31072cfcb669330b03880d6d79dbc0c6357cd0284e613
-MISC ChangeLog 1487 RMD160 c44f40f2c19d39da1136175d6ebcb494ed6d0a1c SHA1 28fb29eace3fc77022ec1f6b1abe8e572313e851 SHA256 7caf20041ff4093c11fcbcbb2d2f8719e4560da58e7746b08acfc21eec113b93
+EBUILD 2mandvd-1.3.5.ebuild 1966 RMD160 24ab904001de40b4c0694db8ee420ef79ec515c1 SHA1 d9e36e40e8d4e49a3bf15c220fe45e320a7a0253 SHA256 1dca96ded472c6d2bc8dff23b0e399cf997b19e3c5f5889071e745fd5d2664a7
+MISC ChangeLog 1754 RMD160 76f50eae5e1644c924405d1fe0e15de86f0647d3 SHA1 92e60fc2cee3bb6fd9a3e81545985bd69bcce3f6 SHA256 44347a961c5b487e9298df0d958f95c90ad9d6edd0f7f89ce6846c6c3430a9f1
 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba
diff --git a/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch
new file mode 100644
index 000000000000..b8d01e50a280
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.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";