Add static-libs USE flag. Use preserve_old_lib_notify to remind revdep-rebuild usage.

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

3 files changed, 31 insertions, 22 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index dae92cacfa62..339f80e53ffe 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.179 2011/11/02 10:14:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.180 2011/11/14 13:00:35 eras Exp $
+
+  14 Nov 2011; Eray Aslan <eras@gentoo.org> heimdal-1.5.1.ebuild:
+  Add static-libs USE flag. Use preserve_old_lib_notify to remind
+  revdep-rebuild usage.
 
   02 Nov 2011; Eray Aslan <eras@gentoo.org> heimdal-1.5.1.ebuild:
   Add revdep-rebuild warning.
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 139758465f84..25fb70003d28 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -26,24 +26,24 @@ DIST heimdal-1.5.1.tar.gz 6800347 RMD160 d66b09bddcd762e91092f862ea084abbcc3670c
 DIST heimdal-1.5.tar.gz 6594801 RMD160 308ef50e804402aab2fd3d8f25a798bec692c597 SHA1 fdf29096a1fa71a275881d64d178c211f148f0fc SHA256 8fe69a90e7ddbf5989054f899071365476689b7aed82bf0443b5bf85f934d53a
 EBUILD heimdal-1.3.3-r1.ebuild 3117 RMD160 60261063ae30fb906c353218b55d513adf4548fe SHA1 56b35803057793143fe26101a69be1ed44998cb2 SHA256 3194ddfc323737a8c00e44ddc7368480e100438c79b0dc4d30eb78a43ced0350
 EBUILD heimdal-1.4.1_pre20110304.ebuild 3642 RMD160 925071edf8d622763a2916b5cc595ea180432fe0 SHA1 3d40be95a8248c6a307838f60884625b0b87ef57 SHA256 9d43884ab18d00148ae7b5ce3321352d17ba00bc6e4ee72110581350d11dbd28
-EBUILD heimdal-1.5.1.ebuild 3408 RMD160 b9a8ce4ae9dbc3bdcc4620688473838e11c19ce3 SHA1 45f5b0a400768df63f84209c600ec840932cf459 SHA256 9ce542897b400dbb0fba51905e0d50860f4b1bb421f060f6031222002b407a15
+EBUILD heimdal-1.5.1.ebuild 3512 RMD160 7ea5f2b3a2d64e0c852fb904b9d6be2237f3f0b4 SHA1 3aaf3e56d2afc68d340016c26fe77f16084ed6dd SHA256 ecf9a000cdb1f5164b81b71c263d39dd41dfa2abe6b2703ab37e3d508f5307a5
 EBUILD heimdal-1.5.ebuild 3266 RMD160 5b520080e308b302669a8a3e8c9375e4aa01b0ac SHA1 876488d248c55e86c40a0681ddb0635d006abb47 SHA256 92e8fda935319fda977c6fe9ad8d4905bf043b7086974c27f92f7bf7ea8b210f
-MISC ChangeLog 29430 RMD160 bfe4f3583e8a60f40caad092e2b0f1a35cb42b4c SHA1 4df61afa0227dd7628f55c73f333f430a58d6a4b SHA256 0301d6ff07f59081533cc9ecadb6c95382c19d3e2748c51101edb0cb4adda011
+MISC ChangeLog 29587 RMD160 fc621dd098431d543fc203c394dac4c305fa907c SHA1 c0dbd55d89b2ea12cba9f5e1639d21305588472c SHA256 1ba5556c2a845790376081234f1513d15aef33df93179fd124815582306651de
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOsRggAAoJEHfx8XVYajsfatUQAKvG3807zXqs+J6LgkWeEq85
-cLGeFD0VFOcHvDTWBO8DPV3RceSzlYiLQg5m68wODNzD37ET/LgpR57Nsk8dZIkj
-qlnaNAmZnVO/CjQwx2PBhI2XZzj4IyNKE+CuHJl5fRFhjungDUBXBiNkBxIPV1IU
-dH/tfeDx79lO3boBCf7Ye0htroxh2AkQXhDEroyBM0cy4wP+m/jsXCTfCITjIGL6
-lEwQP45FFe9HeR1LKVnx0EWjiXBp+jZMBhAoIpt58zDiXgYH6Q38ZDjsebF37pOn
-TZug+b5m7dzxH3s8gNiruSZm4LsmQgDGMZccZU6GzFgdrQVtb1dI5T0GOeHotH36
-vovQnw78t86/y1zc7p9MObdDm0pMuomQlIrXT3MqescpXCf+eBPC7zyUGvcKgIEj
-Pz7VCQn7wAIDrtbCv/7WIj3ynZNnJaBiHXTiDpI3Tk5zv6nsmgVf6qkdTLKGRr+4
-rGS+yEzcXqYgBT4i0rwwnXp9jyCzWjLWrKeZ6wXig87O+ekCrFHZ9/b0A5Tv620d
-Cge2YBbYGXrXunnQxyb4oyqfgl7BEMTTfkq7OVuQL+V0gOUi94iUrh+GA3nLrdYD
-55iWv1gaqgT5Sh1JmpxJL0NuTYWv+CiEmzhtpud+yDThp1Mg2Qmd/EsNqiFJ52if
-4lArQ3QktAqL01NNiNsh
-=zyQP
+iQIcBAEBCAAGBQJOwRD5AAoJEHfx8XVYajsfMakP/16N6zPWduqWXBR22LpBd308
+GRctPG4yj5BULnz9rdH99hbx2BgBmqZYnnG8nH3ULG9dR6L83A4iiCeZsiMUHXar
+rjWiHZLGCm1/7KviPJVrK9Uv6PgjH22+mhQ5WoOBks8BqXV4sdLNpBE4cerKocHW
+ISyyAkV0kSY+32g2XbUGPtE1ZRhCwSWNerDeBRtRgFbAtXXxx5A6IyZZVAcnpc5V
+WXJzfOOYmK9al2eOfNcNWRGTqd+8Ouroih/C9EnQ3njvwpKl+GSGGngDXORA3LH5
+AQVwePJsdC7NQQRvY8YdP/FSRi7sDMVK8GbrC914UEuUHBJceq6Nnuh1YqMlcIr4
+NWEeVFcSJV8hH2bedByhmwjRMjRR0LHBQhHFMoeCYiheORURj7ZmTvSswpxtN34m
+VUw/kYJE7FJljcBcUCj3IyRz7Vn01+l6dPdiUrF+OUjRxNuUzFZ3Z59CvQhmIxwM
+XTBj9gnrMILA/q5EE/7BD+4pA9E7xfT7yJBNBNS16bnnMzoYFFI5WQP6uImuXi1P
+ETai5C+PJqLhHE+Vjr97j7kBbFekPj3dpChmalDD0092iIwenR6eyv1qSocH8Z82
+aDsuiTlF/VGTPqVG66R4hmDGHmFwXe/+Ij+M6M2K05l6xtNxpD0qZHRu5qL7lM5F
+qCxQvPJ9L6wYbYmeXY5l
+=N1+o
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/heimdal-1.5.1.ebuild b/app-crypt/heimdal/heimdal-1.5.1.ebuild
index c99c35655912..7b298665de2a 100644
--- a/app-crypt/heimdal/heimdal-1.5.1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1.ebuild,v 1.3 2011/11/02 10:14:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1.ebuild,v 1.4 2011/11/14 13:00:35 eras Exp $
 
 EAPI=2
 # PYTHON_BDEPEND="2"
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools db-use eutils libtool python toolchain-funcs virtualx flag-o-matic
+inherit autotools-utils db-use eutils libtool python toolchain-funcs virtualx flag-o-matic
 
 MY_P="${P}"
 DESCRIPTION="Kerberos 5 implementation from KTH"
@@ -16,7 +16,7 @@ SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -68,6 +68,7 @@ src_configure() {
 		$(use_enable otp) \
 		$(use_enable pkinit kx509) \
 		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
 		$(use_enable threads pthread-support) \
 		$(use_with caps capng) \
 		$(use_with hdb-ldap openldap /usr) \
@@ -120,12 +121,16 @@ src_install() {
 		doins "${S}/lib/hdb/hdb.schema"
 	fi
 
+	use static-libs || remove_libtool_files
+
 	# default database dir
 	keepdir /var/heimdal
 }
 
 pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.4.0" ; then
-		ewarn "Please make sure to run \"revdep-rebuild\" after upgrading."
-	fi
+	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
 }