Install missing file wrt bug #305625 and bumped to 1.3.2

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

5 files changed, 102 insertions, 10 deletions

diff --git a/media-video/2mandvd/2mandvd-1.2.ebuild b/media-video/2mandvd/2mandvd-1.2-r1.ebuild
index 5fbc67dfa0d6..285fa7b3bd45 100644
--- a/media-video/2mandvd/2mandvd-1.2.ebuild
+++ b/media-video/2mandvd/2mandvd-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2010/02/21 10:31:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v 1.1 2010/03/13 14:43:04 hwoarang Exp $
 
 EAPI="2"
 
@@ -14,10 +14,11 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="media-video/dvdauthor
+DEPEND="dev-lang/perl
+	media-video/dvdauthor
 	media-video/ffmpegthumbnailer
 	media-fonts/dejavu
 	media-sound/sox
@@ -61,6 +62,8 @@ src_install() {
 	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 || die "failed to install fake.pl"
 	doicon Interface/mandvdico.png || die "doicon failed"
 	# Desktop icon
 	make_desktop_entry 2ManDVD 2ManDVD mandvdico "Qt;AudioVideo;Video" \
@@ -71,4 +74,5 @@ src_install() {
 			[[ ${lang} == ${x} ]] && doins ${PN}_${x}.qm
 		done
 	done
+	[[ -z ${LINGUAS} ]] && doins ${PN}_en.qm
 }
diff --git a/media-video/2mandvd/2mandvd-1.3.1-r1.ebuild b/media-video/2mandvd/2mandvd-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..80ea1b438d49
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.3.1-r1.ebuild
@@ -0,0 +1,73 @@
+# 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.1-r1.ebuild,v 1.1 2010/03/13 14:43:04 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}"
+
+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() {
+	dobin 2ManDVD || die "dobin 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 2ManDVD 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/2mandvd-1.3.1.ebuild b/media-video/2mandvd/2mandvd-1.3.2.ebuild
index a2030dda93b8..58b735db25f2 100644
--- a/media-video/2mandvd/2mandvd-1.3.1.ebuild
+++ b/media-video/2mandvd/2mandvd-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2010/02/26 18:02:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.3.2.ebuild,v 1.1 2010/03/13 14:43:04 hwoarang Exp $
 
 EAPI="2"
 LANGS="de en he it pl pt ru"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="media-video/dvdauthor
+DEPEND="dev-lang/perl
+	media-video/dvdauthor
 	media-video/ffmpegthumbnailer
 	media-fonts/dejavu
 	media-sound/sox
@@ -43,7 +44,7 @@ src_prepare() {
 	sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
 		mainfrm.cpp || die "sed failed"
 
-	qt4_src_prepare
+	qt4-r2_src_prepare
 }
 
 src_configure() {
@@ -56,6 +57,8 @@ src_install() {
 	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 2ManDVD 2ManDVD mandvdico "Qt;AudioVideo;Video" \
@@ -66,4 +69,5 @@ src_install() {
 			[[ ${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 3f542679d2e2..527f9dda4ca9 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.5 2010/02/26 18:02:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.6 2010/03/13 14:43:04 hwoarang Exp $
+
+*2mandvd-1.3.2 (13 Mar 2010)
+*2mandvd-1.3.1-r1 (13 Mar 2010)
+*2mandvd-1.2-r1 (13 Mar 2010)
+
+  13 Mar 2010; Markos Chandras <hwoarang@gentoo.org> -2mandvd-1.2.ebuild,
+  +2mandvd-1.2-r1.ebuild, -2mandvd-1.3.1.ebuild, +2mandvd-1.3.1-r1.ebuild,
+  +2mandvd-1.3.2.ebuild:
+  Install missing file wrt bug #305625 and bumped to 1.3.2
 
 *2mandvd-1.3.1 (26 Feb 2010)
 
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index ea014efb96de..7fbc1bd11c71 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,8 +1,10 @@
 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
 EBUILD 2mandvd-1.1.1.ebuild 1805 RMD160 27bffb4a0f1184a63e5b6f13808616d8cde6acc7 SHA1 48e7645e7e2f3aab40384c00cb8a3eb90932447f SHA256 214807ee4e490bd09f5115d71c4fd317eb2634e609fece3e0f7a20f6c18132b8
-EBUILD 2mandvd-1.2.ebuild 1824 RMD160 dd8a38365ce866666756b343bd5221b3b53ecb8d SHA1 a5b4ee4b1456b5bb8ac9edb1380079d974363d45 SHA256 6eef4178e3dbced5f94e95bffe7347d7d81d66498442c4d57532eac1ff1e44ff
-EBUILD 2mandvd-1.3.1.ebuild 1772 RMD160 879241ee976cd4732f8fc9fe0a596ec9a142187f SHA1 e21fa011f2acf02bb542e3c88abe6c6feacf7ae8 SHA256 13858a76f767f8e16898143d42be8019698f0629d9ad1bf2e1c04d79d1355e10
-MISC ChangeLog 895 RMD160 b7efc14b2d5dad7bb2e65c9d9a9b20f48abbd609 SHA1 9ed5e51cbf18738efc68d693e341a582424f1663 SHA256 cb20264608e593492e4d5f9136e0e7426242453bff0a44561f0e752d4d3e1a0b
+EBUILD 2mandvd-1.2-r1.ebuild 1948 RMD160 3d8d871879ff8f69cfd677745d00b15f72a9ea4a SHA1 879cbd6d2073e0a73937f8a353b864a0d38de192 SHA256 f1d753a5c8a9ac39be6f703fec260b2bfa5c4f0fffd6dfb0b958e7b9a4f9a7d5
+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
+MISC ChangeLog 1221 RMD160 9c62b2d2066d3c90598bc35dcd6df0e58bc2d500 SHA1 a344dba2d2c4da44d2c3787052cb45eae8feae0c SHA256 a98d25f48623db8b5f8e6c639ab7aa8d96ec96dfdbd40eb728df9fbbfda262c8
 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba