From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SWcF5-00082l-VG for garchives@archives.gentoo.org; Mon, 21 May 2012 23:42:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18C0EE0CB4; Mon, 21 May 2012 23:42:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D0D32E0CB4 for ; Mon, 21 May 2012 23:42:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4B051B403E for ; Mon, 21 May 2012 23:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A6ABBE5430 for ; Mon, 21 May 2012 23:42:04 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1337643630.f9dc6ad9b309e51dd1bc50c1cac130f7fc851a5f.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: media-video/xvideoservicethief/, eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-r2.eclass media-video/xvideoservicethief/xvideoservicethief-9999.ebuild X-VCS-Directories: media-video/xvideoservicethief/ eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: f9dc6ad9b309e51dd1bc50c1cac130f7fc851a5f X-VCS-Branch: master Date: Mon, 21 May 2012 23:42:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 984c10db-2ba7-45a7-8af2-9d5fe038bd2d X-Archives-Hash: afd31031b3dd5168e351e743074d9914 commit: f9dc6ad9b309e51dd1bc50c1cac130f7fc851a5f Author: Davide Pesavento gmail com> AuthorDate: Mon May 21 23:40:30 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 21 23:40:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Df9dc6ad9 [qt4-r2.eclass] Rename prepare_translations to qt4-r2_install_translation= s. --- eclass/qt4-r2.eclass | 6 +++--- .../xvideoservicethief-9999.ebuild | 17 +++++++++-----= --- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index 362ceaf..a29428b 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.eclass @@ -153,7 +153,7 @@ qt4-r2_src_install() { =20 # install translations # need to have specified LANGS or LANGSLONG for this to work - [[ -n ${LANGS} || -n ${LANGSLONG} ]] && prepare_translations + [[ -n ${LANGS} || -n ${LANGSLONG} ]] && qt4-r2_install_translations } =20 # @FUNCTION: eqmake4 @@ -303,11 +303,11 @@ _find_project_file() { esac } =20 -# @FUNCTION: prepare_translations +# @FUNCTION: qt4-r2_install_translations # @DESCRIPTION: # Choose and install translation files. Normally you don't need to call # this function directly as it is called from qt4-r2_src_install. -prepare_translations() { +qt4-r2_install_translations() { debug-print-function $FUNCNAME "$@" =20 # @VARIABLE: TRANSLATIONSDIR diff --git a/media-video/xvideoservicethief/xvideoservicethief-9999.ebuil= d b/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild index d82578f..a0167a3 100644 --- a/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild +++ b/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -6,7 +6,7 @@ EAPI=3D"2" =20 LANGS=3D"br ca cs da de es fr gl hu it ja ko nl pl ro ru sv" =20 -inherit qt4-r2 versionator subversion +inherit eutils qt4-r2 versionator subversion =20 MY_PN=3D"xVST" MY_PV=3D$(replace_all_version_separators '_') @@ -27,7 +27,7 @@ RDEPEND=3D"x11-libs/qt-gui:4 media-video/ffmpeg media-video/flvstreamer" =20 -S=3D"${WORKDIR}" +S=3D${WORKDIR} TRANSLATIONSDIR=3D"${S}/resources" =20 src_prepare() { @@ -44,13 +44,15 @@ src_prepare() { =20 # fix plugins, language path sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \ - "${S}"/src/options.cpp || die "failed to fix paths" + "${S}"/src/options.cpp || die "failed to fix paths" + qt4-r2_src_prepare } =20 src_compile() { + qt4-r2_src_compile + local lang=3D - emake || die "emake failed" for lang in "${S}"/resources/translations/*.ts; do lrelease ${lang} done @@ -63,11 +65,10 @@ src_install() { make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo= ;Video' \ || die "make_desktop_entry failed" =20 - #install plugins + # install plugins local dest=3D/usr/share/${PN}/plugins dodir ${dest} find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \; =20 - #install translations - prepare_translations + qt4-r2_install_translations }