Cleanup 1.7 ebuild; remove old and unused 1.5-r1.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

4 files changed, 35 insertions, 94 deletions

diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog
index d5bf0fcf23f0..99cce3256cac 100644
--- a/media-video/minitube/ChangeLog
+++ b/media-video/minitube/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/minitube
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.62 2012/01/06 19:18:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.63 2012/02/16 20:51:02 pesa Exp $
+
+  16 Feb 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/minitube-1.5-use-correct-env-variable.patch, -minitube-1.5-r1.ebuild,
+  minitube-1.7.ebuild:
+  Cleanup 1.7 ebuild; remove old and unused 1.5-r1.
 
 *minitube-1.7 (06 Jan 2012)
 
diff --git a/media-video/minitube/files/minitube-1.5-use-correct-env-variable.patch b/media-video/minitube/files/minitube-1.5-use-correct-env-variable.patch
deleted file mode 100644
index ce92baf5ed5d..000000000000
--- a/media-video/minitube/files/minitube-1.5-use-correct-env-variable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/MediaView.cpp	2011-08-06 14:34:20.613150591 +0200
-+++ src/MediaView.cpp	2011-08-06 14:34:32.549001370 +0200
-@@ -347,7 +347,7 @@
- 
-     QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation);
- #ifdef Q_WS_X11
--    QString tempFile = tempDir + "/minitube-" + getenv("USERNAME") + ".mp4";
-+    QString tempFile = tempDir + "/minitube-" + getenv("USER") + ".mp4";
- #else
-     QString tempFile = tempDir + "/minitube.mp4";
- #endif
diff --git a/media-video/minitube/minitube-1.5-r1.ebuild b/media-video/minitube/minitube-1.5-r1.ebuild
deleted file mode 100644
index 274948cc5092..000000000000
--- a/media-video/minitube/minitube-1.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.5-r1.ebuild,v 1.1 2011/08/07 13:46:37 hwoarang Exp $
-
-EAPI="4"
-LANGS="ar es pt_BR pt_PT uk"
-LANGSLONG="bg_BG cs_CZ de_DE el_GR es he_IL hr_HR hu_HU fr_FR fi_FI it_IT
-ja_JP nl_NL nb_NO pl_PL ro_RO ru_RU tr_TR"
-
-inherit qt4-r2
-
-DESCRIPTION="Qt4 YouTube Client"
-HOMEPAGE="http://flavio.tordini.org/minitube"
-SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kde gstreamer"
-
-DEPEND="x11-libs/qt-gui:4[accessibility]
-	x11-libs/qt-dbus:4
-	kde? ( || ( media-libs/phonon[gstreamer?]  x11-libs/qt-phonon:4 ) )
-	!kde? ( || ( x11-libs/qt-phonon media-libs/phonon[gstreamer?] ) )
-	gstreamer? (
-		media-plugins/gst-plugins-soup
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-faac
-		media-plugins/gst-plugins-faad
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-correct-env-variable.patch
-)
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	newicon images/app.png minitube.png
-	#translations
-	insinto "/usr/share/${PN}/locale/"
-	for lang in ${LINGUAS}; do
-		for x in ${LANGS}; do
-			if [[ ${x} == ${lang} ]]; then
-				doins "build/target/locale/${x}.qm"
-			fi
-		done
-		for x in ${LANGSLONG}; do
-			if [[ ${x%_*} == ${lang} ]]; then
-				doins "build/target/locale/${x}.qm"
-			fi
-		done
-	done
-}
diff --git a/media-video/minitube/minitube-1.7.ebuild b/media-video/minitube/minitube-1.7.ebuild
index aab78dd0dde1..c0884f82ec30 100644
--- a/media-video/minitube/minitube-1.7.ebuild
+++ b/media-video/minitube/minitube-1.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.7.ebuild,v 1.1 2012/01/06 19:18:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.7.ebuild,v 1.2 2012/02/16 20:51:02 pesa Exp $
 
-EAPI="4"
-LANGS="ca da es es_AR es_ES el fr gl hr hu ia id it nb nl pl pt pt_BR ro
-ru sl sq sr sv_SE te tr zh_CN"
+EAPI=4
+LANGS="ca da el en_US es es_AR es_ES fr gl hr hu ia id it nb nl pl pt pt_BR
+	ro ru sl sq sr sv_SE te tr zh_CN"
 LANGSLONG="ca_ES de_DE fi_FI he_IL id_ID ka_GE pl_PL uk_UA"
 
 inherit qt4-r2
@@ -16,12 +16,12 @@ SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug kde gstreamer"
+IUSE="debug gstreamer kde"
 
-DEPEND="x11-libs/qt-gui:4[accessibility]
-	x11-libs/qt-dbus:4
-	kde? ( || ( media-libs/phonon[gstreamer?]  x11-libs/qt-phonon:4 ) )
-	!kde? ( || ( x11-libs/qt-phonon media-libs/phonon[gstreamer?] ) )
+DEPEND=">=x11-libs/qt-gui-4.6:4[accessibility]
+	>=x11-libs/qt-dbus-4.6:4
+	kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) )
+	!kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) )
 	gstreamer? (
 		media-plugins/gst-plugins-soup
 		media-plugins/gst-plugins-ffmpeg
@@ -29,24 +29,29 @@ DEPEND="x11-libs/qt-gui:4[accessibility]
 		media-plugins/gst-plugins-faad
 	)
 "
-
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	newicon images/app.png minitube.png
-	#translations
-	insinto "/usr/share/${PN}/locale/"
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-				rm "${D}"/usr/share/${PN}/locale/${x}.qm || die
-		fi
+DOCS="AUTHORS CHANGES TODO"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# Remove unneeded translations
+	local lang= trans=
+	for lang in ${LANGS}; do
+		use linguas_${lang} && trans+=" ${lang}.ts"
 	done
-	for x in ${LANGSLONG}; do
-		if ! has ${x%_*} ${LINGUAS}; then
-			rm "${D}"/usr/share/${PN}/locale/${x}.qm || die
-		fi
+	for lang in ${LANGSLONG}; do
+		use linguas_${lang%_*} && trans+=" ${lang}.ts"
 	done
+	if [[ -n ${trans} ]]; then
+		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+	newicon images/app.png minitube.png
 }