Enable multilib support, bug #505004.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 166 insertions, 15 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index ae173c04a651..3a6f17409b57 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.398 2014/03/26 10:35:09 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.399 2014/05/14 23:08:02 mgorny Exp $
+
+*mit-krb5-1.12.1-r1 (14 May 2014)
+
+  14 May 2014; Michał Górny <mgorny@gentoo.org> +mit-krb5-1.12.1-r1.ebuild:
+  Enable multilib support, bug #505004.
 
   26 Mar 2014; Eray Aslan <eras@gentoo.org>
   +files/mit-krb5-1.12_warn_cflags.patch, mit-krb5-1.12.1.ebuild:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 218a2fbb7a4e..f5596d6cc037 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -13,23 +13,26 @@ AUX mit-krb5kpropd.initd-r1 595 SHA256 c374ea05d7e9f15e10c8f9dbd0cad6548e0f92aef
 DIST krb5-1.11.4-signed.tar 11683840 SHA256 5c294612dcaf830958786056e898384931490eaf7b3290c3af5d2def2312fb97 SHA512 03d4d77681d7ba6f0324dc45f8457f6a5e3be23198c8ffa19fc9542b4455ec0738f78131a054e6d501396d3f66a29677d374726d068a83f6dddf7b7b7db18c6c WHIRLPOOL e710045332d21d5d52d22b746f46e9aa56dc5bf67a1d6e5e0b107f5b4aab6a4aba9ff31a374f865348123d0a61156546214a5929bd1c5a7b0a0e6f8ec599fa74
 DIST krb5-1.12.1-signed.tar 11950080 SHA256 72f1b6c166cb42c0b03814ab7ea10f91926d8a665a5ba1cee430a3f31e62c580 SHA512 bdb1541f6906e86fb00336a8d7c58f32c1203d1b23fe72bf6e943197a0d85a48a0b847cc2cf18388d3eec0b22aecc206ce804fd1009bb73423bac76900052a9e WHIRLPOOL 19021c52df7ceb64703c25e2cb9e643d2c62f180b65bf99aab04caeb2e0014b3c0e486609f4c36e618a00621c57d1291075299ea34b8550b255fe1000484291e
 EBUILD mit-krb5-1.11.4.ebuild 3288 SHA256 f0f48ffff1bd794b0de9bc5e6208efff480b452327e1ed6ef36fdfa5af872815 SHA512 abebc7c718da1ce4bf3f22c6509d724fa63919b9d0deae492b4a9ba89683d423501fcddfbff76246d34a3c46a6357dc0c83177147a0ec27a3d2f446dd2c9a392 WHIRLPOOL efc079a32dd8dfb7e6107b8b7b73159eec40b99d189a5e1ca954a3da80c659a39a5c1ac690b22b055a04eae3300f488aebc409e43d18c18a5474e0dc3cb5d7eb
+EBUILD mit-krb5-1.12.1-r1.ebuild 3807 SHA256 d9dc2d2bdd24bd6bb255357dd8c4cdb9a4d8dbfe78958bbb022ef96f67b8dd01 SHA512 4d2810667b490681af57cca236975d1b2d2968e0444127a40eb1a648b99cd34d04d0c86c26bedf8eb5928799112f038fc09992565b0cd5a061a566bfb32ecf4f WHIRLPOOL e93f8567c09d09c62467871db97dcabab946907047881fcee7940d1ee6d8157b9d1834cec34f39b04331dc125ca122d5f64133c424dcde010136f66ecbca3056
 EBUILD mit-krb5-1.12.1.ebuild 3332 SHA256 191e30786536d86f654d2dbcfe66517f388179a33c608c9bf35a5850dd278d4b SHA512 942a0993219b39e60ee36fe16ca48ab51ba4521e7533d01cf7045baf96961fc62226de143ff9b37e1b98a63cd4d0a283d460a852a87778aa75bde783345b803e WHIRLPOOL 1d7a55752a1f3447b8754b389a7858a5b3016b7f340c597632edc9ed8a35a52d78b06756e80d6a18259577cd8d0ce862358d356debb8a4151d571d0047295d1b
-MISC ChangeLog 61620 SHA256 4fa6177e83424c5988f36e517cd9386c5e989253fa328981fcdad35a285cf2d2 SHA512 37c5e9c7b5bbb397149b17942b5538bc9069804427e4f727171237fb05f6c1b8ee1b8306e780cbaad8b628c12b4dd566eed3dccb22259cba6df544a8cd4a98d3 WHIRLPOOL d675db20412df9d8e15e81f384d7fd706d2a8ffc632f3780d130da617d00814cb18db729d6e025a9b44db2ca416d1ac2f306feed350704e5d1963a49f7cfd50e
+MISC ChangeLog 61776 SHA256 36e707d6c06671768a6d0b11ea10663a115e40f67761fe3cf17356f6899524b7 SHA512 675ed754efe8a580061d15657b2ebe3b2d74cb2b10af6ce05c3dcad6b91e34fadd837bf1230cbbd267e10ff96ca067be9ddea0c448ade1051dc4efbeb3404452 WHIRLPOOL d0bcc97bb891de7e67b5e949e0c4f66869ce07b10d104aa55da8df045d95f768d874038cc6853b11059b0bc707ce1237b78764b1bc6b829be5f2a0871c0196bb
 MISC metadata.xml 668 SHA256 da5862dde92f34b882870961cb9f1e4aa8209fc549e32a43d99770a9de8b232d SHA512 0038aeb7cda74161d2e2fe97c5124ee6cc86a24b9503714c128cd8b9af8b8050a89cf5dd3aadd66b1714c1d1aeb8564d50479547a586200793ea485e9f9c6c8b WHIRLPOOL 52394a4f4d5acb11f3bf2e76e036707c7f7741990d70bafb5c87a6da5d191b6aee3cb8383f6e66694cbda7458eb1a869c7ec8758750741835e2f1af4e028378c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMq1oAAoJEHfx8XVYajsfpioQAJn5U55gapkxt+GhQpfmvxlR
-mBTexCmcHsc4Cg4IQIMtmfSX7uZHM20yxQ0xUt8caeyxzVSeMuLP4vNCvEBuqmBh
-MaTSHCY/o2soHIPVRNT+3HYxfwg0KqP58zRq6m8v8KvCFzFFwM+K1g5uoMuqdUr3
-ECBiA2Yy1+IkoTFK3nuyt6Wp5EvhcFdHtP4s5g7vd+cWCiOcaCIYI07mS2t6bywJ
-tSlDdmZbgTQpPkypS0VkhO2KVDbAmbrJWtbZRZGqxAwO5k8bgoreGRo3Uy3AgROw
-ziQNdlLNLArpd9mVmOi6oj6q5TunIQBB+uTrUhQ+JchpPnivPYEZ4VZ7dLL6V9HN
-wT+9Rlb7JyJw1lLfUqKctGNGM29BtC8AgVTqDIAffZlbIaYmiobgJ2qH564gX+Qv
-e95hz+rirZSlIIU7gYj+5ue66IhzY2ejUUl8ryIU8KWSCeOienvJuVwC2LfG2oZN
-PbbRZbz+04rzB53gPz8nfo0xmYJasVxMHF7hLf/SPFPMfyzR2c7DAoxL3CUoTNzl
-krSM6O814oAHyIFkSjvBlUghz3XuyIzFUhVLnk2/JpTMQhd1EpaKmrdjsHkko7vc
-RSqvmsn+Xa/K4XYRVpeEYB9xr3ZiyPtAx6wqXuyv6wTeJgETaPsRpejQOJykT8oq
-DHoc9paVNemCLCvpEA86
-=YaTR
+iQJ8BAEBCABmBQJTc/dTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5dsQANaaU2omYwtvcSOo1CQN5w7T
+DhmIOHGBWRVseZ5M5CxEQZu55bn9XrTW5OSeBb9kxqRoNlfdSC+micom6sLHHhdK
+FVDlTv7g6ZPtCoduT5qnFtfeMj87TLrhYrBfK2jSwIAQwBi7Cb14poBl9RiC1nMZ
+mKH07imBrsLsP7XEUaoibm2UheLx80FQuO24UIdWA7Q0WxGpsiEC2X4O6ZN05sI7
+GMhNL6QHZZU1c5K619Jfi/KjGm1nbvzoRWgEJaAMvlz3O3jtG/MDNAJP2IUsZ2pm
+ZcnDErPYGnODbRNa7Ed+1Wl2pzB2SH6XgrBZ3T/LjfEg8EFHaVChHCAfjmQVxAXm
+qF1wH/t/myxiGu1ynSK649mj8kP/47nCxZt0pJ6XPX1G37SRZC1Z9FRV3HX8opHm
+pHjv7kkT0P48nXnBQDdkoZlW+c8E0qks+l1lItYaUYx6Cvm1FtonJwcOCxIW27jc
+5MsA/02MJnLwI2zHAcQLkVpBEdngUXu4CfCKYnNP7xy4UvQ8qRJn6ING2Ph0fAdz
+CuYkmEUrzEqCG74npKv3gCvUyOtrlJXD7YS/Z2qVsGDyMfNzyiyuZZqh4SWO6Tow
+AcxFQrDtTRNcCSL0QVJH+95DNgmx12tMO8PN09UKCBOP9aknonDv26JQ5RPq9bLo
+Xo8+7Lk+qxSu8QGU8tZR
+=yoEp
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..9264a260f492
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild,v 1.1 2014/05/14 23:08:02 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
+
+RDEPEND="!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.41.0[${MULTILIB_USEDEP}]
+	|| ( dev-libs/libverto[libev,${MULTILIB_USEDEP}]
+		dev-libs/libverto[libevent,${MULTILIB_USEDEP}]
+		dev-libs/libverto[tevent,${MULTILIB_USEDEP}] )
+	keyutils? ( sys-apps/keyutils[${MULTILIB_USEDEP}] )
+	openldap? ( net-nds/openldap )
+	pkinit? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? ( ${PYTHON_DEPS}
+			dev-lang/tcl
+			dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+
+	# tcl-8.6 compatibility
+	sed -i -e 's/interp->result/Tcl_GetStringResult(interp)/' \
+		kadmin/testing/util/tcl_kadm5.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I${EPREFIX}/usr/include/et"
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(multilib_native_use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dohtml -r doc/html/*
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r1 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r1 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r1 mit-krb5kpropd
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}