From a24eb55f9b8b7be45dfe0b158fa12c614f8d205c Mon Sep 17 00:00:00 2001 From: Tuan Van Date: Mon, 27 Mar 2006 19:23:14 +0000 Subject: [PATCH] gcc-4 fix. Bug #126968 reported by Patrick Lauer . Package-Manager: portage-2.1_pre7-r2 --- net-mail/cyrus-imap-admin/ChangeLog | 9 ++- net-mail/cyrus-imap-admin/Manifest | 39 +++++++-- .../cyrus-imap-admin-2.2.12-r1.ebuild | 79 +++++++++++++++++++ .../files/cyrus-imap-admin-2.2.12-gcc4.patch | 18 +++++ .../files/digest-cyrus-imap-admin-2.2.12-r1 | 3 + 5 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild create mode 100644 net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch create mode 100644 net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12-r1 diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog index 4f7fc73c1e56..07e916f30853 100644 --- a/net-mail/cyrus-imap-admin/ChangeLog +++ b/net-mail/cyrus-imap-admin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-mail/cyrus-imap-admin # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.41 2006/01/10 20:34:45 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.42 2006/03/27 19:23:14 langthang Exp $ + +*cyrus-imap-admin-2.2.12-r1 (27 Mar 2006) + + 27 Mar 2006; Tuấn Văn + +files/cyrus-imap-admin-2.2.12-gcc4.patch, + +cyrus-imap-admin-2.2.12-r1.ebuild: + gcc-4 fix. Bug #126968 reported by Patrick Lauer . *cyrus-imap-admin-2.3.1 (09 Jan 2006) diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest index 3ee7ca5b50fe..fa5c61329224 100644 --- a/net-mail/cyrus-imap-admin/Manifest +++ b/net-mail/cyrus-imap-admin/Manifest @@ -1,20 +1,49 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 bafa99bab2264172d75e1e9219cd454d ChangeLog 6156 +MD5 fb356617d11028d28df66a470c1fa3e7 ChangeLog 6406 +RMD160 d2351e17dee8d9cdb12397dac5584a3f53637f16 ChangeLog 6406 +SHA256 f45f7c3c1d4a8804a5deb46d8748040dcd26205fae408a66d4ec5f5753a3b456 ChangeLog 6406 MD5 4e849da55bb77ace50565fad72f2621f cyrus-imap-admin-2.2.10.ebuild 2033 +RMD160 0eb9036773c337e9eab659217af8ff96f78bc52d cyrus-imap-admin-2.2.10.ebuild 2033 +SHA256 6a7ef323fcaec0db5b64c4aeda4bb8e2392a675de1cb9635b6bde5aa56e1bd51 cyrus-imap-admin-2.2.10.ebuild 2033 +MD5 ba8570c48d42d192c1eca556feed8b87 cyrus-imap-admin-2.2.12-r1.ebuild 2113 +RMD160 a3fc94a6c5a03530615663b95c599650e97c8fac cyrus-imap-admin-2.2.12-r1.ebuild 2113 +SHA256 45abda470406aa54712055530c6a90cbba5de0e355bf15e765feb567b83dd3a0 cyrus-imap-admin-2.2.12-r1.ebuild 2113 MD5 a378d114b78c41566ba7e951bd4b03d3 cyrus-imap-admin-2.2.12.ebuild 2069 +RMD160 69cb6a884a4d5f2370c7e9a97732ca6ad6bb83c4 cyrus-imap-admin-2.2.12.ebuild 2069 +SHA256 fb4fd3996c23361af78ab3eda031d0a315fb600ce6b760b14e29477393fa6fb9 cyrus-imap-admin-2.2.12.ebuild 2069 MD5 ca6521974928ec98be72f1c1359a3075 cyrus-imap-admin-2.3.1.ebuild 2110 +RMD160 0671d5d9ddbfa23d12b2c8be60b13bedee0f0ce3 cyrus-imap-admin-2.3.1.ebuild 2110 +SHA256 66d1beeb2512686162505a9388dd5cbeefb5cad68f50dec75210e93913ac2ef5 cyrus-imap-admin-2.3.1.ebuild 2110 MD5 dd34152fac580be8cccb1d1b69bb1ebc files/cyrus-imap-admin-2.2.10-fPIC.patch 584 +RMD160 b66b94eacafb2f4bd59584701aa3e4a1f028984f files/cyrus-imap-admin-2.2.10-fPIC.patch 584 +SHA256 958fa87050cd5eea811dc33343ef052b0a58d42597cdc3936b58d0a9b6e705dc files/cyrus-imap-admin-2.2.10-fPIC.patch 584 MD5 dd34152fac580be8cccb1d1b69bb1ebc files/cyrus-imap-admin-2.2.12-fPIC.patch 584 +RMD160 b66b94eacafb2f4bd59584701aa3e4a1f028984f files/cyrus-imap-admin-2.2.12-fPIC.patch 584 +SHA256 958fa87050cd5eea811dc33343ef052b0a58d42597cdc3936b58d0a9b6e705dc files/cyrus-imap-admin-2.2.12-fPIC.patch 584 +MD5 77413f5bcf777e10908f9a755e6ff55e files/cyrus-imap-admin-2.2.12-gcc4.patch 396 +RMD160 b01f76386facd436cd9db247a7a4c31129ae55b8 files/cyrus-imap-admin-2.2.12-gcc4.patch 396 +SHA256 f5c8e11355df0ac41ede1fa18381241097e143669ba5903c90ff4b20aeed273c files/cyrus-imap-admin-2.2.12-gcc4.patch 396 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imap-admin-2.2.10 71 +RMD160 e7f87504cf2587b42ddde07e835bcf2f237a0a16 files/digest-cyrus-imap-admin-2.2.10 71 +SHA256 74c37507adf78f57b3dd433e2be38e7d71c5664be6b868be2756400a6902226e files/digest-cyrus-imap-admin-2.2.10 71 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imap-admin-2.2.12 71 +RMD160 0b5fcc75e58ca8cfc21069205bb6e63381622ba8 files/digest-cyrus-imap-admin-2.2.12 71 +SHA256 a662da942213a1f3444e9d11a0853a7bb500d7a211a915ad0cf460185e87b328 files/digest-cyrus-imap-admin-2.2.12 71 +MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imap-admin-2.2.12-r1 259 +RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imap-admin-2.2.12-r1 259 +SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imap-admin-2.2.12-r1 259 MD5 0b3de6cdb50c6422f35588a9f8a5c5dc files/digest-cyrus-imap-admin-2.3.1 70 +RMD160 3de6653d436856d1046fbf66f549d8d8b8e9f165 files/digest-cyrus-imap-admin-2.3.1 70 +SHA256 3e653ad62d023a08d3810d757c0f171ca024969d9e8553b8ff050c2568ebddc8 files/digest-cyrus-imap-admin-2.3.1 70 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 +RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161 +SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFDxBp55FrxP71izLARAnxEAKC9qFHmZDHS77+ZnaB+wLGuo43IcACgrYmd -GVPONx7c3Q6zZG9jwyqHe7o= -=irIG +iD8DBQFEKDug5FrxP71izLARAoDyAJ9KRMfc+1PydPrBsryMG86GhyOj1ACdEdDs +zLoOfkA9ZFdmahvWIAC95eI= +=PUCr -----END PGP SIGNATURE----- diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild new file mode 100644 index 000000000000..be3b29a466ff --- /dev/null +++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild,v 1.1 2006/03/27 19:23:14 langthang Exp $ + +inherit perl-app eutils gnuconfig + +DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server." +HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/" +SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa ~ppc64" +IUSE="ssl kerberos" + +RDEPEND=">=sys-libs/db-3.2 + >=dev-lang/perl-5.6.1 + >=dev-libs/cyrus-sasl-2.1.13 + dev-perl/Term-ReadLine-Perl + dev-perl/TermReadKey + ssl? ( >=dev-libs/openssl-0.9.6 ) + kerberos? ( virtual/krb5 )" + +DEPEND="$RDEPEND + sys-devel/libtool + >=sys-devel/autoconf-2.58 + sys-devel/automake + >=sys-apps/sed-4" + +S="${WORKDIR}/cyrus-imapd-${PV}" + +src_unpack() { + unpack ${A} && cd "${S}" + + # DB4 detection and versioned symbols. + #epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" + + # Recreate configure. + export WANT_AUTOCONF="2.5" + gnuconfig_update || die "gnuconfig_update failed." + ebegin "Recreating configure" + rm -rf configure config.h.in autom4te.cache + sh SMakefile &>/dev/null || die "SMakefile failed" + eend $? + + # When linking with rpm, you need to link with more libraries. + sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed" + + epatch "${FILESDIR}/${P}-fPIC.patch" + epatch "${FILESDIR}/${P}-gcc4.patch" +} + +src_compile() { + # gnuconfig_update + + local myconf + myconf="${myconf} `use_with ssl openssl`" + myconf="${myconf} `use_with kerberos gssapi`" + + econf \ + --disable-server \ + --enable-murder \ + --enable-listext \ + --enable-netscapehack \ + --with-cyrus-group=mail \ + --with-com_err=yes \ + --with-auth=unix \ + --with-perl=/usr/bin/perl \ + --enable-cyradm \ + ${myconf} || die "econf failed" + + emake -C "${S}/lib" all || die "compile problem" + emake -C "${S}/perl" all || die "compile problem" +} + +src_install () { + make -C "${S}/perl" DESTDIR="${D}" install || die "install problem" + fixlocalpod # bug #98122 +} diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch new file mode 100644 index 000000000000..4a0f89ab0100 --- /dev/null +++ b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch @@ -0,0 +1,18 @@ +--- tools/config2header.orig 2006-01-30 09:30:16.000000000 -0800 ++++ tools/config2header 2006-01-30 09:31:05.000000000 -0800 +@@ -214,7 +214,6 @@ + print HFILE <