Version bump, wrt bug 341775

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

3 files changed, 102 insertions, 7 deletions

diff --git a/media-video/2mandvd/2mandvd-1.5.5.ebuild b/media-video/2mandvd/2mandvd-1.5.5.ebuild
new file mode 100644
index 000000000000..62b45d28110c
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.5.5.ebuild
@@ -0,0 +1,88 @@
+# 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 $
+
+EAPI="2"
+LANGS="cs de en it"
+
+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 mad xine"
+
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-webkit:4"
+
+RDEPEND="${DEPEND}
+	|| ( app-cdr/cdrkit app-cdr/cdrtools )
+	dev-lang/perl
+	media-fonts/dejavu
+	media-gfx/exif
+	media-libs/netpbm
+	xine? ( media-libs/xine-lib )
+	mad? ( media-sound/sox[mad] ) || ( media-sound/sox )
+	media-video/dvdauthor
+	media-video/ffmpeg
+	media-video/ffmpegthumbnailer
+	media-video/mjpegtools
+	media-video/mplayer[encode]"
+
+PATCHES=( "${FILESDIR}/2mandvd-fix-const-char-concatenation.patch" )
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	# Cleaning old backup files:
+	find . -name "*~" -exec rm -f {} \; || die "find and remove failed"
+
+	for file in *.cpp
+	do
+	  # Fix path:
+	  sed -e "s:qApp->applicationDirPath().\?+.\?\":\"/usr/share/${PN}:g" -i "${file}" || die "sed failed"
+	  sed -e "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":g" -i "${file}" || die "sed failed"
+	done
+
+	# We'll make a newbin called "${PV}" so we need to change references to the old "2ManDVD" ( ${MY_PV} ).
+	# Sed is more flexible than a patch.
+	sed -e "s:openargument.right(${#MY_PN}) != \"${MY_PN}\":openargument.right(${#PN}) != \"${PN}\":" \
+	    -e "s:openargument.right($(( ${#MY_PN} + 2 ))) != \"./${MY_PN}\":openargument.right($(( ${#PN} + 2 ))) != \"./${PN}\":" \
+	    -i "mainfrm.cpp" || die "sed failed"
+
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	insinto "/usr/share/${PN}/"
+
+	# Data:
+	doins -r Bibliotheque || die "failed to install Library"
+	doins -r Interface || die "failed to install Interface"
+
+	doins "fake.pl" || die "failed to install \"fake.pl\""
+
+	# Translations:
+	for lang in ${LINGUAS}; do
+		for x in ${LANGS}; do
+			[[ ${lang} == ${x} ]] && doins ${PN}_${x}.qm
+		done
+	done
+	[[ -z ${LINGUAS} ]] && doins ${PN}_en.qm
+
+	# Doc:
+	dodoc README.txt || die "dodoc failed"
+
+	# Bin and menu entry:
+	newbin 2ManDVD ${PN} || die "newbin failed"
+	doicon Interface/mandvd.png || die "doicon failed"
+	make_desktop_entry "${PN}" "${MY_PN}" "mandvd" "Qt;AudioVideo;Video" || die "make_desktop_entry failed"
+}
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index cbb9e05a8019..fb4d4d9390f4 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2010/10/23 00:41:36 hwoarang Exp $
+# 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 $
+
+*2mandvd-1.5.5 (22 Apr 2011)
+
+  22 Apr 2011; Tomas Touceda <chiiph@gentoo.org> +2mandvd-1.5.5.ebuild:
+  Version bump, wrt bug 341775
 
   23 Oct 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from metadata
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 1e3ebb17008c..0a5cecd3d2a0 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX 2mandvd-fix-const-char-concatenation.patch 679 RMD160 2b8932af378ea5cad4c490930eb250d87008270e SHA1 3dee58f9a059e0bb8bbfb30a110b01a71a73f9f8 SHA256 9441dbbd162edf4df8cb0b181ba6286515352a2d253101ea97ee6baa4b746f9e
 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
-MISC ChangeLog 2589 RMD160 b99cf9d64897ac33c1bdafb5766ed248c776a0c5 SHA1 a8d48b62b54f4851259cc4cd85e3cd82123e4376 SHA256 e7a53e62ecbd32309eb86f220be0abc64a52ea8d691da11d675f116b28f9dd5e
+EBUILD 2mandvd-1.5.5.ebuild 2533 RMD160 42aace882aed3545e24a00d14b7dc3f80744d4c4 SHA1 db4e5773d7866541751c6a3a95e906b9dc7c2ac8 SHA256 cf541ab49a3110b7597a62091506560eb6899eb3f1b89098cf72c886f1b918b6
+MISC ChangeLog 2721 RMD160 ab71e7de56270a46dae9a2955496ee19613fb3c7 SHA1 a211f0229b774d67c73da709a696d6ae70f6d64c SHA256 1fe23523fb7cf20fdf02d9171714d1b9f7481f87143779d3f6e5525bc0d453c0
 MISC metadata.xml 299 RMD160 39842e097ccae632772df03308ac27a00edcb436 SHA1 666acedd870694e2e20b9ef6d4e06cb789fe04f5 SHA256 eff976964ceb1309172d8d3283f540cb7cf05c83efcaa9846c62a44def2be3a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzCLzQACgkQ9/cejkQaxBCC5QCeO1H19pvzLMZMmuUISdKIk9o+
-+2EAn0lKfir2F+Cpr7SHgBYlFzVVLPow
-=JnmP
+iEYEARECAAYFAk2xpg8ACgkQleOIHZp1OmvOUACdEUHYJj4H3msaMF+/0KDeNF66
+IHEAni32u+ADzAojhPZIGEpu7pQasYeq
+=bFHF
 -----END PGP SIGNATURE-----