From a8d701015330d04495d1c7094233070966f97c7c Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 30 Jun 2010 01:56:14 +0000 Subject: Block eject as the two collides. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-block/unieject/ChangeLog | 8 ++++++-- sys-block/unieject/Manifest | 16 +++++++++++++--- sys-block/unieject/unieject-5.3.2.ebuild | 5 +++-- sys-block/unieject/unieject-6.ebuild | 5 +++-- 4 files changed, 25 insertions(+), 9 deletions(-) (limited to 'sys-block') diff --git a/sys-block/unieject/ChangeLog b/sys-block/unieject/ChangeLog index 8585a5cccded..434a45ee4cdf 100644 --- a/sys-block/unieject/ChangeLog +++ b/sys-block/unieject/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/unieject -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/ChangeLog,v 1.47 2009/10/23 16:12:16 vostorga Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/ChangeLog,v 1.48 2010/06/30 01:56:14 flameeyes Exp $ + + 30 Jun 2010; Diego E. Pettenò + unieject-5.3.2.ebuild, unieject-6.ebuild: + Block eject as the two collides. 23 Oct 2009; Víctor Ostorga unieject-5.3.2.ebuild: Adding die to emake install diff --git a/sys-block/unieject/Manifest b/sys-block/unieject/Manifest index f92aa575760c..44c29ba1dbd3 100644 --- a/sys-block/unieject/Manifest +++ b/sys-block/unieject/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST unieject-5.3.2.tar.bz2 337274 RMD160 a236e58c6cbfdbea2f8c10dfad1361989e8c0406 SHA1 004193f4109a08ded9107e2da61cef132cf191cc SHA256 b32077ffd9e1af94a048afc55591b4ec43ca67fa720218d47f9120cd00105c51 DIST unieject-6.tar.bz2 370802 RMD160 4ef2814a23ded5619e5ca45a80cba4f96289573c SHA1 2be3434e8e8ad23e067cfc9b4595810274da2293 SHA256 1be7017d9132d05186051a6500331ed0330998f3818915e7e84a07e61fecd2ce -EBUILD unieject-5.3.2.ebuild 1858 RMD160 829ad1132758bdfb8f9aeda3aaa13197c71be6a3 SHA1 18dc8849ac1c7001ac9b17cdcd5c24753fd64257 SHA256 f8d3d7d117bfcc1c0c84c000735ecd5db4ac08006ec0441f326802fc15565e2e -EBUILD unieject-6.ebuild 1882 RMD160 83311e54df79f6456da0da5456c7aae0cc52788c SHA1 0f45faf2c102e61cff1373dc8db503af68f279e0 SHA256 4ce494b3c4107b3c2cf7bdbb913f8f1cf21dc7936272b5ee11a97450dba1b50b -MISC ChangeLog 6772 RMD160 bf3dd97ce40c93398037411f1b348358d677a513 SHA1 2d3536fb3a893123ee0e57bb7632f0c39619b9db SHA256 46598dd70af793fa9099f6e322b9921e7be420db505f84af4cc28f006dc16615 +EBUILD unieject-5.3.2.ebuild 1876 RMD160 94a0b2fe02a9cf021c766bc2975f81c2bcb64934 SHA1 9e603592014a6bba92dad54b77d3bd64eb70c457 SHA256 51af24dd049df04140da9af8cd9ed5ac04f3157f10c445922c4d245b58a10326 +EBUILD unieject-6.ebuild 1899 RMD160 836d2e2aec9066eb5313bb6b4825682a4c9802af SHA1 ca28a7b038fc36721e3a11ecf2b541c2b54da416 SHA256 6cd3cb872d43594e8d812b896287b3b2f15f5bbde858e9ad77f5627843aa7f04 +MISC ChangeLog 6909 RMD160 fded2649d6c70f4b72a39fabfdd64936373ced6a SHA1 b2bc37fb075a54bc07d33f2d8ae1de86278f17b9 SHA256 7597575169d317043b270c4e8fbac7574f2604e55ecc341f16fb8eee4f44b0af MISC metadata.xml 499 RMD160 16708141606c9ad7e2a10e09d64b8c008af97f07 SHA1 4a0b8d2139acc15f9ac0bab158b3e4df6e52b9f1 SHA256 51178e467bc285f775d5ad31a64abbe8fed2d971ce01ef98a76491895494c628 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwqpFEACgkQAiZjviIA2Xg4+QCgkbloxvhMKV5S20UFcMX4unml +fMcAoLPJKyAcDt3d2BthT2BlROceEKpP +=xeM1 +-----END PGP SIGNATURE----- diff --git a/sys-block/unieject/unieject-5.3.2.ebuild b/sys-block/unieject/unieject-5.3.2.ebuild index 7c9ffb27443d..b85ff0546566 100644 --- a/sys-block/unieject/unieject-5.3.2.ebuild +++ b/sys-block/unieject/unieject-5.3.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/unieject-5.3.2.ebuild,v 1.12 2009/10/23 16:12:16 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/unieject-5.3.2.ebuild,v 1.13 2010/06/30 01:56:14 flameeyes Exp $ inherit eutils libtool @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} sys-apps/sed dev-util/pkgconfig" RDEPEND="${RDEPEND} + !sys-apps/eject pmount? ( sys-apps/pmount )" pkg_setup() { diff --git a/sys-block/unieject/unieject-6.ebuild b/sys-block/unieject/unieject-6.ebuild index 5cceaed371b8..f6736cc5cd1d 100644 --- a/sys-block/unieject/unieject-6.ebuild +++ b/sys-block/unieject/unieject-6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/unieject-6.ebuild,v 1.2 2009/08/12 19:23:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/unieject/unieject-6.ebuild,v 1.3 2010/06/30 01:56:14 flameeyes Exp $ inherit eutils libtool @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} sys-apps/sed dev-util/pkgconfig" RDEPEND="${RDEPEND} + !sys-apps/eject pmount? ( sys-apps/pmount )" pkg_setup() { -- cgit v1.2.3-65-gdbad