Install unit file (#466376)

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 313 insertions, 16 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 47a608125561..a20fc0edd632 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.279 2013/04/24 08:48:34 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.280 2013/07/13 12:01:10 pacho Exp $
+
+*cyrus-sasl-2.1.26-r2 (13 Jul 2013)
+
+  13 Jul 2013; Pacho Ramos <pacho@gentoo.org> +cyrus-sasl-2.1.26-r2.ebuild,
+  +files/cyrus-sasl.conf, +files/pwcheck.service, +files/saslauthd-2.1.26.conf,
+  +files/saslauthd.service, +files/saslauthd2.rc7:
+  Install unit file (#466376)
 
   24 Apr 2013; Eray Aslan <eras@gentoo.org> cyrus-sasl-2.1.25-r4.ebuild,
   cyrus-sasl-2.1.26-r1.ebuild:
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e5c3dde00be9..e6a596466f31 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -36,11 +36,16 @@ AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 SHA256 76ba2532083630a05ed0e3a
 AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 SHA256 3885246eda016e7a6d273305b2a011770465e8324d1774ef0d021e3def3008d5 SHA512 2da553298b482ca3115294de7264428925911f8d1b6a15ae1af38ee7e0a3191a0f4ad90bcbaeef599c994842a86eea5157b663cb6944f035d9a377dba91dbbf0 WHIRLPOOL d248eae3c8e0e313c0047d0bfbf6e4dd1341afdd4b525138827148517e8cc3847f4c134cd1639be1734c60c5fde922e8bd759895de55b268c2bc9fd54994bda9
 AUX cyrus-sasl-2.1.25-service_keytabs.patch 932 SHA256 6b60574c65fffd802d19b409fe9a4b043614261e59051b7b9cf51380e08cd8f3 SHA512 bd5ceebfe1b8f72d275db487a6f11bbb8e6f20f3b44c05040fd9d0bb5c72e656f2c8f22924fecaa9c268e50d54d272f25f4a5a3b72ca49d1c23ef9f178d00733 WHIRLPOOL 7b3ab47b4af7425ed619c4c6336feb74d45ab9e52d102995d13c6b013cab4c1bf2804ace0b9714066eeec8b105d09e1c267405581ae10361afd7d8762f702a3f
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 348 SHA256 1821e0f511a3eab2cbefba36b6538a997afad2a4892d1fcbf22847d34e06711e SHA512 026183880caa504af9dda5fb93a6f47a159c7ab6af79463bc512709681dd260489411b8b8da78a9f8cd260b77ae5d1977854a39de80bc48f3a03e3ffa1b09fb2 WHIRLPOOL c71d5e4919577b6c23b1610c3fa695ad035befa9cc1de43867c9e9c17016f681854e734275241dab60271d3bc7198fd633b079ab6f53e6b8bc8ce4c513eff6bd
+AUX cyrus-sasl.conf 34 SHA256 1d246914153ca86390e7c39aaa9494ce1175d783d3292a8cc5a2d867b816fb7b SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e WHIRLPOOL 671625830fc9df9b44fff4d7fe16a7d7e76c42e8c1cf75cc7a725586aad3f80b98aa5a07ae5dea848833aed6aa02294c2a7b9969f1e708dd6854370a62c5cd23
 AUX java.README.gentoo 934 SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4 WHIRLPOOL d32cd2cfc9ffab9f791f48e0450c7eeff1b2203e29af8df8b96c4091ca7195cd579e41f38b857ef646eec28a11ea9e7c80aa6cee3f41a58d354b732a6ea15a92
 AUX pwcheck.rc6 518 SHA256 3e4999ec0671b21845b12229b48b21a24d7ee73fe27d6b1432f2f26482a0371d SHA512 63be5e3a60a149e935c845816c9999ea4b40ba21e5e47d817ee3a86182a814908343fcf6457d07a982d2abe7182227cd80c6cc876fc88a0b6e143bee7980cbd5 WHIRLPOOL 2104689b50c03b630481c2fc3ecd61e651cb46a40a6a49f146a2c73e985b05931998ecd8d4b3f03585bdbace77653425dd237a2fd51530ee80614536efccf75f
+AUX pwcheck.service 129 SHA256 6b4dd0f703dfb4d61f24f3ba42884d83eba4a8cd06eb794cc7cd8bebc6c93da5 SHA512 73e01063bf308cbdc45400d4d0b61f81eade8453acec71b2ac0c0acf1ee458881aab2876cbd47208f87c6a9f298846eb509e14eb01b985c4f9e0ad4db1d8b751 WHIRLPOOL 04ba7e1e7ddf7f5cccfc6ffa0d2bc6b7c47eb0d933409dc85eb1176e374a8a1dc1844221c6fe30a0341487226f1f42ea0473a5cc1c3455a06d071ed7ff625b46
 AUX saslauthd-2.1.21.conf 926 SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e SHA512 f4e388b9bcca2a001fc97fed254ff142da696209703be855135da8783a996a0a2460ed2de555cfcef3c1219906c210e720427bece70a677315ae0f5960223a97 WHIRLPOOL 64b63401ac7a2f008e0805779ae9d0de3b819d79c3c248ed69ce0a4bb54ab69d63f797366db7d4023e9ee71c73a9911e2ee4cc7d9b214e52f5442fefe9408800
+AUX saslauthd-2.1.26.conf 809 SHA256 1b11a3f16325443cf0f747cc9bdb7b1d3891f6c9cb158477a7214373398d8e23 SHA512 33e4f220977a12257e9b1dfbdf041d004ff552c02eef6dc5439ca92acd372d9610b8f584e1368dbf84bf6dc18b9a659b0216970f00392b296dd88c08fa3fe2c0 WHIRLPOOL 981c1e7a451f8d044a5d68f9d94ed450b0afb7ad63e1b1c72bf3bab63d95760f1d836e90d46c2e1e95b8f0a57e5af4c9f0504d00c60d80b4e0e34c44e944ead1
 AUX saslauthd.pam-include 160 SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba SHA512 14fcfc0f69dacd25ac9b298cf44b0b44146d418424ef16e66edf8893353e418ef53beebb7199bd516b828c40954e4875ab5659f50a09af12ef2a371b944b45b1 WHIRLPOOL cc1c48bb92cf89ed9f29df2469823bd7bfa96b97fa8d6d33c7cfedef1e1a2ee12e66a0c34b7a992a631d4f446dfa4e9769d5b2c08dae5039115c00514f8a40e9
+AUX saslauthd.service 277 SHA256 a8157a0748269d3534ac6f01bbf61f0215c665b50dbbf94fc2399b6d3287a677 SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c WHIRLPOOL 18f74f1caac60b7bbf58edf41b78c5d670a6892c8c763e05b026c930565dfb2c3ac7b6763e518824fe93c560c5f1f7e42306e950c1a942b38e0ec23824b74e89
 AUX saslauthd2.rc6 525 SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9 SHA512 821cf0da896ebeaa1025f019cc287c457f3820f7150461c6779a57118249c4bc12e2866be5f9d17430c5821fd4a89b44030904c1ed2fb6592bf4a5ee1347c3f6 WHIRLPOOL d989a71863b7a24ed08de8a039ce78b0d24daeb1cd5e33e26a746f69205841bae4c8ee08d11e6c9985a25ab988c5ed5398172e9db3093816325adbdda1a5f3e0
+AUX saslauthd2.rc7 524 SHA256 a095def10c3b7e6894a6d782c70cbe176c7b53f36386dcc4b1e5bc75424e29f0 SHA512 7d677bf482bb675fe1f31960fd1c0ae9f11c699a81ba16ee6bb427264ff38dd2216f72faf2ffa8015095ab92fb1c8abf7fd1d4530a4421c7e11f89ff0618643a WHIRLPOOL c91661649dc4c411e36c49576fa87ac327466f5344656bb4e964c96585dcd34431ed92b5d69dc8baa64ee700a57e4d6fe31b64a7b08f39d399d76ca1d9ee2f79
 DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 SHA256 9514a7436b11184cfd7e8a9ccd3590ce9f89cf2dc272ffbbdeeab16f9ae4fe6f SHA512 a0a00d78019a5bce1456aebb7a8f9c740f9c0f8340916e977249f1b766f503e8e33ab81cbc6e0cdafe4a8c806e5631395431107ff578f75cb89fc9cca1a57fca WHIRLPOOL aac154414f6ae4aa7db9e4eed8dc698c16a0aefdb2b7fe3aa34be5d24aa1b07d04f8f6aa0300f8365911d10e5552b6b978757f951a75af958745b8a5f547ea9f
 DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 SHA512 bf72db55fefe9eccfe4a12caf1160efc80aba98f8acc2743af360fda96659a3ee1fc3a5af6104b3dfc8fc4571f4e98526b9719a6cdf0948980cf76a9cb1a2b0e WHIRLPOOL 36e0b85228105186160ac8f8751137a067bca0cf6e219dda527808cb04ae597273c97b9d8cd3c1e3b900787a70ad67e5395127ab5107ef0e8ac0100b04612673
 DIST cyrus-sasl-2.1.25.tar.gz 5209240 SHA256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe SHA512 cab89deb025cb29b316990f29e7456be4fd1303553032df35c50331e5608c27ade16fd9b48578a294153493a12cd82af1db2f8a2ce7e385b03a9ebfc82085289 WHIRLPOOL eef119539e5c71af9c3505956ca20a8ae12e58f1d91e2c0fcc5af7679cda9e4f0d44beb3d45f03e24d604ff1b9f4b9850ed494c41a4c7a237b22f4b91e3fa79c
@@ -48,22 +53,13 @@ DIST cyrus-sasl-2.1.26.tar.gz 5220231 SHA256 8fbc5136512b59bb793657f36fadda6359c
 EBUILD cyrus-sasl-2.1.23-r6.ebuild 8954 SHA256 18ab7153c4303c16c995007406fe99a997e80fda0dd89a5821eff3ae4e0a435b SHA512 a0583520a67d0abf2a5d74340765933f4a2e999c0e69204a3b79666099d3c29d3338d82f6f6caa3d521ec44eea2647809cd083513aed435e671cfa3f9f579ae7 WHIRLPOOL 35640bc5a5d027fb6c16f0e7a07221aea6aad07b2fbb0100e5627b036ddf25fcd7dee43243239dd8a5e4b3266d27118eac381df69ccb7aac74c66d00a068d58f
 EBUILD cyrus-sasl-2.1.25-r4.ebuild 6998 SHA256 b386a1bb54a29e9846698cc3c2face8386ac8e59719f16fde3b0159e9554b277 SHA512 82b02fead6c6cfc2ad0587d2618f675a2e41e2d8ee2ea6c6a4134ddf4ed672c555160150295402fcd361fea6b3761a7a8e005be38f4fc301f865066de0b599d3 WHIRLPOOL 795ad6fa7d834c7cad8bdc8afcdfd06524eef428e0043316d7191eb9fc2747c8c8c875a03ad2bcb8e1c3c49e5739296566654dd213eda9beba4f0a0bf7b1abb0
 EBUILD cyrus-sasl-2.1.26-r1.ebuild 6823 SHA256 71e833686273bbcf8c0506ec7bb1c06e15620b97163f2c50e0e1ffdbd655254f SHA512 34f4a0e2067c88715758a742dd136d090c9635d0bb8049d8c270912d0b52f3d52e4f39e6770032148b9299ad3dcdebe85a427a0d8d59706f2bd34cf565e92935 WHIRLPOOL e14e86567c56994efcd26d5375ec68c5c54149d11a4cf1139e25559a4ead6177d268cc754974134bf4f60faae770c1208f262a3158abd2d3f3a87241f79914bc
-MISC ChangeLog 45645 SHA256 52fc59bd6f269141000d794a803caf60c6d288e30e5cce4af02a41e5b8ec6018 SHA512 21222479f677150a6b1c5d224a0ddb53c4de66d2848f68e47f7c9edd64259e7a99e8051eb62017e0824481fcadde573877aeaa2c422f54b06d2310e87b9c5dca WHIRLPOOL 32b07021f26172ca5eda76e03df4d53328f5bc890b5eb40f3f3b0ac75a56a59919d1f8c385d5e03ffb4a5f3319ea4cf621f3b44dc933ab195148d478dcc2d164
+EBUILD cyrus-sasl-2.1.26-r2.ebuild 7063 SHA256 a3d9c875b6301fd57edea782e358e691fd1bf2595410cb30d63e4365aaf03d92 SHA512 9ed5c7ae3b732c4046a2a21bda9dd0e2515a88a8ee8757a047babe879cc957100b70f20078bf9f1f82763e31c10402b92b1752eb027043b900e4b715c2a3ff27 WHIRLPOOL 2c3f4f2132cad6a44f4b6f73c02c568512df545df5a1da82e195c34bbd47e01de8737d78ad2675e662446a195d1faf3c7b9e8a2d9e81a889499ed9ecea4dd364
+MISC ChangeLog 45921 SHA256 2e6815c24f1c092bd72e00f16b6786303e4890b5c1203fdc1244ce3c2e02932c SHA512 5d710f7689d2e8c8c3b2fc60332c713b0ea7f60cbc3c179fcf76885f43c3145cd63e3937abd79e273a04ec73f2fe67fca44b8c51fa6eca5a86e0aee62f279b9c WHIRLPOOL 0defc618d77afab1102c45422f91c6fbf99483ce7c1a20924cb446fd3fbe782b1bf4a8bcd4ba6e53766bc371fc02e1ad5ce85c037be389eb60acf28ec7999613
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRd5xsAAoJEHfx8XVYajsfuRIQAKKAQzglcdJJz+32SO/ZjBb+
-NnxWeIoA/DhigYvbVu1E+/+WZEKav3I9V3uwPn1idzObGmmZxoeYuL+bjss7KTYw
-OC6Xxd/KmhbnUtcfC0gTpVEv55drmFQ37MjwzWRDRFBkNhVlmFZPZnwtrJNON8PU
-DtyrRXytQndV2KRcfHMKz29HoCaYB2B3Q0DdJ5M4v4QoxPCtHZc+FHN4b8nCCyZ1
-P0WA29Cc3BM8kqdJ47ZmMg6DBk7LN0SrPUvDCnz4q3xgJQTFdlg6okHKtoWbIS07
-Lp8x+bJyq9uKYa05VB3It2z9f9gQabK5xRNMCPgnPMfA95jB9K37jjIwcwcvoG98
-RJHbdl+CGJwVvau+58S9gnKqgT2rdyVEGL+vTk3ncVrFaQAscY6EuIg0rzQycfy/
-lZ5+MaY78BtuujMAV6S3gT55D2smbbPN+MKjawzo5H9WdBNPsZTEH59qDdWd7T3M
-D7iA5icMD44zhro4y4alzURFkh1qkgGFJ1ZWtF2+92TaMsUfddSJOEOMuBZHn8Ag
-8+E51OtbH0C8mSX+6rLCC056fX1a4S97aNI4SS19c0MCkhU7shISokXTTIFhrQLd
-Vfp7tn4RF1ADsG9QORBl8P0rVACqBfrsvCqambw6Tpr28gbL4025Bmfmge9wUSyK
-jYJoWX0eNUFqHCwzTMxj
-=9F3x
+iEYEAREIAAYFAlHhQYgACgkQCaWpQKGI+9ThZACfbjARQox+7elnBY8lD2D+g7Ac
+CYYAnReRKPF7E+0tyTR7nx1Z3Fl/Fjzu
+=5wbU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
new file mode 100644
index 000000000000..dbb99525c574
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild,v 1.1 2013/07/13 12:01:10 pacho Exp $
+
+EAPI=5
+
+# should be fixed in automake-1.13.2(?).  Please test when released.
+# See automake bug #13514
+WANT_AUTOMAKE="1.12"
+
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-3.2 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	kerberos? ( virtual/krb5 )
+	openldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.in || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+	# Java support.
+	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myconf
+
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+	fi
+
+	# Fix for bug #59634.
+	if ! use ssl ; then
+		myconf="${myconf} --without-des"
+	fi
+
+	if use mysql || use postgres || use sqlite ; then
+		myconf="${myconf} --enable-sql"
+	else
+		myconf="${myconf} --disable-sql"
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+	else
+		einfo "Building without SASLdb support"
+		myconf="${myconf} --with-dblib=none"
+	fi
+
+	# Use /dev/urandom instead of /dev/random (bug #46038).
+	if use urandom ; then
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	fi
+
+	econf \
+		--enable-login \
+		--enable-ntlm \
+		--enable-auth-sasldb \
+		--disable-cmulocal \
+		--disable-krb4 \
+		--enable-otp \
+		--without-sqlite \
+		--with-saslauthd=/run/saslauthd \
+		--with-pwcheck=/run/saslauthd \
+		--with-configdir=/etc/sasl2 \
+		--with-plugindir=/usr/$(get_libdir)/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with openldap ldap) \
+		$(use_enable ldapdb) \
+		$(use_enable sample) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable java) \
+		$(use_with java javahome ${JAVA_HOME}) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+		$(use_enable srp) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	cd "${S}"
+	if use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /etc/sasl2
+
+	if use sample ; then
+		docinto sample
+		dodoc sample/*.c
+		exeinto /usr/share/doc/${P}/sample
+		doexe sample/client sample/server
+	fi
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	if use java ; then
+		java-pkg_dojar ${PN}.jar
+		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+		# hackish, don't wanna dig through makefile
+		rm -Rf "${D}/usr/$(get_libdir)/java"
+		docinto "java"
+		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+		dodir "/usr/share/doc/${PF}/java/Test"
+		insinto "/usr/share/doc/${PF}/java/Test"
+		doins "${S}"/java/Test/*.java
+	fi
+
+	docinto ""
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*.html
+
+	docinto "saslauthd"
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
+
+	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl.conf b/dev-libs/cyrus-sasl/files/cyrus-sasl.conf
new file mode 100644
index 000000000000..d4809f73c8e9
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl.conf
@@ -0,0 +1 @@
+d /run/saslauthd 0755 root root -
diff --git a/dev-libs/cyrus-sasl/files/pwcheck.service b/dev-libs/cyrus-sasl/files/pwcheck.service
new file mode 100644
index 000000000000..74ff4859abf7
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/pwcheck.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=SASL pwcheck daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pwcheck
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf
new file mode 100644
index 000000000000..1eeaa483df09
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf
@@ -0,0 +1,21 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf,v 1.1 2013/07/13 12:01:10 pacho Exp $
+
+# Config file for /etc/init.d/saslauthd and systemd unit
+
+# PLEASE READ THIS IF YOU ARE USING SYSTEMD
+# Please note that systemd does not expand shell variables
+# thus, something like FOO="${FOO} bar" won't work.
+
+# Specify the authentications mechanism.
+# **NOTE** For a list see: saslauthd -v
+# Since 2.1.19, add "-r" to options for old behavior,
+# ie. reassemble user and realm to user@realm form.
+#
+# Specify the hostname for remote IMAP server using:
+# "-O localhost".
+# Specify the number of worker processes to create using:
+# "-n <N>".
+# Enable credential cache, set cache size and timeout using:
+# "-c -s <cache size, like 128> -t <timeout seconds>".
+# 
+SASLAUTHD_OPTS="-a pam"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.service b/dev-libs/cyrus-sasl/files/saslauthd.service
new file mode 100644
index 000000000000..1609a651e4e0
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=SASL Authentication Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/saslauthd/saslauthd.pid
+EnvironmentFile=/etc/conf.d/saslauthd
+ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
+ExecStop=/bin/kill -15 $MAINPID
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc7 b/dev-libs/cyrus-sasl/files/saslauthd2.rc7
new file mode 100644
index 000000000000..d6b453e929f4
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.rc7
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc7,v 1.1 2013/07/13 12:01:10 pacho Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting saslauthd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \
+		-- ${SASLAUTHD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping saslauthd"
+	start-stop-daemon --stop --quiet --pidfile /run/saslauthd/saslauthd.pid
+	eend $?
+}