summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-09-03 23:03:46 +0000
committerTristan Heaven <tristan@gentoo.org>2008-09-03 23:03:46 +0000
commit9b860b02a7746161f26682e03cd6d139da80f0e5 (patch)
treea2aa4dfeb702d5241b3787927bf61d76346f831a /app-text/adiff
parentbump to 2.20.8, should fix bug #233092 and #210302. (diff)
downloadhistorical-9b860b02a7746161f26682e03cd6d139da80f0e5.tar.gz
historical-9b860b02a7746161f26682e03cd6d139da80f0e5.tar.bz2
historical-9b860b02a7746161f26682e03cd6d139da80f0e5.zip
Block app-arch/atool, bug #227037
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64
Diffstat (limited to 'app-text/adiff')
-rw-r--r--app-text/adiff/ChangeLog6
-rw-r--r--app-text/adiff/Manifest16
-rw-r--r--app-text/adiff/adiff-1.2.ebuild28
-rw-r--r--app-text/adiff/adiff-1.4.ebuild5
4 files changed, 20 insertions, 35 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/Manifest b/app-text/adiff/Manifest
index 7589fb5901d0..289f88de3ccc 100644
--- a/app-text/adiff/Manifest
+++ b/app-text/adiff/Manifest
@@ -1,6 +1,14 @@
-DIST adiff-1.2 10141 RMD160 5a50884f241f0363a8a43f8fa072ed2c19089929 SHA1 4b4696a1a34e2d680e575b355985c54075877d10 SHA256 44357d8f2b070cb38a48ee97445f6bbfcb542b16c606cfc18104215fed870073
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST adiff-1.4 10902 RMD160 763b7c024b0fb2a5d9f40ec165f3db250e2e6173 SHA1 dd5ec4633b9c1b4a513d73a60ba5f9df92b58fb0 SHA256 c4e56a2a2288e4dc53a824e603d942c59caaebf9b72f01e332a9d98ebfa6df72
-EBUILD adiff-1.2.ebuild 652 RMD160 910d1c1a68b71f222c6ca71d90c64eedfa8d6f33 SHA1 ba94fbf1e1188060f135afbef3438f52b8e8885a SHA256 2c4df133aab442d43d781b7b7294909be175fb091889316d567c6756999dcb47
-EBUILD adiff-1.4.ebuild 652 RMD160 04eaf0b68b3af4d09ef3c3b3184535b57f215755 SHA1 4ab3b48ea4b3f0771fbc3dd60b5f19bb42c1be50 SHA256 b8a06533c4fde6a46a5dcb6bffb04d7f5e05a89ea4e9c860e13c783fe4577b36
-MISC ChangeLog 902 RMD160 013ee8fe2050f68c5549e0ccf8a62234fd8da8e7 SHA1 bddf783140b731490f6444a89786dd15b5a20a1d SHA256 44bdb8be9e9cb586d3dd9a027c1ae0333da9d631bb8db27cd2782ec14f9f36b9
+EBUILD adiff-1.4.ebuild 666 RMD160 cf39ce159a54e4a947d4a8d2d6b66000884bfd62 SHA1 b6f1441ac8124d7015970fe6a9d85307465b5aea SHA256 5e0033e6c90cf48b55480adeacc2fd4fe761e090e13789fdbef44111b66dc594
+MISC ChangeLog 1023 RMD160 775b181d8fd8fb39af3b41c3eb10b9a31588d6ba SHA1 c3f1fba33bbe4841e8dab5a073e729e55c34c85b SHA256 24861c9a24741716bfb5e2149f998970cbe294615ff7558bb48354aa0151e100
MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki/F9cACgkQdz7hIScOURHCwQCdGnCEPwan/Z7KrhGabwjEtJdt
+gOAAn2+gs7L91qMjs9wNpoGgtu9VsMcK
+=tAQZ
+-----END PGP SIGNATURE-----
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"