Version bump. Remove old ebuilds

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 29 insertions, 81 deletions

diff --git a/media-video/xvideoservicethief/ChangeLog b/media-video/xvideoservicethief/ChangeLog
index 65822a5d3f61..257adbb8c469 100644
--- a/media-video/xvideoservicethief/ChangeLog
+++ b/media-video/xvideoservicethief/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/xvideoservicethief
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.7 2009/08/08 09:20:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.8 2009/10/19 15:32:35 hwoarang Exp $
+
+*xvideoservicethief-2.3 (19 Oct 2009)
+
+  19 Oct 2009; Markos Chandras <hwoarang@gentoo.org>
+  -xvideoservicethief-2.0.0-r1.ebuild, -xvideoservicethief-2.1.ebuild,
+  +xvideoservicethief-2.3.ebuild:
+  Version bump, remove old ebuilds
 
 *xvideoservicethief-2.2 (08 Aug 2009)
 
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.0.0-r1.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.0.0-r1.ebuild
deleted file mode 100644
index e7605b7eb787..000000000000
--- a/media-video/xvideoservicethief/xvideoservicethief-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.0.0-r1.ebuild,v 1.3 2009/06/08 23:46:05 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils qt4 versionator
-
-MY_PN=xVST
-MY_PV=$(replace_all_version_separators '_')
-MY_P=${MY_PN}_${MY_PV}a_src
-
-DESCRIPTION="Download (and convert) videos from various Web Video Services"
-HOMEPAGE="http://xviservicethief.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xviservicethief/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es
-linguas_fr linguas_gl linguas_hu linguas_it linguas_pl linguas_ro
-linguas_sv"
-
-DEPEND="app-arch/unzip
-	>=x11-libs/qt-gui-4.5.0:4"
-RDEPEND=">=x11-libs/qt-gui-4.5.0:4
-	media-video/ffmpeg"
-
-S=${WORKDIR}
-
-LANGS="br ca cs da de es fr gl hu it pl ro sv"
-
-src_prepare() {
-	# fix checz translation
-	mv "${S}"/resources/translations/xVST_cz.ts	"${S}"/resources/translations/xVST_cs.ts
-	# fix plugins, language path
-	sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
-		"${S}"/src/options.cpp || die "failed to fix paths"
-}
-
-src_configure() {
-	eqmake4 xVideoServiceThief.pro
-}
-
-src_compile() {
-	local lang=
-	emake || die "emake failed"
-	for lang in "${S}"/resources/translations/*.ts; do
-		lrelease ${lang}
-	done
-}
-
-src_install() {
-	dobin bin/xvst || die "dobin failed"
-	local dest=/usr/share/${PN}/plugins
-	dodir ${dest}
-	find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \;
-	dodoc changelog.txt
-	newicon resources/images/InformationLogo.png xvst.png
-	make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo;Video'
-
-	#install translations
-	insinto /usr/share/${PN}/languages/
-	local lang= tlang=
-	for lang in ${LINGUAS}; do
-		for tlang in ${LANGS}; do
-			[[ ${lang} == ${tlang} ]] && doins "${S}"/resources/translations/xVST_${tlang}.qm
-		done
-	done
-}
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.1.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild
index cebad88a45fe..7d27d27cd2b2 100644
--- a/media-video/xvideoservicethief/xvideoservicethief-2.1.ebuild
+++ b/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.1.ebuild,v 1.1 2009/07/06 18:38:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild,v 1.1 2009/10/19 15:32:35 hwoarang Exp $
 
 EAPI=2
 inherit eutils qt4 versionator
 
-MY_PN=xVST
+MY_PN="xVideoServiceThief"
 MY_PV=$(replace_all_version_separators '_')
-MY_P=${MY_PN}_${MY_PV}_src
+MY_P="xVST_${MY_PV}_src"
 
 DESCRIPTION="Download (and convert) videos from various Web Video Services"
 HOMEPAGE="http://xviservicethief.sourceforge.net/"
@@ -16,22 +16,27 @@ SRC_URI="mirror://sourceforge/xviservicethief/${MY_P}.zip"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es
-linguas_fr linguas_gl linguas_hu linguas_it linguas_pl linguas_ro
+IUSE="debug doc linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es
+linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_ro
 linguas_sv"
 
 DEPEND="app-arch/unzip
-	>=x11-libs/qt-gui-4.5.0:4"
+	>=x11-libs/qt-gui-4.5.0:4
+	doc? ( app-doc/doxygen )"
 RDEPEND=">=x11-libs/qt-gui-4.5.0:4
-	media-video/ffmpeg"
+	media-video/ffmpeg
+	media-video/flvstreamer"
 
-S="${WORKDIR}/${MY_PN}-src-1.2"
+S="${WORKDIR}/${MY_PN}-src"
 
 LANGS="br ca cs da de es fr gl hu it pl ro sv"
+RES_NAME="xVST"
 
 src_prepare() {
-	# fix czech translation
-	mv "${S}"/resources/translations/xVST_cz.ts	"${S}"/resources/translations/xVST_cs.ts
+	# fix translations
+	mv "${S}"/resources/translations/${RES_NAME}_cz.ts	"${S}"/resources/translations/${RES_NAME}_cs.ts
+	mv "${S}"/resources/translations/${RES_NAME}_jp.ts	"${S}"/resources/translations/${RES_NAME}_ja.ts
+	mv "${S}"/resources/translations/${RES_NAME}_du.ts	"${S}"/resources/translations/${RES_NAME}_nl.ts
 	# fix plugins, language path
 	sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
 		"${S}"/src/options.cpp || die "failed to fix paths"
@@ -54,9 +59,14 @@ src_install() {
 	local dest=/usr/share/${PN}/plugins
 	dodir ${dest}
 	find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \;
-	dodoc changelog.txt
 	newicon resources/images/InformationLogo.png xvst.png
 	make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo;Video'
+	if use doc; then
+		cd "${S}/documentation/source"
+		sed -i "/OUTPUT_DIRECTORY/s:G\:.*:docs:" Doxyfile
+		doxygen Doxyfile
+		dohtml -r docs/html/* || die "dohtml failed"
+	fi
 
 	#install translations
 	insinto /usr/share/${PN}/languages/