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 1NBQG7-00042M-BH for garchives@archives.gentoo.org; Fri, 20 Nov 2009 09:58:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5F84E0908; Fri, 20 Nov 2009 09:58:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7656AE0908 for ; Fri, 20 Nov 2009 09:58:28 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 1D48B67D3D for ; Fri, 20 Nov 2009 09:58:28 +0000 (UTC) Received: from zzam by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NBQG3-0007Mj-3g for gentoo-commits@lists.gentoo.org; Fri, 20 Nov 2009 09:58:27 +0000 From: "Matthias Schwarzott (zzam)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, zzam@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-xineliboutput: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLog vdr-xineliboutput-1.0.4_p20090820.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLog vdr-xineliboutput-1.0.4_p20090820.ebuild X-VCS-Directories: media-plugins/vdr-xineliboutput X-VCS-Committer: zzam X-VCS-Committer-Name: Matthias Schwarzott Content-Type: text/plain; charset=utf8 Message-Id: Sender: Matthias Schwarzott Date: Fri, 20 Nov 2009 09:58:27 +0000 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: d3a5d14d-d787-499b-954d-85f902e38fec X-Archives-Hash: 0a9dd173dd1a7c3ceeb66bc17ca02c54 zzam 09/11/20 09:58:27 Modified: vdr-xineliboutput-1.0.4_p20091118.ebuild ChangeLo= g vdr-xineliboutput-1.0.4_p20090820.ebuild Log: Fix installing sub-plugins, thanks to chub for reporting. (Portage version: 2.2_rc50/cvs/Linux i686) Revision Changes Path 1.2 media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.= 0.4_p20091118.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?rev=3D1.2&view=3Dm= arkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?rev=3D1.2&content-= type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild?r1=3D1.1&r2=3D1.2 Index: vdr-xineliboutput-1.0.4_p20091118.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xin= eliboutput-1.0.4_p20091118.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr-xineliboutput-1.0.4_p20091118.ebuild 18 Nov 2009 20:59:36 -0000 1= .1 +++ vdr-xineliboutput-1.0.4_p20091118.ebuild 20 Nov 2009 09:58:26 -0000 1= .2 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-x= ineliboutput-1.0.4_p20091118.ebuild,v 1.1 2009/11/18 20:59:36 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-x= ineliboutput-1.0.4_p20091118.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $ =20 GENTOO_VDR_CONDITIONAL=3Dyes =20 @@ -11,9 +11,6 @@ MY_PV=3D${PV#*_p} MY_P=3D${PN}-cvs-${MY_PV} =20 -SO_VERSION=3D"${PV%_p*}" -SO_VERSION=3D"${SO_VERSION/_/}" - DESCRIPTION=3D"Video Disk Recorder Xinelib PlugIn" HOMEPAGE=3D"http://sourceforge.net/projects/xineliboutput/" SRC_URI=3D"http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2" @@ -130,13 +127,17 @@ # install vdr plugin vdr-plugin_src_install =20 - # There may be no sub-plugin, depending on use-flags + # version number that the sources contain + local SO_VERSION=3D"$(grep 'static const char \*VERSION *=3D' xinelibo= utput.c |\ + cut -d'"' -f2)" + echo SO_VERSION=3D$SO_VERSION insinto ${VDR_PLUGIN_DIR} - local f - for f in libxineliboutput*.so.${SO_VERSION}; do - [[ -f "$f" ]] || continue - doins "${f}" || die "could not install sub-plugin ${f}" - done + if use fbcon; then + doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed" + fi + if use X; then + doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed" + fi fi =20 if use xine; then 1.50 media-plugins/vdr-xineliboutput/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/ChangeLog?rev=3D1.50&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/ChangeLog?rev=3D1.50&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/ChangeLog?r1=3D1.49&r2=3D1.50 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeL= og,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 20 Nov 2009 08:59:55 -0000 1.49 +++ ChangeLog 20 Nov 2009 09:58:26 -0000 1.50 @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-xineliboutput # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/Chang= eLog,v 1.49 2009/11/20 08:59:55 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/Chang= eLog,v 1.50 2009/11/20 09:58:26 zzam Exp $ + + 20 Nov 2009; Matthias Schwarzott + vdr-xineliboutput-1.0.4_p20090820.ebuild, + vdr-xineliboutput-1.0.4_p20091118.ebuild: + Fix installing sub-plugins, thanks to chub for reporting. =20 20 Nov 2009; Matthias Schwarzott -vdr-xineliboutput-1.0.0_rc1.ebuild, -vdr-xineliboutput-1.0.0_rc2.ebui= ld, 1.2 media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.= 0.4_p20090820.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?rev=3D1.2&view=3Dm= arkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?rev=3D1.2&content-= type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-= xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild?r1=3D1.1&r2=3D1.2 Index: vdr-xineliboutput-1.0.4_p20090820.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xin= eliboutput-1.0.4_p20090820.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr-xineliboutput-1.0.4_p20090820.ebuild 26 Aug 2009 08:20:13 -0000 1= .1 +++ vdr-xineliboutput-1.0.4_p20090820.ebuild 20 Nov 2009 09:58:26 -0000 1= .2 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-x= ineliboutput-1.0.4_p20090820.ebuild,v 1.1 2009/08/26 08:20:13 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-x= ineliboutput-1.0.4_p20090820.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $ =20 GENTOO_VDR_CONDITIONAL=3Dyes =20 @@ -11,9 +11,6 @@ MY_PV=3D${PV#*_p} MY_P=3D${PN}-cvs-${MY_PV} =20 -SO_VERSION=3D"${PV%_p*}" -SO_VERSION=3D"${SO_VERSION/_/}" - DESCRIPTION=3D"Video Disk Recorder Xinelib PlugIn" HOMEPAGE=3D"http://sourceforge.net/projects/xineliboutput/" SRC_URI=3D"http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2" @@ -130,13 +127,17 @@ # install vdr plugin vdr-plugin_src_install =20 - # There may be no sub-plugin, depending on use-flags + # version number that the sources contain + local SO_VERSION=3D"$(grep 'static const char \*VERSION *=3D' xinelibo= utput.c |\ + cut -d'"' -f2)" + echo SO_VERSION=3D$SO_VERSION insinto ${VDR_PLUGIN_DIR} - local f - for f in libxineliboutput*.so.${SO_VERSION}; do - [[ -f "$f" ]] || continue - doins "${f}" || die "could not install sub-plugin ${f}" - done + if use fbcon; then + doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed" + fi + if use X; then + doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed" + fi fi =20 if use xine; then