summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2012-02-16 14:55:48 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2012-02-16 14:55:48 +0000
commitc5d2f0bf2179df3be3b7764b9eda05c88cba4f70 (patch)
treed1d55fd5b9f48d903caefb483c8b004d2f53d24b /media-video/vdr
parentclang now autodetects C++ header paths, dropping the system-cxx-headers syste... (diff)
downloadhistorical-c5d2f0bf2179df3be3b7764b9eda05c88cba4f70.tar.gz
historical-c5d2f0bf2179df3be3b7764b9eda05c88cba4f70.tar.bz2
historical-c5d2f0bf2179df3be3b7764b9eda05c88cba4f70.zip
ecommit
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/ChangeLog5
-rw-r--r--media-video/vdr/Manifest10
-rw-r--r--media-video/vdr/vdr-1.6.0_p2-r7.ebuild18
3 files changed, 14 insertions, 19 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/Manifest b/media-video/vdr/Manifest
index 593f9cc0d8c7..6d0a70163e59 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -15,14 +15,14 @@ DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1
DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
EBUILD vdr-1.6.0_p2-r6.ebuild 11586 RMD160 8c973132e728285b97cc2e8061e47b20d638f07b SHA1 f800dd3584e774c0e744a8f79ddd55651475d6fa SHA256 52e2b489d58c5881543778202be22c4942128c53c0d938c7787dc8d8ea52c7a5
-EBUILD vdr-1.6.0_p2-r7.ebuild 11631 RMD160 5fa1423282161dfd41bc9ceab37fe3f9b312fe25 SHA1 16b90a397621e1dea3ae2e8e13d77ceadc775155 SHA256 d47cd026f9be937279c3c834e996609a9d4e7a408b7a158c859dca35f3639289
-MISC ChangeLog 27576 RMD160 4166bea6ec18866fb769ba4b0cc5266c70b14371 SHA1 0d0509e467bf85d7faae2a321c24d78f4de50715 SHA256 b8d127b4aec46220661a11f1b6b6adf507853234726fa3ac45ae245a8f70665f
+EBUILD vdr-1.6.0_p2-r7.ebuild 11490 RMD160 3300327402fb194b882c8aa1cab160eb886fe1ac SHA1 5247b8c871ae53c84ece23f68fce6f4b8c41212c SHA256 2ac2debd575f914345dff5b33c6f8716c565925a33bdae2f514c524973978522
+MISC ChangeLog 27736 RMD160 ebc3f5c89d37ecc885fbd76fb29d15b7f9fc80db SHA1 21a9cb0eca90f101e8301dbd1fd1be61c8e3b8a6 SHA256 4c210d7f0a0ce54bc40057b07ff94b0c8f5bba87a8df84f81a065d202f84c956
MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFPO/Iedn07HTTCgIoRAv6/AJ9g8uh5Yb+PgiUWvSwP3OuSr2t7VwCfRW0m
-8ckjLP5VqFEYgY4cIQc9RWo=
-=eWVo
+iD8DBQFPPRkGdn07HTTCgIoRAjWgAJ0QJd0uc3kn3hkt3I8MoJo5oEj15wCdFK/7
+M/PSjLR8Sog/UiZZ1zIkTiY=
+=ttyB
-----END PGP SIGNATURE-----
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