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

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

5 files changed, 50 insertions, 112 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/Manifest b/media-video/minitube/Manifest
index b0210866d0dc..d5660a328ba7 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX minitube-1.5-use-correct-env-variable.patch 463 RMD160 41dbe3d95cde7f1417e85bbfd9dfec3214d0eb6c SHA1 2f9574dd1d26a9eaf5f1432823e9d27c1c18fb86 SHA256 52c9ad3f087fea71fcc69d9aa442c01c185d7e64b1725f6dcb8f8dca7de25dfa
-DIST minitube-1.5.tar.gz 516313 RMD160 3672d9e2b53ccf386a139e1a5d6a5133a1d9ccbc SHA1 cf2ae85ef4b60ce67496eebe412bffe010eb1d54 SHA256 dd98301b878cd408130f677b7c69c49b969629f15cdfe10e01321977413a3ac9
 DIST minitube-1.6.tar.gz 580452 RMD160 d3c6761944954e1a9c0661a2706138ac1b1542b0 SHA1 2e373ff8abe7abf8c0b1e9d38e7acae49287d13a SHA256 ec1df6e7e92291afab504942e2e0f64eb8ba055de2aeabb534616fd9bd7ecbfc
 DIST minitube-1.7.tar.gz 566495 RMD160 97bdb1897b75627fc2c4806b1420a16bb38fea60 SHA1 ccf93da104584ccbfcbdc55b63c9725acb8cd490 SHA256 ceed4b685209a66321c007947aa9f9ce79886978b78d736dd88b77d4c3fbfb9d
-EBUILD minitube-1.5-r1.ebuild 1476 RMD160 235f87cbe498602102a63764434babcc80153d45 SHA1 a13e3147ac3c4fc1fbd3defeacb4fc44ffd5e801 SHA256 74b3235798cddb4f098dd93b922bb7a04d66410ed063fe048caee4d66475739b
 EBUILD minitube-1.6.ebuild 1387 RMD160 5403df01beb77b90d5fe138317f6ef58190c8624 SHA1 eb83145923787f216d8e9e3ada73c39bff4e2fc2 SHA256 9b8c4d4752b3f9d41d323bb8aa97ae0347bcb931d3a6ffa113454c0aa9d5f075
-EBUILD minitube-1.7.ebuild 1410 RMD160 c556074cdb26195f5c594a808ff62a16653233c6 SHA1 c9d0c7b93ec34273ff0952b5f095ace8754057da SHA256 386a3bc88e8bdc2bcf51b5f90d71c6e0396d8893826abd0dfe956a98a0bc01e4
-MISC ChangeLog 9102 RMD160 f55dda4dc769fef2f8b909ce7b9ea49c302adc1c SHA1 210d6f6ebfb3081d9a2db77b408d372a386805c3 SHA256 6657c1e70d2223c38e8711390ad350fdd1ce2d0f591b189267bb9f1d5dded47b
+EBUILD minitube-1.7.ebuild 1512 RMD160 f8dcc3e76433e1940067f16d9b195e981ed0f8ca SHA1 307716e72be93be9674db527b100574bd3bd36be SHA256 09653edee8356e609f8b799f411ace6369e76d80adcc7dc310175b2465f37961
+MISC ChangeLog 9303 RMD160 4ab85547c804ebe66f3e92b68af6312cb1d822d4 SHA1 084215727cd384a69500fbed91919862185f4df6 SHA256 756c5ce87974ed269b35078562daad2362b858b9fb3f4cf845a046ec62298e63
 MISC metadata.xml 265 RMD160 e723dc6fc78de62b3144444b1329d9791b1f2099 SHA1 4ed7a4469aafc625f36fb28d3b7932d1c9e75f91 SHA256 218f4f107ec5040834a5d0d24c83e179cdd83cdb49a639fa29df53f479a680c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPB1b1AAoJEPqDWhW0r/LCpxQQAKS0wtAUQ7IxhQLC4oWmz590
-IBI09ILgHyUUwOhy1kobz1OhqIlCb6ZHrTIGMtBM7dvS/m3MKPsFByziJX6iD+Oi
-EXMhWZpS5469PNi/QArsDAUF0VpkfIkEoYbmRdrLqLFeTryJBVTIXzILaARgoY6/
-TWwWZDElHs/79b7lMowSwfKI9Vlse72hrYBoR/gC20Mz5yKGFCGfJju9sZqcWX4F
-ZO9Vz9dZT4Kw6mp+ERv0JEsinWdfysdANQFRx1ksuORtzS2Og4lHA9ZErok6bCn9
-6go+CeFeeBUBYiP+/FrdzYku92LsorWXPEr4OIJiCnvxrjPvsWRp3H3WlMlapF9Z
-zs0iRyRnsuUeggUuH8sLOMNzRdRD7dkqx9rwCYypV28kSWrAQD16B/EgpFm9w7+V
-Jwc/eR8t7Mgu3rJsfQjbGFJtUrajPG4Cagwo/K8vaMG6+yUQCBbYAaEzpRHxWrdm
-Y3SLK9uuQ77P36Qodc2i5ghEElmYp9dDFda/BVXfsBC5ejYdCBBBTGZ1w/j/Lhj2
-rzkrtpmOmCKt+818fZ160FWLwtp1MwS9e7TDeBv2NrBHIyUt+VY7Y3DbV8ztMGJ0
-biXRZbEVIB/x46ziZA+2ZoDWw3UzNDYzL/jRzFRCfo9qabRcXnHghCbCLuLfst/d
-u8UsZrEuV5uar0YNNX5s
-=QoU2
+iQIcBAEBCgAGBQJPPWw8AAoJENXLsxwXqFxylU8QAIt5xP7R4Vf3td3clmqTJxyl
+/oVk+mh7G/Xvcoqf2oxfrjIGiP44ofm+1k2X5un3e5S320m3ojn7KEH4MLVNtcZw
+9vEXktO8lOf+v3RLXC6odVlaFwzStVKuartXI8o3Rj1daxTjjsq+2qIQIZHdZc/h
+ybR1IyyABFViEtqT6Xhim6Hm6lZgh3M45kQkKzoYpDfq3Pyc16o7HKMfcStzWeB5
+rS4uji2BkpDM11xQnBYoBpwZnQSVeuHTKKHKHbOk8ugtZQHa0TSyHuvkwOqPE89Q
+X8AqTHIP9fpOvBOHjNu2t/7h97nKcEqGL9hvYKXvQFeWAfusN4J0GvUQltvBINv/
+VNQLBCpw2v9e4pwG8j66tjU6b+am+B62PKAZVjdHIeNuWxzgz4Y8R9xObr3FREOJ
+S7U1AajvQ6GJdutkJSwl+kq92tB8GhK/uWFQSVwFevqVOkMz4He7nGEywnmFIsLk
+/KApLJSqdoljxSq4ImhWRMPM5fQuNDzc4LDb/sKjxCmSjje9xwnc36q0fZBpoV5x
+UajFYjz4IcoyJPKbdL98qaqJmm/TowIpe9eEddqXDZj/dBNZoWc6v0BpE3fxt2i6
+WEGX8Dhx5vXhT7R1Iwy1nizaJFazNSfnC5OK7RaeeOhAHDRvFb1psfQ27S6igxYD
+0Dn6cY28mlv9QBRR+cPR
+=Kpvm
 -----END PGP SIGNATURE-----
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
 }