Revbump to fix sys-libs/ldb dependencies and runtime problems against sys-libs/ldb-1.1.15-r1. Remove old versions

Package-Manager: portage-2.1.12.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

8 files changed, 40 insertions, 311 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index c5a0d5312bc1..762920649f8d 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.42 2013/05/21 20:04:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.43 2013/07/03 20:26:57 hwoarang Exp $
+
+*sssd-1.9.5-r1 (03 Jul 2013)
+*sssd-1.9.4-r3 (03 Jul 2013)
+
+  03 Jul 2013; Markos Chandras <hwoarang@gentoo.org> +sssd-1.9.4-r3.ebuild,
+  +sssd-1.9.5-r1.ebuild, -sssd-1.9.4-r1.ebuild, -sssd-1.9.4-r2.ebuild,
+  -sssd-1.9.4.ebuild, -sssd-1.9.5.ebuild, metadata.xml, sssd-1.8.6-r1.ebuild,
+  sssd-1.8.6.ebuild:
+  Revbump to fix sys-libs/ldb dependencies and runtime problems against sys-
+  libs/ldb-1.1.15-r1. Remove old versions
 
 *sssd-1.9.5 (21 May 2013)
 
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 59133817edb7..b0e9856e390a 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -10,30 +10,28 @@ AUX sssd.conf 124 SHA256 bc5154f0ee2c2e6cffd5b6e371d4302a5952bd04343dd4c56689f43
 DIST sssd-1.8.6.tar.gz 2175323 SHA256 df3417e7c95e49ee982b6919059a5f181d59fcfbffa1c75106025980fda4c023 SHA512 137b3f2977511ed88c013e3e07da73dff689f8064c7ecf4c6c555e2686d76dd9daf10a184396b9e4a663a5a4fc4942808f6eae2b72eef47a730e041916445a30 WHIRLPOOL 25c8baecc35e69028b92cf4be01a2d37412838b6ec624ca3928e3f013b0e81bb0f0f1a3d57b7145291da7bed52f84f6259366a78e9f562afd26b9af0eb12c31c
 DIST sssd-1.9.4.tar.gz 3050325 SHA256 20e39d7c5d89e217b5301f7e75360eb869ac1889701755a598fb3fbed923f4b4 SHA512 2e0297c4a748a5b265956034727a97c3addfa135216133cb76dcf7e905a3a0d87ea02331f98d06dd7a90c5185ba3e89496ff386e3cc675ae90c51a1c49ac0984 WHIRLPOOL 984395610ccc47b6d5b77c73f2ce4fb6f9dea2bfdd4a128d19599dabd6530286513b11c16707641c1610b1d80afdb8996b57f2dcadb9dc9a858053628fac65cf
 DIST sssd-1.9.5.tar.gz 3106988 SHA256 a377c436901e92d689de811d48e37d88764460e889e47bfddd90626f0a8a015c SHA512 308785c660b9df7884e4d089d5d6880ff512598ca7803c2320404898328741d4c8cd15103f3074f0fb11b63dacddec808328db3de7b3ec07b81768bac1554624 WHIRLPOOL 4bfb6b35bc867f49662b5a5e6e80330e927340796f930c717a750e15e0977766957cf873b43f8e3ad11a181c22997c6a59868f458d9fe6fe12ce6c078f82d3b5
-EBUILD sssd-1.8.6-r1.ebuild 3040 SHA256 1d794e77590282d878e22e8ba988375fb2b9145f2f64cb469f33b9b1e125c953 SHA512 5eba98bc47eb4d148d7abba14745cc815976cab75c18397ef1e74aecaf2a4ff7e89175543428f33863274b8892a894ad52b29c8068e64b122fe8e52888d0d878 WHIRLPOOL 476071fff0dcb54161c686ca1f4d1cf0af5761bfcee3534c363ffce717c07d9b5bbf40d40cc82d6522450838d08c663749a4bb3bbfcdd2b849dd0c82379c88f4
-EBUILD sssd-1.8.6.ebuild 2964 SHA256 aced9bdec88bba4f7832625dc8b27c7cdbcdc7e8dac51809073815ab75776563 SHA512 aca7a2a3a6f8f53198b7f1a73ce4aaed9285ee9ab8a67ce4b2409a302baec76837d79cfbff957bdb2c1719e92b16a4a8c6d83f92cd96f56023bc8280d36b7530 WHIRLPOOL 01932e345de00a3967910c20403b854d27005b991ebe3cbe39c3b87d0e3e5b1e399fe35fde9ed992bad76629830ae02765d57681d362e5a38d89d97519166e9f
-EBUILD sssd-1.9.4-r1.ebuild 3342 SHA256 45b7752b27f44ec350a399cf6dc6c6210d5d38157acba9c8752531be5b71f25f SHA512 c53523f3b101ab7f46557472e63df17eed5d4d280ef8846e6dae5502b3a6d60edb891444b72c3fa4d0f56a08d8cab6d9482d1e23b4ddd74d164bf1a66ff5df06 WHIRLPOOL 593fd4e1641a407a969e169df420fe2c61840ad5df3995b70fecd132332ee20c17fe21d3443176aa6374c5c9e3d350cbca18d8e4aebd8128a8284403d13fd4c0
-EBUILD sssd-1.9.4-r2.ebuild 3406 SHA256 135e2cedc6d226ccc918ff67b2cbead445262d0482012122dbed539437857119 SHA512 b9fe992d24821dba44b02e150e87c6f22e80b324e26f67123aa1a395bfbb5ce3b9e286bfbdeac75cc224110aa2c370b2c852818211c7c458027804ca0cd6f7f3 WHIRLPOOL 7bc5cc1707d75a7717615038f380ad15c8881babad0fb80acdb72d6b728f124536fab3f04dcb25769e0cd0b772e0627fb7c9e6b24183542327ce65863aeb2088
-EBUILD sssd-1.9.4.ebuild 3357 SHA256 7a04a01d551e5f00bc66564db200377e9680b906ee001716dcbdc1227d0952f8 SHA512 06f8fc0f2fbac133870049c8eeaa6adf2addb0a22f89bbefa85c6114f1637b24a922b1b776f69056b29a3b978e359e35614fa17c5ca718d357ce2c16a77ac9e1 WHIRLPOOL 7d0d4ad7d83f2523e4709a1b526a73291ce4c22890bf90c994b18563f3bf4e0e4d3cb97d70e3cb9ea5be17443583b5b016750a364c7dfd7d056a1b2a58fd7a33
-EBUILD sssd-1.9.5.ebuild 3405 SHA256 feead932bc46da79fa64c90b9f5c2a546b6d4bd828c5cebbfb0828299c452194 SHA512 90a9d2303117d15161e644e1dbbec20d4f3b3ddf945da2bc6644b2775f9fd99470fa6cb1707246da480e26861f168f6a3683e293213ee645309548acc70911b2 WHIRLPOOL fd721679684da9c2e9a96cf3486bd06ce69ecb477de9a09e0399936e9911076ac4ab14140ee4b4b3d7eb508ab30a847c9ad1c5e8e8505577e3fe2b85b4802803
-MISC ChangeLog 6863 SHA256 a60b5397ae2ed441de3c232927f9df4e1027b75035fe1b7a46d87177e9085ea6 SHA512 6e5d3d0b79d52a2c2d0cbcef39728d8360f5cb0e9a89f2345dc924a7b6404232bbc89efe55075a5483138dc5a7b2b8bfc07e647789a62529191c188109f68e6f WHIRLPOOL 0c51d3cca15ee90aad54305264c530d0bfcc604a700eaf5e4a7dacad7013c87e79095886ca80170224c1b76bf027f907ddfb7aff276a29231717d95bb2970227
+EBUILD sssd-1.8.6-r1.ebuild 3050 SHA256 974ffe861eaef1b8efffc4588fe5a13f9ea3f008a70ff4de8c60970fc4381765 SHA512 5ecac7dbcca70e764cb699786864090090fc2e5998269da5ca3ba7abf849f7032b6bc1ae671b836cc3d8d9bc84a522a1f66885e3df822bc9957fb0622faebbbc WHIRLPOOL e8c0101b33bd8e862eaf4e289b83ef99d30ece27a1e1c06fc68c171e7958d9c5ce4ae1bc02dfb72fbc471019b4a818682b543a1006c6fa4aa2ee7e9f1d3211a5
+EBUILD sssd-1.8.6.ebuild 2980 SHA256 1172aa0a2d3928df5f6b3d5b3f1ed1890ba08689b5367a1d81669393f5cfa797 SHA512 645c2b4628b250eb81ef658a63342c969f1bd51c677de929dd40f00ec8a32ec4fb9e688e1e1357098a1f1b789abb131bf61e5da04c7e36bf7ab311374ad618a1 WHIRLPOOL 67367b7ebe26e0f8ab87f393e29072dbadeba4cca43173602566ff40186d84f202cbe0eef89a75ba8cc2eb80205c21c1da185a966b6a611f19e4fc2737a4ef3a
+EBUILD sssd-1.9.4-r3.ebuild 3402 SHA256 4f7e20af2c89d6e0a456d18378394982a4181e526cdef920a72eb868f69541a1 SHA512 e12aa6fee4783e308017fb435e3fe33b6de2fb23365c8a93994d4db34b1f2c597ac668f3c1b5fa596fffbc4a25c3cdc957449af112bfe53b04dda3837f6f96c5 WHIRLPOOL 98832c0b107d84662da547a45a2861b96d3e647d2f025fd99b5956e5d96aceedbea998d52c780a95789ff6bd9ac659e61cb38f974fb3df319c3e2b024840785a
+EBUILD sssd-1.9.5-r1.ebuild 3404 SHA256 c3063d6d0ce0d80cd110ef46bf36b9b2a081ec18deb32c950ee6d661ff2346d6 SHA512 924207660b6bcd3aee1aab65bbb5df56a0d81b4eca3b8fc13c5a1c730f5683c1c49a065afece2bdaa7031a2891c872bbe9431a3efbdd49c19851fe45612a6b5a WHIRLPOOL 6fd363168bbb1af61531e061fdff210af7580587440b5c4f20fc04428715b2a115af4f6d49178dbddf50c366081c54d3fc4778a4257e7a829ba5aeb9c852e3b0
+MISC ChangeLog 7288 SHA256 d8fd96e8b74ed007837b4853d8ccc6324e5752793585c202ac177efe3cfae83b SHA512 beae9f6a35e3cb77c05ee997e3e675f5a169d400a74e2491c141c6091e91db5cdb4525822eae1cb90c658b88b8bf5a0b527abf0c352c2e937674791354fffa3b WHIRLPOOL 0e186adea55287540a11c166b00d21ee62d3d9a9af970366ec3761c15356e6c8bbd28a13f237e0ab33c065d8aae4ca43df420995a46f2da6deb47cdfeeafdaca
 MISC metadata.xml 921 SHA256 4b2d79c80f3d9fa0d70be4a31083bc39edca07215611184bc1c1f1597260f8f3 SHA512 034310ea409bdfd6a4008c726b16a51659d625f8bc705eecc39643cecd4ed69689068e49311029f95d896347084c642d4e3283c913381770d3072a363c12f922 WHIRLPOOL 67a8da5b5e0d745443757ded349dae3ae3bdde8a9f679290226c6c0af27df890b83b0c18b7610f45b34a416301b7ee8bd45ff33c74fde2550cce7f66d9194fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRm9M2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJR1IkUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88zhkQAKgtk6NKoAbO2aMQNLNa9l20
-x837ExiXUCC+Zl5QmmZtG2uuMm7Tb3wpK/RlQnFifvz5M42FaJHEG+fCrMdi+C9P
-IfQEPbCAJP03PsQgqhsFk2zYki66tkhZQpDMfgnXGmgrMLpFwc08rSsSi4qD9Ml6
-uAUTiTEdBBEhtTnpntFbCCjUtHSAQZS2B4sCf3qoT/QUiQV3fOAB3fG1d2IszUzj
-XfzMfnvBwMMG+BN6tJO/5UFvhzIqxfFtFpVIDYwqSfl4EDPyeNMk8Li100Sb/30E
-T0ga1mm+QLEvedO+OYCc322NNjJ/DwlJentAov2veo6wZLiourLyFym5ZAh3wuJC
-r5Ne5BTP8Hlj2cBs8NM6fSMkLClgdYXn9VEfLuIeHyzrSUs7NsNPW4OjMyteFUr9
-1/7QiGdVhf6y0BrLYuCva0M48XWGeS9itVxXpER3q0SBD+F6fuAYFdvxAjpoGHVo
-C55LLohf4MNahK8KdKn1RRT1LZBamJPLyI5YUQDi2oXEcxzgNqpmHMG0ZMeu6MpS
-ZdMvQP/S4vJVXmuD20z5Yp8NgoyonipKsY2g37ydt6irCooOgeF4jdc4ZPgQivK2
-7mrD9j0PK7BPU5t2VeTnZhracS+xt1vZgYpuOz6egNFZ1wG9DyNhLzndO3ooWebs
-zqJqnzKSG6dfSBzzVgqx
-=T8Es
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88n8gQALsi/6EKy/MONPullkJGP4lr
+AVHwkQUVA1rKS2m7jtPlwDXA8EVVA0hG21nOjQoa0uIALSNk1tFgY1QvE9Hca33N
+q/MsayX36d8Roq5UFgLYWug8Hiq8M7ajm/BPXInLH68GtsBZRpAa1DbQph1xpxke
+6+s5lEQiEtZcml2A2KO8eD1Q4XSaQlw5iPW6hiYPnax7NnBvybCcrkE482mO0ms3
+OhwtRp/ychvNkKiDQcCxVGEjZnHvc9RAL3GrrJbX96FCfv0ETXSA88YGKIhQner6
+FIj1TDcSln3kVAZQcXqrkzLDqdO95xEBTnG4bGC5rngnJoRV9Q6PQvMibuL0YGTF
+4TXCitV2bIDeQt+L2CSpRsh7k6ZMqutQJW6PZi0noGWJKsbKgv/dwiRYCKOqDoxl
+j61bcsaReUFuqPELb6d4bVH0ww5g0hE8BcIR1DvRAh9OX7esndu5wG0Vdz72QH2t
+5HqM9JyIk008cvi0oSKByBpjqlxEketxZNPIMEEMRjROkLmqPHgDxI7n7p+7JoMo
+CQ7gdPdfJ/Ipf5NrzSCgBRZx73tkkHADSGPM5I3XnTcsMK6z4cXxaBRWqwt7Vj0N
+D21NyMXTDMdhkWazzpEw9mLWTGInucTSpnSqqdlnWr0T9xDgCw+WAKIMvF6Y0R2E
+CS3ZfERKh+47wo1eki6K
+=VAw5
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/sssd/sssd-1.8.6-r1.ebuild b/sys-auth/sssd/sssd-1.8.6-r1.ebuild
index 4bd3e25a628b..fdd7280a6a6c 100644
--- a/sys-auth/sssd/sssd-1.8.6-r1.ebuild
+++ b/sys-auth/sssd/sssd-1.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.8.6-r1.ebuild,v 1.1 2013/04/05 07:16:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.8.6-r1.ebuild,v 1.2 2013/07/03 20:26:57 hwoarang Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ COMMON_DEP="
 	>=sys-libs/talloc-2.0
 	sys-libs/tdb
 	sys-libs/tevent
-	sys-libs/ldb
+	<sys-libs/ldb-1.1.15-r1
 	>=net-nds/openldap-2.4.19
 	!!~net-nds/openldap-2.4.28
 	dev-libs/libpcre
diff --git a/sys-auth/sssd/sssd-1.8.6.ebuild b/sys-auth/sssd/sssd-1.8.6.ebuild
index 1a32b124935a..d11e185161a7 100644
--- a/sys-auth/sssd/sssd-1.8.6.ebuild
+++ b/sys-auth/sssd/sssd-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.8.6.ebuild,v 1.3 2013/01/31 19:40:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.8.6.ebuild,v 1.4 2013/07/03 20:26:57 hwoarang Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ COMMON_DEP="
 	>=sys-libs/talloc-2.0
 	sys-libs/tdb
 	sys-libs/tevent
-	sys-libs/ldb
+	<sys-libs/ldb-1.1.15-r1
 	>=net-nds/openldap-2.4.19
 	!!~net-nds/openldap-2.4.28
 	dev-libs/libpcre
diff --git a/sys-auth/sssd/sssd-1.9.4-r1.ebuild b/sys-auth/sssd/sssd-1.9.4-r1.ebuild
deleted file mode 100644
index b31e4d4ba2ee..000000000000
--- a/sys-auth/sssd/sssd-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.4-r1.ebuild,v 1.1 2013/02/20 16:46:53 maksbotan Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit python multilib pam linux-info autotools-utils
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="http://fedorahosted.org/sssd/"
-SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autofs doc +locator netlink nls +manpages python selinux sudo ssh test"
-
-COMMON_DEP="
-	virtual/pam
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.13
-	>=net-nds/openldap-2.4.30
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-		>=sec-policy/selinux-sssd-2.20120725-r9
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	"
-
-RDEPEND="${COMMON_DEP}"
-
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)
-	doc? ( app-doc/doxygen )"
-
-CONFIG_CHECK="~KEYS"
-
-PATCHES=( "${FILESDIR}"/0*.patch )
-
-pkg_setup(){
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		python_need_rebuild
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure(){
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--enable-silent-rules
-		$(use_with selinux)
-		$(use_with selinux semanage)
-		$(use_with python python-bindings)
-		$(use_enable locator krb5-locator-plugin)
-		$(use_enable nls )
-		$(use_with netlink libnl)
-		$(use_with manpages)
-		$(use_with sudo)
-		$(use_with autofs)
-		$(use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-		)
-
-	autotools-utils_src_configure
-}
-
-src_install(){
-	autotools-utils_src_install
-	prune_libtool_files --all
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	if use python; then
-		python_clean_installation_image
-		python_convert_shebangs -r 2 "${ED}$(python_get_sitedir)"/*.py
-	fi
-	newconfd "${FILESDIR}"/sssd.conf sssd
-}
-
-src_test() {
-	autotools-utils_src_test
-}
-
-pkg_postinst(){
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2"
-
-	use python && python_mod_optimize SSSDConfig.py ipachangeconf.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup SSSDConfig.py ipachangeconf.py
-}
diff --git a/sys-auth/sssd/sssd-1.9.4-r2.ebuild b/sys-auth/sssd/sssd-1.9.4-r3.ebuild
index c8cfdb739d98..7c9b102ddce7 100644
--- a/sys-auth/sssd/sssd-1.9.4-r2.ebuild
+++ b/sys-auth/sssd/sssd-1.9.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.4-r2.ebuild,v 1.1 2013/04/05 07:16:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.4-r3.ebuild,v 1.1 2013/07/03 20:26:57 hwoarang Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ COMMON_DEP="
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
 	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.13
+	>=sys-libs/ldb-1.1.15-r1
 	>=net-nds/openldap-2.4.30
 	>=dev-libs/libpcre-8.30
 	>=app-crypt/mit-krb5-1.10.3
@@ -82,7 +82,7 @@ src_configure(){
 		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
 		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
 		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules/ldb
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
diff --git a/sys-auth/sssd/sssd-1.9.4.ebuild b/sys-auth/sssd/sssd-1.9.4.ebuild
deleted file mode 100644
index 76a411800cd8..000000000000
--- a/sys-auth/sssd/sssd-1.9.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.4.ebuild,v 1.1 2013/01/31 17:56:01 maksbotan Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit python multilib pam linux-info autotools-utils
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="http://fedorahosted.org/sssd/"
-SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autofs doc +locator netlink nls +manpages python selinux sudo ssh test"
-
-COMMON_DEP="
-	virtual/pam
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.13
-	>=net-nds/openldap-2.4.30
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	>=net-fs/samba-4
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-		>=sec-policy/selinux-sssd-2.20120725-r9
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	"
-
-RDEPEND="${COMMON_DEP}"
-
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)
-	doc? ( app-doc/doxygen )"
-
-CONFIG_CHECK="~KEYS"
-
-PATCHES=( "${FILESDIR}"/0*.patch )
-
-pkg_setup(){
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		python_need_rebuild
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure(){
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--enable-silent-rules
-		$(use_with selinux)
-		$(use_with selinux semanage)
-		$(use_with python python-bindings)
-		$(use_enable locator krb5-locator-plugin)
-		$(use_enable nls )
-		$(use_with netlink libnl)
-		$(use_with manpages)
-		$(use_with sudo)
-		$(use_with autofs)
-		$(use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-		)
-
-	autotools-utils_src_configure
-}
-
-src_install(){
-	autotools-utils_src_install
-	prune_libtool_files --all
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	if use python; then
-		python_clean_installation_image
-		python_convert_shebangs -r 2 "${ED}$(python_get_sitedir)"/*.py
-	fi
-	newconfd "${FILESDIR}"/sssd.conf sssd
-}
-
-src_test() {
-	autotools-utils_src_test
-}
-
-pkg_postinst(){
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2"
-
-	use python && python_mod_optimize SSSDConfig.py ipachangeconf.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup SSSDConfig.py ipachangeconf.py
-}
diff --git a/sys-auth/sssd/sssd-1.9.5.ebuild b/sys-auth/sssd/sssd-1.9.5-r1.ebuild
index 06f27f3f7163..cfaaefe7bf11 100644
--- a/sys-auth/sssd/sssd-1.9.5.ebuild
+++ b/sys-auth/sssd/sssd-1.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.5.ebuild,v 1.1 2013/05/21 20:04:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.5-r1.ebuild,v 1.1 2013/07/03 20:26:57 hwoarang Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ COMMON_DEP="
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
 	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.13
+	=sys-libs/ldb-1.1.15-r1
 	>=net-nds/openldap-2.4.30
 	>=dev-libs/libpcre-8.30
 	>=app-crypt/mit-krb5-1.10.3
@@ -85,7 +85,7 @@ src_configure(){
 		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
 		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
 		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules/ldb
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath