summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-03-07 01:23:03 +0000
committerMike Frysinger <vapier@gentoo.org>2010-03-07 01:23:03 +0000
commit7b7a9da09df14024932f0b661d83fcd891218564 (patch)
treebad86b85d075eb177ddc5c332d5b014a9f42c053 /app-arch/tapeutils
parentVersion bump, remove old. (diff)
downloadgentoo-2-7b7a9da09df14024932f0b661d83fcd891218564.tar.gz
gentoo-2-7b7a9da09df14024932f0b661d83fcd891218564.tar.bz2
gentoo-2-7b7a9da09df14024932f0b661d83fcd891218564.zip
Block app-emulation/hercules due to tapecopy collision #247393 by Diego E. Pettenò.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/tapeutils')
-rw-r--r--app-arch/tapeutils/ChangeLog8
-rw-r--r--app-arch/tapeutils/tapeutils-0.4.ebuild11
2 files changed, 13 insertions, 6 deletions
diff --git a/app-arch/tapeutils/ChangeLog b/app-arch/tapeutils/ChangeLog
index 0e3fc9153d4b..db7f6ef106ca 100644
--- a/app-arch/tapeutils/ChangeLog
+++ b/app-arch/tapeutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/tapeutils
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tapeutils/ChangeLog,v 1.2 2008/07/18 23:04:52 cla Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tapeutils/ChangeLog,v 1.3 2010/03/07 01:23:03 vapier Exp $
+
+ 07 Mar 2010; Mike Frysinger <vapier@gentoo.org> tapeutils-0.4.ebuild:
+ Block app-emulation/hercules due to tapecopy collision #247393 by Diego E.
+ Pettenò.
18 Jul 2008; Dawid Węgliński <cla@gentoo.org> tapeutils-0.4.ebuild:
Add ~amd64 keyword (bug #225989)
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4.ebuild
index 4e75c830c7b0..5c4722aaca06 100644
--- a/app-arch/tapeutils/tapeutils-0.4.ebuild
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tapeutils/tapeutils-0.4.ebuild,v 1.2 2008/07/18 23:04:52 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tapeutils/tapeutils-0.4.ebuild,v 1.3 2010/03/07 01:23:03 vapier Exp $
inherit toolchain-funcs
DESCRIPTION="Utilities for manipulation of tapes and tape image files"
HOMEPAGE="http://www.brouhaha.com/~eric/software/tapeutils/"
SRC_URI="http://www.brouhaha.com/~eric/software/tapeutils/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
+RDEPEND="!app-emulation/hercules"
+
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
}
src_install() {
- dobin tapecopy tapedump
+ dobin tapecopy tapedump || die
# no docs to install
}