Really fix #64733.

3 files changed, 36 insertions, 10 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index e881d3a69500..e7dc435042c5 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.109 2004/12/23 15:11:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.110 2004/12/23 20:23:36 ticho Exp $
+
+  23 Dec 2004; Andrej Kacian <ticho@gentoo.org> cyrus-sasl-2.1.20-r1.ebuild:
+  Really fix #64733.
 
 *cyrus-sasl-2.1.20-r1 (23 Dec 2004)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 5d92910649be..0df2ac91c83e 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6cbe02d63f94bd74f518abb1437d3b75 ChangeLog 19585
+MD5 c967c214b7ba931a718dfea3687a3c7a ChangeLog 19684
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 888ff0ec58f34193c69acc689393dc9b cyrus-sasl-2.1.20.ebuild 7328
 MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
-MD5 42f7aa23d582571b6d131e89621d5b26 cyrus-sasl-2.1.20-r1.ebuild 7381
+MD5 4c00273055f12a13f099fde8b1ae17a5 cyrus-sasl-2.1.20-r1.ebuild 8339
 MD5 b6b628180f01eae601d52e9ca5faf725 cyrus-sasl-2.1.19-r1.ebuild 7156
 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70
 MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
@@ -44,7 +44,7 @@ MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 138
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFByuAxQlM6RnzZP+IRAmGhAJoCPFu1FqoGl4ktxmjvazTi3zsj5ACbBj0X
-IiCfciCG7fyILyl5TFusTEk=
-=7FuQ
+iD8DBQFByylRQlM6RnzZP+IRAoLaAJ4i38Erm6NXY8DVaDm4RiOcAbLuXACgt1PJ
+NUkLURey1EI0QVaWKABEjZw=
+=xvDL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
index 69178f56f210..22eb70d53a77 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild,v 1.1 2004/12/23 15:11:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild,v 1.2 2004/12/23 20:23:36 ticho Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -178,6 +178,24 @@ src_install () {
 	make DESTDIR=${D} install || die "failed to install."
 	keepdir /var/lib/sasl2 /etc/sasl2
 
+	# Install everything necessary so user can build sample client/server
+	# (bug #64733)
+	if use sample; then
+	        insinto /usr/share/${PN}-2/examples
+	        doins aclocal.m4 config.h config.status configure.in
+		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
+	        exeinto /usr/share/${PN}-2/examples
+	        doexe libtool
+	        insinto /usr/share/${PN}-2/examples/sample
+	        doins sample/*.{c,h} sample/*Makefile*
+	        insinto /usr/share/${PN}-2/examples/sample/.deps
+	        doins sample/.deps/*
+		dodir /usr/share/${PN}-2/examples/lib
+	        dosym /usr/lib/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
+		dodir /usr/share/${PN}-2/examples/lib/.libs
+	        dosym /usr/lib/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
+	fi
+
 	# Bug #60769. Default location for java classes breaks OpenOffice.
 	if use java; then
 		java-pkg_dojar ${PN}.jar
@@ -205,9 +223,6 @@ src_install () {
 	newdoc pwcheck/README README.pwcheck
 	dohtml doc/*.html
 
-	docinto examples
-	dodoc sample/{*.[ch],Makefile}
-
 	docinto saslauthd
 	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
 
@@ -228,3 +243,11 @@ src_install () {
 	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
 		die "failed to install testsaslauthd."
 }
+
+pkg_postinst () {
+	if use sample; then
+		einfo "You have chosen to install sources for example client and server."
+		einfo "To build these, please type:"
+		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
+	fi
+}