USE="static-libs" and keep .la files (they are used for loading plugins). Fix documentation installation.

Package-Manager: portage-2.2_rc87/cvs/Linux x86_64

3 files changed, 19 insertions, 38 deletions

diff --git a/net-libs/libesmtp/ChangeLog b/net-libs/libesmtp/ChangeLog
index 4fd96741e367..3a472accba98 100644
--- a/net-libs/libesmtp/ChangeLog
+++ b/net-libs/libesmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libesmtp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.45 2010/09/25 02:37:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.46 2010/09/28 10:22:41 ssuominen Exp $
+
+  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> libesmtp-1.0.6.ebuild:
+  USE="static-libs" and keep .la files (they are used for loading plugins).
+  Fix documentation installation.
 
 *libesmtp-1.0.6 (25 Sep 2010)
 
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 69d1f4d07391..efaf6621fc5d 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libesmtp-1.0-openssl.patch 405 RMD160 072d15cd287e11a7dd608e5a5bcadf915cfc98fa SHA1 70e5e4380cac4565db90f91b8353791b703cc423 SHA256 bac3bdf83293bd92a6531f18e2db0707d4c9edeb035286b82142897d408402da
 DIST libesmtp-1.0.3r1.tar.bz2 269527 RMD160 8bb113e0a1574f57a3ac71997f056116f31ed696 SHA1 05a11a95f6083c25d99a850dbc0d93c8301b77fd SHA256 6564c7302937f8a17be6a4afccab3fd9e38a4b585913bf03d9524dafd7a1ae34
 DIST libesmtp-1.0.4.tar.bz2 351917 RMD160 642d6dd18293672ae78abe0050f8d5ea37a4f44c SHA1 cda45c437164ecfa4fd8cf24d0a056224fc29c6a SHA256 407ec85a4c3ce2c4045608d28c36a8e19f1cfbad02bf3de784f6b6fa83d15a56
 DIST libesmtp-1.0.6.tar.bz2 365506 RMD160 7489ef298b56085f8788a3af4d17aed4ef0f1077 SHA1 cf538cfc6cb15d9d99bdeb20a3b3b6b320d97df3 SHA256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b
 EBUILD libesmtp-1.0.3.ebuild 1235 RMD160 a2a8662dc2f5fe5bccd0bf78b1132c3ea7317ba0 SHA1 515945e6166c3f236e2447b33d30b8a177a27d4f SHA256 d68adc3c524fff41aed844cafe8c3a0a5d8cee96ff28bc7732cec5244b82c71e
 EBUILD libesmtp-1.0.4.ebuild 1228 RMD160 1584cf4138316e7825bc4997350eb57abb4b782d SHA1 ee302207411c17fe2ed766a51d7b6792e0c3fe76 SHA256 06dc73a491b6c35354cff4c947b097741fc828768e20992edc2dd497c815120c
-EBUILD libesmtp-1.0.6.ebuild 1214 RMD160 0351730d45966bc7b602a7c52ac999c0bd17e548 SHA1 44a8c8ca2d4d08949b4f9bef408c6cedb7cc8931 SHA256 edeb6e35653da9c4668f4988f3175e57fb6c5d0570a25554a43dc07fc2f813aa
-MISC ChangeLog 5754 RMD160 1644d02e71e9c8577cfa2be574c1afffadd0f461 SHA1 17d5f986f1fbee78caf1ac8c45b572d87a24f32b SHA256 efcdac6e7dc9f2a1e4c3a41fe2dcf6066b11b373c3b28a5a7885546f3be3268f
+EBUILD libesmtp-1.0.6.ebuild 1051 RMD160 c98ef1dbbeaec5f5e0b381b386ca8890761fb56c SHA1 4d5ecc7ef9e2c8725d2a4ccf2ab151c272a3a78c SHA256 05cb88aded556159d03636b29ce2d9127e3738194a4d710617312c94889fcc12
+MISC ChangeLog 5942 RMD160 050b3f2dda1f38faa2afcb90c91e283605bd202e SHA1 611a4351902600698ac909acbf1530b01f1c6c5f SHA256 02ef56b7ec6a7cba444af6ce2c8073b9007a5ef46d5fdb39df19cdb6b5368d0a
 MISC metadata.xml 358 RMD160 4b8f4b1eb10390ba927d7382b3d52e3f70853756 SHA1 75de46ee3c1c8974bb2905352d483f72669294c2 SHA256 02841e914dbe151151b9a95a481098bc031f3e1e5c7b1eb5ff44ccf7d9a5a08b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMnWBjAAoJEEqz6FtPBkyj/mYH/2kJFTYBuTguTF9EWsdfJW1e
-uzaweXRGouyEvZ+Qcl7NpA4Ft3N/Gn6n9eV8pkmg3msUjPONFCvsGi5apqhCGV1+
-hjSCrl6F+9KQRa5lnqzgb/VKDWOoqDIHBiGbj3LeQHV+wNv0/mApckyUOD6yJ5Pc
-8gdnaAF/NViCnuwvGZf/uARjih4R299IFNRN56qZ4AvrUDzrcwtbHhM7z3ZTTQ1r
-SkxRxHhpYFR4ewDmaJAM3035Lb1iPZeMzTJn7xsnFTOfDdC68SFWJb2SRCphluHD
-49ir4tORJ26fkRkblEzRV46DkzebjbAc/5NpLcc6o9IacghEntCZhF3vquXMQZc=
-=b5q9
------END PGP SIGNATURE-----
diff --git a/net-libs/libesmtp/libesmtp-1.0.6.ebuild b/net-libs/libesmtp/libesmtp-1.0.6.ebuild
index f8ff3613050c..95949698808d 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.6.ebuild,v 1.1 2010/09/25 02:37:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.6.ebuild,v 1.2 2010/09/28 10:22:41 ssuominen Exp $
 
 EAPI=3
-
-inherit toolchain-funcs libtool
+inherit libtool
 
 DESCRIPTION="lib that implements the client side of the SMTP protocol"
 HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
@@ -13,36 +12,28 @@ SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="debug ssl threads"
+IUSE="debug ssl static-libs threads"
 
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	elibtoolize
 }
 
 src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		myconf="${myconf} --disable-isoc"
-	fi
-
 	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
 		--enable-all \
-		$(use_with ssl openssl) \
 		$(use_enable threads pthreads) \
 		$(use_enable debug) \
-		${myconf}
-
-	if [[ $(gcc-major-version) == 3 ]] && [[ $(gcc-minor-version) == 3 ]]; then
-		sed -i "s:-Wsign-promo::g" Makefile
-	fi
+		$(use_with ssl openssl)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS INSTALL ChangeLog NEWS Notes README TODO
-	dohtml doc/api.xml
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS Notes README TODO
+	insinto /usr/share/doc/${PF}/xml
+	doins doc/api.xml
 }