Migrate to qt4-r2 eclass wrt bug #311481

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog
index 2310bb3d68544055ad12bfa66b8430dbee77bc1a..81e168668330fb510380edd412d58c92944a29c0 100644 (file)
--- a/media-video/minitube/ChangeLog
+++ b/media-video/minitube/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/minitube
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.23 2010/04/02 09:59:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.24 2010/04/29 08:10:10 hwoarang Exp $
+
+  29 Apr 2010; Markos Chandras <hwoarang@gentoo.org> minitube-0.7.ebuild,
+  minitube-0.8.ebuild, minitube-0.8.1.ebuild:
+  Migrate to qt4-r2 eclass wrt bug #311481
 
   02 Apr 2010; Markos Chandras <hwoarang@gentoo.org> minitube-0.9.ebuild:
   Fix my previous commit

diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index ac2a8b8daf8316702030f943aa487b0f9fd340b9..2029d030b8d20fd065b1b19e83174b66011a988b 100644 (file)
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -2,9 +2,9 @@ DIST minitube-0.8.1.tar.gz 168066 RMD160 4eb6ba80264df8369d6901f9e91a3a616c1a04e
 DIST minitube-0.9.tar.gz 174152 RMD160 76b0fb7aa038d52f801e67528692c7acd692cfb7 SHA1 3395289c4748ee574d646446c673662847e246ab SHA256 2637795a357832d889f3ebba176116ec0d652362265bc6104c6723f47de9a9fd
 DIST minitube-src-0.7.tar.gz 120296 RMD160 e7502ff8a6f2a4963af34f3d76efe8aeef30c1d7 SHA1 9d84efbee607a3b8f893c1cae2e6a66237605d87 SHA256 5a60df41fb80b24569c2109523d6b02df9c45aaa09c7dbc167268fe6d824cec4
 DIST minitube-src-0.8.tar.gz 166196 RMD160 a1cbe900a353379ae6e31eaeacdb6ea124c8a9ea SHA1 b999f39136359a16fe40f913dee49e86eaa70f30 SHA256 aa0d270e84d0faab3f16b075e212e44630bc47ead04e32aac2f9d0417311dfa0
-EBUILD minitube-0.7.ebuild 1476 RMD160 40ef3407c28d7e1c7175f0b938ad96fc03b697bf SHA1 03dcf223c7205931a065962b9cfb2876bb62d631 SHA256 97b8ca7bc3c001df0e7a24e17f27c92d8723bf0f457c1cdbe8824cb87afa5d35
-EBUILD minitube-0.8.1.ebuild 1471 RMD160 a8e5d0f463239dd05fcedeeacff1c60aaec042fb SHA1 2db9f068c783f94faf437153307dc1b509e51407 SHA256 8a737d4e690abf36bab1cb9477fa38fa2a10292e29d535a9246d2aa4f2135439
-EBUILD minitube-0.8.ebuild 1503 RMD160 df98eb029860eff17ee8d1e328825e1b07514283 SHA1 f45dbf5f359b262fcdeb89f62f0d481e1537a406 SHA256 0691e037fcbc2064b76867f12e13e1b4a82b9ed22850232905ca79bea7c75fb3
+EBUILD minitube-0.7.ebuild 1333 RMD160 5ff642016dfe6adf2db494964fd923424a50c8e8 SHA1 15613bf9f24eb1aec635648fb6d7fba76cd72e02 SHA256 210019606afb9963b28cf602460cb0a51a25f98e515ff72e5c95a4ec57e3a6f6
+EBUILD minitube-0.8.1.ebuild 1316 RMD160 9d92e6bd985ba9f265acef8e79b01f9b9850b032 SHA1 59846cdfc507221d756dfa751a7b52975246f20d SHA256 a8c0d48c910cd65871bd640e4466f940263188484e1f0b4392c9b87325db946a
+EBUILD minitube-0.8.ebuild 1351 RMD160 4200da38d30f44b6445c938f224255351a24c6fc SHA1 491ca585b060f74a47a1cccf4cba6f40dad06cd0 SHA256 51db76603830bfe16c19477b71bd795a8ebd59e8e438fe58a8b8f8268a32129d
 EBUILD minitube-0.9.ebuild 1496 RMD160 bb1ec1c0d886bb3302c1c54ff8661c4491ad8545 SHA1 48e0d53af0dfc5a09ab95d5d750ed6cd046cf711 SHA256 c62c985d51023d1d748c0ef5e2b3f9c314b621a305a7602327d57867eca221ce
-MISC ChangeLog 3651 RMD160 61d13d839c6cdc27b63d42e4aff41836a1e527fd SHA1 4c21ec4e186b31d88adba6b18ab6cfe07326b623 SHA256 f48ad40eb218a79dd90c867998ecd9d440f388d98aebcfdfabb981a2e6260a56
+MISC ChangeLog 3815 RMD160 f0b95eee0344b3390a233845bda9d3b0a577938c SHA1 27cbef46bcec2df4663d1c2b2f64f23241a5a46d SHA256 e2e0e526f9db8c75dc4a35852db4e8cb93c81d09a69c802d01516724394be52a
 MISC metadata.xml 265 RMD160 e723dc6fc78de62b3144444b1329d9791b1f2099 SHA1 4ed7a4469aafc625f36fb28d3b7932d1c9e75f91 SHA256 218f4f107ec5040834a5d0d24c83e179cdd83cdb49a639fa29df53f479a680c7

diff --git a/media-video/minitube/minitube-0.7.ebuild b/media-video/minitube/minitube-0.7.ebuild
index 23f2b78e5e468191a7d395365a8a0517e8ca7e9a..f6109d8cfff77aedc027f492d3d710c4ccf15aae 100644 (file)
--- a/media-video/minitube/minitube-0.7.ebuild
+++ b/media-video/minitube/minitube-0.7.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.7.ebuild,v 1.2 2010/03/09 12:25:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.7.ebuild,v 1.3 2010/04/29 08:10:10 hwoarang Exp $
 
 EAPI="2"
+LANGS="es_AR pt_BR"
+LANGSLONG="cs_CZ de_DE es_ES he_IL it_IT ja_JP pl_PL ru_RU"
 
-inherit qt4
+inherit qt4-r2
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
@@ -17,10 +19,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug kde"
-LNGS="cs de es es_AR he it ja pl pt_BR ru uk"
-for lng in ${LNGS}; do
-       IUSE="${IUSE} linguas_${lng}"
-done
 
 DEPEND="x11-libs/qt-gui:4[accessibility]
        kde? ( media-sound/phonon[gstreamer] )
@@ -29,13 +27,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-LANGS="es_AR pt_BR"
-LANGSNOLONG="cs_CZ de_DE es_ES he_IL it_IT jp_JP pl_PL ru_RU"
-
-src_configure() {
-       eqmake4 ${PN}.pro
-}
-
 src_install() {
        dobin build/target/minitube || die "dobin failed"
        newicon images/app.png minitube.png || die "doicon failed"
@@ -49,7 +40,7 @@ src_install() {
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi
                done
-               for x in ${LANGSNOLONG}; do
+               for x in ${LANGSLONG}; do
                        if [[ ${x%_*} == ${lang} ]]; then
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi

diff --git a/media-video/minitube/minitube-0.8.1.ebuild b/media-video/minitube/minitube-0.8.1.ebuild
index 2f874ef295fb6f0d49c3e7f9febdad173595c60d..607d0d8d4f7f0515d5d5a36b7608072fca2ad0c6 100644 (file)
--- a/media-video/minitube/minitube-0.8.1.ebuild
+++ b/media-video/minitube/minitube-0.8.1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.8.1.ebuild,v 1.4 2010/03/09 12:25:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.8.1.ebuild,v 1.5 2010/04/29 08:10:10 hwoarang Exp $
 
 EAPI="2"
+LANGS="es_AR pt_BR uk"
+LANGSLONG="cs_CZ de_DE es_ES he_IL hr_HR hu_HU fr_FR it_IT ja_JP pl_PL ru_RU
+tr_TR"
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="Qt4 YouTube Client"
 HOMEPAGE="http://flavio.tordini.org/minitube"
@@ -14,10 +17,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug kde"
-LNGS="cs de es es_AR fr he hr hu it ja pl pt_BR ru tr uk"
-for lng in ${LNGS}; do
-       IUSE="${IUSE} linguas_${lng}"
-done
 
 DEPEND="x11-libs/qt-gui:4[accessibility]
        kde? ( media-sound/phonon[gstreamer] )
@@ -26,14 +25,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-LANGS="es_AR pt_BR uk"
-LANGSNOLONG="cs_CZ de_DE es_ES he_IL hr_HR hu_HU fr_FR it_IT jp_JP pl_PL ru_RU
-tr_TR"
-
-src_configure() {
-       eqmake4 ${PN}.pro
-}
-
 src_install() {
        dobin build/target/minitube || die "dobin failed"
        newicon images/app.png minitube.png || die "doicon failed"
@@ -47,7 +38,7 @@ src_install() {
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi
                done
-               for x in ${LANGSNOLONG}; do
+               for x in ${LANGSLONG}; do
                        if [[ ${x%_*} == ${lang} ]]; then
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi

diff --git a/media-video/minitube/minitube-0.8.ebuild b/media-video/minitube/minitube-0.8.ebuild
index 184c5fbe0fc3f279c01f3b5b73b16981e11a42d9..c20fd4edd6a2997affa5a32d29a7d9b842b2dc21 100644 (file)
--- a/media-video/minitube/minitube-0.8.ebuild
+++ b/media-video/minitube/minitube-0.8.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.8.ebuild,v 1.2 2010/03/09 12:25:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-0.8.ebuild,v 1.3 2010/04/29 08:10:10 hwoarang Exp $
 
 EAPI="2"
+LANGS="es_AR pt_BR"
+LANGSLONG="cs_CZ de_DE es_ES he_IL hr_HR hu_HU fr_FR it_IT ja_JP pl_PL ru_RU"
 
-inherit qt4
+inherit qt4-r2
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
@@ -17,10 +19,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug kde"
-LNGS="cs de es es_AR fr he hr hu it ja pl pt_BR ru uk"
-for lng in ${LNGS}; do
-       IUSE="${IUSE} linguas_${lng}"
-done
 
 DEPEND="x11-libs/qt-gui:4[accessibility]
        kde? ( media-sound/phonon[gstreamer] )
@@ -29,13 +27,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-LANGS="es_AR pt_BR"
-LANGSNOLONG="cs_CZ de_DE es_ES he_IL hr_HR hu_HU fr_FR it_IT jp_JP pl_PL ru_RU"
-
-src_configure() {
-       eqmake4 ${PN}.pro
-}
-
 src_install() {
        dobin build/target/minitube || die "dobin failed"
        newicon images/app.png minitube.png || die "doicon failed"
@@ -49,7 +40,7 @@ src_install() {
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi
                done
-               for x in ${LANGSNOLONG}; do
+               for x in ${LANGSLONG}; do
                        if [[ ${x%_*} == ${lang} ]]; then
                                doins "build/target/locale/${x}.qm" || die "doins failed"
                        fi