Version bump, bug 405153. Thanks to Michael (kensington) for the patch and the updated ebuild. Remove old.

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

7 files changed, 138 insertions, 102 deletions

diff --git a/media-video/2mandvd/2mandvd-1.4.ebuild b/media-video/2mandvd/2mandvd-1.4.ebuild
deleted file mode 100644
index 13a661aad3d5..000000000000
--- a/media-video/2mandvd/2mandvd-1.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.2 2012/02/15 18:14:59 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.old.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 || die "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/2mandvd-1.5.5.ebuild b/media-video/2mandvd/2mandvd-1.5.5.ebuild
index a70414e75a9d..982d29ebaa96 100644
--- a/media-video/2mandvd/2mandvd-1.5.5.ebuild
+++ b/media-video/2mandvd/2mandvd-1.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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.5.5.ebuild,v 1.2 2011/05/08 01:51:38 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.5.5.ebuild,v 1.3 2012/03/12 17:38:00 pesa Exp $
 
 EAPI="2"
 LANGS="cs de en it"
diff --git a/media-video/2mandvd/2mandvd-1.7.3.ebuild b/media-video/2mandvd/2mandvd-1.7.3.ebuild
new file mode 100644
index 000000000000..6a4dc86897d9
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.7.3.ebuild
@@ -0,0 +1,97 @@
+# 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.7.3.ebuild,v 1.1 2012/03/12 17:38:00 pesa Exp $
+
+EAPI=4
+LANGS="cs de en it ru"
+
+inherit eutils 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="media-libs/libsdl
+	virtual/ffmpeg
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+"
+RDEPEND="${DEPEND}
+	|| ( app-cdr/cdrkit app-cdr/cdrtools )
+	dev-lang/perl
+	media-fonts/dejavu
+	media-gfx/exif
+	media-libs/netpbm
+	media-sound/sox
+	media-video/dvdauthor
+	media-video/ffmpegthumbnailer
+	media-video/mjpegtools
+	media-video/mplayer[encode]
+"
+
+S=${WORKDIR}/${MY_PN}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-const-char-concatenation.patch"
+	"${FILESDIR}/${P}-libav.patch"
+)
+
+src_prepare() {
+	# Cleaning old backup files
+	find . -name "*~" -delete || die
+
+	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 ${PN} so we need to change references to the old "2ManDVD" (${MY_PN}).
+	# 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
+	doins -r Interface
+
+	doins 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
+
+	# Bin and menu entry:
+	newbin 2ManDVD ${PN}
+	doicon Interface/mandvd.png
+	make_desktop_entry ${PN} ${MY_PN} mandvd "Qt;AudioVideo;Video"
+}
+
+pkg_postinst() {
+	elog "You may wish to install media-video/xine-ui and/or build"
+	elog "media-sound/sox with USE=mad for improved media handling support."
+}
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index 226f35aa9a05..83723c954afa 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/2mandvd
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.20 2012/03/12 17:38:00 pesa Exp $
+
+*2mandvd-1.7.3 (12 Mar 2012)
+
+  12 Mar 2012; Davide Pesavento <pesa@gentoo.org> +2mandvd-1.7.3.ebuild,
+  +files/2mandvd-1.7.3-libav.patch, -2mandvd-1.4.ebuild, 2mandvd-1.5.5.ebuild,
+  metadata.xml:
+  Version bump, bug 405153. Thanks to Michael (kensington) for the patch and the
+  updated ebuild. Remove old.
 
   15 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/2mandvd-fix-const-char-concatenation.old.patch, 2mandvd-1.3.5.ebuild,
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 09c8cd8c08a6..5d0c3c94d009 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX 2mandvd-1.7.3-libav.patch 269 RMD160 0305dcd8b80b9dd4d68553ae809ea2f0bbf2bb14 SHA1 56b02691d012569ed77b7a3b69e7089fc36d6eaa SHA256 5c60fc260aca4a7c32e9a54646b8fae88eabbdc9a9fb8f867f2f81de62abefe5
 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
+DIST 2ManDVD-1.7.3.tar.gz 28644704 RMD160 1fdd35b734de05962602499cc91670559cc80f01 SHA1 8db491a9143f44ed29a0e0de4651a7cb229f5b2c SHA256 1faf635118f4b1295f8ac7bd39a6d549d07ecf91c426769b59bee41e2168902c
 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 3196 RMD160 2eb7a4eb9e7c4de5374e481f9d7e4722e6bbf049 SHA1 d576e0adfaf265c2d0639eb4cfabd0a558ffcf7f SHA256 4d8b075d31b7a13729e9acdbac57d19632cb7a3f5e11af675b316aaad6d7f335
-MISC metadata.xml 206 RMD160 cf308c9bcfc7d65bbdc0d440db1ba1ff8444c397 SHA1 70f2489dffdfdacd3f17a429b4125e3f3beebdb7 SHA256 07a9435d849cc356574c9b0a46fd41b86c83258ab4dec70a6b3ce6840382566c
+EBUILD 2mandvd-1.5.5.ebuild 2653 RMD160 e49a5556aa9a15bcf8f314717023cfd88509f470 SHA1 75140c929d9b0ce3c3df94c274a05d4be89b0a96 SHA256 7c618d107dd0d53bb3018869f2ea33aabd7bb34ac628653317e0ff4533befbba
+EBUILD 2mandvd-1.7.3.ebuild 2396 RMD160 11ac7f5b9d7c8cf07cfe83fe601da5f5a6a93b28 SHA1 e4085efbc0f207f9279aeb7de7cce30eb8e1b6d9 SHA256 67ffeee50063aa254d1a2f5ba787bd3233f930d51a952073f577235787a981b7
+MISC ChangeLog 3502 RMD160 966e6a6af7cf12bdcd269fe256c12e66a3a9ddbd SHA1 11dafb8bc142e608d14864cf97716f55f4ddb125 SHA256 5459814d67bef4243dbeaac50966a2064432dddde010cf8265e7e05e311a3bf7
+MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJPXjR+AAoJENXLsxwXqFxyrQEQAJFpbG/3MVtNeBVuZsE7plZg
+f8QDDGsF5Wywt5l1KwlFrXWAWWBTtDlzDACyj0lP6/V/Nch+d37180UHqQH8p8TY
+Ew7r95dsRjXpXeSvA0A4p8zvnVXTem/fsxBjM0q2Gy17v17WO4FGqJbtoJ3AxA9F
+pLn+vQg1kBYmqa1AzCeHa070HrYwNomWHlLMktmTsRBZ4U6R29dmrrwClrM+GhKm
+TxaxRN+eHHYKXw8hAP8gEQhyfJFeeWKeLAzSeLUOLsTbxFQ3qiIcFPBIi7LmJGy3
+aEz8eCjXG6m6DqaCuOriqhhD1yRprAMM1UI6Dn6s+1ifhiCClNHxBY/QvLELK+jC
+5kTmNrIltjj8WVZhv7jrtDP4NiWYom8NvSmS0+tHauIxcKIcRXmuOna5oVeekk3y
+y9GAD6V8D2DtrIRMne6mUg05fbEpfwRI6syjc833lrEB4Xwvhzwd5UiIfpe9mqLN
+YIoVUHMG7MQOgMav1PHu+0IhmaY4AIFK2ShJ3bparOOSMMIB+8YdJ10QTWjn7tfI
+l0e6eSu0xNkq87C6+9UHFIiYbKJfEYZG3Ng2JtsbZeM6mYxMMMrpXNeE3kQlCj/m
+6QCWdNkqU+3cRtBFZhfp4NSGe0hyi3zsSOeGyZ+8s2RiFKfStWMIutg12qFzamDm
+yiZGeDBjZX5CknZnZFzO
+=fwFU
 -----END PGP SIGNATURE-----
diff --git a/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
new file mode 100644
index 000000000000..59dfd1e33a1e
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
@@ -0,0 +1,10 @@
+--- videowrapper.h
++++ videowrapper.h
+@@ -11,6 +11,7 @@
+         #include <libavutil/common.h>
+         #include <libavcodec/avcodec.h>
+         #include <libavformat/avformat.h>
++        #include <libavutil/mathematics.h>
+         #include <libswscale/swscale.h>
+ }
+ 
diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml
index 37b9640e6ce9..dc439f7e84f5 100644
--- a/media-video/2mandvd/metadata.xml
+++ b/media-video/2mandvd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<longdescription lang="en">
-	</longdescription>
+<herd>qt</herd>
 </pkgmetadata>
-