diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-09-03 23:03:46 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-09-03 23:03:46 +0000 |
| commit | 5476db2f1706b6b1a44f1752b59b1cf39ab18151 (patch) | |
| tree | dea24482f0fb5e3995b9b1b5e1d0c3a9347a193a /app-text/adiff | |
| parent | bump to 2.20.8, should fix bug #233092 and #210302. (diff) | |
| download | gentoo-2-5476db2f1706b6b1a44f1752b59b1cf39ab18151.tar.gz gentoo-2-5476db2f1706b6b1a44f1752b59b1cf39ab18151.tar.bz2 gentoo-2-5476db2f1706b6b1a44f1752b59b1cf39ab18151.zip | |
Block app-arch/atool, bug #227037
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)
Diffstat (limited to 'app-text/adiff')
| -rw-r--r-- | app-text/adiff/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/adiff/adiff-1.2.ebuild | 28 | ||||
| -rw-r--r-- | app-text/adiff/adiff-1.4.ebuild | 5 |
3 files changed, 8 insertions, 31 deletions
diff --git a/app-text/adiff/ChangeLog b/app-text/adiff/ChangeLog index 11633af73f97..3a21a363fc03 100644 --- a/app-text/adiff/ChangeLog +++ b/app-text/adiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/adiff # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/adiff/ChangeLog,v 1.5 2008/01/19 14:44:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/adiff/ChangeLog,v 1.6 2008/09/03 23:03:46 nyhm Exp $ + + 03 Sep 2008; Tristan Heaven <nyhm@gentoo.org> -adiff-1.2.ebuild, + adiff-1.4.ebuild: + Block app-arch/atool, bug #227037 *adiff-1.4 (19 Jan 2008) diff --git a/app-text/adiff/adiff-1.2.ebuild b/app-text/adiff/adiff-1.2.ebuild deleted file mode 100644 index 8ace547738dd..000000000000 --- a/app-text/adiff/adiff-1.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/adiff/adiff-1.2.ebuild,v 1.3 2008/01/19 14:44:13 grobian Exp $ - -DESCRIPTION="wordwise diff" -HOMEPAGE="http://agriffis.n01se.net/adiff/" -SRC_URI="${HOMEPAGE}/${P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~x86" -IUSE="" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - sys-apps/diffutils" - -S=${WORKDIR} - -src_compile() { - pod2man --release=${PV} --center="${HOMEPAGE}" \ - --date="2005-08-15" "${DISTDIR}"/${P} ${PN}.1 || die -} - -src_install() { - newbin "${DISTDIR}"/${P} ${PN} - doman ${PN}.1 -} diff --git a/app-text/adiff/adiff-1.4.ebuild b/app-text/adiff/adiff-1.4.ebuild index 671892716c1e..0f7819b326ea 100644 --- a/app-text/adiff/adiff-1.4.ebuild +++ b/app-text/adiff/adiff-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/adiff/adiff-1.4.ebuild,v 1.1 2008/01/19 14:44:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/adiff/adiff-1.4.ebuild,v 1.2 2008/09/03 23:03:46 nyhm Exp $ DESCRIPTION="wordwise diff" HOMEPAGE="http://agriffis.n01se.net/adiff/" @@ -11,7 +11,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~x86" IUSE="" -DEPEND="dev-lang/perl" +DEPEND="dev-lang/perl + !app-arch/atool" RDEPEND="${DEPEND} sys-apps/diffutils" |