diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-02-16 14:55:48 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-02-16 14:55:48 +0000 |
| commit | f196abbb5eb06e66ec59adf496fa4e435d5de014 (patch) | |
| tree | 1747cbf9dfa5a92a832f4c96593e2b4042676ffa /media-video/vdr | |
| parent | clang now autodetects C++ header paths, dropping the system-cxx-headers syste... (diff) | |
| download | gentoo-2-f196abbb5eb06e66ec59adf496fa4e435d5de014.tar.gz gentoo-2-f196abbb5eb06e66ec59adf496fa4e435d5de014.tar.bz2 gentoo-2-f196abbb5eb06e66ec59adf496fa4e435d5de014.zip | |
ecommit
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-video/vdr')
| -rw-r--r-- | media-video/vdr/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/vdr/vdr-1.6.0_p2-r7.ebuild | 18 |
2 files changed, 9 insertions, 14 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 63ed2cd1729d..5f070a915563 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/vdr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.152 2012/02/15 17:57:39 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.153 2012/02/16 14:55:48 hd_brummy Exp $ + + 16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild: + ecommit fixed depend vdr-dxr3 version, changed use-flag check to REQUIRED_USE 15 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r6.ebuild, vdr-1.6.0_p2-r7.ebuild: diff --git a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild b/media-video/vdr/vdr-1.6.0_p2-r7.ebuild index 7a6cdf471e38..bf26c328a2f9 100644 --- a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild +++ b/media-video/vdr/vdr-1.6.0_p2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.4 2012/02/15 17:57:39 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.5 2012/02/16 14:55:48 hd_brummy Exp $ EAPI="4" @@ -44,6 +44,9 @@ KEYWORDS="~arm ~amd64 ~ppc ~x86" SLOT="0" LICENSE="GPL-2" +REQUIRED_USE="setup? ( !menuorg ) + menuorg? ( !setup )" + COMMON_DEPEND="virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 @@ -63,28 +66,17 @@ RDEPEND="${COMMON_DEPEND} # pull in vdr-setup to get the xml files, else menu will not work PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r4 ) - dxr3? ( >=media-plugins/vdr-dxr3-0.2.12 ) " + dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 ) " CONF_DIR=/etc/vdr CAP_FILE=${S}/capabilities.sh CAPS="# Capabilities of the vdr-executable for use by startscript etc." pkg_setup() { - check_menu_flags - use debug && append-flags -g PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" } -check_menu_flags() { - if use menuorg && use setup; then - echo - eerror "Please use only one of this USE-Flags" - eerror "\tmenuorg setup" - die "multiple menu manipulation" - fi -} - add_cap() { local arg for arg; do |