diff options
| author |   Markus Meier <maekke@gentoo.org> | 2009-09-29 09:19:20 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2009-09-29 09:19:20 +0000 |
| commit | d49ffb74df4c8f1087f3ead7a0a68178f141c199 (patch) | |
| tree | e0633758edeef7f70def24a5038713a700dfcf07 /dev-util/cocom | |
| parent | Remove groff from the explicit system set; groff is *still* part of the syste... (diff) | |
| download | historical-d49ffb74df4c8f1087f3ead7a0a68178f141c199.tar.gz historical-d49ffb74df4c8f1087f3ead7a0a68178f141c199.tar.bz2 historical-d49ffb74df4c8f1087f3ead7a0a68178f141c199.zip | |
block media-gfx/hugin due to a file collision wrt bug #280241
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64
Diffstat (limited to 'dev-util/cocom')
| -rw-r--r-- | dev-util/cocom/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cocom/Manifest | 16 | ||||
| -rw-r--r-- | dev-util/cocom/cocom-0.996-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cocom/cocom-0.996.ebuild | 4 |
4 files changed, 24 insertions, 6 deletions
diff --git a/dev-util/cocom/ChangeLog b/dev-util/cocom/ChangeLog index ed609f8c6d4c..7c551c86b47e 100644 --- a/dev-util/cocom/ChangeLog +++ b/dev-util/cocom/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cocom # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/ChangeLog,v 1.9 2009/09/01 18:34:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/ChangeLog,v 1.10 2009/09/29 09:19:20 maekke Exp $ + + 29 Sep 2009; Markus Meier <maekke@gentoo.org> cocom-0.996.ebuild, + cocom-0.996-r1.ebuild: + block media-gfx/hugin due to a file collision wrt bug #280241 01 Sep 2009; Jeroen Roovers <jer@gentoo.org> -cocom-0.995.ebuild, -files/cocom-0.995-gcc4.patch, cocom-0.996.ebuild, cocom-0.996-r1.ebuild: diff --git a/dev-util/cocom/Manifest b/dev-util/cocom/Manifest index 01a2e0cd7d5d..392e25bcae4c 100644 --- a/dev-util/cocom/Manifest +++ b/dev-util/cocom/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX cocom-0.996-configure.patch 452 RMD160 565fc0aa85b937e176fcb6818216bb7be89e6f3d SHA1 48d0efb824c3d2102528413d2f5e9293eb03fd09 SHA256 5fb5c1e814aaba815c4bc316d51af41699b6a340a2e38427d23b5c443e450315 DIST cocom-0.996.tar.gz 4632140 RMD160 7d50179a234796f072d3183ada83b403fa4b27c8 SHA1 c62f3d8aa65ec10dd17d3eb987b8ef96737b040b SHA256 e143ab556d79a35ef31ec1e240897c9b8a8d0b6693e50a2b6e47d7fd4b200519 -EBUILD cocom-0.996-r1.ebuild 681 RMD160 64e44d6778a7d9bfae1baedd70eff1c2086583a4 SHA1 5808bba80526438472ed38a9a8a7c43e94f73c7d SHA256 03415ec06ff070f43a0511736debb8a0deaac9252af5b69d3058ada29560ea27 -EBUILD cocom-0.996.ebuild 630 RMD160 d246df8c8a4a4e0801d6f24211440d9f8e53c400 SHA1 b59a6cc40e9de3bcbe2d6d8a95bf8be555203066 SHA256 69e4ce7ab270e3eadde4a2bb6fc7676f7035c4c29a48d7cc1e4fe006892d14af -MISC ChangeLog 1434 RMD160 e27ab1f8b7b23ffa615880caf01e695cbdf1b144 SHA1 21d24a94ef400a24913dc0e2cf25558505aff9e0 SHA256 77d392e86678099defaee17185a9caf12470c3f5503d624780952bb8127124f7 +EBUILD cocom-0.996-r1.ebuild 732 RMD160 994ce9d6d64d878848f8214a84064e66edd44cee SHA1 13f4cd83a7a5d27291dd5f61b503cdb1fd21e804 SHA256 4dbbc3e7e04c1ae124979f0a4d7757fa3af66000da283d44be74daad693fe337 +EBUILD cocom-0.996.ebuild 680 RMD160 003966b7b79b2d716a713c97632b06c8001bfa5c SHA1 f37c02d89871835276cb84405f4392dc77182392 SHA256 f01d400b552e833efb35eb00fb46fb14dba323a6069bc1971928f83822034508 +MISC ChangeLog 1596 RMD160 c45cc54e2d86a58f37732ab902f226391498a717 SHA1 6eb913b8e4761f771f973937b932775bb0a8e08f SHA256 ef4d334bbff3545d975e7bd8e600c8661cfa513b065c506c7527d2e1d304faca MISC metadata.xml 1014 RMD160 d9bcdc1cf41e0c25fb66d6b258a47809cd6e4d3e SHA1 c49b1f6cc52ef3bc047584d04cbda5bb3697beec SHA256 5f48f0be96cbdbd166842b1a6bdb59d06ad52680a8fb20a9f174b932da213ce8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrB0UQACgkQkKaRLQcq0GLLQACfbKPk5uzbX8rHi+RT23jATnnC +Db4AnicTCNmXRQMTR3DJH9jDjK/tt9Bw +=O5R/ +-----END PGP SIGNATURE----- diff --git a/dev-util/cocom/cocom-0.996-r1.ebuild b/dev-util/cocom/cocom-0.996-r1.ebuild index 116d205b9cd9..cfab89b55ebf 100644 --- a/dev-util/cocom/cocom-0.996-r1.ebuild +++ b/dev-util/cocom/cocom-0.996-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/dev-util/cocom/cocom-0.996-r1.ebuild,v 1.2 2009/09/01 18:34:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild,v 1.3 2009/09/29 09:19:20 maekke Exp $ EAPI="2" @@ -14,6 +14,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +RDEPEND="!!media-gfx/hugin" +DEPEND="${RDEPEND}" src_prepare() { epatch "${FILESDIR}/${P}-configure.patch" diff --git a/dev-util/cocom/cocom-0.996.ebuild b/dev-util/cocom/cocom-0.996.ebuild index d96186b05029..f0b290910055 100644 --- a/dev-util/cocom/cocom-0.996.ebuild +++ b/dev-util/cocom/cocom-0.996.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/dev-util/cocom/cocom-0.996.ebuild,v 1.2 2009/09/01 18:34:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild,v 1.3 2009/09/29 09:19:20 maekke Exp $ inherit autotools @@ -12,6 +12,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +RDEPEND="!media-gfx/hugin" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} |