diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-02-10 00:46:09 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-02-10 00:46:09 +0000 |
| commit | 49d4cc4d7d034177d27377295f6d8c0bcc5ae208 (patch) | |
| tree | 1797364606d422342021c02db8df8b1671cfc715 /dev-util | |
| parent | Fix bug 454884 by using autotools-utils and bug 454886 by upstream patch (diff) | |
| download | historical-49d4cc4d7d034177d27377295f6d8c0bcc5ae208.tar.gz historical-49d4cc4d7d034177d27377295f6d8c0bcc5ae208.tar.bz2 historical-49d4cc4d7d034177d27377295f6d8c0bcc5ae208.zip | |
Block app-misc/colordiff since it installs a /usr/bin/cdiff symlink. Fixes #456358.
Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cdiff/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cdiff/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/cdiff/cdiff-0.3.ebuild | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog index 0d8c98f2d898..b2d22d155d69 100644 --- a/dev-util/cdiff/ChangeLog +++ b/dev-util/cdiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cdiff # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.1 2013/02/09 20:15:38 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.2 2013/02/10 00:46:06 tomwij Exp $ + + 10 Feb 2013; Tom Wijsman <TomWij@gentoo.org> cdiff-0.3.ebuild: + Block app-misc/colordiff since it installs a /usr/bin/cdiff symlink. Fixes + #456358. *cdiff-0.3 (09 Feb 2013) diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest index eca80c3d1caf..df1277e6e6fe 100644 --- a/dev-util/cdiff/Manifest +++ b/dev-util/cdiff/Manifest @@ -1,4 +1,4 @@ DIST cdiff-0.3.tar.gz 10734 SHA256 0e7342a325f0d95261eb2e8c1b9271f63235ee4c5d24cbb39d02033658ec2b99 SHA512 ea27da03eee5a19369d20eb10ee5def04a0b26038956834234f2a7a680431d948524ad14e17774535f99ba67c8c99b481a0fd44fa92116e2b389775f14158b78 WHIRLPOOL 0bba1919ec52f8783768c17a04b88ac33d03a4ddac080655e9363a3d9aa436ac46ff17d2ca04c8530e3ee603e7c56997019e3bda0561a5d48192eb2070c3cfe0 -EBUILD cdiff-0.3.ebuild 589 SHA256 523db899550938a104cda8352fd64dc9808f1d27343367767559df7e510a470e SHA512 cac495786ad291714a6b916dfe85c7eedb9208cf131015f8b86fc73fe89b660a5eeb0d8c045b3153dceab86cbf8416514be92a6d88af57a87a24a8427e3de1b2 WHIRLPOOL 95ac1b7db22c622d7e1a85e50a2f158135cf3547259eafcfb0387df3ae25928122eb58dd8ddee93e218920ec59ada7e84196d01169658cc82d2bedfaff82d762 -MISC ChangeLog 381 SHA256 34513ec5a9badf6c787d50b06e1a07cab59626460c106758a3166b9e6ccfcadc SHA512 1ed2c5c0ed86b978c40b1c10114e9e673a2feafa59943ae5355ff1899087720d1a53d765a616e2d3f8c24f3fe4b814dfb0bcc10d20e42f242382e1c748526b4f WHIRLPOOL cbaf98e60b948ce218380396fb9ce321d6409892b52b4d7c781cae55d9913ede8616ef7672731a625d29d9f02af3134308190f0aedfede441242a54f3e6ccb55 +EBUILD cdiff-0.3.ebuild 610 SHA256 c5a27aedeb136a5d1ebb93329393329b94bd4bb7313bb1f50c8308e9b349b202 SHA512 f877828e7f1cfd0513a1243a0a445d38b8fb05e5d3e5d04df122252d8af7dbfe2f6bfb2d23f74738e1d4a195ef9054df36dedd4c3afc3052675c1e891eab39c2 WHIRLPOOL b1ca4993f249b2355ac1759ed22bbb43d403353e422998f9086b4f7b43704fb5085838def0b9c1a4c09ac2dd58a54ee76cb1ace5e811510e6fb51e775ee804c3 +MISC ChangeLog 535 SHA256 0e60ee54fde62dc80dc4f38e8e123343a1b4999a84ecc088f6939b4964063bf3 SHA512 6c456f0b4215da48dffcaa456c1f6c1d38bd41dc042c6112dacbe5dd9e6e6be24690dff8b3e7fb53ddd8d4c15fc82e24d2c311e95d61418ce967cffc8949c3a9 WHIRLPOOL 4af3ddd6b8c630201b050cc8113bf68eea49d73398068cb58454ff7bfbd6d32925a43a49adf5e0aeb512cab829d40b11332506cb2b9cc3cc8b358d0a1a29acbd MISC metadata.xml 325 SHA256 3783ab40f01868b757a30df85e92623c84c638e0cd8f03d42b14d9e116c9528c SHA512 0071d980877c458ef28e3aa4a6ec0908662b73c47162f541ccc3f93734ed2043139e2df8fbca3cf9774ee8941d8c4ea09a70b73f0f08c267ae4212dd40d4b851 WHIRLPOOL d3803f5e46005cc8ac380075c56ca890274e23f36058ba7b317ea5f0081b70ec2e6f2a243c3419a8bfa3ac0650cf06023fcec10725a358c79e6e50ffd03d2e0d diff --git a/dev-util/cdiff/cdiff-0.3.ebuild b/dev-util/cdiff/cdiff-0.3.ebuild index 59dcdc966001..f4e26e67352a 100644 --- a/dev-util/cdiff/cdiff-0.3.ebuild +++ b/dev-util/cdiff/cdiff-0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.3.ebuild,v 1.1 2013/02/09 20:15:38 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.3.ebuild,v 1.2 2013/02/10 00:46:06 tomwij Exp $ EAPI=5 @@ -17,5 +17,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="!app-misc/colordiff + dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" |