Fix for #147810

Package-Manager: portage-2.1.2_rc3-r7

diff --git a/dev-libs/cyrus-imap-dev/ChangeLog b/dev-libs/cyrus-imap-dev/ChangeLog
index b002609b3ad0e05c7dd636536b1b7ac43e60b87e..ae8f3cf92558614c240ca8ad52eee2c965d7fb8f 100644 (file)
--- a/dev-libs/cyrus-imap-dev/ChangeLog
+++ b/dev-libs/cyrus-imap-dev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-imap-dev
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.33 2006/01/10 20:41:11 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.34 2006/12/20 21:15:22 tove Exp $
+
+  20 Dec 2006; Torsten Veller <tove@gentoo.org>
+  +files/2.2.10-imapopts.h.patch, cyrus-imap-dev-2.2.10.ebuild,
+  cyrus-imap-dev-2.2.12.ebuild:
+  Fix for #147810
 
 *cyrus-imap-dev-2.3.1 (10 Jan 2006)
 

diff --git a/dev-libs/cyrus-imap-dev/Manifest b/dev-libs/cyrus-imap-dev/Manifest
index 2f33a0692fe70ed5f831ae47c57ac076a3d163be..739ca1e904433998f0de22e2a2e6deb63f69eebd 100644 (file)
--- a/dev-libs/cyrus-imap-dev/Manifest
+++ b/dev-libs/cyrus-imap-dev/Manifest
@@ -1,19 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 09b4d51e856a46fecf02dba6362a3458 ChangeLog 5042
-MD5 638cfd4ef2860d05e9daae65f6ecc61f cyrus-imap-dev-2.2.10.ebuild 2267
-MD5 110e4bb9cfeada08f1ff0097714a534a cyrus-imap-dev-2.2.12.ebuild 2277
-MD5 03681abffca3cc913253e57db488f775 cyrus-imap-dev-2.3.1.ebuild 2279
+AUX 2.2.10-imapopts.h.patch 337 RMD160 83fa5ad6a9531c43409671b0e3edf41133777968 SHA1 f62b9f57589e13aa5c26877d58fb3c8397f7dd14 SHA256 d743f40eed52d8808194cc6f002831225ee0b0386819bc00e412ff83f45a6c87
+MD5 e3d9a53cb779205b976a05690e761236 files/2.2.10-imapopts.h.patch 337
+RMD160 83fa5ad6a9531c43409671b0e3edf41133777968 files/2.2.10-imapopts.h.patch 337
+SHA256 d743f40eed52d8808194cc6f002831225ee0b0386819bc00e412ff83f45a6c87 files/2.2.10-imapopts.h.patch 337
+AUX cyrus-imapd-libwrap.patch 494 RMD160 1c1d21beec263455be254f8cb07920fe034dba78 SHA1 a9c0217cbcf8a863cd6e526f2f945da602c2f15e SHA256 0a009c3263f7e8d35fbe292db774c186d969e3d22952f6889fcf2cf1bb6ea723
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
-MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imap-dev-2.2.10 71
-MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imap-dev-2.2.12 71
-MD5 0b3de6cdb50c6422f35588a9f8a5c5dc files/digest-cyrus-imap-dev-2.3.1 70
+RMD160 1c1d21beec263455be254f8cb07920fe034dba78 files/cyrus-imapd-libwrap.patch 494
+SHA256 0a009c3263f7e8d35fbe292db774c186d969e3d22952f6889fcf2cf1bb6ea723 files/cyrus-imapd-libwrap.patch 494
+DIST cyrus-imapd-2.2.10.tar.gz 1946803 RMD160 2cc1bb11af57e77ad701eac7efe85bb396ee350c SHA1 460ff6e9fb9a69190661516a5a2217f14366dd15 SHA256 f592cda734a5060ac82077cb74178fbd9a9d029dcbae6fb5478b5b37319a60eb
+DIST cyrus-imapd-2.2.12.tar.gz 1961161 RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 SHA1 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
+DIST cyrus-imapd-2.3.1.tar.gz 2212999 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 SHA1 6af81e311992a3d89c2f093f00b88ea38708c176 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c
+EBUILD cyrus-imap-dev-2.2.10.ebuild 2343 RMD160 24b11a3c537910e062688d6cc843964a326b0d0b SHA1 a5dd9447aad03ce1a95f6aa5dba1e5c5b0af6595 SHA256 056e8c66618d1587197fbc17952cfa4896bdf18c6347dd0b8c13e7112e461b45
+MD5 29e0f3ee95beb1ed9f3a838022c5e35d cyrus-imap-dev-2.2.10.ebuild 2343
+RMD160 24b11a3c537910e062688d6cc843964a326b0d0b cyrus-imap-dev-2.2.10.ebuild 2343
+SHA256 056e8c66618d1587197fbc17952cfa4896bdf18c6347dd0b8c13e7112e461b45 cyrus-imap-dev-2.2.10.ebuild 2343
+EBUILD cyrus-imap-dev-2.2.12.ebuild 2354 RMD160 ce9cfa56ccac8cfc050ab1b5d857e80b5664b8a2 SHA1 a5feadcc9ad2fce46057cc04e1b1f63c88bdc014 SHA256 f39f9deef5e5e2a8ecb7a0047d4fc46434bb7a51d6f846002a0c4848b40164a0
+MD5 5220207ad907d28391e8ba72483c9ac2 cyrus-imap-dev-2.2.12.ebuild 2354
+RMD160 ce9cfa56ccac8cfc050ab1b5d857e80b5664b8a2 cyrus-imap-dev-2.2.12.ebuild 2354
+SHA256 f39f9deef5e5e2a8ecb7a0047d4fc46434bb7a51d6f846002a0c4848b40164a0 cyrus-imap-dev-2.2.12.ebuild 2354
+EBUILD cyrus-imap-dev-2.3.1.ebuild 2279 RMD160 eedbeebb8ef106a7ddb223d131c2e082e1925046 SHA1 0619853b5b62c1780962db0652a588b9cd392408 SHA256 483137125afa4e30c5a23e44f67199a313c5c2b208a711cf5c30ab3525bd412f
+MD5 03681abffca3cc913253e57db488f775 cyrus-imap-dev-2.3.1.ebuild 2279
+RMD160 eedbeebb8ef106a7ddb223d131c2e082e1925046 cyrus-imap-dev-2.3.1.ebuild 2279
+SHA256 483137125afa4e30c5a23e44f67199a313c5c2b208a711cf5c30ab3525bd412f cyrus-imap-dev-2.3.1.ebuild 2279
+MISC ChangeLog 5200 RMD160 fc7b856ad9366e29a4527ee7620cce52385ded75 SHA1 7ce23a06486106810d47b3ac894c9003bba7082c SHA256 ef03573e36e4884f957a865ae4bc33fc0e860669f93d6f2d61f083b6f86a91c1
+MD5 4a574e1e1355779d392e1da57bd67f86 ChangeLog 5200
+RMD160 fc7b856ad9366e29a4527ee7620cce52385ded75 ChangeLog 5200
+SHA256 ef03573e36e4884f957a865ae4bc33fc0e860669f93d6f2d61f083b6f86a91c1 ChangeLog 5200
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MD5 64f9bd0539e056fb1107165fa7698935 files/digest-cyrus-imap-dev-2.2.10 259
+RMD160 2fb24d5976d467e5d773cfa0b7fd3297f2b2673c files/digest-cyrus-imap-dev-2.2.10 259
+SHA256 58ffe81f7797539bbbb813b8ffec6c2aa54a79bc51207a65fbff3ea76be507b2 files/digest-cyrus-imap-dev-2.2.10 259
+MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imap-dev-2.2.12 259
+RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imap-dev-2.2.12 259
+SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imap-dev-2.2.12 259
+MD5 93d83f89eac20b8472804d5efd683085 files/digest-cyrus-imap-dev-2.3.1 256
+RMD160 638c120e1b2c594c7da309bf510cd465513a2454 files/digest-cyrus-imap-dev-2.3.1 256
+SHA256 4d61da839f65dbe4cac1298b447f92a4033ac70d94acd1e1d537af3b67a05253 files/digest-cyrus-imap-dev-2.3.1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFDxBwB5FrxP71izLARAl3PAKDVTnZ1JGhORggmBU11X2y6VAqsoQCgqKmS
-0DeIFT85K7/CZYi3yrezAM0=
-=u1FM
+iD8DBQFFiafyV3J2n04EauwRAvdKAKDGGXx+nBu9A+DuM3wmjiIqU8j8rACfciNt
+HTgZr+kuGsGhUSe+sz1Ep/Y=
+=K/K4
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
index 16c879da4119b99ff7efbc9651341e7a7bec3c44..70fa626db070056571f837521f2820691f26274a 100644 (file)
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild,v 1.6 2005/04/24 12:39:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild,v 1.7 2006/12/20 21:15:22 tove Exp $
 
 inherit eutils gnuconfig
 
@@ -38,6 +38,7 @@ src_unpack() {
                epatch "${FILESDIR}/cyrus-imapd-libwrap.patch" || die "patch failed"
        fi
 
+       epatch "${FILESDIR}"/${PV}-imapopts.h.patch || die "imapopts.h.patch failed"
        # DB4 detection and versioned symbols.
        #epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
 

diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
index 683ac6822617121b189df9273d55f28ac52f6279..56d2e9fb657e68c743c4e246c5657e54201a611c 100644 (file)
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild,v 1.4 2005/04/06 18:55:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild,v 1.5 2006/12/20 21:15:22 tove Exp $
 
 inherit eutils gnuconfig
 
@@ -38,6 +38,8 @@ src_unpack() {
                epatch "${FILESDIR}/cyrus-imapd-libwrap.patch" || die "patch failed"
        fi
 
+       epatch "${FILESDIR}"/2.2.10-imapopts.h.patch || die "imapopts.h.patch failed"
+
        # DB4 detection and versioned symbols.
        #epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
 

diff --git a/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch b/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch
new file mode 100644 (file)
index 0000000..12357ea
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch
@@ -0,0 +1,21 @@
+--- lib/imapopts.h.orig        2006-12-20 21:33:37.000000000 +0100
++++ lib/imapopts.h     2006-12-20 21:34:08.000000000 +0100
+@@ -178,10 +178,6 @@
+ 
+ };
+ 
+-extern struct imapopt_s imapopts[];
+-
+-
+-
+ enum enum_value {
+ 
+   IMAP_ENUM_ZERO = 0,
+@@ -236,5 +232,7 @@
+ 
+ };
+ 
++extern struct imapopt_s imapopts[];
++
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ 

diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
index 0afa5f0cc941d32b70339de78015ea8367174e5e..3f354c5689ebac974e595c8a6b0c1da40a804347 100644 (file)
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
@@ -1 +1,3 @@
 MD5 f3159efa2ffb9856ab79c35c7b002184 cyrus-imapd-2.2.10.tar.gz 1946803
+RMD160 2cc1bb11af57e77ad701eac7efe85bb396ee350c cyrus-imapd-2.2.10.tar.gz 1946803
+SHA256 f592cda734a5060ac82077cb74178fbd9a9d029dcbae6fb5478b5b37319a60eb cyrus-imapd-2.2.10.tar.gz 1946803

diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12
index 9ba8fcd5d938be6e8adbd65c9ed4cae923abc490..9892eb1bb989ab8a08ed5e7448051a09bf362580 100644 (file)
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12
@@ -1 +1,3 @@
 MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
+RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
+SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161

diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1
index 736ff1ce4b6d10880a3cba2aebda206e898159cb..0d886946e1f020ee20f3a1245e66a49f1bc184fd 100644 (file)
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1
@@ -1 +1,3 @@
 MD5 cde15876d5c953bba9ad9f7811aff695 cyrus-imapd-2.3.1.tar.gz 2212999
+RMD160 68b40b89f5558afe19886724a8bb8736139254e5 cyrus-imapd-2.3.1.tar.gz 2212999
+SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c cyrus-imapd-2.3.1.tar.gz 2212999