Add prefix support from prefix overlay. Bump to EAPI 3. Add prefix keywords.

Package-Manager: portage-2.2.0_alpha23_p5/cvs/Linux i686

4 files changed, 40 insertions, 14 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index a24182631026..82d4a1358895 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.261 2011/03/12 15:46:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.262 2011/03/12 18:45:00 abcd Exp $
+
+  12 Mar 2011; Jonathan Callen <abcd@gentoo.org> mit-krb5-1.9-r1.ebuild,
+  metadata.xml:
+  Add prefix support from prefix overlay. Bump to EAPI 3. Add prefix keywords.
 
   12 Mar 2011; Eray Aslan <eras@gentoo.org> mit-krb5-1.9-r1.ebuild,
   metadata.xml:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index e556bab0a29a..72667213b670 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX CVE-2010-1322.patch 1066 RMD160 fc262a23e9aa118262a4258f74832445062444e4 SHA1 600f0890de65f96112f267b56317a4fd0166cba0 SHA256 7d9fbfffdaa0cde0ca499ccbb2cf09a6c7253e537755bbf6da9e08715fd9a474
 AUX CVE-2010-1323.1324.4020.patch 7908 RMD160 848b776218473200e5a54beb4f3adfc3db915cf4 SHA1 a6fbc3b6ab15ca98c1aa1521fd42dad1f5003ee8 SHA256 ec08fca9738b5fae619154379ae0158531cb630b6f25551c14d87313c2d2a5f0
 AUX CVE-2010-4022.patch 632 RMD160 62a7b2b0d4acbca919fd9df52e707bf0b9fff076 SHA1 79ece8b1c140deb2c01bfb64af575636b9bc7704 SHA256 25f50e9406a36525b5f727041c9d584ef3f188fa5d3a39b4e63d1a853219a9e2
@@ -10,6 +13,23 @@ AUX mit-krb5kdc.initd 656 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b SHA1 6
 DIST krb5-1.8.3-signed.tar 11642880 RMD160 bdf3a505e4b2447af0c9080b441918d665dcdd9c SHA1 69696f63b6c2b0e3238156b19eed68cecd661c6b SHA256 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019
 DIST krb5-1.9-signed.tar 11888640 RMD160 bb067cb2fde9cb2a7ea04140683b9bc4a616bd38 SHA1 a7ad1b4ed37bff4b9087f6c4561b2b222208d779 SHA256 c30e012226f04943411dbb28d303d1a488955af74eb7d1ab50d6f4f21a6e1d06
 EBUILD mit-krb5-1.8.3-r3.ebuild 2901 RMD160 8937da2dec127ec9c15929a905a8ec63ef75302b SHA1 b846e7870ce5c16fd913d8dd1d41e9da7744009a SHA256 feb25a021dd40804bdfe235be91c68c6ab6a902469418e87f3165ed7dde48490
-EBUILD mit-krb5-1.9-r1.ebuild 2905 RMD160 463d5c53fcb850c4bd3af0bef1547ff0e5251801 SHA1 25a3080ddfcd025a45ca216e839a507fb40884bf SHA256 d9069426269240a0dc1880d714bce7f4610d23aa15dc83cbcf6a63b734f80b94
-MISC ChangeLog 41795 RMD160 d2587ccb97897da5e4c8919978b9e4e0194cbacc SHA1 14b5593c78cbd27f260b00c12e199e244eef1ce6 SHA256 a8974d01f09b019a5e419ce24f1198b4c9b85d442a4f37a9613e7a685e1c0cb5
-MISC metadata.xml 591 RMD160 45010246f34606c6aa0efcd2cd39cc003f2cfd2a SHA1 61026f0f64b6ff475699db6e3926070207703446 SHA256 83b41fa0aa310b86e9b396c67342c5470df3fbc3e97c0190d9bef168f9c2171d
+EBUILD mit-krb5-1.9-r1.ebuild 3062 RMD160 7215f3a7d27b5b059ed9d900c4d93c54a1f28e72 SHA1 d930d66c28ffa6be142203248631cf38875aaa1a SHA256 4248da45ebd9c5912543be9412a356d03ce81ae233d17fd7dabc867ae14d3f9f
+MISC ChangeLog 41964 RMD160 0246e65588be0a5889628e4f77ade1d3390d72b2 SHA1 eb12fecb64b469affc99d08a535e4586c1b95a40 SHA256 b14b192d096898f211c849bf4e95c1ccc902c3312e4b5b66529e3f3c815900df
+MISC metadata.xml 668 RMD160 825e73c2b8d1bdcfffb6c5cfa2110f596d7940ae SHA1 b9fca90e7a86fea05d8174d824e939cf61905310 SHA256 da5862dde92f34b882870961cb9f1e4aa8209fc549e32a43d99770a9de8b232d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNe784AAoJELHSF2kinlg4D1IP/0R2M289xMqUtckQzUOhuQpf
+kFGuebiyXIqIyD8noDRyP4M1RgH3u/CBNgzyglAQ1mfYxMSQKYUcgr8FjeNL4lCc
+do1LHy0QBY+Qz2G6Qlq30TWPnxCjy1LgYzS69i4B/0A2PhUNhhlWM5/IHYkCgp2Q
+JEqE1pHtF5oQKTwtbQmpoVScZSRdbGwWC2H7ZVguQJj9RhleOEOIVeaGeqdRkqZ1
+aTu6St0sexUM7+9acqwUp6DU4wFK+g/rT0RFYoYzrcLR6H/1AHXBfVBHocnk+Mix
+wQIL8Noimqxy/MuzNzZuziHOMMloO0YJ+nNbqHvLta43zsS2GsMibKmA5GQxvJI7
+FQl6mtkFFJS+KDTTs78QUIQHCC1OMCHNQRMLfDzqPPkNKI0Oar3IR01bMbKcYFxc
+viCrixA+Ugh3AGua7q/UwiJD88lZuZJfY96ZTNUvJjoAwCfv3H4BbCGHlXXnnuLC
+e2J8GCCX+gt43oRGjk789J09C79iuXtEMPqnuYjyITr3QbEOhJ5GE65+eV9dOeWR
+9JUmSfcPlWYkCAp7/11u+cUr/geiy0S/upGCLgHJXzFi/Z1OJJaK9vLZBdTOOAUX
+uIvpXv5MbBSx2Q9TAeTH8XCFdlRoZtbsVMOE7qJWiAN3XhKgJ2GiCawc+FvJAl0c
+FDJq0BgYcKQk7er86vFw
+=Kvqi
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
index 09d4d31de2ce..2609e96c2f9d 100644
--- a/app-crypt/mit-krb5/metadata.xml
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -9,6 +9,7 @@
     documentation. This is only useful if you want to develop software
     which depends on kerberos.
   </flag>
+  <flag name="keyutils">Enable for the keyring ccache using keyutils.</flag>
   <flag name="pkinit">Enable pkinit support for the initial ticket.</flag>
   <flag name="openldap">Enable support for ldap as a database backend.</flag>
 </use>
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild
index 7487fec1a8bd..9f2d1155647f 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.9-r1.ebuild,v 1.2 2011/03/12 15:46:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild,v 1.3 2011/03/12 18:45:00 abcd Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils flag-o-matic versionator
 
@@ -14,12 +14,12 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc openldap +pkinit +threads test xinetd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
 
 RDEPEND="!!app-crypt/heimdal
 	>=sys-libs/e2fsprogs-libs-1.41.0
-	sys-apps/keyutils
+	keyutils? ( sys-apps/keyutils )
 	openldap? ( net-nds/openldap )
 	xinetd? ( sys-apps/xinetd )"
 DEPEND="${RDEPEND}
@@ -43,10 +43,11 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags "-I/usr/include/et"
+	append-flags "-I${EPREFIX}/usr/include/et"
+	use keyutils || export ac_cv_header_keyutils_h=no
 	econf \
 		$(use_with openldap ldap) \
-		$(use_with test tcl /usr) \
+		"$(use_with test tcl "${EPREFIX}/usr")" \
 		$(use_enable pkinit) \
 		$(use_enable threads thread-support) \
 		--without-krb4 \
@@ -73,7 +74,7 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		EXAMPLEDIR="/usr/share/doc/${PF}/examples" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
 		install || die "install failed"
 
 	# default database dir
@@ -94,9 +95,9 @@ src_install() {
 	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
 
 	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
 	insinto /var/lib/krb5kdc
-	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
 
 	if use openldap ; then
 		insinto /etc/openldap/schema