diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2011-04-06 18:15:09 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2011-04-06 18:15:09 +0000 |
| commit | 9a2c719fdd591ec693e3bb3b41d043a4a3a88c70 (patch) | |
| tree | 65bdcbc9fb412b7ca5a305a768dbad5131562b90 /media-plugins | |
| parent | Fix dependencies. Restrict Jython ABIs. (diff) | |
| download | gentoo-2-9a2c719fdd591ec693e3bb3b41d043a4a3a88c70.tar.gz gentoo-2-9a2c719fdd591ec693e3bb3b41d043a4a3a88c70.tar.bz2 gentoo-2-9a2c719fdd591ec693e3bb3b41d043a4a3a88c70.zip | |
Improve my previos commit by depending on a more recent EAPI to ensure "has_version" works fine with usedeps.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
3 files changed, 12 insertions, 17 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index df72b181b361..be9b4a37bfea 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-softdevice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.67 2011/04/06 17:29:09 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.68 2011/04/06 18:15:09 idl0r Exp $ + + 06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> + vdr-softdevice-0.5.0.20080922.ebuild, vdr-softdevice-0.5.0.20090218.ebuild: + Improve my previos commit by depending on a more recent EAPI to ensure + "has_version" works fine with usedeps. 06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> vdr-softdevice-0.5.0.20080922.ebuild, vdr-softdevice-0.5.0.20090218.ebuild, diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild index 4dc0a3338c8a..6598073695a4 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.5 2011/04/06 17:29:09 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.6 2011/04/06 18:15:09 idl0r Exp $ -EAPI=1 +EAPI=3 inherit eutils vdr-plugin versionator @@ -89,7 +89,7 @@ pkg_setup() { fi } -src_compile() { +src_configure() { local MYOPTS="" MYOPTS="${MYOPTS} --disable-vidix" use xv || MYOPTS="${MYOPTS} --disable-xv" @@ -109,18 +109,13 @@ src_compile() { [[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm" - cd "${S}" elog configure ${MYOPTS} ./configure ${MYOPTS} || die "configure failed" - - vdr-plugin_src_compile } src_install() { vdr-plugin_src_install - cd "${S}" - insinto "${VDR_PLUGIN_DIR}" doins libsoftdevice-*.so.* diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild index 36cd6bd40d43..b8ba72b4b06c 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.4 2011/04/06 17:29:09 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.5 2011/04/06 18:15:09 idl0r Exp $ -EAPI=1 +EAPI=3 inherit eutils vdr-plugin versionator @@ -88,7 +88,7 @@ pkg_setup() { fi } -src_compile() { +src_configure() { local MYOPTS="" MYOPTS="${MYOPTS} --disable-vidix" use xv || MYOPTS="${MYOPTS} --disable-xv" @@ -102,18 +102,13 @@ src_compile() { [[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm" - cd "${S}" elog configure ${MYOPTS} ./configure ${MYOPTS} || die "configure failed" - - vdr-plugin_src_compile } src_install() { vdr-plugin_src_install - cd "${S}" - insinto "${VDR_PLUGIN_DIR}" doins libsoftdevice-*.so.* |