diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2006-01-09 21:11:44 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2006-01-09 21:11:44 +0000 |
| commit | e56b217fd2f58aad723c7a3dabb0d70f908b38d2 (patch) | |
| tree | b68451189f426f1dab2580266d80d4c2ab887ba9 /media-plugins | |
| parent | whitespace (diff) | |
| download | gentoo-2-e56b217fd2f58aad723c7a3dabb0d70f908b38d2.tar.gz gentoo-2-e56b217fd2f58aad723c7a3dabb0d70f908b38d2.tar.bz2 gentoo-2-e56b217fd2f58aad723c7a3dabb0d70f908b38d2.zip | |
added block, to fix a conflict with ebuilds on gentoo.de cvs
(Portage version: 2.0.53)
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/vdr-graphlcd/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-graphlcd/Manifest | 4 | ||||
| -rw-r--r-- | media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog index 26bac261ee13..c0b7207267a4 100644 --- a/media-plugins/vdr-graphlcd/ChangeLog +++ b/media-plugins/vdr-graphlcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-graphlcd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.1 2006/01/08 15:36:55 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.2 2006/01/09 21:11:44 hd_brummy Exp $ + + 09 Jan 2006; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-graphlcd-0.1.2_pre6-r1.ebuild: + added block to fix conflict with ebuilds on gentoo.de cvs *vdr-graphlcd-0.1.2_pre6-r1 (08 Jan 2006) diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest index bd6ee8e5fbae..5a13f75124e4 100644 --- a/media-plugins/vdr-graphlcd/Manifest +++ b/media-plugins/vdr-graphlcd/Manifest @@ -1,6 +1,6 @@ -MD5 876dc05d01cf73e798d894bb94426389 ChangeLog 469 +MD5 85f9b8bb434bb3c7b7523e2b846a4ab0 ChangeLog 622 MD5 b52e340ed185e77044523dcee028aae6 files/confd 681 MD5 c06ef00216c435d94502bd44c0cf7e51 files/digest-vdr-graphlcd-0.1.2_pre6-r1 72 MD5 517fd6e47ab25170f56df5a2a07510e6 files/rc-addon.sh 453 MD5 363fe851c7edc1284983ea5393b8c2a9 metadata.xml 403 -MD5 def1fe8875556177f48a84be0da7fb5d vdr-graphlcd-0.1.2_pre6-r1.ebuild 2344 +MD5 90b6d24ccfc9ef49042deeee893d2af5 vdr-graphlcd-0.1.2_pre6-r1.ebuild 2500 diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild index c521d46cf779..96f29e0aeff1 100644 --- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild +++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild,v 1.1 2006/01/08 15:36:55 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild,v 1.2 2006/01/09 21:11:44 hd_brummy Exp $ inherit eutils vdr-plugin @@ -19,8 +19,11 @@ IUSE="truetype" S=${WORKDIR}/${VDRPLUGIN}-${MY_PV} DEPEND=">=media-video/vdr-1.2.6 - >=graphlcd-base-${PV}" + >=app-misc/graphlcd-base-${PV} + !sys-apps/graphlcd-base" +# DO NOT remove "!sys-apps/graphlcd-base" from DEPEND !!! +# It will fix a conflict with ebuilds in Gentoo.de OVERLAY CVS src_unpack() { |