Migrate to qt4-r2 eclass wrt bug #311481

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

diff --git a/media-video/2mandvd/2mandvd-1.1.1.ebuild b/media-video/2mandvd/2mandvd-1.1.1.ebuild
index 2bd9a71664074e005cefc858c3df2cae1842c413..861f22675e955896ef40f299d4ae2c4d8df1a9b9 100644 (file)
--- a/media-video/2mandvd/2mandvd-1.1.1.ebuild
+++ b/media-video/2mandvd/2mandvd-1.1.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild,v 1.1 2009/11/09 21:06:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild,v 1.2 2010/04/29 08:00:45 hwoarang Exp $
 
 EAPI="2"
+LANGS="de en he it pl pt ru"
 
-inherit qt4
+inherit qt4-r2
 
 MY_PN="2ManDVD"
 
@@ -31,12 +32,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
-LANGS="de en he it pl pt ru"
-
-for x in ${LANGS}; do
-       IUSE="${IUSE} linguas_${x}"
-done
-
 src_prepare() {
        # fix installation path
        for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
@@ -47,11 +42,7 @@ src_prepare() {
        sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
                mainfrm.cpp || die "sed failed"
 
-       qt4_src_prepare
-}
-
-src_configure() {
-       eqmake4 ${MY_PN}.pro
+       qt4-r2_src_prepare
 }
 
 src_install() {

diff --git a/media-video/2mandvd/2mandvd-1.2-r1.ebuild b/media-video/2mandvd/2mandvd-1.2-r1.ebuild
index 285fa7b3bd45437cfd7f92a15bf8de993abe2fb7..eb08587a1e105c6427e1414b96d94d8dee95d243 100644 (file)
--- a/media-video/2mandvd/2mandvd-1.2-r1.ebuild
+++ b/media-video/2mandvd/2mandvd-1.2-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v 1.1 2010/03/13 14:43:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v 1.2 2010/04/29 08:00:45 hwoarang Exp $
 
 EAPI="2"
+LANGS="de en he it pl pt ru"
 
-inherit qt4
+inherit qt4-r2
 
 MY_PN="2ManDVD"
 
@@ -33,12 +34,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
-LANGS="de en he it pl pt ru"
-
-for x in ${LANGS}; do
-       IUSE="${IUSE} linguas_${x}"
-done
-
 src_prepare() {
        # fix installation path
        for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
@@ -49,11 +44,7 @@ src_prepare() {
        sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
                mainfrm.cpp || die "sed failed"
 
-       qt4_src_prepare
-}
-
-src_configure() {
-       eqmake4 ${MY_PN}.pro
+       qt4-r2_src_prepare
 }
 
 src_install() {

diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index 48973f4541daf199d76ba0516426f26a8f485775..8bc1212cc478e9798680243266dc317d6029fb71 100644 (file)
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/2mandvd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.7 2010/03/25 20:37:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.8 2010/04/29 08:00:45 hwoarang Exp $
+
+  29 Apr 2010; Markos Chandras <hwoarang@gentoo.org> 2mandvd-1.1.1.ebuild,
+  2mandvd-1.2-r1.ebuild:
+  Migrate to qt4-r2 eclass wrt bug #311481
 
 *2mandvd-1.3.3 (25 Mar 2010)
 

diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild
index 7d27d27cd2b215ddff0e4bdd4dbccb7b998fded2..933adcdf17a8b5c4afc6faea737f9b97f2c7815e 100644 (file)
--- a/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild
+++ b/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild
@@ -1,9 +1,11 @@
 # 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.3.ebuild,v 1.1 2009/10/19 15:32:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.3.ebuild,v 1.2 2010/04/29 08:02:28 hwoarang Exp $
 
 EAPI=2
-inherit eutils qt4 versionator
+LANGS="br ca cs da de es fr gl hu it pl ro sv"
+
+inherit eutils qt4-r2 versionator
 
 MY_PN="xVideoServiceThief"
 MY_PV=$(replace_all_version_separators '_')
@@ -29,7 +31,6 @@ RDEPEND=">=x11-libs/qt-gui-4.5.0:4
 
 S="${WORKDIR}/${MY_PN}-src"
 
-LANGS="br ca cs da de es fr gl hu it pl ro sv"
 RES_NAME="xVST"
 
 src_prepare() {
@@ -42,10 +43,6 @@ src_prepare() {
                "${S}"/src/options.cpp || die "failed to fix paths"
 }
 
-src_configure() {
-       eqmake4 xVideoServiceThief.pro
-}
-
 src_compile() {
        local lang=
        emake || die "emake failed"