add kde tools

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@903 6952d904-891a-0410-993b-d76249ca496b
2009-03-29 07:05:36 +00:00 · 2009-03-29 07:05:36 +00:00 · f8647230c5
commit f8647230c5
parent a62799ffc0
80 changed files with 4794 additions and 0 deletions
--- a/kde-misc/kdelirc/ChangeLog
+++ b/kde-misc/kdelirc/ChangeLog
@ -0,0 +1,18 @@
+# ChangeLog for kde-misc/kdelirc
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  18 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  kdelirc-9999.ebuild:
+  Dropped live SLOT
+
+  10 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +metadata.xml:
+  Added missing metadata.xml
+
+*kdelirc-9999 (19 Dec 2008)
+
+  19 Dec 2008; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +kdelirc-9999.ebuild:
+  Added kdelirc live
+
--- a/kde-misc/kdelirc/Manifest
+++ b/kde-misc/kdelirc/Manifest
@ -0,0 +1,3 @@
+EBUILD kdelirc-4.0_pre20090317.ebuild 470 RMD160 3bd9698932012a8c0814ae6ed28f28ff1efcd718 SHA1 feb1fd976540a5a0278f5bfafa7027cc041b7455 SHA256 67a44dd3c0e7191560be4ec803216e1b8588b5ad259f4aa35b8c470fcb333126
+MISC ChangeLog 475 RMD160 31c0cf6967835dd61ec0ad94184056cbc7bdb99a SHA1 06ab0cb66ef4c08235dcc4d10f678acdf3ba54f2 SHA256 2b8e46eee7e7d662fbd29a5d5a0f4b8041c16b3935ca694a5336e2770e108b75
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
--- a/kde-misc/kdelirc/kdelirc-4.0_pre20090317.ebuild
+++ b/kde-misc/kdelirc/kdelirc-4.0_pre20090317.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="playground/utils"
+inherit kde4-base subversion
+ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/playground/utils/${PN}/@{${PV/4.0_pre/}}"
+
+DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
+HOMEPAGE="http://kde.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	app-misc/lirc
+"
--- a/kde-misc/kdelirc/metadata.xml
+++ b/kde-misc/kdelirc/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
--- a/kde-misc/kgtk/ChangeLog
+++ b/kde-misc/kgtk/ChangeLog
@ -0,0 +1,83 @@
+# ChangeLog for kde-misc/kgtk
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.16 2008/08/23 12:14:12 carlo Exp $
+
+  23 Aug 2008; Carsten Lohrke <carlo@gentoo.org> kgtk-0.10.0.ebuild:
+  Adjust CMake dependency, bug #233300.
+
+*kgtk-0.10.0 (21 Jul 2008)
+
+  21 Jul 2008; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +kgtk-0.10.0.ebuild:
+  Version bump.
+
+*kgtk-0.9.5 (08 Jun 2008)
+
+  08 Jun 2008; Carsten Lohrke <carlo@gentoo.org> +kgtk-0.9.5.ebuild:
+  Version bump.
+
+  27 May 2008; Mark Loeser <halcy0n@gentoo.org> kgtk-0.9.1-r1.ebuild,
+  kgtk-0.9.4.ebuild:
+  Remove RDEPEND on cmake; bug #220453
+
+  09 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> kgtk-0.9.4.ebuild:
+  Make dependencies compatible with split Qt:4.
+
+*kgtk-0.9.4 (19 Dec 2007)
+
+  19 Dec 2007; Stefan Schweizer <genstef@gentoo.org> +kgtk-0.9.4.ebuild:
+  version bump
+
+*kgtk-0.9.1-r1 (13 Oct 2007)
+
+  13 Oct 2007; Stefan Schweizer <genstef@gentoo.org> -kgtk-0.9.1.ebuild,
+  +kgtk-0.9.1-r1.ebuild:
+  Add USE=qt4 thanks to Roberto Castagnola <roberto.castagnola@gmail.com> in
+  bug 194887
+
+  09 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/kgtk-no-local.diff, -kgtk-0.7.ebuild, -kgtk-0.8.ebuild,
+  kgtk-0.9.1.ebuild:
+  Fix echo -> elog for zlin and remove old
+
+*kgtk-0.9.1 (03 Oct 2007)
+
+  03 Oct 2007; Stefan Schweizer <genstef@gentoo.org> +kgtk-0.9.1.ebuild:
+  Version bump thanks to Lukasz Lukaszewicz <lukasz@arit.pl> in bug 194641 and
+  philantrop, also fixing bug 193852
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kgtk-0.7.ebuild,
+  kgtk-0.8.ebuild:
+  Convert to use elog.
+
+  22 Oct 2006; Piotr Jaroszyński <peper@gentoo.org> kgtk-0.8.ebuild:
+  Add ~amd64 keyword. Bug #133414.
+
+*kgtk-0.8 (12 Oct 2006)
+
+  12 Oct 2006; Stefan Schweizer <genstef@gentoo.org> +kgtk-0.8.ebuild:
+  version bump
+
+  01 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/kgtk-no-local.diff, kgtk-0.7.ebuild:
+  dont use /usr/local thanks to Hanno Boeck <hanno@gentoo.org> in bug 143500
+
+*kgtk-0.7 (05 Aug 2006)
+
+  05 Aug 2006; Stefan Schweizer <genstef@gentoo.org> -kgtk-0.5.1.ebuild,
+  +kgtk-0.7.ebuild:
+  verson bump thanks to 6thpink <6thpink@terra.es> in bug 142574
+
+*kgtk-0.5.1 (07 May 2006)
+
+  07 May 2006; Stefan Schweizer <genstef@gentoo.org> -kgtk-0.5.ebuild,
+  +kgtk-0.5.1.ebuild:
+  version bump
+
+*kgtk-0.5 (05 May 2006)
+
+  05 May 2006; Stefan Schweizer <genstef@gentoo.org> +metadata.xml,
+  +kgtk-0.5.ebuild:
+  New ebuild thanks to Christoph Mockenhaupt <gentoo@mockies.de> and Tobias
+  Roeser <le.petit.fou@web.de> in bug 131380
+
--- a/kde-misc/kgtk/Manifest
+++ b/kde-misc/kgtk/Manifest
@ -0,0 +1,6 @@
+AUX kgtk-0.10.0-gcc433.patch 591 RMD160 8f7a1ed9c5f899e5c722230a231ac2a1f385064c SHA1 deca91608756c70a3761a5c273775c669153dd0d SHA256 f350ebbf34424432060fd7c5a00341bf320f69804c879bb6dbdab6cb3acc93e5
+AUX kgtk-0.10.0-kde4.patch 719 RMD160 48ef1796cb872b30f1d0632518f26e929410503d SHA1 88d363437f18a980eedaa878345eb317100573a0 SHA256 b5c7e3e6cf0232aa3fa0ca148e25c45ee0ed324cbf8bafac3a750fd3546f1e6b
+DIST KGtk-0.10.0.tar.bz2 44139 RMD160 56c2c5f90927277d911391beb8d6197f517e5d47 SHA1 6dd77aa3177aeaf8ed32c62a38dca8db9d9b6c0f SHA256 a47dc15ab18526536b9fa2401ab2b5a08412580c367af720896311a4a98318b0
+EBUILD kgtk-0.10.0-r1.ebuild 2088 RMD160 2c98302175f8ca571f57dd7605b68e702b94e538 SHA1 9ce828de8cc7cc2744ce24c412b7af008d0bd6e6 SHA256 b13e2bc9a4d60b8f177647f46840e637989eeb2c91fe449ac8474957a93866a3
+MISC ChangeLog 2597 RMD160 6b0fa89f25d382f59d3638388f95584843163bb9 SHA1 8f5607626a6a2ba4fc970c51330fd896c381e22f SHA256 62956bf220dee4fc7ffbd440e529f45a946b132b10d17ade881fdd5de7423537
+MISC metadata.xml 299 RMD160 a767ddd07c0f4b6fce78c67d9763ff43c7bc4322 SHA1 395ff29a6f06d3bdd429442f06a56fefc39fe062 SHA256 f48550bdb6d815df45ac0f95128edcc941d4159b47e95c70db2d0126758c2159
--- a/kde-misc/kgtk/files/kgtk-0.10.0-gcc433.patch
+++ b/kde-misc/kgtk/files/kgtk-0.10.0-gcc433.patch
@ -0,0 +1,16 @@
+--- common/common.h.orig	2009-02-03 19:54:32.000000000 +0500
+++ common/common.h	2009-02-03 19:55:09.000000000 +0500
+@@ -205,7 +205,12 @@
+ {
+     do
+     {
+-        lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL);
+#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 3 || (__GNUC_MINOR__ == 3 &&  __GNUC_PATCHLEVEL__ > 2)))
+	lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL, 0777);
+#else
+	lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL);
+#endif
+
+         if (lockFd<0 && errno==EEXIST)
+         {
+             /* Hmm, lock file already exists. Is it stale? */
--- a/kde-misc/kgtk/files/kgtk-0.10.0-kde4.patch
+++ b/kde-misc/kgtk/files/kgtk-0.10.0-kde4.patch
@ -0,0 +1,11 @@
+--- kdialogd4/kdialogd.cpp.orig	2009-02-03 19:49:03.000000000 +0500
+++ kdialogd4/kdialogd.cpp	2009-02-03 19:49:17.000000000 +0500
+@@ -391,7 +391,7 @@
+     // * the dir select dialog doesnt seem to set the QDialog result parameter
+     //   when it is accepted - so for this reason if ok is clicked we store an
+     //   'accepted' value there, and check for that after the dialog is finished.
+-    kDebug() << "finished " << (int)itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
+    kDebug() << "finished " << itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
+ 
+     if(itsDlg && !(itsAccepted || QDialog::Accepted==itsDlg->result()))
+         cancel();
--- a/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild
+++ b/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ARTS_REQUIRED="never"
+EAPI="1"
+inherit kde
+
+DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
+SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
+S=$WORKDIR/KGtk-$PV
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="qt4 kde4"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.8"
+if use !kde4; then
+	need-kde 3.5
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/"${P}"-gcc433.patch"
+	epatch "${FILESDIR}/"${P}"-kde4.patch"
+}
+
+src_compile() {
+	mkdir -p "${S}/build" && cd "${S}/build"
+	cmake \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		.. || die "cmake (configure) failed"
+	emake || die "emake failed"
+
+	if use qt4; then
+		K4GTK_FLAGS="-DKGTK_QT4=true DKGTK_GTK2=false"
+		if use kde4; then
+		    K4GTK_FLAGS="-DKGTK_KDE4=true ${K4GTK_FLAGS}"
+		fi
+
+		mkdir -p "${S}/build4" && cd "${S}/build4"
+		cmake \
+			-DCMAKE_INSTALL_PREFIX:PATH=/usr ${K4GTK_FLAGS} \
+			.. || die "cmake (configure) failed"
+		emake || die "emake failed"
+
+	fi
+}
+
+src_install() {
+	cd "${S}/build"
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	if use qt4; then
+		cd "${S}/build4"
+		emake install DESTDIR="${D}" || die "make install failed"
+	fi
+	if use kde4; then
+		cd "${S}/build4/kdialogd4"
+		emake install DESTDIR="${D}" || die "make install failed"
+	fi
+
+	find "${D}" -name kdialogd-wrapper -exec sed -i 's@kdialogd4@which kdialogd4 \&>/dev/null \&\& kdialogd4 || kdialogd3@' {} \;
+	dodoc ../{AUTHORS,ChangeLog,TODO,README}
+}
+
+pkg_postinst() {
+	elog "To see the kde-file-selector in a gtk-application, just do:"
+	elog "cd /usr/local/bin"
+	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
+	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
+	elog
+	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
+}
--- a/kde-misc/kgtk/metadata.xml
+++ b/kde-misc/kgtk/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>kde</herd>
+  <maintainer>
+    <email>genstef@gentoo.org</email>
+  </maintainer>
+  <use>
+  <flag name='kde4'>Use KDE 4.x.x file dialogue</flag>
+  </use>
+</pkgmetadata>
--- a/licenses/OWPL-1
+++ b/licenses/OWPL-1
@ -0,0 +1,350 @@
+USE OF THE SYBASE OPEN WATCOM SOFTWARE DESCRIBED BELOW ("SOFTWARE") IS SUBJECT
+TO THE TERMS AND CONDITIONS SET FORTH IN THE SYBASE OPEN WATCOM PUBLIC LICENSE
+SET FORTH BELOW ("LICENSE").  YOU MAY NOT USE THE SOFTWARE IN ANY MANNER
+UNLESS YOU ACCEPT THE TERMS AND CONDITIONS OF THE LICENSE.  YOU INDICATE YOUR
+ACCEPTANCE BY IN ANY MANNER USING (INCLUDING WITHOUT LIMITATION BY
+REPRODUCING, MODIFYING OR DISTRIBUTING) THE SOFTWARE.  IF YOU DO NOT ACCEPT
+ALL OF THE TERMS AND CONDITIONS OF THE LICENSE, DO NOT USE THE SOFTWARE IN ANY
+MANNER.
+
+Sybase Open Watcom Public License version 1.0
+
+1. General; Definitions.  This License applies only to the following software
+programs:  the open source versions of Sybase's Watcom C/C++ and Fortran
+compiler products ("Software"), which are modified versions of, with
+significant changes from, the last versions made commercially available by
+Sybase.  As used in this License:
+
+1.1 "Applicable Patent Rights" mean:  (a) in the case where Sybase is the
+grantor of rights, (i) claims of patents that are now or hereafter acquired,
+owned by or assigned to Sybase and (ii) that cover subject matter contained in
+the Original Code, but only to the extent necessary to use, reproduce and/or
+distribute the Original Code without infringement; and (b) in the case where
+You are the grantor of rights, (i) claims of patents that are now or hereafter
+acquired, owned by or assigned to You and (ii) that cover subject matter in
+Your Modifications, taken alone or in combination with Original Code.
+
+1.2 "Contributor" means any person or entity that creates or contributes to
+the creation of Modifications.
+
+1.3 "Covered Code" means the Original Code, Modifications, the combination of
+Original Code and any Modifications, and/or any respective portions thereof.
+
+1.4 "Deploy" means to use, sublicense or distribute Covered Code other than
+for Your internal research and development (R&D) and/or Personal Use, and
+includes without limitation, any and all internal use or distribution of
+Covered Code within Your business or organization except for R&D use and/or
+Personal Use, as well as direct or indirect sublicensing or distribution of
+Covered Code by You to any third party in any form or manner.
+
+1.5 "Larger Work" means a work which combines Covered Code or portions thereof
+with code not governed by the terms of this License.
+
+1.6 "Modifications" mean any addition to, deletion from, and/or change to, the
+substance and/or structure of the Original Code, any previous Modifications,
+the combination of Original Code and any previous Modifications, and/or any
+respective portions thereof.  When code is released as a series of files, a
+Modification is:  (a) any addition to or deletion from the contents of a file
+containing Covered Code; and/or (b) any new file or other representation of
+computer program statements that contains any part of Covered Code.
+
+1.7 "Original Code" means (a) the Source Code of a program or other work as
+originally made available by Sybase under this License, including the Source
+Code of any updates or upgrades to such programs or works made available by
+Sybase under this License, and that has been expressly identified by Sybase as
+such in the header file(s) of such work; and (b) the object code compiled from
+such Source Code and originally made available by Sybase under this License.
+
+1.8 "Personal Use" means use of Covered Code by an individual solely for his
+or her personal, private and non-commercial purposes.  An individual's use of
+Covered Code in his or her capacity as an officer, employee, member,
+independent contractor or agent of a corporation, business or organization
+(commercial or non-commercial) does not qualify as Personal Use.
+
+1.9 "Source Code" means the human readable form of a program or other work
+that is suitable for making modifications to it, including all modules it
+contains, plus any associated interface definition files, scripts used to
+control compilation and installation of an executable (object code).
+
+1.10 "You" or "Your" means an individual or a legal entity exercising rights
+under this License.  For legal entities, "You" or "Your" includes any entity
+which controls, is controlled by, or is under common control with, You, where
+"control" means (a) the power, direct or indirect, to cause the direction or
+management of such entity, whether by contract or otherwise, or (b) ownership
+of fifty percent (50%) or more of the outstanding shares or beneficial
+ownership of such entity.
+
+2. Permitted Uses; Conditions & Restrictions.Subject to the terms and
+conditions of this License, Sybase hereby grants You, effective on the date
+You accept this License and download the Original Code, a world-wide,
+royalty-free, non-exclusive license, to the extent of Sybase's Applicable
+Patent Rights and copyrights covering the Original Code, to do the following:
+
+2.1 You may use, reproduce, display, perform, modify and distribute Original
+Code, with or without Modifications, solely for Your internal research and
+development and/or Personal Use, provided that in each instance:
+
+(a) You must retain and reproduce in all copies of Original Code the copyright
+and other proprietary notices and disclaimers of Sybase as they appear in the
+Original Code, and keep intact all notices in the Original Code that refer to
+this License; and
+
+(b) You must retain and reproduce a copy of this License with every copy of
+Source Code of Covered Code and documentation You distribute, and You may not
+offer or impose any terms on such Source Code that alter or restrict this
+License or the recipients' rights hereunder, except as permitted under 
+Section 6.
+
+(c) Whenever reasonably feasible you should include the copy of this License
+in a click-wrap format, which requires affirmative acceptance by clicking on
+an "I accept" button or similar mechanism.  If a click-wrap format is not
+included, you must include a statement that any use (including without
+limitation reproduction, modification or distribution) of the Software, and
+any other affirmative act that you define, constitutes acceptance of the
+License, and instructing the user not to use the Covered Code in any manner if
+the user does not accept all of the terms and conditions of the License.
+
+2.2 You may use, reproduce, display, perform, modify and Deploy Covered Code,
+provided that in each instance:
+
+(a) You must satisfy all the conditions of Section 2.1 with respect to the
+Source Code of the Covered Code;
+
+(b) You must duplicate, to the extent it does not already exist, the notice in
+Exhibit A in each file of the Source Code of all Your Modifications, and cause
+the modified files to carry prominent notices stating that You changed the
+files and the date of any change;
+
+(c) You must make Source Code of all Your Deployed Modifications publicly
+available under the terms of this License, including the license grants set
+forth in Section 3 below, for as long as you Deploy the Covered Code or twelve
+(12) months from the date of initial Deployment, whichever is longer.  You
+should preferably distribute the Source Code of Your Deployed Modifications
+electronically (e.g.  download from a web site);
+
+(d) if You Deploy Covered Code in object code, executable form only, You must
+include a prominent notice, in the code itself as well as in related
+documentation, stating that Source Code of the Covered Code is available under
+the terms of this License with information on how and where to obtain such
+Source Code; and
+
+(e) the object code form of the Covered Code may be distributed under Your own
+license agreement, provided that such license agreement contains terms no less
+protective of Sybase and each Contributor than the terms of this License, and
+stating that any provisions which differ from this License are offered by You
+alone and not by any other party.
+
+2.3 You expressly acknowledge and agree that although Sybase and each
+Contributor grants the licenses to their respective portions of the Covered
+Code set forth herein, no assurances are provided by Sybase or any Contributor
+that the Covered Code does not infringe the patent or other intellectual
+property rights of any other entity.  Sybase and each Contributor disclaim any
+liability to You for claims brought by any other entity based on infringement
+of intellectual property rights or otherwise.  As a condition to exercising
+the rights and licenses granted hereunder, You hereby assume sole
+responsibility to secure any other intellectual property rights needed, if
+any.  For example, if a third party patent license is required to allow You to
+distribute the Covered Code, it is Your responsibility to acquire that license
+before distributing the Covered Code.
+
+3. Your Grants.  In consideration of, and as a condition to, the licenses
+granted to You under this License, You hereby grant to Sybase and all third
+parties a non-exclusive, royalty-free license, under Your Applicable Patent
+Rights and other intellectual property rights (other than patent) owned or
+controlled by You, to use, reproduce, display, perform, modify, distribute and
+Deploy Your Modifications of the same scope and extent as Sybase's licenses
+under Sections 2.1 and 2.2.
+
+4. Larger Works.  You may create a Larger Work by combining Covered Code with
+other code not governed by the terms of this License and distribute the Larger
+Work as a single product.  In each such instance, You must make sure the
+requirements of this License are fulfilled for the Covered Code or any portion
+thereof.
+
+5. Limitations on Patent License.  Except as expressly stated in Section 2, no
+other patent rights, express or implied, are granted by Sybase herein.
+Modifications and/or Larger Works may require additional patent licenses from
+Sybase which Sybase may grant in its sole discretion.
+
+6. Additional Terms.  You may choose to offer, and to charge a fee for,
+warranty, support, indemnity or liability obligations and/or other rights
+consistent with this License ("Additional Terms") to one or more recipients of
+Covered Code.  However, You may do so only on Your own behalf and as Your sole
+responsibility, and not on behalf of Sybase or any Contributor.  You must
+obtain the recipient's agreement that any such Additional Terms are offered by
+You alone, and You hereby agree to indemnify, defend and hold Sybase and every
+Contributor harmless for any liability incurred by or claims asserted against
+Sybase or such Contributor by reason of any such Additional Terms.
+
+7. Versions of the License.  Sybase may publish revised and/or new versions of
+this License from time to time.  Each version will be given a distinguishing
+version number.  Once Original Code has been published under a particular
+version of this License, You may continue to use it under the terms of that
+version.  You may also choose to use such Original Code under the terms of any
+subsequent version of this License published by Sybase.  No one other than
+Sybase has the right to modify the terms applicable to Covered Code created
+under this License.
+
+8. NO WARRANTY OR SUPPORT.  The Covered Code may contain in whole or in part
+pre-release, untested, or not fully tested works.  The Covered Code may
+contain errors that could cause failures or loss of data, and may be
+incomplete or contain inaccuracies.  You expressly acknowledge and agree that
+use of the Covered Code, or any portion thereof, is at Your sole and entire
+risk.  THE COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR
+SUPPORT OF ANY KIND AND SYBASE AND SYBASE'S LICENSOR(S) (COLLECTIVELY REFERRED
+TO AS "SYBASE" FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS
+EXPRESSLY DISCLAIM ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF
+MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE,
+OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+SYBASE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR
+ENJOYMENT OF THE COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED
+CODE WILL MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL
+BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE
+CORRECTED.  NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY SYBASE, A SYBASE
+AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.  You
+acknowledge that the Covered Code is not intended for use in the operation of
+nuclear facilities, aircraft navigation, communication systems, or air traffic
+control machines in which case the failure of the Covered Code could lead to
+death, personal injury, or severe physical or environmental damage.
+
+9. LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT
+SHALL SYBASE OR ANY CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INCIDENTAL, SPECIAL,
+INDIRECT, CONSEQUENTIAL OR OTHER DAMAGES OF ANY KIND ARISING OUT OF OR
+RELATING TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR
+ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY, TORT
+(INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF SYBASE OR
+SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND
+NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.  SOME
+JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF INCIDENTAL OR
+CONSEQUENTIAL OR OTHER DAMAGES OF ANY KIND, SO THIS LIMITATION MAY NOT APPLY
+TO YOU.  In no event shall Sybase's or any Contributor's total liability to
+You for all damages (other than as may be required by applicable law) under
+this License exceed the amount of five hundred dollars ($500.00).
+
+10.  Trademarks.  This License does not grant any rights to use the trademarks
+or trade names "Sybase" or any other trademarks or trade names belonging to
+Sybase (collectively "Sybase Marks") or to any trademark or trade name
+belonging to any Contributor("Contributor Marks").  No Sybase Marks or
+Contributor Marks may be used to endorse or promote products derived from the
+Original Code or Covered Code other than with the prior written consent of
+Sybase or the Contributor, as applicable.
+
+11.  Ownership.  Subject to the licenses granted under this License, each
+Contributor retains all rights, title and interest in and to any Modifications
+made by such Contributor.  Sybase retains all rights, title and interest in
+and to the Original Code and any Modifications made by or on behalf of Sybase
+("Sybase Modifications"), and such Sybase Modifications will not be
+automatically subject to this License.  Sybase may, at its sole discretion,
+choose to license such Sybase Modifications under this License, or on
+different terms from those contained in this License or may choose not to
+license them at all.
+
+12.  Termination.
+
+12.1 Termination.  This License and the rights granted hereunder will
+terminate:
+
+(a) automatically without notice if You fail to comply with any term(s) of
+this License and fail to cure such breach within 30 days of becoming aware of
+such breach;
+
+(b) immediately in the event of the circumstances described in Section
+13.5(b); or
+
+(c) automatically without notice if You, at any time during the term of this
+License, commence an action for patent infringement (including as a cross
+claim or counterclaim) against Sybase or any Contributor.
+
+12.2 Effect of Termination.  Upon termination, You agree to immediately stop
+any further use, reproduction, modification, sublicensing and distribution of
+the Covered Code and to destroy all copies of the Covered Code that are in
+your possession or control.  All sublicenses to the Covered Code that have
+been properly granted prior to termination shall survive any termination of
+this License.  Provisions which, by their nature, should remain in effect
+beyond the termination of this License shall survive, including but not
+limited to Sections 3, 5, 8, 9, 10, 11, 12.2 and 13.  No party will be liable
+to any other for compensation, indemnity or damages of any sort solely as a
+result of terminating this License in accordance with its terms, and
+termination of this License will be without prejudice to any other right or
+remedy of any party.
+
+13.  Miscellaneous.
+
+13.1 Government End Users.  The Covered Code is a "commercial item" as defined
+in FAR 2.101.  Government software and technical data rights in the Covered
+Code include only those rights customarily provided to the public as defined
+in this License.  This customary commercial license in technical data and
+software is provided in accordance with FAR 12.211 (Technical Data) and 12.212
+(Computer Software) and, for Department of Defense purchases, DFAR
+252.227-7015 (Technical Data -- Commercial Items) and 227.7202-3 (Rights in
+Commercial Computer Software or Computer Software Documentation).
+Accordingly, all U.S.  Government End Users acquire Covered Code with only
+those rights set forth herein.
+
+13.2 Relationship of Parties.  This License will not be construed as creating
+an agency, partnership, joint venture or any other form of legal association
+between or among you, Sybase or any Contributor, and You will not represent to
+the contrary, whether expressly, by implication, appearance or otherwise.
+
+13.3 Independent Development.  Nothing in this License will impair Sybase's or
+any Contributor's right to acquire, license, develop, have others develop for
+it, market and/or distribute technology or products that perform the same or
+similar functions as, or otherwise compete with, Modifications, Larger Works,
+technology or products that You may develop, produce, market or distribute.
+
+13.4 Waiver; Construction.  Failure by Sybase or any Contributor to enforce
+any provision of this License will not be deemed a waiver of future
+enforcement of that or any other provision.  Any law or regulation which
+provides that the language of a contract shall be construed against the
+drafter will not apply to this License.
+
+13.5 Severability.  (a) If for any reason a court of competent jurisdiction
+finds any provision of this License, or portion thereof, to be unenforceable,
+that provision of the License will be enforced to the maximum extent
+permissible so as to effect the economic benefits and intent of the parties,
+and the remainder of this License will continue in full force and effect.  (b)
+Notwithstanding the foregoing, if applicable law prohibits or restricts You
+from fully and/or specifically complying with Sections 2 and/or 3 or prevents
+the enforceability of either of those Sections, this License will immediately
+terminate and You must immediately discontinue any use of the Covered Code and
+destroy all copies of it that are in your possession or control.
+
+13.6 Dispute Resolution.  Any litigation or other dispute resolution between
+You and Sybase relating to this License shall take place in the Northern
+District of California, and You and Sybase hereby consent to the personal
+jurisdiction of, and venue in, the state and federal courts within that
+District with respect to this License.  The application of the United Nations
+Convention on Contracts for the International Sale of Goods is expressly
+excluded.
+
+13.7 Entire Agreement; Governing Law.  This License constitutes the entire
+agreement between the parties with respect to the subject matter hereof.  This
+License shall be governed by the laws of the United States and the State of
+California, except that body of California law concerning conflicts of law.
+
+Where You are located in the province of Quebec, Canada, the following clause
+applies:  The parties hereby confirm that they have requested that this
+License and all related documents be drafted in English.  Les parties ont
+exige que le present contrat et tous les documents connexes soient rediges en
+anglais.
+
+EXHIBIT A.
+
+"Portions Copyright (c) 1983-2002 Sybase, Inc.  All Rights Reserved.
+
+This file contains Original Code and/or Modifications of Original Code as
+defined in and that are subject to the Sybase Open Watcom Public License
+version 1.0 (the 'License').  You may not use this file except in compliance
+with the License.  BY USING THIS FILE YOU AGREE TO ALL TERMS AND CONDITIONS OF
+THE LICENSE.  A copy of the License is provided with the Original Code and
+Modifications, and is also available at www.sybase.com/developer/opensource.
+
+The Original Code and all software distributed under the License are
+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS
+OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM ALL SUCH
+WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  Please
+see the License for the specific language governing rights and limitations
+under the License."
+
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@ -0,0 +1,118 @@
+# ChangeLog for media-sound/amarok
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*amarok-2.0.2 (05 Mar 2009)
+
+  05 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> +amarok-2.0.2.ebuild:
+  Bump
+
+  05 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  metadata.xml, amarok-9999.ebuild:
+  Added missing [kdeprefix=] USE deps in amarok, reformatting
+
+  12 Jan 2009; Manuel Nickschas <sputnick@quassel-irc.org>
+  amarok-2.0.1.1.ebuild:
+  Remove unused USE
+
+*amarok-2.0.1.1 (12 Jan 2009)
+
+  12 Jan 2009; Manuel Nickschas <sputnick@quassel-irc.org>
+  +amarok-2.0.1.1.ebuild:
+  Bump
+
+*amarok-2.0-r1 (27 Dec 2008)
+
+  27 Dec 2008; Alexey Shvetsov <alexxy@gentoo.ru> -amarok-1.98.ebuild,
+  +amarok-2.0-r1.ebuild, -amarok-2.0.ebuild:
+  Remove unneeded src_install
+
+  28 Nov 2008; Manuel Nickschas <sputnick@quassel-irc.org>
+  amarok-9999.ebuild:
+  Prefer mysql over mysql-community. Amarok works fine with either one, but
+  portage seems to suggest only the first of them, and that confuses users.
+
+  27 Nov 2008; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  amarok-9999.ebuild:
+  Files no longer installed in trunk, fixed KEYWORDS for tagged amarok
+
+*amarok-1.98 (21 Nov 2008)
+
+  21 Nov 2008; Alexey Shvetsov <alexxy@gentoo.ru> -amarok-1.94.ebuild,
+  +amarok-1.98.ebuild:
+  Version bump
+
+  16 Nov 2008; Theo Chatzimichos <tampakrap@gmail.com> ChangeLog:
+  fix collisions for snapshots, bug 246639
+
+  05 Nov 2008; Theo Chatzimichos <tampakrap@gmail.com> ChangeLog:
+  fix collisions with kdelibs and plasma-workspace
+
+  05 Nov 2008; Manuel 'Sput' Nickschas <sputnick@quassel-irc.org>
+  amarok-9999.ebuild:
+  Update amd64 -fPIC warning
+
+  04 Nov 2008; Manuel 'Sput' Nickschas <sputnick@quassel-irc.org>
+  amarok-9999.ebuild:
+  libplasma move to kdelibs
+
+*amarok-1.94 (01 Nov 2008)
+
+  01 Nov 2008; <alexxy@gentoo.org> -amarok-1.92.2.ebuild,
+  +amarok-1.94.ebuild:
+  Version bump
+
+  30 Oct 2008; Theo Chatzimichos <tampakrap@gmail.com> ChangeLog:
+  small fixes
+
+  29 Oct 2008; Theo Chatzimichos <tampakrap@gmail.com> ChangeLog:
+  small fix
+
+  29 Oct 2008; <tampakrap@gentoo.org> ChangeLog:
+  importing live ebuild
+
+  10 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -amarok-1.90.ebuild:
+  Removed amarok-1.90 as it was put in the tree.
+
+  06 Oct 2008; <alexxy@gentoo.org> amarok-1.90.ebuild, amarok-1.92.2.ebuild:
+  update NEED_KDE to use slots instead of versions
+
+*amarok-1.92.2 (03 Oct 2008)
+
+  03 Oct 2008; Tomáš Chvátal <tomas.chvatal@gmail.com>
+  +amarok-1.92.2.ebuild, -amarok-1.92.ebuild:
+  Again do version bump.
+
+*amarok-1.92 (03 Oct 2008)
+
+  03 Oct 2008; Tomáš Chvátal <tomas.chvatal@gmail.com>
+  +amarok-1.92.ebuild:
+  Bump new version.
+
+  02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml:
+  Added missing use flags descriptions to metadata.xml.
+
+  27 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
+  amarok-1.90.ebuild:
+  Move ebuild towards EAPI2 compilance
+
+  27 Aug 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-1.90.ebuild:
+  Fixed alphabetical order in KEYWORDS and deps.
+
+  25 Aug 2008; Manuel Nickschas (Sput) <sputnick@quassel-irc.org>
+  amarok-1.90.ebuild:
+  Keyword ~amd64
+
+  22 Aug 2008; Manuel Nickschas (Sput) <sputnick@quassel-irc.org>
+  amarok-1.90.ebuild:
+  Add ~x86 keyword
+
+*amarok-1.90 (22 Aug 2008)
+
+  22 Aug 2008; Manuel Nickschas <sputnick@quassel-irc.org> +metadata.xml,
+  +amarok-1.90.ebuild:
+  Initial import.
+
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@ -0,0 +1,6 @@
+AUX 2.0.1.1-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61
+AUX amarok-2.0.2-librt-1.patch 721 RMD160 a36d3cb937674672d41c790559084e4cd8c7c730 SHA1 0ca0e33ec624937d1d55a35911d8a2e401cc4c09 SHA256 37801a5a80bb2272dcd0eb5aad6305eed41c9822f92e1876c159e805cd7565c5
+DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651
+EBUILD amarok-2.0.2.ebuild 2971 RMD160 27e664ef53e1e790f66ccb29dbd59e1b60477c6b SHA1 502ad3bf53464d84c16565d5d18352fd1a811b49 SHA256 89e30e2a3a95d63b2f457eb04d9ef6ad9e7fb3ee4a301be824e175f7810d7a7a
+MISC ChangeLog 3475 RMD160 b1f633dc047f305e4ac8de5018b9b644c01f7717 SHA1 9023f9f58fb01d816ed654c6d34fb809f89f5ed0 SHA256 a7f7a34109e544a970aa89509d14ef37e95635dd82ea2df17ec919bff24e6a67
+MISC metadata.xml 2242 RMD160 5c8dc1dad24c8ced0799cec417f365eb6f5b34f4 SHA1 d34e266daa2e6b1e9b90930003b7aafdd9354195 SHA256 b51d1bb69f0f14303609a332c31fcf88b1a54b8b317e275550a26803ba076cae
--- a/media-sound/amarok/amarok-2.0.2.ebuild
+++ b/media-sound/amarok/amarok-2.0.2.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km
+			ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se sl si sk sv th tr uk zh_CN zh_TW"
+
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SLOT="2"
+IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
+
+DEPEND="
+	>=app-misc/strigi-0.5.7
+	|| (
+		>=dev-db/mysql-5.0[embedded]
+		>=dev-db/mysql-community-5.0[embedded]
+	)
+	dev-db/sqlite:3
+	>=media-libs/taglib-1.5
+	|| (
+		media-sound/phonon
+		x11-libs/qt-phonon:4
+	)
+	>=kde-base/kdelibs-${KDE_MINIMAL}[kdeprefix=,opengl?,semantic-desktop?]
+	>=kde-base/plasma-workspace-${KDE_MINIMAL}[kdeprefix=]
+	x11-libs/qt-webkit:4
+	cdaudio? (
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}[kdeprefix=]
+		>=kde-base/libkcddb-${KDE_MINIMAL}[kdeprefix=]
+	)
+	ifp? ( media-libs/libifp )
+	ipod? ( >=media-libs/libgpod-0.4.2 )
+	mp3tunes? (
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+	)
+	mp4? ( media-libs/libmp4v2 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+"
+RDEPEND="${DEPEND}
+	app-arch/unzip
+	daap? ( www-servers/mongrel )
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL}[kdeprefix=] )
+"
+
+PATCHES=( "${FILESDIR}/2.0.1.1-ipod.patch"
+	"${FILESDIR}/amarok-2.0.2-librt-1.patch" )
+
+pkg_setup() {
+	if use amd64 ; then
+		echo
+		ewarn "Compilation will fail if dev-db/mysql[-community] is built without -fPIC in your CFLAGS!"
+		ewarn "Related bug: http://bugs.gentoo.org/show_bug.cgi?id=238487"
+		ewarn
+		ewarn "To fix this, and to avoid using -fPIC globally in your make.conf (which is not recommended),"
+		ewarn "put the following into /etc/portage/env/dev-db/mysql (or mysql-community, depending on which you use;"
+		ewarn "create dirs and the file if they don't exist):"
+		ewarn
+		ewarn "CFLAGS=\"${CFLAGS} -DPIC -fPIC\""
+		ewarn "CXXFLAGS=\"${CXXFLAGS} -DPIC -fPIC\""
+		echo
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_configure() {
+	if ! use mp3tunes; then
+		sed -e'/mp3tunes/ s:^:#DONOTWANT :' \
+		-i "${S}"/src/services/CMakeLists.txt \
+		|| die "Deactivating mp3tunes failed."
+	fi
+
+	# Remove superfluous QT_WEBKIT
+	sed -e 's/ -DQT_WEBKIT//g' \
+		-i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \
+		|| die "Removing unnecessary -DQT_WEBKIT failed."
+
+	mycmakeargs="${mycmakeargs}
+		-DUSE_SYSTEM_SQLITE=ON
+		$(cmake-utils_use_with cdaudio KdeMultimedia)
+		$(cmake-utils_use_with ipod Ipod)
+		$(cmake-utils_use_with ifp Ifp)
+		$(cmake-utils_use_with mp4 Mp4v2)
+		$(cmake-utils_use_with mtp Mtp)
+		$(cmake-utils_use_with njb Njb)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	kde4-base_src_configure
+}
--- a/media-sound/amarok/files/2.0.1.1-ipod.patch
+++ b/media-sound/amarok/files/2.0.1.1-ipod.patch
@ -0,0 +1,175 @@
+diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/modules/FindIpod.cmake
+--- amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake	2009-01-06 13:48:28.000000000 +0100
+++ amarok-2.0.1.1/cmake/modules/FindIpod.cmake	2009-02-10 18:18:23.000000000 +0100
+@@ -2,45 +2,35 @@
+ # Once done this will define
+ #
+ #  IPOD_FOUND - system has libgpod
+-#  IPOD_INCLUDE_DIR - the libgpod include directory
+#  IPOD_INCLUDE_DIRS - the libgpod include directory
+ #  IPOD_LIBRARIES - Link these to use libgpod
+-#  IPOD_DEFINITIONS - Compiler switches required for using libgpod
+#  IPOD_CFLAGS - Compiler switches required for using libgpod
+#  IPOD_VERSION - Version number of libgpod
+ #
+ 
+-if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
+ 
+   # in cache already
+   SET(IPOD_FOUND TRUE)
+ 
+-else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
+   if(NOT WIN32)
+     # use pkg-config to get the directories and then use these values
+     # in the FIND_PATH() and FIND_LIBRARY() calls
+-    INCLUDE(UsePkgConfig)
+-  
+-    PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags)
+-  
+-    set(IPOD_DEFINITIONS ${_IPODCflags})
+    find_package(PkgConfig)
+    PKG_SEARCH_MODULE(IPOD libgpod-1.0)
+
+   endif(NOT WIN32)
+  IF (IPOD_FOUND)
+     IF (NOT IPOD_FIND_QUIETLY)
+        MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
+     ENDIF (NOT IPOD_FIND_QUIETLY)
+  ELSE (IPOD_FOUND)
+     IF (IPOD_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!")
+     ENDIF (IPOD_FIND_REQUIRED)
+  ENDIF (IPOD_FOUND)
+
+  MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS)
+ 
+-  FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0
+-    ${_IPODIncDir}
+-  )
+-  
+-  FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod
+-    PATHS
+-    ${_IPODLinkDir}
+-  )
+-
+-  if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+-    SET(IPOD_FOUND TRUE)
+-  else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+-    SET(IPOD_FOUND_FALSE)
+-  endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+-
+-  include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES )
+- 
+-  MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES)
+-  
+-endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
+diff -urN amarok-2.0.1.1.old/CMakeLists.txt amarok-2.0.1.1/CMakeLists.txt
+--- amarok-2.0.1.1.old/CMakeLists.txt	2009-01-06 14:12:50.000000000 +0100
+++ amarok-2.0.1.1/CMakeLists.txt	2009-02-10 18:22:23.000000000 +0100
+@@ -56,7 +56,10 @@
+ macro_log_feature( GDK_FOUND "Gdk" "Support for artwork on iPod audio devices via GdkPixbuf" "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" FALSE "2.0.x" "" )
+ 
+ macro_optional_find_package(Ipod)
+-macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" )
+if(IPOD_FOUND)
+	macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7)
+endif(IPOD_FOUND)
+macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" )
+ 
+ #macro_optional_find_package(MySQL)
+ #macro_log_feature( MYSQL_FOUND "mysql" "Store Collection in a mysql database instead of a sqlite one" "http://www.mysql.com" FALSE "4.1.0" "" )
+diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt
+--- amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt	2009-01-06 13:49:32.000000000 +0100
+++ amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt	2009-02-10 22:22:01.000000000 +0100
+@@ -17,7 +17,7 @@
+    handler
+    ${GLIB2_INCLUDE_DIR}
+    ${GDK_INCLUDE_DIR}
+-   ${IPOD_INCLUDE_DIR}
+   ${IPOD_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}/../..
+    ${AMAROK_COLLECTION_SUPPORT_DIR}
+    ${KDE4_INCLUDE_DIR}
+diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp
+--- amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-01-06 13:49:32.000000000 +0100
+++ amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-02-10 18:00:09.000000000 +0100
+@@ -1339,73 +1339,12 @@
+     QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
+     QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
+ 
+-    Itdb_Thumb *thumb = NULL;
+     GdkPixbuf *gpixbuf = NULL;
+-    QString thumbPath;
+ 
+     // pull image out of ipod
+ 
+-    if( ipodtrack->has_artwork == 0x01 )
+-    {
+-        // try small first
+-
+-        thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL );
+-
+-        // then large if needed
+-        if( thumb == NULL)
+-        {
+-            thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE );
+-        }
+-
+-        if( thumb != NULL)
+-        {
+-            gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
+-        }
+-        else
+-        {
+-            GList *thumbs = ipodtrack->artwork->thumbnails;
+-
+-            for(; thumbs; thumbs = thumbs->next)
+-            {
+-                Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data;
+-                if( curThumb == NULL)
+-                    continue;
+-
+-                switch( curThumb->type )
+-                {
+-                    case ITDB_THUMB_PHOTO_SMALL:
+-                        break;
+-                    case ITDB_THUMB_PHOTO_LARGE:
+-                        break;
+-                    case ITDB_THUMB_PHOTO_FULL_SCREEN:
+-                        break;
+-                    case ITDB_THUMB_PHOTO_TV_SCREEN:
+-                        break;
+-                    case ITDB_THUMB_COVER_XLARGE:
+-                        break;
+-                    case ITDB_THUMB_COVER_MEDIUM:
+-                        break;
+-                    case ITDB_THUMB_COVER_SMEDIUM:
+-                        break;
+-                    case ITDB_THUMB_COVER_XSMALL:
+-                        break;
+-
+-                    default:
+-                        break;
+-                }
+-
+-                thumb = curThumb;
+-                break;
+-
+-            }
+-
+-            if( thumb != NULL)
+-            {
+-                thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
+-                gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
+-            }
+-        }
+-    }
+    if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false
+		 gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 );
+ 
+     if(gpixbuf != NULL)
+     {
--- a/media-sound/amarok/files/amarok-2.0.2-librt-1.patch
+++ b/media-sound/amarok/files/amarok-2.0.2-librt-1.patch
@ -0,0 +1,18 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-03-08
+Initial Package Version: 2.0.2
+Origin: me
+Upstream Status: unknown
+Description: also link to lib rt for mysql embedded
+ 
+diff -Naur amarok-2.0.2.orig/src/collection/sqlcollection/CMakeLists.txt amarok-2.0.2/src/collection/sqlcollection/CMakeLists.txt
+--- amarok-2.0.2.orig/src/collection/sqlcollection/CMakeLists.txt	2009-03-08 11:55:17.804059862 +0000
+++ amarok-2.0.2/src/collection/sqlcollection/CMakeLists.txt	2009-03-08 11:56:04.183102651 +0000
+@@ -58,6 +58,7 @@
+ target_link_libraries(amarok_collection-sqlcollection
+     amaroklib
+     amarokpud
+    rt
+     ${KDE4_KDEUI_LIBS}
+     ${KDE4_KIO_LIBS}
+     ${KDE4_THREADWEAVER_LIBRARIES}
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<use>
+	<!--
+	<flag name="amazon">Enable support for downloading covers from amazon.com</flag>
+	-->
+	<flag name="cdaudio">Enable cdaudio functionality</flag>
+	<flag name="daap">
+		Enable the scripts for music sharing through DAAP. This flag adds
+		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
+		the Amarok music collection through DAAP protocol. Please note
+		that turning this flag off has no effect on DAAP browsing.
+	</flag>
+	<flag name="ifp">Enable support for iRiver devices access through libifp</flag>
+	<flag name="mp3tunes">Enable mp3tunes integration</flag>
+	<flag name="mp4">
+		Build the TagLib plugin for writing tags in Mp4 container files
+		(m4a). Please note that by enabling this USE flag, the resulting
+		package will not be redistributable, as it links to
+		<pkg>media-libs/libmp4v2</pkg>, distributed under a
+		GPL-incompatible license.
+	</flag>
+	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
+	<flag name="njb">Enable support for NJB (Creative) devices access through libnjb</flag>
+	<!--
+	<flag name="python">
+		Install the Amarok scripts written in Python, depending on
+		<pkg>dev-python/PyQt</pkg>. At the moment the only script
+		installed by this flag is the webcontrol script.
+	</flag>
+	<flag name="real">
+		Build the Helix engine for Amarok, linked against
+		<pkg>media-video/realplayer</pkg>. This is an alternative engine
+		to the xine one, which supports a different set of formats. Only
+		available for x86 architecture as it uses the binary version of
+		RealPlayer. Please note that by enabling this USE flag, the resulting
+		package will not be redistributable, as it links to the non-GPL compatible
+		RealPlayer.
+	</flag>
+	-->
+	<flag name="semantic-desktop">
+		Semantic desktop allows for storage of digital informationand its
+		metadata to allow the user to express his personal mental models, making
+		all information become intuitively accessible
+	</flag>
+	<!--
+	<flag name="visualization">
+		Support visualization plugins through <pkg>media-libs/libvisual</pkg>
+	</flag>
+	-->
+</use>
+</pkgmetadata>
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@ -0,0 +1,497 @@
+# ChangeLog for net-libs/courier-authlib
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.101 2009/02/25 20:33:03 maekke Exp $
+
+  25 Feb 2009; Markus Meier <maekke@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  amd64 stable, bug #252576
+
+  25 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  ppc stable, bug #252576
+
+  25 Feb 2009; Raúl Porcel <armin76@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  arm/ia64/s390/sh/x86 stable wrt #252576
+
+  23 Feb 2009; Jeroen Roovers <jer@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  Stable for HPPA (bug #252576).
+
+  23 Feb 2009; Brent Baude <ranger@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  Marking courier-authlib-0.62.2 ppc64 for bug 252576
+
+  23 Feb 2009; Ferris McCormick <fmccor@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  Sparc stable, security Bug #252576.
+
+  23 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
+  courier-authlib-0.62.2.ebuild:
+  Stable on alpha, bug #252576
+
+*courier-authlib-0.62.2 (22 Feb 2009)
+
+  22 Feb 2009; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.62.2.ebuild:
+  Version bump and removed obsolete sed line.
+
+*courier-authlib-0.61.1 (16 Dec 2008)
+
+  16 Dec 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.61.1.ebuild:
+  Version bump.
+
+*courier-authlib-0.61.0 (21 Jul 2008)
+
+  21 Jul 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.61.0.ebuild:
+  Version bump and simplification of sed commands.
+
+  16 Jul 2008; Luca Longinotti <chtekk@gentoo.org>
+  courier-authlib-0.58.ebuild, courier-authlib-0.59.2.ebuild,
+  courier-authlib-0.60.2.ebuild, courier-authlib-0.60.2-r1.ebuild,
+  courier-authlib-0.60.6.ebuild:
+  Dep on PostgreSQL libs only.
+
+  22 Jun 2008; Markus Meier <maekke@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  amd64 stable, bug #225407
+
+  17 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  stable x86, security bug 225407
+
+  17 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  don't execute tests when USE=berkdb is disabled
+
+  15 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  Don't install libltdl in any case, replace the installable macro with the
+  convenience one.
+
+  14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  Don't run eautoreconf twice (first recursive and then non-recursive), as
+  it would also have deleted elibtoolize results.
+
+  11 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  alpha/ia64/sparc stable wrt #225407
+
+  10 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  ppc stable, bug #225407
+
+  10 Jun 2008; Brent Baude <ranger@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  Marking courier-authlib-0.60.6 ppc64 for bug 225407
+
+  10 Jun 2008; Jeroen Roovers <jer@gentoo.org>
+  courier-authlib-0.60.6.ebuild:
+  Stable for HPPA (bug #225407).
+
+*courier-authlib-0.60.6 (08 Jun 2008)
+
+  08 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.60.6.ebuild:
+  Version bump, security.
+
+  25 May 2008; Hanno Boeck <hanno@gentoo.org> courier-authlib-0.60.2.ebuild,
+  courier-authlib-0.60.2-r1.ebuild:
+  Fix license (GPL-3).
+
+  23 May 2008; Raúl Porcel <armin76@gentoo.org>
+  courier-authlib-0.60.2-r1.ebuild:
+  ia64 stable wrt #222737
+
+  22 May 2008; Markus Meier <maekke@gentoo.org>
+  courier-authlib-0.60.2-r1.ebuild:
+  amd64/x86 stable, bug #222737
+
+  22 May 2008; Tobias Klausmann <klausman@gentoo.org>
+  courier-authlib-0.60.2-r1.ebuild:
+  Stable on alpha, bug #222737
+
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  courier-authlib-0.58.ebuild, courier-authlib-0.59.2.ebuild,
+  courier-authlib-0.60.2.ebuild, courier-authlib-0.60.2-r1.ebuild:
+  Changed dependency for postgresql from dev-db/postgresql to
+  virtual/postgresql-server
+
+  21 May 2008; nixnut <nixnut@gentoo.org> courier-authlib-0.60.2-r1.ebuild:
+  Stable on ppc wrt bug 222737
+
+  20 May 2008; Jeroen Roovers <jer@gentoo.org>
+  courier-authlib-0.60.2-r1.ebuild:
+  Stable for HPPA (bug #222737).
+
+*courier-authlib-0.60.2-r1 (20 May 2008)
+
+  20 May 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.60.2-r1.ebuild:
+  Remove vpopmail-support.
+
+  18 May 2008; Ferris McCormick <fmccor@gentoo.org>
+  courier-authlib-0.60.2.ebuild:
+  Sparc stable --- Bug #222737 --- builds, installs, works for me.
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  courier-authlib-0.60.2.ebuild:
+  Run autotools in all directories, not just the toplevel #218295.
+
+  16 Apr 2008; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
+  Update metadata, assign this solely to the herd, I'm no longer interested
+  in maintaining it myself.
+
+*courier-authlib-0.60.2 (15 Apr 2008)
+
+  15 Apr 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.60.2.ebuild:
+  Version bump, proxy-maintained ebuild by user Bernd Wurst.
+
+  09 Mar 2008; <ricmm@gentoo.org> courier-authlib-0.58.ebuild:
+  Drop to ~mips due to unstable deps
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  (QA) RESTRICT clean up.
+
+  08 May 2007; Marius Mauch <genone@gentoo.org> courier-authlib-0.58.ebuild,
+  courier-authlib-0.59.2.ebuild:
+  Replacing einfo with elog
+
+  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
+  Update metadata.
+
+*courier-authlib-0.59.2 (08 Apr 2007)
+
+  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/0.59.1-configure-db4.patch,
+  -files/0.59.1-remove-obsolete-macro.patch,
+  +files/0.59.2-configure-db4.patch,
+  +files/0.59.2-remove-obsolete-macro.patch, files/courier-authlib,
+  -files/initd/courier-authlib, metadata.xml, courier-authlib-0.58.ebuild,
+  -courier-authlib-0.58-r1.ebuild, -courier-authlib-0.59.1.ebuild,
+  +courier-authlib-0.59.2.ebuild:
+  Ebuild cleanup, version bump to 0.59.2.
+
+  30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
+  courier-authlib-0.59.1.ebuild:
+  Add ~x86-fbsd keyword
+
+*courier-authlib-0.59.1 (03 Feb 2007)
+
+  03 Feb 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/0.59.1-configure-db4.patch,
+  +files/0.59.1-remove-obsolete-macro.patch, +courier-authlib-0.59.1.ebuild:
+  Bump to version, bug 162531, thanks to Conrad Kostecki. Add a vpopmail use
+  flag, bug 161754, thanks to Georgi Georgiev.
+
+*courier-authlib-0.58-r1 (16 Jan 2007)
+
+  16 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/0.58-configure-db4.patch, +files/0.58-remove-obsolete-macro.patch,
+  -files/configure-db4.patch, -files/CVE-2005-3532.patch,
+  +files/courier-authlib, -files/courier-authlib-initd,
+  +files/initd/courier-authlib, -courier-authlib-0.53.ebuild,
+  -courier-authlib-0.54.20050224.ebuild, -courier-authlib-0.55.ebuild,
+  -courier-authlib-0.55.20050320.ebuild, -courier-authlib-0.56.ebuild,
+  -courier-authlib-0.57.ebuild, -courier-authlib-0.57-r1.ebuild,
+  -courier-authlib-0.57-r2.ebuild, -courier-authlib-0.57.20051116.ebuild,
+  courier-authlib-0.58.ebuild, +courier-authlib-0.58-r1.ebuild:
+  Clean out old versions. Sanitize remaining ebuild. Bump to -r1 for bug 117290.
+  Fix configure for bug 117290 for >db-4.3, thanks to Hanno Meyer-Thurow. Fix
+  configure for bug 160286, thanks to Sheldon Hearn.
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.20050224.ebuild,
+  courier-authlib-0.55.ebuild, courier-authlib-0.55.20050320.ebuild,
+  courier-authlib-0.56.ebuild, courier-authlib-0.57.ebuild,
+  courier-authlib-0.57-r1.ebuild, courier-authlib-0.57-r2.ebuild,
+  courier-authlib-0.57.20051116.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Fix broken autotools handling.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.20050224.ebuild,
+  courier-authlib-0.55.ebuild, courier-authlib-0.55.20050320.ebuild,
+  courier-authlib-0.56.ebuild, courier-authlib-0.57.ebuild,
+  courier-authlib-0.57-r1.ebuild, courier-authlib-0.57-r2.ebuild,
+  courier-authlib-0.57.20051116.ebuild, courier-authlib-0.58.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove swtaylor from metadata.xml due to retiring.
+
+  24 Apr 2006; Joshua Kinard <kumba@gentoo.org> courier-authlib-0.58.ebuild:
+  Marked stable on mips.
+
+  02 Apr 2006; Jason Wever <weeve@gentoo.org> courier-authlib-0.58.ebuild:
+  Stable on SPARC.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  stable on amd64
+
+  07 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Mark 0.58 stable on alpha
+
+  21 Jan 2006; Markus Rothe <corsair@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Stable on ppc64
+
+  21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Stable on ppc.
+
+  17 Jan 2006; Paul Varner <fuzzyray@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Stable on x86. Bug #119055
+
+*courier-authlib-0.58 (10 Dec 2005)
+
+  10 Dec 2005; Scott Taylor <staylor@gentoo.org>
+  files/courier-authlib-initd, +courier-authlib-0.58.ebuild:
+  add 0.58 ebuild, update init script to export params, for bug 111672
+
+*courier-authlib-0.57.20051116 (06 Dec 2005)
+*courier-authlib-0.57-r2 (06 Dec 2005)
+
+  06 Dec 2005; Scott Taylor <staylor@gentoo.org> +files/CVE-2005-3532.patch,
+  +courier-authlib-0.57-r2.ebuild, +courier-authlib-0.57.20051116.ebuild:
+  patch for Bug 113074
+
+  27 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on hppa.
+
+  12 Nov 2005; Jason Wever <weeve@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on SPARC.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Mark 0.57-r1 stable on alpha
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on ppc.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Mark 0.57-r1 stable on ia64
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on sh.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on ppc64
+
+  21 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on "x86" and "amd64"
+
+*courier-authlib-0.57-r1 (24 Aug 2005)
+
+  24 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  files/courier-authlib-initd, +courier-authlib-0.57-r1.ebuild:
+  Rev bump for new init script. Fixes #103104
+
+*courier-authlib-0.57 (26 Jul 2005)
+
+  26 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +courier-authlib-0.57.ebuild:
+  version bump
+  fix Bug #88415 : courier-authlib-0.5* doesn't compile using mysql when 
+                   LDFLAGS are set in system
+
+*courier-authlib-0.56 (02 Jul 2005)
+
+  02 Jul 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.56.ebuild:
+  bump
+
+  29 May 2005; <solar@gentoo.org> courier-authlib-0.53.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.20050320.ebuild,
+  courier-authlib-0.55.ebuild:
+  - update courier-authlib to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
+
+*courier-authlib-0.55.20050320 (21 Mar 2005)
+
+  21 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.54.ebuild, +courier-authlib-0.55.20050320.ebuild:
+  bump
+
+  20 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.55.ebuild:
+  promote 0.55, strip -fomit-frame-pointer
+
+  19 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
+  bash cleanup
+
+  17 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
+  install mysql readme file for pgsql users
+
+  15 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild,
+  courier-authlib-0.54.ebuild, courier-authlib-0.54.20050224.ebuild,
+  courier-authlib-0.55.ebuild:
+  change vpopmail detection for #85391
+
+*courier-authlib-0.55 (04 Mar 2005)
+
+  04 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.55.ebuild:
+  bump
+
+*courier-authlib-0.54.20050224 (25 Feb 2005)
+
+  25 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.54.20050224.ebuild:
+  bump. adds cram-sha256
+
+*courier-authlib-0.54 (13 Feb 2005)
+
+  13 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.54.ebuild:
+  errata bump
+
+  04 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd:
+  add "provide authdaemond" to init script
+
+  31 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
+  changed sed calls for more consistent edits.
+  make sure userdb is found and migrated
+  call makeuserdb after the install, if userdb exists
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
+  mostly cosmetic changes. also puts authldap.schema in /etc/openldap/schema/
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild:
+  initial stable keywording
+
+*courier-authlib-0.53 (30 Jan 2005)
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.53.ebuild:
+  bump to 0.53
+
+*courier-authlib-0.52-r1 (07 Jan 2005)
+
+  07 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.52-r1.ebuild:
+  build authshadow (bug 71909) and use /usr/$(get_libdir) for better arch support
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  courier-authlib-0.52.ebuild:
+  multilib and cross-compilation fixes.
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org> courier-authlib-0.52.ebuild:
+  add "libtoolize --copy --force"
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org> files/configure-db4.patch:
+  adjust patch for the newer version.
+
+*courier-authlib-0.52 (01 Jan 2005)
+
+  01 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.51_pre.ebuild, +courier-authlib-0.52.ebuild:
+  courier-authlib 0.52 released
+
+  24 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #75450
+
+  22 Dec 2004; Tuan Van <langthang@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  arm/hppa/ia64/s390 keywords on behalf of vapier.
+
+  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041203.ebuild:
+  change keepdir in the other one too
+
+  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  keep more specific dir, and one that doesn't collide with courier
+
+  10 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.50.20041120.ebuild,
+  -courier-authlib-0.50.20041129.ebuild:
+  housecleaning
+
+  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  don't mirror release candidate
+
+*courier-authlib-0.51_pre (09 Dec 2004)
+
+  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.51_pre.ebuild:
+  bump
+
+*courier-authlib-0.50.20041203 (04 Dec 2004)
+
+  04 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041203.ebuild:
+  bump
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041129.ebuild:
+  ~mips
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.50.20041116.ebuild,
+  courier-authlib-0.50.20041129.ebuild:
+  also check /etc/courier-imap folder for auth*rc configs to migrate
+
+*courier-authlib-0.50.20041129 (01 Dec 2004)
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041129.ebuild:
+  bump. fix migration from self
+
+  27 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd, courier-authlib-0.50.20041120.ebuild:
+  almost there
+
+  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041120.ebuild:
+  fix postgres
+
+  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd:
+  fix initd
+
+*courier-authlib-0.50.20041120 (21 Nov 2004)
+
+  21 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041120.ebuild:
+  version bump. work in progress.
+
+  20 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +files/configure-db4.patch, courier-authlib-0.50.20041116.ebuild:
+  work in progress. merging stuff from imap
+
+*courier-authlib-0.50.20041116 (19 Nov 2004)
+
+  19 Nov 2004; Scott W Taylor <swtaylor@gentoo.org> +metadata.xml,
+  +courier-authlib-0.50.20041116.ebuild:
+  work in progress
+
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@ -0,0 +1,8 @@
+AUX 0.59.2-configure-db4.patch 2618 RMD160 33691117802c3a9fe75c75c69594a4f63f4d2575 SHA1 47fc3ba36441c79fa4d8188530a4a2e1a9c8dcd2 SHA256 a60e2f5d26673be2ae107d9fcec024f41c522663d28f4741000fb1885ce067bc
+AUX 0.59.2-remove-obsolete-macro.patch 254 RMD160 268c175e0e75893661c9d17a36265a008469d49d SHA1 1afe4d21d480ab71d58a60cfca03d0a5abef2a3b SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f
+AUX courier-authlib 1112 RMD160 a0d5bf781ed1792677d83efd5034c83f689f7f2f SHA1 e755e781157787c921ef4884c1aca27e0ec68e87 SHA256 c946e42e5ed31a210da99af4d83cb739e2008ad2ea524955cdb141f4c7289dc9
+AUX courier-authlib.patch 778 RMD160 65928a8c9cc220e758be0422fb71acc10ef55647 SHA1 356a4114c4ec07d6dcbea2cfa0cd069c2764af0f SHA256 0622f9872c5498c5abfe5e9c9b525e3955dec74b21bc7f6a706826095fcc7e5f
+DIST courier-authlib-0.62.2.tar.bz2 2233216 RMD160 c0f4f32994056f8034f30055cfe55238d137a2ca SHA1 dc495ad6c54c271483d4862e09788621d86629a9 SHA256 8ce756df57c7f4c09219fe9c70b4f7e6002a2e0fbf9de73f304c22b316387c50
+EBUILD courier-authlib-0.62.2.ebuild 5974 RMD160 0b355a2155db96221075677c10b63444f02bd4ca SHA1 9c81843fbca43428af03cf3a675c56556a3e683b SHA256 f4293d948019a663856b96d983558ee88d106ab2d48e2df3a1328142b3532c9c
+MISC ChangeLog 16694 RMD160 d9549d1668f45cc41133296460a9df9b9a1cfaa9 SHA1 db6f6182005a853762c0c2b68d388efd7b6f67b6 SHA256 c6b9c40fac127291b14fdf208061faf37f5fdfdf004f576748a8ca289b8b03ad
+MISC metadata.xml 237 RMD160 09f434a348f9d766c58ac464743d6c55f4d6d4ac SHA1 fceb032c3f94eb505cfcaa1fdb9c0162eb205912 SHA256 a8a93d896577309c559cb95967fe0ebab7ee7201a1c7204eeae6e95ce9375305
--- a/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild
@ -0,0 +1,192 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild,v 1.8 2009/02/25 20:33:03 maekke Exp $
+
+inherit eutils flag-o-matic autotools libtool
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library."
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
+MAKEOPTS="-j1"
+
+RESTRICT="userpriv
+	!berkdb? ( test )"
+
+RDEPEND="gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db )"
+
+DEPEND="${RDEPEND}
+		>=dev-libs/openssl-0.9.6
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( virtual/postgresql-base )"
+
+pkg_setup() {
+	enewuser mail -1 -1 /var/spool/mail
+
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+
+	if use vpopmail ; then
+		eerror
+		eerror "vpopmail support has been removed, it's unmaintained upstream and will be"
+		eerror "removed with the next release."
+		eerror
+		eerror "Please remove vpopmail USE-flag."
+		die "vpopmail support removed"
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use gdbm ; then
+		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
+	else
+		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
+	fi
+#	epatch "${FILESDIR}/courier-authlib.patch"
+
+	sed -i -e'/for dir in/a\\t\t/etc/courier-imap \\' authmigrate.in || die "sed failed"
+	sed -i -e'/for dir in/a\\t\t/etc/courier/authlib \\' authmigrate.in || die "sed failed"
+	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
+
+	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
+		|| die "fixing libltdl call failed"
+
+	local d
+	for d in $(find -name configure.in) ; do
+		[[ ${d} == */libltdl/* ]] && continue
+		cd "${S}"/${d%configure.in}
+		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
+	done
+
+	elibtoolize
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	local myconf=""
+
+	myconf="${myconf} `use_with pam authpam`"
+	myconf="${myconf} `use_with ldap authldap`"
+
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="${myconf} --with-db=db"
+		fi
+	fi
+	use gdbm && myconf="${myconf} --with-db=gdbm"
+
+	myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
+
+	use debug && myconf="${myconf} debug=true"
+
+	einfo "Configuring courier-authlib: ${myconf}"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--libexecdir=/usr/$(get_libdir)/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}"
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -f "${dir}/userdb" "${D}/etc/courier/authlib/"
+			chmod go-rwx "${D}/etc/courier/authlib/userdb"
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/*
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+	dodoc AUTHORS ChangeLog* INSTALL NEWS README
+	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+	if use mysql ; then
+		dodoc README.authmysql.myownquery
+		dohtml README.authmysql.html
+	fi
+	if use postgres ; then
+		dohtml README.authpostgres.html README.authmysql.html
+	fi
+	if use ldap ; then
+		dodoc README.ldap
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/"
+	fi
+	doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb
+		makeuserdb
+	fi
+
+	# Suggest cleaning out the following old files
+	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
+	if [[ ! -z "${list}" ]] ; then
+		ewarn "Courier authentication files are now in /etc/courier/authlib/"
+		elog "The following files are no longer needed and can likely be removed:"
+		elog " rm $(echo \"${list}\")"
+	fi
+}
--- a/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
+++ b/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
@ -0,0 +1,68 @@
+--- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
+++ configure.in	2007-02-03 19:52:48.000000000 +0000
+@@ -22,7 +22,6 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_SYSCONFTOOL
+ AC_LIBLTDL_INSTALLABLE
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+@@ -264,15 +263,17 @@
+ 
+ if test "$db" != "gdbm"
+ then
+-	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)
+  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_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_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)
+ fi
+ 
+ LIBS="$saveLIBS"
+--- bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
+++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-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"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
+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_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
+FOUND_DB=0
+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
--- a/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
+++ b/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
@ -0,0 +1,10 @@
+--- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
+++ configure.in	2007-02-03 19:58:19.000000000 +0000
+@@ -22,7 +22,6 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_SYSCONFTOOL
+ AC_LIBLTDL_INSTALLABLE
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
--- a/net-libs/courier-authlib/files/courier-authlib
+++ b/net-libs/courier-authlib/files/courier-authlib
@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.2 2007/04/08 14:10:55 chtekk Exp $
+
+depend() {
+	need net
+	provide authdaemond
+}
+
+checkconfig() {
+	if [[ ! -e /etc/courier/authlib/authdaemonrc ]] ; then
+		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
+		return 1
+	fi
+}
+
+setauth() {
+	source /etc/courier/authlib/authdaemonrc
+	AUTHLIB="/usr/lib/courier/courier-authlib"
+	AUTHDAEMOND="authdaemond"
+	pidfile="/var/run/authdaemon.pid"
+	logger="/usr/sbin/courierlogger"
+	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
+}
+
+start() {
+	checkconfig || return 1
+	setauth
+	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+	eend $?
+}
+
+stop() {
+	setauth
+	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
+	eend $?
+}
--- a/net-libs/courier-authlib/files/courier-authlib.patch
+++ b/net-libs/courier-authlib/files/courier-authlib.patch
@ -0,0 +1,22 @@
+--- courier-authlib-0.60.6.ebuild	2008-07-20 12:12:58.339434681 -0400
+++ courier-authlib-0.60.6-r1.ebuild	2008-07-20 12:14:03.991435094 -0400
+@@ -63,16 +63,11 @@
+ 	sed -i -e"s|@@INDENT@@|		|g" authmigrate.in || die "sed failed"
+ 	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
+ 
+-	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
+	sed -i -e 's|\(AC_CONFIG_SUBDIRS[[:space:]]*(.*\)libltdl|\1|' \
+		-e 's:AC_LIBLTDL_INSTALLABLE:AC_LIB_LTDL:' configure.in \
+ 		|| die "fixing libltdl call failed"
+ 
+-	local d
+-	for d in $(find -name configure.in) ; do
+-		[[ ${d} == */libltdl/* ]] && continue
+-		cd "${S}"/${d%configure.in}
+-		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
+-	done
+-
+	eautoreconf
+ 	elibtoolize
+ }
+ 
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="vpopmail">Enable vpopmail support</flag>
+  </use>
+</pkgmetadata>
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@ -0,0 +1,873 @@
+# ChangeLog for net-mail/courier-imap
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.168 2008/12/22 20:03:44 armin76 Exp $
+
+  22 Dec 2008; Raúl Porcel <armin76@gentoo.org>
+  courier-imap-4.0.6-r3.ebuild:
+  alpha/arm/ia64/sparc stable wrt #168196
+
+  18 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-imap-4.0.6-r3.ebuild:
+  ppc stable, bug #168196
+
+  17 Dec 2008; Markus Meier <maekke@gentoo.org>
+  courier-imap-4.0.6-r3.ebuild:
+  amd64/x86 stable, bug #168196
+
+  16 Dec 2008; Brent Baude <ranger@gentoo.org> courier-imap-4.0.6-r3.ebuild:
+  Marking courier-imap-4.0.6-r3 ppc64 for bug 168196
+
+  16 Dec 2008; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.6-r3.ebuild:
+  Stable for HPPA (bug #168196).
+
+*courier-imap-4.4.1-r1 (14 Dec 2008)
+*courier-imap-4.1.2-r2 (14 Dec 2008)
+*courier-imap-4.0.6-r3 (14 Dec 2008)
+
+  14 Dec 2008; Matti Bickel <mabi@gentoo.org>
+  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  +courier-imap-4.0.6-r3.ebuild, +courier-imap-4.1.2-r2.ebuild,
+  +courier-imap-4.4.1-r1.ebuild:
+  fixed bug #168196
+
+*courier-imap-4.4.1 (29 Jul 2008)
+
+  29 Jul 2008; Patrick McLean <chutz@gentoo.org> metadata.xml,
+  +courier-imap-4.4.1.ebuild:
+  Version bump (bug #183434), allow eautoreconf to be recursive (bug
+  #226127). Take over maintainership.
+
+  16 Jul 2008; Luca Longinotti <chtekk@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  Dep on PostgreSQL libs only.
+
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  Changed dependency for postgresql from dev-db/postgresql to
+  virtual/postgresql-server
+
+  17 Mar 2008; <ricmm@gentoo.org> courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1.ebuild, courier-imap-4.0.4.ebuild:
+  Drop to ~mips due to unstable deps
+
+  15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
+  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
+  courier-imap-4.0.6-r2.ebuild, courier-imap-4.1.2-r1.ebuild:
+  Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug
+  #198633
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  courier-imap-3.0.8.ebuild, courier-imap-4.0.1.ebuild,
+  courier-imap-4.0.1-r1.ebuild, courier-imap-4.0.1-r2.ebuild,
+  courier-imap-4.0.4.ebuild:
+  (QA) RESTRICT clean up.
+
+  12 Jun 2007; Marius Mauch <genone@gentoo.org> courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
+  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
+  courier-imap-4.0.6-r2.ebuild, courier-imap-4.1.2-r1.ebuild:
+  Replacing einfo with elog
+
+  12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  Stable on alpha as per bug #168196
+
+  11 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  ppc stable, bug #168196
+
+  10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  Stable on sparc wrt security #168196
+
+  09 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  ia64 stable wrt security bug 168196
+
+  08 Apr 2007; Markus Rothe <corsair@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  Stable on ppc64; bug #168196
+
+  07 Apr 2007; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.6-r2.ebuild:
+  Stable for HPPA (bug #168196).
+
+  07 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  courier-imap-4.0.6-r2.ebuild:
+  stable x86, security bug 168196
+
+  07 Apr 2007; Peter Weller <welp@gentoo.org> courier-imap-4.0.6-r2.ebuild:
+  Stable on amd64 wrt bug 168196
+
+*courier-imap-4.1.2-r1 (07 Apr 2007)
+*courier-imap-4.0.6-r2 (07 Apr 2007)
+
+  07 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.7-db4-configure.in.patch,
+  -files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.6-aclocal-fix.patch,
+  files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  files/courier-imap-4.0.6-db4-configure.in.patch,
+  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  files/courier-imap-4.0.6-r1-courier-imapd.rc6,
+  files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
+  files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
+  files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
+  files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
+  files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.1.2-aclocal-fix.patch,
+  -files/courier-imap-4.1.2-db4-configure.in.patch, metadata.xml,
+  -courier-imap-3.0.7.ebuild, -courier-imap-4.0.6.ebuild,
+  -courier-imap-4.0.6-r1.ebuild, +courier-imap-4.0.6-r2.ebuild,
+  -courier-imap-4.1.2.ebuild, +courier-imap-4.1.2-r1.ebuild:
+  Remove old/unused versions with redundant/unstable keywords. General ebuild
+  cleanup for 4.0.6-r2 and 4.1.2-r1. Cleanup of init-scripts and patches. Fix
+  security bug #168196 and autotools handling bug #160037.
+
+  30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
+  courier-imap-4.1.2.ebuild:
+  Add ~x86-fbsd keyword
+
+  01 Mar 2007; Patrick McLean <chutzpah@gentoo.org>
+  +files/courier-imap-4.1.2-as-needed.patch, courier-imap-4.1.2.ebuild:
+  Add patch to fix compilation with -as-needed (bug #168769)
+
+  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,
+  courier-imap-4.1.2.ebuild:
+  Restore ChangeLog to previous state before it was killed by blubb. Add patch
+  that was previously left out. fixes bug 168190.
+
+*courier-imap-4.1.2 (23 Feb 2007)
+
+  23 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  +courier-imap-4.1.2.ebuild:
+  Version bump, ebuild contributions by Hanno Meyer-Thurow <h.mth@web.de>,
+  Conrad Kostecki <ConiKost@gmx.de>, "Nicola" <n.murino@theorematica.it> and
+  James Colannino <james@colannino.org>. Fixes bugs 124985 and 160037.
+
+*courier-imap-4.0.6-r1 (03 Feb 2007)
+
+  03 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  +files/courier-imap-4.0.6-r1-courier-imapd.rc6,
+  +files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  +files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
+  +files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
+  +courier-imap-4.0.6-r1.ebuild:
+  fix bug 141775
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
+  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
+  courier-imap-4.0.6.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  28 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-4.0.6.ebuild:
+  Bug #144651, fix spelling and typos.
+
+  15 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.6-db4-configure.in.patch,
+  courier-imap-4.0.6.ebuild:
+  Fix bug #134943 - compile failure with newer versions of berkdb.
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.4.ebuild:
+  Marked stable on mips.
+
+  25 Aug 2006; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-4.0.4.ebuild, courier-imap-4.0.6.ebuild:
+  Add chown fixup to avoid some user weirdness of perms 600 on a directory.
+
+  18 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  ppc stable, bug #143830
+
+  18 Aug 2006; Joshua Jackson <tsunam@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stable x86; bug #143830
+
+  17 Aug 2006; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.4.ebuild:
+  stable on amd64
+
+  17 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  Stable on alpha wrt bug #143830.
+
+  15 Aug 2006; Jason Wever <weeve@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stabgle on SPARC wrt bug #143830.
+
+  14 Aug 2006; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stable for HPPA (bug #143830).
+
+  14 Aug 2006; Brent Baude <ranger@gentoo.org> courier-imap-4.0.4.ebuild:
+  Marking courier-imap-4.0.4 ppc64 wrt bug #143830
+
+  07 Aug 2006; Aron Griffis <agriffis@gentoo.org> courier-imap-4.0.4.ebuild:
+  Mark 4.0.4 stable on ia64
+
+*courier-imap-4.0.6 (07 Aug 2006)
+
+  07 Aug 2006; Aron Griffis <agriffis@gentoo.org>
+  +courier-imap-4.0.6.ebuild:
+  Bump to 4.0.6 (from 4.0.4)
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-4.0.1-r2.ebuild:
+  Mark 4.0.1-r2 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-4.0.1-r2.ebuild:
+  stable on ia64
+
+  25 Aug 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  courier-imap-3.0.8.ebuild:
+  stabilize alpha
+
+  12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  Fix courier-authlib dependency to 0.57.
+
+*courier-imap-4.0.4 (08 Aug 2005)
+
+  08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/courier-imap-4.0.4-courier-imapd.rc6,
+  +files/courier-imap-4.0.4-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.4-courier-pop3d.rc6,
+  +files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,
+  +courier-imap-4.0.4.ebuild:
+  Updated to 4.0.4, initd files updated for new baselayout,
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  courier-imap-4.0.1.ebuild:
+  Stable on ppc.
+
+*courier-imap-4.0.1-r2 (31 May 2005)
+
+  31 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +courier-imap-4.0.1-r2.ebuild:
+  Bug #79240, courier-imap should not provide files for /etc/pam.d/.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  courier-imap-4.0.1-r1.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.1.ebuild:
+  stable on amd64
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1-r1.ebuild, courier-imap-4.0.1.ebuild:
+  sys-apps/procps -> sys-process/procps
+
+  13 Feb 2005; Jason Wever <weeve@gentoo.org> courier-imap-4.0.1.ebuild:
+  Stable on sparc.
+
+*courier-imap-4.0.1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.1-r1-courier-imapd.indirect,
+  +files/courier-imap-4.0.1-r1-courier-pop3d.indirect,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d.rc,
+  +courier-imap-4.0.1-r1.ebuild:
+  Bug #81540, implemented a workaround for upstream removing functionality
+  that is still widely used. For all users wanting to use relay-ctrl-allow,
+  remove it from your courier-authlib config, and put it in
+  /etc/courier-imap/{pop3d,imapd} as LOGINRUN="relay-ctrl-allow" at the end.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.1.ebuild:
+  Marked stable on mips.
+
+  03 Feb 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
+  Stable on x86. This upgrade is non-trival. Please read:
+  http://www.courier-mta.org/imap/?INSTALL.html~upgrading
+  less /usr/share/doc/courier-imap-4.0.1/courier-imap-gentoo.readme.gz
+  and pay attention to postinstall messages.
+
+  16 Jan 2005; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.8.ebuild:
+  Stable on hppa.
+
+  07 Jan 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
+  change lib --> $(get_libdir)
+
+*courier-imap-4.0.1 (04 Jan 2005)
+
+  04 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  +courier-imap-4.0.1.ebuild:
+  errata release
+
+  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
+  change !virtual/imapd to !mail-mta/courier
+
+  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
+  turn off configure cache. it confuses the new configure script.
+
+*courier-imap-4.0.0 (01 Jan 2005)
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-4.0.0-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.0-courier-imapd.rc6,
+  +files/courier-imap-4.0.0-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.0-courier-pop3d.rc6,
+  +files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.0-db4-configure.in.patch,
+  +files/courier-imap-4.0.0-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.0-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.0-gentoo-imapd.rc,
+  +files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.0-gentoo-pop3d.rc,
+  -files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
+  -files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc, +courier-imap-4.0.0.ebuild,
+  -courier-imap-4.0.0_rc1.ebuild:
+  New version release.
+
+  23 Dec 2004; Tuan Van <langthang@gentoo.org>
+  files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  files/courier-imap-4.0.0_rc1-courier-pop3d.rc6:
+  authdaemond --> courier-authlib
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  Stable on amd64.
+
+*courier-imap-4.0.0_rc1 (11 Dec 2004)
+
+  11 Dec 2004; Tuan Van <langthang@gentoo.org>
+  -files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  -files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
+  +files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc,
+  +files/courier-imap-gentoo.readme, -courier-imap-3.0.8.20041116.ebuild,
+  +courier-imap-4.0.0_rc1.ebuild:
+  Release candidate.
+
+  29 Nov 2004; Andrej Kacian <ticho@gentoo.org> courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  app-admin/fam -> virtual/fam, for bug #67170.
+
+  27 Nov 2004; Philip Walls <malverian@gentoo.org> courier-imap-3.0.8.ebuild,
+  courier-imap-3.0.8.20041116.ebuild:
+  Migrate to virtual/fam
+
+*courier-imap-3.0.8.20041116 (18 Nov 2004)
+
+  18 Nov 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  +files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +courier-imap-3.0.8.20041116.ebuild:
+  Commit for testing only. Do not use.
+
+  16 Nov 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.8.ebuild:
+  Add virtual/imapd blocking. Bug #55309.
+
+  16 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  fix bug #69867.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.8.ebuild:
+  Stable on sparc.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> courier-imap-3.0.8.ebuild:
+  Marked stable on mips.
+
+  02 Nov 2004; Tuan Van <langthang@gentoo.org> -files/authdaemond.conf,
+  -files/authdaemond.rc6, -files/courier-imap-3.0.2-db40vs41.patch,
+  -files/courier-imap-3.0.2-disable-fam.diff,
+  -files/courier-imap-3.0.2-removerpm.patch, -files/courier-imapd-ssl.rc6,
+  -files/courier-pop3d-ssl.rc6, -files/gentoo-imapd-ssl.rc,
+  -files/gentoo-imapd.rc, -files/gentoo-pop3d-ssl.rc,
+  -files/gentoo-pop3d.rc, courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  remove cruft. fix RDEPEND use? syntax error.
+
+  01 Nov 2004; Tuan Van <langthang@gentoo.org> -courier-imap-3.0.5.ebuild,
+  courier-imap-3.0.8.ebuild:
+  stable on x86.
+
+*courier-imap-3.0.8 (22 Sep 2004)
+
+  22 Sep 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.8-db4-configure.in.patch,
+  +files/courier-imap-3.0.8-disable-fam-configure.in.patch,
+  +courier-imap-3.0.8.ebuild:
+  Version bump.
+
+  30 Aug 2004; Tom Gall <tgall@gentoo.org> courier-imap-3.0.7.ebuild:
+  stable on ppc64, bug #61745
+
+  25 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
+  Stable on x86.
+
+  25 Aug 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.7.ebuild:
+  Stable on sparc wrt bug #60865.
+
+  25 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.7.ebuild:
+  Marked stable on amd64.
+
+  23 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
+  add dohtml, remove *.html from dodoc.
+
+  23 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  Loosing the DB restriction now that we support DB4.
+
+  22 Aug 2004; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  fix up docs.
+
+  22 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/authdaemond-3.0.4-r1:
+  bug #61254.
+
+  21 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  Fix a bug for Rajiv.
+
+  20 Aug 2004; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.5.ebuild:
+  Stable on hppa.
+
+*courier-imap-3.0.7 (19 Aug 2004)
+
+  19 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.7-db4-configure.in.patch,
+  +files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +courier-imap-3.0.7.ebuild:
+  Version bump. Add patches to support db4. Add gdbm USE flag back.
+  Add logic to default to gdbm if both 'berkdb' and 'gdmb' USE flags present.
+
+  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.5.ebuild:
+  Marked stable on amd64.
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  courier-imap-3.0.5.ebuild:
+  Stable on sparc wrt #60865
+
+  19 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.5.ebuild:
+  stable on x86. GLSA bug #60865.
+
+  05 Jul 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
+  bug #55956, backport fix I put into 3.0.5 for gdbm vs. berkdb.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  courier-imap-2.1.2-r2.ebuild, courier-imap-3.0.2-r1.ebuild,
+  courier-imap-3.0.2.ebuild, courier-imap-3.0.4-r1.ebuild,
+  courier-imap-3.0.4.ebuild, courier-imap-3.0.5.ebuild:
+  virtual/glibc -> virtual/libc
+
+*courier-imap-3.0.5 (26 Jun 2004)
+
+  26 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.5.ebuild,
+  files/authdaemond-3.0.4-r1, files/authdaemond.conf,
+  files/authdaemond.conf-3.0.4-r1, files/authdaemond.rc6,
+  files/courier-imapd-ssl.rc6, files/courier-imapd-ssl.rc6-3.0.5,
+  files/courier-imapd.rc6, files/courier-pop3d-ssl.rc6,
+  files/courier-pop3d-ssl.rc6-3.0.5, files/courier-pop3d.rc6,
+  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
+  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
+  fix bugs 42686, 52496, 39653, 52174, 52658, new upstream version.
+
+  17 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  Remove 2.1.2-r1 as per bug #54020.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
+  Fix use invocation
+
+  28 May 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  Update metadata.xml.
+
+*courier-imap-3.0.4-r1 (19 May 2004)
+
+  19 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4-r1.ebuild, files/authdaemond-3.0.4-r1,
+  files/authdaemond.conf-3.0.4-r1:
+  bug #51306 again, authdaemond changes
+
+*courier-imap-3.0.4 (17 May 2004)
+
+  17 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4.ebuild:
+  version bump, bug #51306. severe problem found in 3.0.2.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  Add die following econf for bug 48950
+
+*courier-imap-3.0.2-r1 (23 Apr 2004)
+
+  23 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2-r1.ebuild, files/courier-imap-3.0.2-disable-fam.diff:
+  bug #48838, make it possible to disable fam properly, configure.in patch by
+  <robbat2@gentoo.org>
+
+*courier-imap-2.1.2-r2 (19 Apr 2004)
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r2.ebuild:
+  remove 1.7.3-r1, add new revision of 2.1.2 with QA fixes for bug #48362
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2.ebuild:
+  fix bug #21330 a bit better
+
+  31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/courier-imapd-ssl.rc6, files/courier-imapd.rc6,
+  files/courier-pop3d-ssl.rc6, files/courier-pop3d.rc6:
+  avoid bug #46351 recurring by having init scripts use famd.
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  added selinux policy to rdepend
+
+  28 Mar 2004; Jochen Maes <sejo@gentoo.org> courier-imap-3.0.2.ebuild:
+  courier-imap-3.0.2.ebuild
+
+  26 Mar 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.2.ebuild:
+  Marked stable on sparc wrt bug #45584.
+
+  26 Mar 2004; Jon Portnoy <avenj@gentoo.org>
+  courier-imap-3.0.2.ebuild :
+  Stable on AMD64
+
+  26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2.ebuild:
+  clean up vpopmail and more in ebuild. bump to x86 for security bug #45584.
+
+*courier-imap-3.0.2 (26 Mar 2004)
+
+  26 Mar 2004; <solar@gentoo.org> courier-imap-3.0.2.ebuild,
+  files/courier-imap-3.0.2-db40vs41.patch,
+  files/courier-imap-3.0.2-removerpm.patch:
+  courier-imap <3.0.0: Courier Multiple Remote Buffer Overflow Vulnerabilities.
+  bug #45584
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> courier-imap-2.1.2-r1.ebuild,
+  files/courier-imap-2.1.2-res_query.patch:
+  Add patch for res_query to allow courier-imap to compile on amd64. Should close #41160.
+
+  22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
+  Remove arm keywords
+
+  28 Jan 2004; Jon Portnoy <avenj@gentoo.org> courier-imap-2.1.2-r1.ebuild :
+  AMD64 keywords.
+
+  18 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #38606.
+
+  08 Jan 2004; Jason Wever <weeve@gentoo.org> courier-imap-2.1.2-r1.ebuild:
+  Added ~sparc keyword.
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #33346
+
+  09 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
+  adding RESTRICT="nomirror"
+
+  07 Dec 2003; foser <foser@gentoo.org> courier-imap*.ebuild :
+  Fix fam-oss dep to fam, due to move
+
+  14 Nov 2003; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild:
+  marked stable on ppc.
+
+  31 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #32410, bump to stable
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, files/courier-imap-2.1.2-removerpm.patch:
+  commit brandy's patch for bug #28070
+
+*courier-imap-2.1.2-r1 (02 Oct 2003)
+
+  02 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  add fam support - bug #29879
+
+*courier-imap-2.1.2 (25 Sep 2003)
+
+  25 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2.ebuild:
+  version bump
+
+  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild:
+  add fix for bug #27528, and add a few comments about the last fix too
+
+  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild, files/courier-imap-2.1.1-db40vs41.patch:
+  apply Brandy's patch for bug #27517
+
+*courier-imap-2.1.1 (28 Aug 2003)
+
+  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild:
+  version bump, fix ipv6 bug, another attempted tcltk fix
+
+*courier-imap-2.0.0 (31 Jul 2003)
+
+  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-2.0.0.ebuild:
+  Bump to latest stable upstream version, new fix for userpriv
+
+*courier-imap-1.7.3-r1 (31 Jul 2003)
+
+  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-1.7.3-r1.ebuild,
+  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
+  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
+  Fixed Prerun support again, bump to x86.
+
+  10 Jun 2003; <msterret@gentoo.org> courier-imap-1.7.1.ebuild,
+  courier-imap-1.7.2.ebuild, courier-imap-1.7.3.ebuild:
+  DEPEND on sed >= 4
+
+*courier-imap-1.7.3 (20 May 2003)
+
+  27 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Fix bug #21803
+
+  25 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Fix bug #21577
+
+  20 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Version bump and move warning message. Removed extraneous cflag filtering.
+  Fixed bug #21330 as well.
+
+*courier-imap-1.7.2 (19 May 2003)
+
+  19 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.2.ebuild, 
+  files/gentoo-imapd-ssl.rc, files/gentoo-imapd.rc, files/gentoo-pop3d-ssl.rc,
+  files/gentoo-pop3d.rc:
+  Version bump. Fixed DB3/DB4 stuff properly (minor bug in sed-foo).  Install
+  all auth modules. Added prerun support for some other mail stuff.  Fix
+  SRC_URI. Fix Vpopmail support. Other misc cleanups.
+
+*courier-imap-1.7.1 (30 Apr 2003)
+
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.1.ebuild:
+  version bump. workaround db3/db4 coexisting problems. added
+  /var/lib/courier-imap
+
+  18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/gentoo-*.rc :
+  Updated gentoo-*.rc with fix0rs found by Psi-Jack!
+
+*courier-imap-1.7.0 (01 Feb 2003)
+
+  11 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.0.ebuild:
+  deps now reflect that it needs db3 and nothing else. fixes #18734.
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild :
+  Updated vpopmail detection to account for a different home directory
+  for vpopmail.
+
+  01 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild,
+  files/digest-courier-imap-1.7.0 :
+  Version bump.  Includes some postgres changes and other fixes.
+
+*courier-imap-1.6.2-r1 (29 Jan 2003)
+
+  29 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2-r1.ebuild,
+  files/digest-courier-imap-1.6.2-r1 :
+  Now filtering -funroll-loops and -fomit-frame-pointer like in the
+  courier ebuild.
+
+*courier-imap-1.6.2 (31 Dec 2002)
+
+  14 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
+  Tamed down the postgres dependancy.
+
+  09 Jan 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
+  Marked stable for x86.
+
+  31 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild,
+  files/digest-courier-imap-1.6.2 :
+  Version bump.  new ebuild logic for unicode support.  Added postgres
+  use variable support.
+
+*courier-imap-1.6.1 (12 Dec 2002)
+
+  25 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.1.ebuild,
+  files/gentoo-imapd-1.6.1.rc, files/gentoo-imapd-ssl-1.6.1.rc,
+  files/gentoo-pop3d-1.6.1.rc, files/gentoo-pop3d-ssl-1.6.1.rc :
+  Updated the gentoo rc files and ebuild as logger has changed
+  to courierlogger.
+
+  12 Dec 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.6.1.ebuild, files/digest-courier-imap-1.6.1 :
+  Version bump.  Added a test for vpopmail so proper configure options
+  are passed.
+
+06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*courier-imap-1.5.3 (25 Sep 2002)
+
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.3.ebuild, files/digest-courier-imap-1.5.3 :
+  Version bump.  Lots of SSL fixes.
+
+*courier-imap-1.5.1 (03 Aug 2002)
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.1.ebuild, files/authdaemond.conf,
+  files/authdaemond.rc6 :
+  Updated authenticator choosing mechanism.  Removed pgsql authenticator
+  as it is not a supported backend.
+
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+  Added ppc to keywords.
+
+  03 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.1.ebuild, files/digest-courier-imap-1.5.1 :
+  Version bump.  Added support for unicode searching, and proper
+  listening to the ipv6 use variable.
+
+*courier-imap-1.5.0 (24 Jun 2002)
+
+  22 Jul 2002; Nick Hadaway <raker@gentoo.org> authdaemond.rc6 :
+  Fixed small typo.  changed pqsql to pgsql.  Closes bug #5163.
+
+  26 Jul 2002; Nicholas Jones <carpaski@gentoo.org :
+  Added in a check for vpopmail as Courier-IMAP just assumes that if
+  the user exists, then all the files MUST exist.
+
+  24 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  Chase latest release.
+
+*courier-imap-1.4.5-r3 (20 Jun 2002)
+
+  20 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Moved maildirmake for /usr/sbin to /usr/bin, close bug #3844
+
+*courier-imap-1.4.5-r2 (14 Jun 2002)
+
+  14 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Forgot to install /etc/init.d/authdaemond
+
+*courier-imap-1.4.5-r1 (8 Jun 2002)
+
+  8 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Added pop3 init scripts.
+
+*courier-imap-1.4.3-r1 (30 Apr 2002)
+
+  30 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Added tcltk? ( >=dev-tcltk/expect-5.33.0 ) to RDEPEND, closing #2282.
+
+*courier-imap-1.4.3 (1 Apr 2002)
+
+  1 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Updated to latest release.  Added --enable-workarounds-for-imap-client-bugs
+  to ./configure which helps some clients; notably Netscape Messenger.  Now
+  installs a pam_stack aware pam.d/ file.
+
+*courier-imap-1.4.1-r4 (14 Mar 2002)
+
+  14 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Fixed bug where /etc/courier-imap/pop3d didn't have MAILDIR=.maildir set.
+
+*courier-imap-1.4.1-r2 (21 Feb 2002)
+
+21 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Modified the ebuild so that /usr/sbin/{imapd,pop3d} get renamed to
+  /usr/sbin/{courier-imapd,courier-pop3d}.  I also had to change hack
+  the /usr/lib/courier-imap/*.rc files to call these newly-named functions.
+  While I was at it I cleaned up the ebuilds and fixed the not-yet-caught
+  bug that pop3d was still trying to use Maildir instead of ${MAILDIR}.
+  Fixes bug #584.
+
+*courier-imap-1.4.1-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@ -0,0 +1,51 @@
+AUX courier-imap-4.0.1-courier-imapd-ssl.rc6 1215 RMD160 895e04e9d0fc49fa5e2a022b070c09e31706918b SHA1 55e6a427c1acae17853fe016dc38068a9f3456b6 SHA256 7724a4e51effba581872917244a56d165506a813a923c4126323d93985ea5c2f
+AUX courier-imap-4.0.1-courier-imapd.rc6 970 RMD160 cc29497750a0d4c1f09a8dde111b3e387bf902bd SHA1 34f0bf3456ad6d33280216940807cf5805214cd6 SHA256 adde0c60fb7d66253c791197631281efb57975cb130b7e70925cac03a1085d5a
+AUX courier-imap-4.0.1-courier-pop3d-ssl.rc6 1223 RMD160 ce2d8a86fb20da03d9a3b085032cc1c68d48b3b9 SHA1 021a3b52493dfd1c97614a31f1015ad947a58e9b SHA256 ecb4258a140359940637f84c1457c885e57aa0f45a6b5c3247db4d413219680f
+AUX courier-imap-4.0.1-courier-pop3d.rc6 978 RMD160 fbcc8eaaa0c68e29beaa83236d165ed489a0eea7 SHA1 b66127eab29e9e0a44469a5e2aebe1582518b3d0 SHA256 a66aa6fd10ab8d43bc28357b1c9db63afb80e6c66b8fa47fa26214c40cf1bcf7
+AUX courier-imap-4.0.1-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
+AUX courier-imap-4.0.1-db4-configure.in.patch 1303 RMD160 69228d5d2fb61bf176581c22a0a02e795342595e SHA1 75e73e48fb91c22996bdbd6417d30a6698a96309 SHA256 f7d626d03e6a83a6851be1ec7b1ad8b24e26d20fa1a2cf87ebce4560c226c2c3
+AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
+AUX courier-imap-4.0.1-gentoo-imapd-ssl.rc 1092 RMD160 d32cbf015f9fda6bbeee1bfa054c39a08ccead95 SHA1 9f5ad90b96a40c0cd3d910e5390d7f648c2c0046 SHA256 1feabc5a11925e8a9abef29b3797b6f8ee6c9935f726e4a9af918f2f9879b797
+AUX courier-imap-4.0.1-gentoo-imapd.rc 1129 RMD160 db3c0dfea4074482144fca2195acbbc18a9b395b SHA1 6b0966aeace6d643c63e902443cf782ad5c81422 SHA256 0814d73c7eb1cd857288390b3e8206fa8037bccb2d17c4998e18d351da87fcf7
+AUX courier-imap-4.0.1-gentoo-pop3d-ssl.rc 1067 RMD160 a33364035b91a371da9e0b7a6cd1f8af075edcd9 SHA1 df93bd12d2afeafc6576d67a0d945827e791c298 SHA256 7ffa8c0a0788ad70332c5351aebf58be715b8ed6f7ace887c3163b4b4282d397
+AUX courier-imap-4.0.1-gentoo-pop3d.rc 1075 RMD160 8cc119405c18525fbc3bed9a5ea1be3ac3cb02b8 SHA1 cf79243fbf860c0082b39df9ba16d726b198ccf6 SHA256 a81f912ff7542f6cb3fee162a75a045606b5f1175264a0b5b303a9d5c1c4a1d1
+AUX courier-imap-4.0.1-r1-courier-imapd.indirect 85 RMD160 3b6790ccee0c7271c23f76a393b9d0a0d0b575ef SHA1 807e2294f80b95f0bae856a64774ffed7175dbef SHA256 96f7cd8cb1f4817be039df630b0e5da3838530955881b7217527307514b1b8a3
+AUX courier-imap-4.0.1-r1-courier-pop3d.indirect 85 RMD160 f0750ff2a958b9a24112c9352bdc6a70b4a077f4 SHA1 6b7859075554104f0fe04f1e74fde2565a77e65d SHA256 df03082133b598631c4e47b5f448bba385f5993c0bd55a4eca9637b8176d8593
+AUX courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc 1114 RMD160 c68bdfd5e7d73a0977db02833fad84efa4697419 SHA1 9ced6a64c1c7f8e0843f8e63c36f057ab6ed1ef3 SHA256 d632673bb34aa049205682d7c26c4972623589bbcace6604bf6c81a91d02d30d
+AUX courier-imap-4.0.1-r1-gentoo-imapd.rc 1151 RMD160 c0e1c3402382b62210a4855e1fe5239bcce3e06a SHA1 087ca38c92d82c3cf6a94aa2c97368415a28b72e SHA256 c9929c008990b5e4602f2b9e2654875c25f5cc776e1d0c433f16c716a327afa6
+AUX courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc 1089 RMD160 1b0339c606987f6c230d7b7e962a098c01bba0e3 SHA1 4cb7a81534d19f45c065b41139ee66a51ff64c61 SHA256 ce0ce1e14324ce8d6633aad60762b4bcc7dc79a94047b6aa45a670b4e897393e
+AUX courier-imap-4.0.1-r1-gentoo-pop3d.rc 1097 RMD160 d138103cf9fd92ebc7806593eb79b22a4aea4d50 SHA1 d2d7e885e37e8d4510f440ab3e94593ce02eef86 SHA256 6e7fd5f98e40504c0da0236bdfeadad33cf95cc8dfe31af8207d23620f27b84d
+AUX courier-imap-4.0.4-courier-imapd-ssl.rc6 1174 RMD160 a7e9593106447b743cc8dc153664869924a152a2 SHA1 984c4e7324e890290c3ae793f9afdf855991a205 SHA256 ef3d363558c64dcb3b6429de700eb4bc1557c622dbfad2e26abe98f59c18329f
+AUX courier-imap-4.0.4-courier-imapd.rc6 929 RMD160 4aec3c1c2fd1e32ff8fc89bc4d89b7b1227cda57 SHA1 bb919257cdd11f66bf448db86539d784ca539ccf SHA256 5187c9dbaaeceb98273e719b676fe7197bcfa215dfdf05c9d8cb161af48e3146
+AUX courier-imap-4.0.4-courier-pop3d-ssl.rc6 1182 RMD160 61a232d9de309f8a79c9ee05a412afc3265f0b21 SHA1 e337b7ba969462e896c595b205eb1b15d2860a5e SHA256 bc1e61890624d9ecc930d33785879b6d22bea6ac962be5f2aad1529a024c88f3
+AUX courier-imap-4.0.4-courier-pop3d.rc6 937 RMD160 aa08726aefd6fd3dad6cf2003de853869eb2d71a SHA1 2728ecebabcb5210c6d7f985df777b14a1edc5d3 SHA256 70c526347c8c53888df1bc6602d242376e9ef885a2b125d5292363c082dc4fca
+AUX courier-imap-4.0.6-aclocal-fix.patch 237 RMD160 005a1b1bcff427b747b5fdae0fbe678367e7ebfa SHA1 9593c438e8b6be719d1685f5398659bb841f115b SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579
+AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558 RMD160 ae5866697c98a760e11927faa69687b942795ff3 SHA1 e6fd4defb33644d806679e00f2eb056e7f72170e SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7
+AUX courier-imap-4.0.6-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
+AUX courier-imap-4.0.6-db4-tcpd_configure.in.patch 264 RMD160 49e1deaa1d006b1f3bd8d68ebad037fd934d3d06 SHA1 836208b414a72cf426a17e27f4c6dcf3c88138f3 SHA256 553b9b20afad380b2901318b6b2152b14c1f26ed3bfe26126364284f143cdd21
+AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200 RMD160 cfe0a24af1c4ca8ae1bbeafb25612a790961fd68 SHA1 77363438726d1e2fd7b9afb11b6bd2223fd75775 SHA256 c417f5de1bf2eeb5a7918931c30f1902d9f463279d8aa73ea0e13623923805df
+AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 RMD160 0d74ba0662418361e275a9762990771869485ac9 SHA1 404ae233fed0d3ad252e4a2897a5d01f6b613ade SHA256 5d2e175e20aa5d7b7049a76be847a9bd974d25625b5324ac8f23680cb7e734bc
+AUX courier-imap-4.0.6-r1-courier-imapd.rc6 949 RMD160 484cdac2b40e6f8dbad3a604a8ab2d3967226952 SHA1 562a624818140ed324cdaf2cb7d3541f7b5a48f7 SHA256 67406394a81a4ca697b8d08e987a0680b4e7622ac30ea009241b002f1d3adc8e
+AUX courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208 RMD160 8a997b6299c6a3de6dcd3e4b2d7c5171286e466a SHA1 0e007a0a8964e2c0523f187b0aed291008d70c2b SHA256 dec6250978b39b6dd1bfbea0b0dbd108ca60171db04135dff66c5ae73a7a33e6
+AUX courier-imap-4.0.6-r1-courier-pop3d.indirect 81 RMD160 047384e594e26ef2148085b0c5b88dba98187617 SHA1 3872f619cc6a5c91d3454e450638802e37556cda SHA256 27fa269811a3f916b050166733232e5de1fa578c0f3cb79ca649e6b0cff67ea5
+AUX courier-imap-4.0.6-r1-courier-pop3d.rc6 957 RMD160 d1502bbce31fc6a26cb3adf073abfe2b91bf29f3 SHA1 8db1f39de8d4041c96be3a5c04c6ecb763c6b00f SHA256 f3c8996471543ca35a9d4af6f2a7e5bc4fc5c9820dcc461792231236fababa69
+AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984 RMD160 93671fcb0eb2660ef41edf9ffc404c864bc369b7 SHA1 fc0c25e11555384db3fb7756a4c6b78d9c8c8e7e SHA256 dd79242bddbd46f7eabbd99da612c4189bbc998e3680bf9d50f6788783ba820e
+AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1026 RMD160 1bd16e446e10da64352390803cbaa691c11ecc68 SHA1 b8eb095bb6c8b6c970dd60e944ebfd2f36a39b40 SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1
+AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957 RMD160 7dcbfe1e550601ebdd973394ff03f19701425254 SHA1 d5bc5e06275d4082ab9b76c739d9da491a08cafd SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6
+AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 999 RMD160 10028f0deafad4b31b12e4006ace1a007b542495 SHA1 5db7530c017c1e0a4cdb02a67bc5256f9b790110 SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278
+AUX courier-imap-4.1.2-as-needed.patch 398 RMD160 0cda873874a9261cd0f640703fdb0c7cfb79e044 SHA1 53ab7b464ed0daf167066c323827524a653964e0 SHA256 8d1185d1929ab1cce5216f188adeb66a52ede20fbcb95b45d9b7a39287f884e3
+AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
+AUX courier-imapd-ssl.rc6-3.0.5 1196 RMD160 b3d21018f32d59c8db09491aa5d25e99ef5022ca SHA1 b25b6d29cba405ba7ea96223d564178f7cce8ece SHA256 818217507f3d27aebf9f14fa10a9eb9805b605c5bacc7a936e8610127816fd76
+AUX courier-imapd.rc6 945 RMD160 1446c5fdc95aceeebfb670e501d2f6d0f8e15c5b SHA1 77f36e56631db5be6f51377386a6059e9f48244f SHA256 37d2d245f58dbfeca4f6c15f3dffbb652daaae18ba07973989f661ce00f23178
+AUX courier-pop3d-ssl.rc6-3.0.5 1204 RMD160 c1638bd94fadc331cc97cc54462c9d9ed8fbd986 SHA1 7c1956c410179881430be2580561f6ea6c6fd5c2 SHA256 4a107d764d17ec217ecaeaa57504bb893558b0bc8fa5e82af33a3c63771d60a4
+AUX courier-pop3d.rc6 953 RMD160 c98bce7aabef2e138febf10e4c8bab86026216d4 SHA1 0aa6898254e70b0f2f13b9b3cc68e9895f9d4a3b SHA256 e64d98087123a432b528a301bb5a4f1d6ef6232a39c981318f8159297f775f76
+AUX gentoo-imapd-1.7.3-r1.rc 1074 RMD160 0fec4a1dc289b348e0605152467e603a2674847a SHA1 5eae59350ef88024041cad7bb8b4e7c79ea03b43 SHA256 52ad1bb47496be6fdd5a943cc5d156e18f4429c7b3f9d4d89670d451023db9e7
+AUX gentoo-imapd-ssl-1.7.3-r1.rc 1036 RMD160 441ee24be1825ab8cfb485cad5df329a1aa008fa SHA1 7791e6fc38cce038562b8dee868ec83c6e06a5c1 SHA256 2430819bae8e265934ac31944534ef8e3ab94dfe0e59a3ea658f60ebdd7d989b
+AUX gentoo-pop3d-1.7.3-r1.rc 1020 RMD160 e0c83f2cf3507cd8b08dd53f47abe3dcbeb10c8a SHA1 bab1db4ee5f31e33c8ca81ebab7cd46e93a908bc SHA256 189dca5b4fa90405e25f7d659b984c10a705d6c9a725f0571bc37d784793911b
+AUX gentoo-pop3d-ssl-1.7.3-r1.rc 1012 RMD160 d967c3996f95e113e7e6f9dd0a62b418c37d6ee4 SHA1 b8cfb3069000e2a70e0aa836b231fa40bdeef6c7 SHA256 12659fbc648e66ccfd5b62f75a9cc4a580f56b35ddb02f1460b6ce2726050e0d
+AUX mkimapdcert 996 RMD160 4ca3c600dc558f14648f318007447318a5e45165 SHA1 a1259ae6a18d4c2b2d783da72b730437fe0ffc2f SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6
+AUX mkpop3dcert 996 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 SHA1 28f43f0f62999105fe37b6a2edd5a0cbf8cee157 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb
+DIST courier-imap-4.4.1.tar.bz2 3383036 RMD160 ae1feff71b6dbd893ba1866bf4bf974e84210236 SHA1 c5d7a2790f6ce0ed7eda90a36268a1e772627bd7 SHA256 d7cff71f0aaf34ea8dc6823550dadf62def4f616b750548bf0512f12d1b4725f
+EBUILD courier-imap-4.4.1-r1.ebuild 8198 RMD160 a3d49a72b7b74b932f9ec2355efe4dbcb703d564 SHA1 cf38abf12b6e3b8a807007be3d448589f2c0a262 SHA256 059e2f9678c86ffef18e507347eeb9eb2d3ae8ef7a69cf4d2384e8ace3e09477
+MISC ChangeLog 33000 RMD160 91058c94ffbb878429e24f4bb6c401c02211a6c5 SHA1 3b34cadeff42df4421836bf225e204488a23504b SHA256 1c72fbe6ec6c63c4bb6635b074c89c1ce20bc6f9a2b46076b925fc22bb3c8e50
+MISC metadata.xml 258 RMD160 897ec10251e2fc462bdbb9780e945c896f44c7c1 SHA1 4f790bcbe4149520174095bb7e048a8e39fbfc16 SHA256 87167a6f2c7b3c99a92806e11600b3c9bfb1b51126a670fd2bc9b4358935f810
--- a/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
@ -0,0 +1,251 @@
+# Copyright 1999-2008 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.4.1-r1.ebuild,v 1.1 2008/12/14 21:19:10 mabi Exp $
+
+inherit autotools eutils multilib libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+		>=net-libs/courier-authlib-0.61
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+RDEPEND="${RDEPEND}
+		!virtual/imapd"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+MAKEOPTS="-j1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This 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}"/${PN}-4.0.6-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# 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-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	eautoreconf || die "eautoreconf failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Authdaemond is no longer provided by this package."
+	elog "Authentication libraries are now in courier-authlib."
+	elog "For a quick-start howto please refer to:"
+	elog "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd-ssl.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start imapd-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
+		--pid=$SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.1-courier-imapd.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd ] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
+		--pid=$PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d-ssl.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start pop3d-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
+		--pidfile $SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.1-courier-pop3d.rc6,v 1.1 2005/01/05 15:46:55 langthang Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d ] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
+		--pidfile $PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch
@ -0,0 +1,31 @@
+--- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
+++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-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"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
+for dbname in 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_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
+FOUND_DB=0
+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-db4-configure.in.patch
@ -0,0 +1,38 @@
+--- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
+++ configure.in	2004-11-16 16:03:06.743324584 -0800
+@@ -11,7 +11,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
+@@ -150,16 +150,18 @@
+ 
+ if test "$db" != "gdbm"
+ then
+  for dbname in 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_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_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"
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch
@ -0,0 +1,23 @@
+--- courier-imap-3.0.7-orig/maildir/configure.in	2004-06-08 15:44:23.000000000 -0700
+++ courier-imap-3.0.7/maildir/configure.in	2004-08-14 15:28:20.525714876 -0700
+@@ -60,6 +60,12 @@
+ dnl Checks for library functions.
+ AC_CHECK_HEADER(fam.h, :, :)
+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
+       fam="$withval",
+       fam="no")
+
+if test "$fam" != "no"
+then
+ AC_CHECK_LIB(fam, FAMOpen,  [
+ 			LIBFAM=-lfam
+ 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
+@@ -74,6 +80,7 @@
+ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
+ 					)
+ 		  ])
+fi
+ 
+ AC_SUBST(LIBFAM)
+ 
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd-ssl.rc
@ -0,0 +1,37 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-gentoo-imapd-ssl.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+# the new courier-authlib doesn't usee these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/imaplogin \
+		/usr/sbin/courier-imapd ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-imapd.rc
@ -0,0 +1,38 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-gentoo-imapd.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+IMAP_STARTTLS="$IMAPDSTARTTLS"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/imaplogin \
+		/usr/sbin/courier-imapd ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc
@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-gentoo-pop3d-ssl.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/pop3login \
+		/usr/sbin/courier-pop3d ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-gentoo-pop3d.rc
@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-gentoo-pop3d.rc,v 1.1 2005/01/05 15:46:55 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3DSTARTTLS=$POP3_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/pop3login \
+		/usr/sbin/courier-pop3d ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
@ -0,0 +1,5 @@
+#!/bin/bash
+XMAILDIR="$1"
+eval ${LOGINRUN} \
+	/usr/sbin/courier-imapd \
+	${XMAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
@ -0,0 +1,5 @@
+#!/bin/bash
+XMAILDIR="$1"
+eval ${LOGINRUN} \
+	/usr/sbin/courier-pop3d \
+	${XMAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
@ -0,0 +1,37 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+# the new courier-authlib doesn't usee these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/imaplogin \
+		/usr/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
@ -0,0 +1,38 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-imapd.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+IMAP_STARTTLS="$IMAPDSTARTTLS"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/imaplogin \
+		/usr/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/pop3login \
+		/usr/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-pop3d.rc,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3DSTARTTLS=$POP3_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/pop3login \
+		/usr/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd-ssl.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start imapd-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	/usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
+		--pid=$SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.4-courier-imapd.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd ] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	/usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
+		--pid=$PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start pop3d-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	/usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
+		--pidfile $SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.4-courier-pop3d.rc6,v 1.1 2005/08/08 09:57:05 flameeyes Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d ] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	/usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
+		--pidfile $PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch
@ -0,0 +1,10 @@
+--- configure.in.orig	2006-12-30 09:28:52.000000000 -0500
+++ 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
+ 
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
@ -0,0 +1,35 @@
+--- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
+++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,23 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-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"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
+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
+FOUND_DB=0
+AC_CHECK_FUNC(db_create_4004, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4003, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-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"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
@ -0,0 +1,11 @@
+--- tcpd/configure.in.orig	2007-02-02 17:20:18.000000000 +0100
+++ tcpd/configure.in	2007-02-02 17:20:58.000000000 +0100
+@@ -84,7 +84,7 @@
+ 	USE_GDBM=0
+ 	LIBGDBM=""
+ 	dblibrary=../bdbobj/libbdbobj.la
+-	LIBDB="-Wl,$LIBDB"
+	LIBDB="$LIBDB"
+ 	;;
+ *)
+ 	COURIERTCPD=""
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@ -0,0 +1,41 @@
+#!/sbin/runscript
+# 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/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start courier-imapd-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc --pid=${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=${SSLPIDFILE}
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-imapd "${XMAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@ -0,0 +1,36 @@
+#!/sbin/runscript
+# 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/files/courier-imap-4.0.6-r1-courier-imapd.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd ]] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start courier-imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc --pid=${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=${PIDFILE}
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@ -0,0 +1,41 @@
+#!/sbin/runscript
+# 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/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start courier-pop3d-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc --pidfile ${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile ${SSLPIDFILE}
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-pop3d "${XMAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@ -0,0 +1,36 @@
+#!/sbin/runscript
+# 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/files/courier-imap-4.0.6-r1-courier-pop3d.rc6,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start courier-pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc --pidfile ${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile ${PIDFILE}
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
@ -0,0 +1,32 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+ulimit -d ${IMAP_ULIMITD}
+
+export IMAP_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
@ -0,0 +1,33 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+ulimit -d ${IMAP_ULIMITD}
+
+IMAP_STARTTLS="${IMAPDSTARTTLS}"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
@ -0,0 +1,30 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+export POP3_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
@ -0,0 +1,31 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.2 2007/04/07 01:08:00 chtekk Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+POP3DSTARTTLS="${POP3_STARTTLS}"
+export POP3_STARTTLS POP3DSTARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
--- a/net-mail/courier-imap/files/courier-imap-4.1.2-as-needed.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.1.2-as-needed.patch
@ -0,0 +1,12 @@
+Index: courier-imap-4.1.2/gdbmobj/Makefile.am
+===================================================================
+--- courier-imap-4.1.2.orig/gdbmobj/Makefile.am
+++ courier-imap-4.1.2/gdbmobj/Makefile.am
+@@ -15,6 +15,7 @@ noinst_LTLIBRARIES=libgdbmobj.la
+ noinst_PROGRAMS=testgdbm
+ 
+ libgdbmobj_la_SOURCES=$(LIBGDBMSOURCES)
+libgdbmobj_la_LIBADD=@LIBGDBM@
+ 
+ testgdbm_SOURCES=$(TESTGDBMSOURCES)
+ 
--- a/net-mail/courier-imap/files/courier-imap-gentoo.readme
+++ b/net-mail/courier-imap/files/courier-imap-gentoo.readme
@ -0,0 +1,75 @@
+// This quick guide is for mysql authentication support base on the Gentoo Virtual Mailhosting Guide
+// turn ON mysql USE flag for courier-authlib. Need to authenticate against mysql database backend.
+localhost ~ # nano -w /etc/portage/package.use
+net-libs/courier-authlib mysql
+net-mail/courier-imap mysql
+localhost ~ # emerge courier-imap
+// limit to mysql module only, instead load all of them.
+localhost ~ # nano -w /etc/courier/authlib/authdaemonrc
+authmodulelist="authmysql"
+
+// set variables to match your setup.
+localhost ~ # nano -w /etc/courier/authlib/authmysqlrc
+MYSQL_SERVER            localhost
+MYSQL_USERNAME          mailsql_admin_username
+MYSQL_PASSWORD          password
+MYSQL_DATABASE          mailsql_database
+MYSQL_USER_TABLE        users
+# MYSQL_CRYPT_PWFIELD   crypt (commented this out if you want CRAM-MD5)
+MYSQL_CLEAR_PWFIELD     clear
+MYSQL_LOGIN_FIELD       email
+MYSQL_HOME_FIELD        homedir
+MYSQL_MAILDIR_FIELD     maildir
+
+// Start authdaemond
+localhost ~ # etc/init.d/courier-authlib start
+* Starting courier-authlib: authdaemond ...                                               [ ok ]
+
+### Courier-IMAP' ssl certificate setup
+localhost ~ # nano -w /etc/courier-imap/imapd.cnf
+localhost ~ # nano -w /etc/courier-imap/pop3.cnf
+// change to match your site.
+[ req_dn ]
+C=US
+ST=NY
+L=New York
+O=Courier Mail Server
+OU=Automatically-generated IMAP SSL key
+CN=mailhost.example.com
+emailAddress=postmaster@example.com
+
+// Generate Certificate
+localhost ~ # mkimapdcert
+...
+writing new private key to '/etc/courier-imap/imapd.pem'
+...
+localhost ~ # mkpop3dcert
+...
+writing new private key to '/etc/courier-imap/pop3d.pem'
+...
+
+### Secure Authentication Setup (CRAM-MD5)
+localhost ~ # nano -w /etc/courier-imap/imapd
+IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5"
+
+### Start Courier-imap daemons.
+localhost ~ # /etc/init.d/courier-pop3d start
+localhost ~ # /etc/init.d/courier-pop3d-ssl start
+localhost ~ # /etc/init.d/courier-imapd start
+localhost ~ # /etc/init.d/courier-imapd-ssl start
+
+### Checking authentication.
+// From your favorite client send an email to user@your_domain.com
+// so your mail user's maildir created by your MTA.
+// you can not login unless user maildir has been created.
+localhost ~ $ telnet mailexample.com 143
+Trying xxx.xxx.xxx.xxx...
+Connected to mail.example.com (xxx.xxx.xxx.xxx).
+Escape character is '^]'.
+* OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5 ACL ACL2=UNION STARTTLS] Courier-IMAP ready. Copyright 1998-2004 Double Precision, Inc.  See COPYING for distribution information.
+a login user@example.com password
+a OK LOGIN Ok.
+ OK LOGOUT completed
+Connection closed by foreign host.
+
+### That's all folks.
--- a/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5
+++ b/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imapd-ssl.rc6-3.0.5,v 1.1 2004/06/26 23:30:58 robbat2 Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start imapd-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
+		--pid=$SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imapd.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imapd.rc6,v 1.6 2004/06/26 23:30:58 robbat2 Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd ] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
+		--pid=$PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5
+++ b/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5
@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-pop3d-ssl.rc6-3.0.5,v 1.1 2004/06/26 23:30:58 robbat2 Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start pop3d-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
+		--pidfile $SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-pop3d.rc6
@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-pop3d.rc6,v 1.6 2004/06/26 23:30:58 robbat2 Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d ] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
+		--pidfile $PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
--- a/net-mail/courier-imap/files/gentoo-imapd-1.7.3-r1.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd-1.7.3-r1.rc
@ -0,0 +1,37 @@
+#!/bin/bash
+# $Id: gentoo-imapd-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+ulimit -d $IMAP_ULIMITD
+IMAP_STARTTLS="$IMAPDSTARTTLS"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
+		/usr/sbin/courier-imapd ${MAILDIR}
--- a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.7.3-r1.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd-ssl-1.7.3-r1.rc
@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: gentoo-imapd-ssl-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
+		/usr/sbin/courier-imapd ${MAILDIR}
--- a/net-mail/courier-imap/files/gentoo-pop3d-1.7.3-r1.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d-1.7.3-r1.rc
@ -0,0 +1,35 @@
+#!/bin/bash
+# $Id: gentoo-pop3d-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+export POP3DSTARTTLS=$POP3_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
+		/usr/sbin/courier-pop3d ${MAILDIR}
--- a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.7.3-r1.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.7.3-r1.rc
@ -0,0 +1,35 @@
+#!/bin/bash
+# $Id: gentoo-pop3d-ssl-1.7.3-r1.rc,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+export POP3_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
+		/usr/sbin/courier-pop3d ${MAILDIR}
--- a/net-mail/courier-imap/files/mkimapdcert
+++ b/net-mail/courier-imap/files/mkimapdcert
@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# mkimapdcert,v 1.1 2001/01/02 03:54:25 drobbins Exp
+#
+# Copyright 2000 Double Precision, Inc.  See COPYING for
+# distribution information.
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# IMAP over SSL.  Normally this script would get called by an automatic
+# package installation routine.
+
+test -x /usr/bin/openssl || exit 0
+
+prefix="/usr"
+pemfile="/etc/courier-imap/imapd.pem"
+randfile="/etc/courier-imap/imapd.rand"
+
+if test -f $pemfile
+then
+	echo "$pemfile already exists."
+	exit 1
+fi
+
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+/usr/bin/openssl req -new -x509 -days 365 -nodes \
+	-config /etc/courier-imap/imapd.cnf -out $pemfile -keyout $pemfile || cleanup
+/usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+rm -f $randfile
--- a/net-mail/courier-imap/files/mkpop3dcert
+++ b/net-mail/courier-imap/files/mkpop3dcert
@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# mkimapdcert,v 1.1 2001/01/02 03:54:25 drobbins Exp
+#
+# Copyright 2000 Double Precision, Inc.  See COPYING for
+# distribution information.
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# IMAP over SSL.  Normally this script would get called by an automatic
+# package installation routine.
+
+test -x /usr/bin/openssl || exit 0
+
+prefix="/usr"
+pemfile="/etc/courier-imap/pop3d.pem"
+randfile="/etc/courier-imap/pop3d.rand"
+
+if test -f $pemfile
+then
+	echo "$pemfile already exists."
+	exit 1
+fi
+
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+/usr/bin/openssl req -new -x509 -days 365 -nodes \
+	-config /etc/courier-imap/pop3d.cnf -out $pemfile -keyout $pemfile || cleanup
+/usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+rm -f $randfile
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
--- a/sys-devel/openwatcom/Manifest
+++ b/sys-devel/openwatcom/Manifest
@ -0,0 +1,2 @@
+DIST open_watcom_1.7.1-src.tar.bz2 26173755 RMD160 cc9bc3a5bf41a560058a4ffb3d55146cf9d4b40a SHA1 b9289221ffa8a595fcfce6a1a94bef5808bdf629 SHA256 14410438afd2d331e89dd2ae60a6e75e2db1251bba6f8a416a4b5987f8f4c712
+EBUILD openwatcom-1.7.1.ebuild 700 RMD160 0b011c6799d784f8b5528e8f9b4b7cf91ed6b749 SHA1 c8e0f4eed28c9312b214736154e404b8f24d81eb SHA256 8110714e92646e493ea9640cb4ae98f0dfb442c8313a2b8cd9959dfd9e4c1a14
--- a/sys-devel/openwatcom/openwatcom-1.7.1.ebuild
+++ b/sys-devel/openwatcom/openwatcom-1.7.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+LICENSE="OWPL-1"
+DESCRIPTION="The Open Watcom compiler"
+HOMEPAGE="http://www.openwatcom.org"
+SRC_URI="http://openwatcom.mirrors.skynet.be/pub/ftp.openwatcom.org/source/open_watcom_${PV}-src.tar.bz2"
+
+KEYWORDS="x86 amd64"
+SLOT="0"
+IUSE="examples source"
+
+DEPEND="sys-devel/gcc"
+
+RESTRICT="strip"
+S=${WORKDIR}
+
+src_compile() {
+	./build.sh || die "build.sh failed"
+}
+
+src_install() {
+	mkdir -p "${D}"/opt
+	cp -R rel2 "${D}"/opt/openwatcom
+	ln -s binl "${D}"/opt/openwatcom/bin
+
+	use examples || rm -rf "${D}"/opt/openwatcom/samples
+	use source || rm -rf "${D}"/opt/openwatcom/src
+}
--- a/www-apps/opendb/files/postinstall-en.txt
+++ b/www-apps/opendb/files/postinstall-en.txt
@ -0,0 +1,7 @@
+please keep the access rights to your patch.php file as strict
+as possible (600) as long as you don't need it. patch.php does
+bad  things  without  the  need  for  authentication  if  your
+web-server can access it!
+
+Please consult the packages documentation for installing a new
+database or upgrading yours to the current version.
--- a/www-apps/opendb/opendb-0.81_p13-r1.ebuild
+++ b/www-apps/opendb/opendb-0.81_p13-r1.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp eutils
+
+DESCRIPTION="The Open Media Lending Database (OpenDb) is an extremely flexible
+application to catalogue all sorts of things including DVD, VCD, CD, VHS, GAMES,
+BOOKS & Laser Discs"
+HOMEPAGE="http://opendb.iamvegan.net/"
+SRC_URI="mirror://sourceforge/${PN}/OpenDb-0.81p13.zip
+	amazonde? ( mirror://sourceforge/${PN}/amazonde-0.81p1.zip )
+	amazonfr? ( mirror://sourceforge/${PN}/amazonfr-0.81.zip )
+	amazonuk? ( mirror://sourceforge/${PN}/amazonuk-0.81p8.zip )
+	hminfo? ( mirror://sourceforge/${PN}/hminfo-0.81p8.zip )
+	dvdempire? ( mirror://sourceforge/${PN}/dvdempire-0.81p1.zip )
+	iblist? ( mirror://sourceforge/${PN}/iblist-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/naturals-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/atom-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/obsidian-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/fuse-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/blues-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/default2-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/menu-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/orangecream-0.81.zip )
+	themes? ( mirror://sourceforge/${PN}/simpsons-0.81.zip )
+	itemtypes? ( http://opendb.iamvegan.net/contrib/item_type/zip/33rpm-0.81.zip )
+	itemtypes? ( http://opendb.iamvegan.net/contrib/item_type/zip/45rpm-0.81.zip )
+	itemtypes? ( http://opendb.iamvegan.net/contrib/item_type/zip/bootleg-0.81.zip )
+	itemtypes? ( http://opendb.iamvegan.net/contrib/item_type/zip/cds-0.81.zip )
+	itemtypes? ( http://opendb.iamvegan.net/contrib/item_type/zip/svcd-0.81.zip )
+	"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="mysql amazonde amazonfr amazonuk hminfo dvdempire iblist themes itemtypes"
+
+RDEPEND="virtual/httpd-php
+	mysql? ( >=dev-db/mysql-3.23.2 )
+	virtual/mta"
+
+S=${WORKDIR}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc docs/INSTALL docs/LICENSE docs/MySQL_3.23.X-create_user_and_db.sql
+	dodoc docs/MySQL_4.X.X-create_user_and_db.sql docs/README
+	dodoc docs/check_for_zombie_items.sql docs/export/ExportPlugins.txt docs/import/ImportPlugins.txt
+	dodoc docs/lang/LanguagePacks.txt docs/opendb-items_1.1.dtd docs/theme/Themes.txt
+	dodoc docs/admin/new_attribute.txt
+	use amazonde && dodoc amazonde.readme
+	docinto lang-patch
+	dodoc docs/lang-patch/*
+	docinto misc
+	dodoc docs/misc/*
+	docinto notes
+	dodoc docs/notes/*
+	docinto test
+	dodoc docs/test/*
+	docinto scripts
+	dodoc docs/scripts/*
+	docinto site
+	dodoc docs/site/*
+
+	cp -R *.php export functions images import importcache ${D}/${MY_HTDOCSDIR}
+	cp -R admin include lang log patch site theme upload ${D}/${MY_HTDOCSDIR}
+
+	echo "order deny,allow" >${D}/${MY_HTDOCSDIR}/log/.htaccess
+	echo "deny  from all" >>${D}/${MY_HTDOCSDIR}/log/.htaccess
+
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	if use amazonde; then
+		einfo "You chose to install the amazon.de - plugin."
+		einfo "Please read amazonde.readme in the docs-dir!"
+	fi
+	if use hminfo; then
+		einfo "You chose to install the HometheaterInfo.com - plugin."
+		einfo "This plugin requires the DVD_CSV.txt file downloaded from the"
+		einfo "HomeTheaterInfo site. It is not distributed with the plugin. The"
+		einfo "URL to download this file is currently"
+		einfo "http://www.hometheaterinfo.com/download/dvd_csv.zip."
+	fi
+}