summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-11-17 15:15:51 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-11-17 15:15:51 +0000
commit305b19b9cd2dfac97c8b0d1552d66c747e0eee06 (patch)
tree8b368c57bb0b19a7d4e3452bd20cbf4c64f45b08
parentAdd ~sparc (diff)
downloadgentoo-2-305b19b9cd2dfac97c8b0d1552d66c747e0eee06.tar.gz
gentoo-2-305b19b9cd2dfac97c8b0d1552d66c747e0eee06.tar.bz2
gentoo-2-305b19b9cd2dfac97c8b0d1552d66c747e0eee06.zip
Just remove the braindead situation of blocking on dev-util[git] by renaming the colliding binary, gitview -> gnuitview. Thanks to ulm for the suggestion
(Portage version: 2.1.7.4/cvs/Linux x86_64, RepoMan options: --force)
-rw-r--r--app-misc/gnuit/ChangeLog9
-rw-r--r--app-misc/gnuit/gnuit-4.9.5-r1.ebuild (renamed from app-misc/gnuit/gnuit-4.9.5.ebuild)10
2 files changed, 13 insertions, 6 deletions
diff --git a/app-misc/gnuit/ChangeLog b/app-misc/gnuit/ChangeLog
index 1efbede04a0a..d3b012dc0c54 100644
--- a/app-misc/gnuit/ChangeLog
+++ b/app-misc/gnuit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/gnuit
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/ChangeLog,v 1.4 2009/11/16 20:23:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/ChangeLog,v 1.5 2009/11/17 15:15:51 darkside Exp $
+
+*gnuit-4.9.5-r1 (17 Nov 2009)
+
+ 17 Nov 2009; Jeremy Olexa <darkside@gentoo.org> -gnuit-4.9.5.ebuild,
+ +gnuit-4.9.5-r1.ebuild:
+ Just remove the braindead situation of blocking on dev-util[git] by
+ renaming the colliding binary, gitview -> gnuitview
16 Nov 2009; Raúl Porcel <armin76@gentoo.org> gnuit-4.9.5.ebuild:
sparc stable wrt #287863
diff --git a/app-misc/gnuit/gnuit-4.9.5.ebuild b/app-misc/gnuit/gnuit-4.9.5-r1.ebuild
index 5abe14043dde..7f57021c1935 100644
--- a/app-misc/gnuit/gnuit-4.9.5.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5.ebuild,v 1.4 2009/11/16 20:23:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r1.ebuild,v 1.1 2009/11/17 15:15:51 darkside Exp $
EAPI="2"
@@ -14,9 +14,7 @@ KEYWORDS="amd64 ppc sparc x86"
IUSE=""
# app-text/texi2html is only needed if any documentation patches are added
-# dev-util/git[gtk] installs the gitview tool which collides with this
-# package.
-DEPEND="!dev-util/git[gtk]"
+DEPEND=""
RDEPEND="${DEPEND}"
src_configure() {
@@ -28,11 +26,13 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install \
|| die "emake install failed"
- dodoc AUTHORS NEWS PROBLEMS README
+ mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+ dodoc AUTHORS NEWS PROBLEMS README || die
}
pkg_postinst() {
elog "The 'git' tool this package previously installed is now called 'gitfm'"
+ elog "The 'gitview' tool this package previously installed is now called 'gnuitview'"
elog "If you want the 'gitaction' tool to use your preferred desktop"
elog "application settings install the 'x11-misc/xdg-utils' package."
}