Add patch to remove AC_PROG_SYSCONFTOOL from configure.in, move patch out of -db4...

Package-Manager: portage-2.1.2-r10

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index edad6792fa579d5cc0f7a0de874dc7852403fdc8..186cd7b7468db363469f8e8047930b83f0242bff 100644 (file)
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.143 2007/02/26 11:09:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.144 2007/02/27 17:34:53 chutzpah Exp $
+
+  27 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  +files/courier-imap-4.1.2-aclocal-fix.patch,
+  +files/courier-imap-4.1.2-db4-configure.in.patch,
+  courier-imap-4.1.2.ebuild:
+  Add patch to remove AC_PROG_SYSCONFTOOL from configure.in, move patch out of
+  -db4-configure.in.patch (fixes bug #168206).
 
   25 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
   +files/courier-imap-4.0.6-db4-tcpd_configure.in.patch,

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 206a3e48aa2c4944c28dc8bb33054454dd120195..f399fd6ff791088fcddda4c9af3b5c6ae8f63804 100644 (file)
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX authdaemond-3.0.4-r1 1062 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 SHA1 55180242453ee47c951d265615da7a0902a5dc1f SHA256 2731b87fec98ae4ecdb5cfdb5917894e28eaf768f68555462d801c116cfa2a0d
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 files/authdaemond-3.0.4-r1 1062
@@ -169,6 +166,14 @@ AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145 RMD160 ecd07be4f3b1e0fedce91f3389
 MD5 3dcf7c14a50e6d756825de78b1c145a7 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
 RMD160 ecd07be4f3b1e0fedce91f3389c585211aea3357 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
 SHA256 ab32df3ab7a4070b6b6029b59f41b2a144ca44a7f8e3d573e885c58eee8984d8 files/courier-imap-4.0.6-r1-gentoo-pop3d.rc 1145
+AUX courier-imap-4.1.2-aclocal-fix.patch 275 RMD160 ebc6b95d267aef24a93cf5dd9b652708e1f60742 SHA1 5f44cbc91bb359547309385919ef599085a47bd0 SHA256 daec57c7ddcae3e70dac9fef192a72f45ebfd9e5b2d329ff94b7525df16af5f3
+MD5 97581e415917bb777ce4a8ee1624599a files/courier-imap-4.1.2-aclocal-fix.patch 275
+RMD160 ebc6b95d267aef24a93cf5dd9b652708e1f60742 files/courier-imap-4.1.2-aclocal-fix.patch 275
+SHA256 daec57c7ddcae3e70dac9fef192a72f45ebfd9e5b2d329ff94b7525df16af5f3 files/courier-imap-4.1.2-aclocal-fix.patch 275
+AUX courier-imap-4.1.2-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
+MD5 3d90d6cacf8a4c23c09d3a198f509c62 files/courier-imap-4.1.2-db4-configure.in.patch 1497
+RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 files/courier-imap-4.1.2-db4-configure.in.patch 1497
+SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c files/courier-imap-4.1.2-db4-configure.in.patch 1497
 AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
 MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 files/courier-imap-gentoo.readme 2827
@@ -251,14 +256,14 @@ EBUILD courier-imap-4.0.6.ebuild 10128 RMD160 ef2b87dd3905044dc01721e54bfa6d1c79
 MD5 175193eaa4b40b00df0b16acc074c64d courier-imap-4.0.6.ebuild 10128
 RMD160 ef2b87dd3905044dc01721e54bfa6d1c790b5e29 courier-imap-4.0.6.ebuild 10128
 SHA256 48623443290cb6095f32eb70967d89213bd2eff2ca61abba164cd6a0d8cb6d10 courier-imap-4.0.6.ebuild 10128
-EBUILD courier-imap-4.1.2.ebuild 9842 RMD160 1eaf11577e073ce9e89f7983ebfbc4bd5ba9cb78 SHA1 ffa0bfbc327a45552a2cedc0f074d1da71686363 SHA256 8b4479425371fd394bec9b0a027abe06c8aa82e71ef11303d741c656fb61250b
-MD5 0b530e988aef54e599e3f25526185a7f courier-imap-4.1.2.ebuild 9842
-RMD160 1eaf11577e073ce9e89f7983ebfbc4bd5ba9cb78 courier-imap-4.1.2.ebuild 9842
-SHA256 8b4479425371fd394bec9b0a027abe06c8aa82e71ef11303d741c656fb61250b courier-imap-4.1.2.ebuild 9842
-MISC ChangeLog 27475 RMD160 e62a53f0c74dc721d14a5016f2bb4003e787264c SHA1 df8385714fc885f3d762eaa1cee31881a7dc2778 SHA256 f979448158c94bb4615118a48876d5755be85a4964ee26b28ed85f7b6cf4b83c
-MD5 73e04ae8578cba5c36eabddeec9ec31d ChangeLog 27475
-RMD160 e62a53f0c74dc721d14a5016f2bb4003e787264c ChangeLog 27475
-SHA256 f979448158c94bb4615118a48876d5755be85a4964ee26b28ed85f7b6cf4b83c ChangeLog 27475
+EBUILD courier-imap-4.1.2.ebuild 9940 RMD160 3d18fe393d8369a3e6c04a9463e31ce2dd8cd1d8 SHA1 15e81c9e3b0259589118b26129723ca53ce5d989 SHA256 33cbeb7412e9f61d730c6d8b0d14edd3c1bb85fe2c14cb47bfce114570fbf9ef
+MD5 ec07f44d785a906ee5603ae0362a6515 courier-imap-4.1.2.ebuild 9940
+RMD160 3d18fe393d8369a3e6c04a9463e31ce2dd8cd1d8 courier-imap-4.1.2.ebuild 9940
+SHA256 33cbeb7412e9f61d730c6d8b0d14edd3c1bb85fe2c14cb47bfce114570fbf9ef courier-imap-4.1.2.ebuild 9940
+MISC ChangeLog 27786 RMD160 bd22b4f33835825b9828b65610684c5912f831cd SHA1 22aecdd5925c47a109bdc76f534cfd7677d67438 SHA256 c3820ac885af95c12a5f51c6da48107281a60781944b3558e5a1ad0182731f0b
+MD5 a8bd8ed543296c3fe524330fa1fe39f8 ChangeLog 27786
+RMD160 bd22b4f33835825b9828b65610684c5912f831cd ChangeLog 27786
+SHA256 c3820ac885af95c12a5f51c6da48107281a60781944b3558e5a1ad0182731f0b ChangeLog 27786
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
@@ -290,10 +295,3 @@ SHA256 3e0023761481fb070682400be05dfb6c3c02547c4a5db2fe0d8c1beffb37d7bf files/di
 MD5 c1fc1514f0256f3976cb49e9d420e478 files/digest-courier-imap-4.1.2 262
 RMD160 931feb25d5903456270bbcbcfae5fa1b4a7e6402 files/digest-courier-imap-4.1.2 262
 SHA256 334d2be842f306f500dd7da00eb8dbb4f433299a2d4f34c40093a28fa702f471 files/digest-courier-imap-4.1.2 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF4r+HV3J2n04EauwRArY7AJ4jt0kCxlmro0laJh11WgwElMQcAACgnf7S
-WwhjfBeU0hRkqK70Tn+3JxU=
-=Tcen
------END PGP SIGNATURE-----

diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
index c40fa80ece4f2f35624372ae92b64e052eed7f66..084cd0cd7d3de5f77ab60b928abadc11811ddfb3 100644 (file)
--- a/net-mail/courier-imap/courier-imap-4.1.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.2 2007/02/25 22:56:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.3 2007/02/27 17:34:53 chutzpah Exp $
 
 WANT_AUTOCONF="2.6"
 
@@ -70,12 +70,15 @@ src_unpack() {
        # This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
        epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
 
+       # kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206)
+       epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
        # These patches should fix problem detecting Berkeley DB.
        # We now can compile with db4 support.
        if use berkdb; then
                epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
                epatch ${FILESDIR}/${PN}-4.0.6-db4-tcpd_configure.in.patch
-               epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
+               epatch ${FILESDIR}/${P}-db4-configure.in.patch
        fi
 
        export WANT_AUTOCONF="2.5"

diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
new file mode 100644 (file)
index 0000000..f8cb78a
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- courier-imap-4.1.2.orig/configure.in       2006-12-30 09:28:52.000000000 -0500
++++ courier-imap-4.1.2/configure.in    2007-02-27 12:13:38.000000000 -0500
+@@ -16,7 +16,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 

diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
new file mode 100644 (file)
index 0000000..03d2c03
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
@@ -0,0 +1,34 @@
+--- configure.in.orig  2004-11-16 16:02:11.045791896 -0800
++++ configure.in       2004-11-16 16:03:06.743324584 -0800
+@@ -150,16 +149,22 @@
+ 
+ if test "$db" != "gdbm"
+ then
++  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++    do
++      AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++                      AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++    done
++  AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+ 
+-      AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-              AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-              AC_CHECK_LIB(db, db_env_create,
+-                              [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-      ))
+-
+-      AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-      AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-      AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
+ fi
+ 
+ LIBS="$saveLIBS"