Remove old.

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

5 files changed, 15 insertions, 197 deletions

diff --git a/media-video/2mandvd/2mandvd-1.3.5.ebuild b/media-video/2mandvd/2mandvd-1.3.5.ebuild
deleted file mode 100644
index b56f3bbfacca..000000000000
--- a/media-video/2mandvd/2mandvd-1.3.5.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.3.5.ebuild,v 1.5 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
deleted file mode 100644
index 982d29ebaa96..000000000000
--- a/media-video/2mandvd/2mandvd-1.5.5.ebuild
+++ /dev/null
@@ -1,93 +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.5.5.ebuild,v 1.3 2012/03/12 17:38:00 pesa 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]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/2mandvd-fix-const-char-concatenation.patch" )
-
-src_unpack() {
-	# Filter alot of noisy messages (differences between bsd tar and gnu one):
-	unpack ${A} 2> "/dev/null"
-}
-
-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 897293421975..171c7110229f 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2012/04/15 17:02:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.23 2012/04/15 17:08:27 johu Exp $
+
+  15 Apr 2012; Johannes Huber <johu@gentoo.org> -2mandvd-1.3.5.ebuild,
+  -2mandvd-1.5.5.ebuild, -files/2mandvd-fix-const-char-concatenation.old.patch:
+  Remove old.
 
   15 Apr 2012; Markus Meier <maekke@gentoo.org> 2mandvd-1.7.3.ebuild:
   x86 stable, bug #411731
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index cb5e894f69d9..2f318a536637 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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.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.5.5.ebuild 2653 RMD160 e49a5556aa9a15bcf8f314717023cfd88509f470 SHA1 75140c929d9b0ce3c3df94c274a05d4be89b0a96 SHA256 7c618d107dd0d53bb3018869f2ea33aabd7bb34ac628653317e0ff4533befbba
 EBUILD 2mandvd-1.7.3.ebuild 2396 RMD160 9628831ff5974bfcb65d1aec8daf43e5ff507cae SHA1 68954e0009728e05743cf59583ab898cdd9fbae7 SHA256 61bedd1338965c1c9e5d358da682d587e7d7d0b593e25b1fb07b2b6a6bd6b314
-MISC ChangeLog 3709 RMD160 8a22040b594f6c6796e95edc48acbae8689d196f SHA1 a88f56e8d71a7777108b4ab4663bcbbf4c37f71c SHA256 57df82145d38764658d554b5b303c28fc4e4ba5a01d6cd3c97c79e2262ff91f9
+MISC ChangeLog 3873 RMD160 db48eb655d55f43f10771eb30083f260abd19711 SHA1 a88031f0712ca0d5780d2819f8714b4903ac44ca SHA256 9e73a1bf7786088540bd3d4c10866b529deb8e5ed5c258a77e504ce286aa1b4e
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+K/9kACgkQkKaRLQcq0GLQ3wCdEX19yrDsB2SDmg5+MunocO7T
-Qh8AnAq5ID6t1RquUQDDr2Ex1Io1GGPA
-=Pj8K
+iQEcBAEBCgAGBQJPiwC4AAoJEO+t9ga+3I3aFGwH/jdVoIH5oKFjeaYWSmAjjeIB
+WLEqpRW8FVFmE6ne//YDoYKdYADW962ojgHG1SkV9QZtFFb6MTWA9bAvnCWmsNul
+RGYiozLdsCULBb+t/DkVY5RSlitob6DDeFRaIDWaE90vRD2L4GQUvKKwuBZj65ko
+9pYs8aJMFrchmZf6CR3l7PblbpCStBPUPccXmMK+kyjAtS1Z76fI7jrad6ub9zQh
+UEN9VqZcNPfeCcFE5zuaHKgU9L1VufWqbTU83YNKvPvnZUL+0RZKX+n5qMzYC7lQ
+Hgqsc/WQua9qW30dkFstPZKQxXUaFTVg4CAtPB1wzBNpfFwX1tsVZhLwHGzj044=
+=h3Rm
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index b8d01e50a280..000000000000
--- a/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.old.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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";