Big tidy, resolving multilib errors and other QA faults.

Package-Manager: portage-2.1_pre3-r1

3 files changed, 30 insertions, 34 deletions

diff --git a/net-libs/libesmtp/ChangeLog b/net-libs/libesmtp/ChangeLog
index 6ddb4c2aac81..6ab198570ea2 100644
--- a/net-libs/libesmtp/ChangeLog
+++ b/net-libs/libesmtp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libesmtp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.25 2005/05/16 09:49:35 ticho Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.26 2006/01/27 14:27:31 slarti Exp $
+
+  27 Jan 2006; Tom Martin <slarti@gentoo.org> libesmtp-1.0.3.ebuild:
+  Big tidy, resolving multilib errors and several other QA faults.
 
   16 May 2005; Andrej Kacian <ticho@gentoo.org> libesmtp-0.8.12.ebuild,
   libesmtp-1.0-r1.ebuild, libesmtp-1.0.1.ebuild, libesmtp-1.0.3.ebuild:
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index c7818ed14734..9a6b543c7f8e 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe7313c2c7c21298b458bf779ae52a66 libesmtp-1.0.1.ebuild 1316
-MD5 ac1ca5b43d39d976cf1a621ee545b8a6 libesmtp-1.0-r1.ebuild 1374
-MD5 7c19521148281371ea11a4de16b287c1 ChangeLog 3339
-MD5 bcb0db567cce5ffbbe6fb7b787fc4364 libesmtp-1.0.3.ebuild 1359
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 7065f7b7252a510866887d53d1b8b684 libesmtp-0.8.12.ebuild 923
+MD5 9b1b1bcfea3a5d5bf5ac3441f56e5582 ChangeLog 3477
 MD5 395e602b515d970eab3a9d7ef8a2016f files/digest-libesmtp-0.8.12 68
+MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0-r1 65
 MD5 d3159044f52697e5328eed2b789f0f8d files/digest-libesmtp-1.0.1 67
 MD5 e7fb7627dfe48ba908ddc22564eead57 files/digest-libesmtp-1.0.3 69
-MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0-r1 65
 MD5 43822a1b725899b2ad3fbc20f58ee840 files/libesmtp-1.0-openssl.patch 405
+MD5 7065f7b7252a510866887d53d1b8b684 libesmtp-0.8.12.ebuild 923
+MD5 ac1ca5b43d39d976cf1a621ee545b8a6 libesmtp-1.0-r1.ebuild 1374
+MD5 fe7313c2c7c21298b458bf779ae52a66 libesmtp-1.0.1.ebuild 1316
+MD5 dfd4b8ea2c46b113187619b1fd6e26b4 libesmtp-1.0.3.ebuild 1235
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCiGzCQlM6RnzZP+IRApAcAJ4pXxm/GEJiWWOCjYvzonfcOCAC7gCgslrl
-A+t5U7HKKjT3UX4Adukza/Q=
-=nXUc
+iD4DBQFD2i3fCHk4+ZoBpvsRAjVEAJdawzuztEmoJQL9gEYD9tbwx0oAAJ9F0odN
+f9Z4k3TKKLQBY9YOx2WfxA==
+=cAAm
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libesmtp/libesmtp-1.0.3.ebuild b/net-libs/libesmtp/libesmtp-1.0.3.ebuild
index cb7675355551..cb92628069a6 100644
--- a/net-libs/libesmtp/libesmtp-1.0.3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.3.ebuild,v 1.8 2005/05/16 09:49:35 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.3.ebuild,v 1.9 2006/01/27 14:27:31 slarti Exp $
 
-inherit toolchain-funcs eutils gnuconfig libtool
+inherit toolchain-funcs eutils
 
 MY_P="${P}r1"
 DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
@@ -10,38 +10,31 @@ SRC_URI="http://www.stafford.uklinux.net/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 LICENSE="LGPL-2.1 GPL-2"
 
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
+DEPEND=">=sys-devel/libtool-1.4.1
+	>=sys-apps/sed-4
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1
-	>=sys-apps/sed-4"
-
-IUSE="ssl"
+IUSE="ssl debug"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
 
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	gnuconfig_update
-
-	elibtoolize
-
 	local myconf
 
-	use ssl || myconf="${myconf} --without-openssl"
-
-	if [ "`gcc-major-version`" -eq "2"  ]; then
+	if [[ $(gcc-major-version) == 2 ]]; then
 		myconf="${myconf} --disable-isoc"
 	fi
 
-	./configure \
-		--prefix=/usr \
+	econf \
 		--enable-all \
 		--enable-threads \
+		$(use_with ssl) \
+		$(use_enable debug) \
 		${myconf} || die "configure failed"
 
-	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -ge "3" ]; then
+	if [[ $(gcc-major-version) == 3 ]] && [[ $(gcc-minor-version) == 3 ]]; then
 		sed -i "s:-Wsign-promo::g" Makefile
 	fi
 
@@ -50,8 +43,8 @@ src_compile() {
 
 src_install () {
 
-	make prefix=${D}/usr install || die "make install failed"
-	dodoc AUTHORS COPYING COPYING.GPL INSTALL ChangeLog NEWS Notes README TODO
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS INSTALL ChangeLog NEWS Notes README TODO
 	dohtml doc/api.xml
 
 }