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 | 024df32f61eea4642f40e1f542f29fa5deacdc40 (patch) | |
| tree | f82e8df8890bd8564d013fda8af238bcac3591fd /app-cdr | |
| parent | inkscape poppler 0.16 fix (diff) | |
| download | historical-024df32f61eea4642f40e1f542f29fa5deacdc40.tar.gz historical-024df32f61eea4642f40e1f542f29fa5deacdc40.tar.bz2 historical-024df32f61eea4642f40e1f542f29fa5deacdc40.zip | |
app-cdr/cdrtools conflict must be also in RDEPEND
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/cdrkit/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/cdrkit/Manifest | 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 |
4 files changed, 14 insertions, 10 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/Manifest b/app-cdr/cdrkit/Manifest index 016b73b4cc32..7a96a7d10028 100644 --- a/app-cdr/cdrkit/Manifest +++ b/app-cdr/cdrkit/Manifest @@ -1,6 +1,6 @@ DIST cdrkit_1.1.10.orig.tar.gz 1443493 RMD160 5eb098ddb98bc4e55b694131aa1ffe193a2160ae SHA1 37f35c0cb3180bbe56efc37bbf7bc82df39447c4 SHA256 8b6e90b4068cac6f3a75a501d7a85aba6583b2dc34f434e3eb62d29104b107e5 DIST cdrkit_1.1.11.orig.tar.gz 1445133 RMD160 7fc3635a6cb80d15710b5ad947e226f1433921ca SHA1 3f7ddc06db0272942e1a4cd98c3c96462df77387 SHA256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da -EBUILD cdrkit-1.1.10.ebuild 1621 RMD160 e7293010343dfae3ee099e571e3b39acde50b175 SHA1 c23c502913f558f0299b2cdddcabcbcccb611d99 SHA256 d3cbb86e52da3b9b5688e4691e378577478d507dc64ffb2a775cb2f999b0631a -EBUILD cdrkit-1.1.11.ebuild 1536 RMD160 4042ebd695bee7859c58af2e63fe815bcce1cf1a SHA1 87ddb8f0b30cf3df0c9058d6e196639e59401b2c SHA256 0fcc09d4b3621191ff3bfd7f1588d3fb81f3f707aeae4637076af7ccd13fbbc6 -MISC ChangeLog 10164 RMD160 a0f7988ea736ba96614e9c3328df0703c7b52ec7 SHA1 8da8a65fe490c3cc00d271cb6a804af9367effb3 SHA256 52e7ab6835858e7f424446006b8fedadb0586ad7b617911563840bcc1fc3f245 +EBUILD cdrkit-1.1.10.ebuild 1619 RMD160 b8451aad9053a9053aa7c1c5c0557176548abc8e SHA1 40cacbb0c75ded19e54391ad7c2bf9f27ade8c5e SHA256 49c941eda81bd8bf88dd0197a84a4d318d998b3434a2d5e86beb84ed20e6224b +EBUILD cdrkit-1.1.11.ebuild 1532 RMD160 4e2f40b905d73fac24fa89cd55d2384e931e61ec SHA1 ce95cbe8456d9eac094de4e1d6a0fb12f89006c1 SHA256 b9cb30bd0d23d253e8be1b957e1fb87a504f1140a3e385b48c4f91e4549395c7 +MISC ChangeLog 10309 RMD160 16db7f7a77b4ecbee9b4088460c9fb2115f98a68 SHA1 eff122d421588b14698c68b1a612ac17445f22fe SHA256 1e9d5430809feac9e06ba7dab453929a0a1c4f184d71418a8204aa1334444a2b MISC metadata.xml 247 RMD160 f3cc383d1015158a8bfe1b6efd3586fa89a95345 SHA1 47a345bfa35d34381b88e9a8770cbe35a24c1476 SHA256 4d18b2a7e3f3237d29a2ea874c71c66abcda946f15bb7e15fa7cfc1d33731a24 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() { |