diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-12-28 11:05:30 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-12-28 11:05:30 +0000 |
| commit | c39615c71edad068b387a461b57b5c4100201caf (patch) | |
| tree | 236e3fab26f9510ff7db26e79fc0513e53a81d03 /app-cdr/cdrkit | |
| parent | inkscape poppler 0.16 fix (diff) | |
| download | gentoo-2-c39615c71edad068b387a461b57b5c4100201caf.tar.gz gentoo-2-c39615c71edad068b387a461b57b5c4100201caf.tar.bz2 gentoo-2-c39615c71edad068b387a461b57b5c4100201caf.zip | |
app-cdr/cdrtools conflict must be also in RDEPEND
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/cdrkit')
| -rw-r--r-- | app-cdr/cdrkit/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/cdrkit/cdrkit-1.1.10.ebuild | 6 | ||||
| -rw-r--r-- | app-cdr/cdrkit/cdrkit-1.1.11.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app-cdr/cdrkit/ChangeLog b/app-cdr/cdrkit/ChangeLog index ddd3635faf27..754f6a39c946 100644 --- a/app-cdr/cdrkit/ChangeLog +++ b/app-cdr/cdrkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/cdrkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.86 2010/12/18 20:37:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.87 2010/12/28 11:05:30 lxnay Exp $ + + 28 Dec 2010; Fabio Erculiani <lxnay@gentoo.org> cdrkit-1.1.10.ebuild, + cdrkit-1.1.11.ebuild: + app-cdr/cdrtools conflict must be also in RDEPEND *cdrkit-1.1.11 (18 Dec 2010) diff --git a/app-cdr/cdrkit/cdrkit-1.1.10.ebuild b/app-cdr/cdrkit/cdrkit-1.1.10.ebuild index 824f0c7fa836..d2fe475709f0 100644 --- a/app-cdr/cdrkit/cdrkit-1.1.10.ebuild +++ b/app-cdr/cdrkit/cdrkit-1.1.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.10.ebuild,v 1.7 2010/02/07 15:56:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.10.ebuild,v 1.8 2010/12/28 11:05:30 lxnay Exp $ inherit cmake-utils @@ -13,10 +13,10 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd" IUSE="debug hfs unicode" -RDEPEND="unicode? ( virtual/libiconv ) +RDEPEND="!app-cdr/cdrtools + unicode? ( virtual/libiconv ) kernel_linux? ( sys-libs/libcap )" DEPEND="${RDEPEND} - !app-cdr/cdrtools hfs? ( sys-apps/file )" src_install() { diff --git a/app-cdr/cdrkit/cdrkit-1.1.11.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11.ebuild index 55ad5ca0090b..1d723032c6cd 100644 --- a/app-cdr/cdrkit/cdrkit-1.1.11.ebuild +++ b/app-cdr/cdrkit/cdrkit-1.1.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11.ebuild,v 1.1 2010/12/18 20:37:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11.ebuild,v 1.2 2010/12/28 11:05:30 lxnay Exp $ EAPI=3 inherit cmake-utils @@ -14,10 +14,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" IUSE="debug hfs unicode" -RDEPEND="unicode? ( virtual/libiconv ) +RDEPEND="!app-cdr/cdrtools + unicode? ( virtual/libiconv ) kernel_linux? ( sys-libs/libcap )" DEPEND="${RDEPEND} - !app-cdr/cdrtools hfs? ( sys-apps/file )" src_prepare() { |