From: Jeremy Olexa <darkside@gentoo.org>
Date: Sun, 9 May 2010 16:32:44 +0000 (+0000)
Subject: Revbump to workaround parallel make issues and install schema file correctly, bug... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ab136af7ca9eb1808e17b509a280549474c683e;p=gentoo.git

Revbump to workaround parallel make issues and install schema file correctly, bug 319039
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index bf847dd9ccbd..736066e75080 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.151 2010/05/09 03:50:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.152 2010/05/09 16:32:44 darkside Exp $
+
+*heimdal-1.3.2-r1 (09 May 2010)
+
+  09 May 2010; Jeremy Olexa <darkside@gentoo.org> -heimdal-1.3.2.ebuild,
+  +heimdal-1.3.2-r1.ebuild:
+  Revbump to workaround parallel make issues and install schema file
+  correctly, bug 319039
 
 *heimdal-1.3.2 (09 May 2010)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 9c652d8348b6..165a6afb4461 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -17,6 +17,6 @@ DIST heimdal-1.3.2.tar.gz 5743151 RMD160 57c2706a5893afc41e604f7821c10571cc8999d
 DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a
 EBUILD heimdal-1.2.1-r1.ebuild 4237 RMD160 4b3f562242cf2eabcaaeab583223b90cd38cb23d SHA1 db55235d6a779c80cff7ef11f09f6e033d397043 SHA256 e14cc0cacb4edc26c3df8366a40fbabd8ab444c1e2b4d6d37fdec9f0ed8d5cbf
 EBUILD heimdal-1.2.1-r4.ebuild 4064 RMD160 931764a654b3a4fe4aedb6d9163fe6125c959d51 SHA1 b1c3ba453075d6f4d398ce13b2516246a1315f4f SHA256 92eb7771c35730ca33e296a4d9cec6fa867e5df24040a263294d864b84833018
-EBUILD heimdal-1.3.2.ebuild 2597 RMD160 3732914de7998ef3dc92c3d40cb14fa724910616 SHA1 282e7bb6b4db1dfc1cd99a8c9b716e448d27ef5f SHA256 36f2f877b5754120aedf36c7977174c402d8addd85caaa92a111a52d1ed21947
-MISC ChangeLog 24795 RMD160 9a3a9624d604e391bc9dc3962d6db2cac3e5c2cc SHA1 2cfbb4aef3d5033c04c6611a0cd7ab3ee2d81af6 SHA256 89292c3609a7fc4b215e9da9bf401b8baece1aacd81b0de0777778426c381bed
+EBUILD heimdal-1.3.2-r1.ebuild 2637 RMD160 b65f56b535b931375948fe47a16fc2ed4ae70e28 SHA1 2c94e7eab79c53d2bf7bcf094491e6361c764070 SHA256 c9639dc0714cc0d78ecacf5777c4d7ab1295b63fc3e7590cb99ad9253fde6581
+MISC ChangeLog 25023 RMD160 59802429f164e5eea6fa39b0c4b7615b8ab7eb78 SHA1 3dd85ad904f78257606582c22464f4a81aac01f8 SHA256 98d6fd486f1d1e59ab2df9772393947efd67b5c6fa4bba494fa0845836755b2d
 MISC metadata.xml 923 RMD160 47b35a8f1efeaa17ac7104932a7ac75fa58b2f48 SHA1 82f3c37e41de86ca104a021461613a23680b86cb SHA256 f3eb7cc9ed2e70bdf91b8b1817f352a9eb0ce22e8a026510250b064040e18a3b
diff --git a/app-crypt/heimdal/heimdal-1.3.2.ebuild b/app-crypt/heimdal/heimdal-1.3.2-r1.ebuild
similarity index 94%
rename from app-crypt/heimdal/heimdal-1.3.2.ebuild
rename to app-crypt/heimdal/heimdal-1.3.2-r1.ebuild
index 213662f206bd..48e494c4b603 100644
--- a/app-crypt/heimdal/heimdal-1.3.2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.3.2.ebuild,v 1.1 2010/05/09 03:50:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.3.2-r1.ebuild,v 1.1 2010/05/09 16:32:44 darkside Exp $
 
 EAPI=2
 VIRTUALX_REQUIRED="manual"
@@ -64,6 +64,10 @@ src_configure() {
 		$(use_with X x)
 }
 
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
 src_install() {
 	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
 
@@ -95,7 +99,7 @@ src_install() {
 
 	if use hdb-ldap; then
 		insinto /etc/openldap/schema
-		newins "${S}"/lib/hdb/hdb.schema "${S}"/lib/hdb/krb5-kdc.schema
+		newins "${S}/lib/hdb/hdb.schema" krb5-kdc.schema
 	fi
 
 	# default database dir