summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-06-30 01:56:14 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-06-30 01:56:14 +0000
commit2b0a238b463aef11ad6e476cbd4313631d698ebf (patch)
treed00e1b9d75b631e358e60236e81f285dc5074f03 /sys-block
parentSet SUPPORT_PYTHON_ABIS. (diff)
downloadgentoo-2-2b0a238b463aef11ad6e476cbd4313631d698ebf.tar.gz
gentoo-2-2b0a238b463aef11ad6e476cbd4313631d698ebf.tar.bz2
gentoo-2-2b0a238b463aef11ad6e476cbd4313631d698ebf.zip
Block eject as the two collides.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/unieject/ChangeLog8
-rw-r--r--sys-block/unieject/unieject-5.3.2.ebuild5
-rw-r--r--sys-block/unieject/unieject-6.ebuild5
3 files changed, 12 insertions, 6 deletions
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ò <flameeyes@gentoo.org>
+ unieject-5.3.2.ebuild, unieject-6.ebuild:
+ Block eject as the two collides.
23 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> unieject-5.3.2.ebuild:
Adding die to emake install
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() {