diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-07-25 20:05:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-07-25 20:05:51 +0000 |
| commit | 8de8a03cd2eda7b38c6c0a5cd465a200e4b2cfad (patch) | |
| tree | 061563aa832a30a9d9abcbd27d38afb4e3a86e4d /sys-apps/eject | |
| parent | Stable on hppa (diff) | |
| download | gentoo-2-8de8a03cd2eda7b38c6c0a5cd465a200e4b2cfad.tar.gz gentoo-2-8de8a03cd2eda7b38c6c0a5cd465a200e4b2cfad.tar.bz2 gentoo-2-8de8a03cd2eda7b38c6c0a5cd465a200e4b2cfad.zip | |
Block virtual/eject else it conflicts with sys-block/unieject.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-apps/eject')
| -rw-r--r-- | sys-apps/eject/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/eject/eject-2.0.13-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/eject/eject-2.0.13-r2.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/eject/eject-2.0.13.ebuild | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog index aefcd2b6181c..215c03e1a393 100644 --- a/sys-apps/eject/ChangeLog +++ b/sys-apps/eject/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/eject # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.33 2005/07/23 15:12:30 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.34 2005/07/25 20:05:51 flameeyes Exp $ + + 25 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> eject-2.0.13.ebuild, + eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild: + Block virtual/eject else it conflicts with sys-block/unieject. 23 Jul 2005; <solar.@gentoo.org> +files/eject-2.0.13-i18n-uclibc.patch, eject-2.0.13-r2.ebuild: diff --git a/sys-apps/eject/eject-2.0.13-r1.ebuild b/sys-apps/eject/eject-2.0.13-r1.ebuild index 866d8faf502a..400fa1b5ccc4 100644 --- a/sys-apps/eject/eject-2.0.13-r1.ebuild +++ b/sys-apps/eject/eject-2.0.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r1.ebuild,v 1.3 2005/05/28 00:44:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r1.ebuild,v 1.4 2005/07/25 20:05:51 flameeyes Exp $ inherit eutils @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 sh sparc x86" IUSE="nls" -DEPEND="" +DEPEND="!virtual/eject" PROVIDE="virtual/eject" src_unpack() { diff --git a/sys-apps/eject/eject-2.0.13-r2.ebuild b/sys-apps/eject/eject-2.0.13-r2.ebuild index 1501a47b882c..7e759bee1019 100644 --- a/sys-apps/eject/eject-2.0.13-r2.ebuild +++ b/sys-apps/eject/eject-2.0.13-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.4 2005/07/23 15:12:30 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.5 2005/07/25 20:05:51 flameeyes Exp $ inherit eutils @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="nls" -DEPEND="" +DEPEND="!virtual/eject" PROVIDE="virtual/eject" src_unpack() { diff --git a/sys-apps/eject/eject-2.0.13.ebuild b/sys-apps/eject/eject-2.0.13.ebuild index e4232c4d7b2d..b2a510eff5b8 100644 --- a/sys-apps/eject/eject-2.0.13.ebuild +++ b/sys-apps/eject/eject-2.0.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13.ebuild,v 1.18 2005/05/28 00:44:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13.ebuild,v 1.19 2005/07/25 20:05:51 flameeyes Exp $ inherit eutils @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" IUSE="nls" -RDEPEND="virtual/libc" +RDEPEND="virtual/libc + !virtual/eject" DEPEND="${RDEPEND} >=sys-apps/sed-4" PROVIDE="virtual/eject" |