diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-11-20 09:58:26 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-11-20 09:58:26 +0000 |
| commit | 509f3631936f8b3cdec5b51cdb25677d7d1520dd (patch) | |
| tree | c917b1f4fd8df27e5ba8ccd01519bb69fc4be6c1 /media-plugins/vdr-xineliboutput | |
| parent | version bump - remove old versions (diff) | |
| download | gentoo-2-509f3631936f8b3cdec5b51cdb25677d7d1520dd.tar.gz gentoo-2-509f3631936f8b3cdec5b51cdb25677d7d1520dd.tar.bz2 gentoo-2-509f3631936f8b3cdec5b51cdb25677d7d1520dd.zip | |
Fix installing sub-plugins, thanks to chub for reporting.
(Portage version: 2.2_rc50/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
3 files changed, 28 insertions, 21 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index b8103c47341b..ec7ef14a07d5 100644 --- a/media-plugins/vdr-xineliboutput/ChangeLog +++ b/media-plugins/vdr-xineliboutput/ChangeLog @@ -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/ChangeLog,v 1.49 2009/11/20 08:59:55 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.50 2009/11/20 09:58:26 zzam Exp $ + + 20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> + vdr-xineliboutput-1.0.4_p20090820.ebuild, + vdr-xineliboutput-1.0.4_p20091118.ebuild: + Fix installing sub-plugins, thanks to chub for reporting. 20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> -vdr-xineliboutput-1.0.0_rc1.ebuild, -vdr-xineliboutput-1.0.0_rc2.ebuild, diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild index 98e243133e66..1dc65ce3cd3b 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild @@ -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-xineliboutput-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-xineliboutput-1.0.4_p20090820.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $ GENTOO_VDR_CONDITIONAL=yes @@ -11,9 +11,6 @@ inherit vdr-plugin eutils multilib versionator MY_PV=${PV#*_p} MY_P=${PN}-cvs-${MY_PV} -SO_VERSION="${PV%_p*}" -SO_VERSION="${SO_VERSION/_/}" - DESCRIPTION="Video Disk Recorder Xinelib PlugIn" HOMEPAGE="http://sourceforge.net/projects/xineliboutput/" SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2" @@ -130,13 +127,17 @@ src_install() { # install vdr plugin vdr-plugin_src_install - # There may be no sub-plugin, depending on use-flags + # version number that the sources contain + local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\ + cut -d'"' -f2)" + echo SO_VERSION=$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 if use xine; then diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild index 5a18e432f5ab..a113e8797f0e 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild @@ -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-xineliboutput-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-xineliboutput-1.0.4_p20091118.ebuild,v 1.2 2009/11/20 09:58:26 zzam Exp $ GENTOO_VDR_CONDITIONAL=yes @@ -11,9 +11,6 @@ inherit vdr-plugin eutils multilib versionator MY_PV=${PV#*_p} MY_P=${PN}-cvs-${MY_PV} -SO_VERSION="${PV%_p*}" -SO_VERSION="${SO_VERSION/_/}" - DESCRIPTION="Video Disk Recorder Xinelib PlugIn" HOMEPAGE="http://sourceforge.net/projects/xineliboutput/" SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2" @@ -130,13 +127,17 @@ src_install() { # install vdr plugin vdr-plugin_src_install - # There may be no sub-plugin, depending on use-flags + # version number that the sources contain + local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\ + cut -d'"' -f2)" + echo SO_VERSION=$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 if use xine; then |