Remove old.

(Portage version: 2.2.0_alpha100/cvs/Linux i686)

4 files changed, 5 insertions, 186 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/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";