Use autotools-utils -- suport user patches with autoreconf.

Package-Manager: portage-2.2.0_alpha84_p26/cvs/Linux x86_64

3 files changed, 45 insertions, 42 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index f99e7db38354..e5fed604b078 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/claws-mail
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.191 2011/12/26 10:08:22 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.192 2012/01/14 19:55:11 mgorny Exp $
+
+  14 Jan 2012; Michał Górny <mgorny@gentoo.org> claws-mail-3.8.0.ebuild:
+  Use autotools-utils -- suport user patches with autoreconf.
 
 *claws-mail-3.8.0 (26 Dec 2011)
 
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 66d6b20c2c57..94c177dc5b19 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX claws-mail-3.7.9-fix-nossl.patch 567 RMD160 84ad338601fbe4b0bce698175418c49dadfb8cbb SHA1 915b4e4b2359691837a8c2aedc33de97311f5f5b SHA256 f9ccd9b29b0e2e670d5040369be636b811dad711b8ca3bc91ff4f1d048f89438
 AUX claws-mail-3.7.9_notify_crash.patch 483 RMD160 9acf659c5b19899d9333625702ce19ddc60a21a2 SHA1 6d71de691cab1b39c7548c012acb2729dab5183f SHA256 bae47d4990a9bf00066b367f33384ecddc290b8fb6cf622c3bbbb065647ddc56
@@ -8,13 +8,15 @@ DIST claws-mail-3.7.9.tar.bz2 7086757 RMD160 9310a1aa430f9d26947ea8cd25f3a8ef63e
 DIST claws-mail-3.8.0.tar.bz2 7190415 RMD160 583e2966efda7a2fd6211eac43001b57c3d0efce SHA1 de6010392074633194e2aa5898e66d73c35bda5a SHA256 ec945e3b0f3df6f1f13fcf149ad3ee5306c0e6575bb375cf558e9028a0eb6231
 EBUILD claws-mail-3.7.10.ebuild 4035 RMD160 2626b183c08dad9ac8ce7fe4a92ca47a09ad6eb5 SHA1 e7415bfb37ffec3a9a1b8de45dadb213f149b753 SHA256 7c76726d7d75bca42212f5a6197861076edd9965b6762cec55d56b31798d5dcb
 EBUILD claws-mail-3.7.9-r1.ebuild 4145 RMD160 cb590e1fb92dddb45fe9dae51a75abbf5505b843 SHA1 587a6ae5cb41806b687e6e8667357efa8d71b522 SHA256 bca3e75b05ef7e33a4f29fc03dd1b3fc694b69f72cf0cfa876e6a3d41f2acb73
-EBUILD claws-mail-3.8.0.ebuild 4039 RMD160 9ba6d4c73537cc96fea08e8a4012d736b6182ad6 SHA1 feceebbea6287dd5b3924ac13726baf6d16f2a00 SHA256 15f780e03b874a98b9305dd8fc7c3f219366f2f47da35845014677c9dcde4344
-MISC ChangeLog 41036 RMD160 3a42d66dfe22cf552e88cf6e2c58b57f2daea934 SHA1 3ed6c5ad309106d40554c7528b40b51f9bb439d3 SHA256 6f5554935adc4276c859c5e1b84ef6bf54d03354c2a502c1d899d6e3248d8207
+EBUILD claws-mail-3.8.0.ebuild 3948 RMD160 1eed580aadb079fe1e1165a246213c6b40bbfb85 SHA1 ea2a3adb8804d7e82e66a57a12696150dbbdcc77 SHA256 8ca6ca72dcb18217320ca45741c25058bc26544b490d3ca14378e8f9032b3efd
+MISC ChangeLog 41175 RMD160 454a4702fecaaa2879c10663539fdbe34059325e SHA1 2f41113e3b0d0da203e9a290ea8d900375a21908 SHA256 b2280f7766f15c0b57ab2890a1b87cef179a6c94ea99fa1c1fbd0908a7d37a2f
 MISC metadata.xml 875 RMD160 2e7246f025433a4116aa96c7ce779bedfbc3fc52 SHA1 f5fdcbbae2591bd599c1769566fb8b3031787b4e SHA256 6702b8eb1b7b299682083cfee3b986aa6855534bd5ecf0b98eb09a1e55d0243a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk74R+IACgkQNQqtfCuFneOQhQCdGbN7306jEdezmpJfJiwXzuaF
-Jb8AoIcebTij3m/Uo7LEjZhrldzBamwo
-=9Lj6
+iJwEAQEIAAYFAk8R3gQACgkQfXuS5UK5QB0HNQP/Z3dPL24uiRVisvP31Mn2cy6v
+rpbHs73blCYjy4N1Xuv6L8e6GFCHSB+SeTSMmhPv+//06TEqXx2umZoIEbpOuy6o
+APK+LCgOU5CWNYVcAuHwAKUqoyvbWM4peMPvUt3QWr9oj5wEZE4k2ENkknS/O/W9
+BoRvarfgG63c/YxrnYw=
+=TMLT
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.8.0.ebuild b/mail-client/claws-mail/claws-mail-3.8.0.ebuild
index 85d926025052..08dc277d75c5 100644
--- a/mail-client/claws-mail/claws-mail-3.8.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.8.0.ebuild,v 1.1 2011/12/26 10:08:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.8.0.ebuild,v 1.2 2012/01/14 19:55:11 mgorny Exp $
 
 EAPI="4"
 
-inherit multilib gnome2-utils
+inherit autotools-utils multilib gnome2-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org/"
@@ -44,46 +44,48 @@ RDEPEND="${COMMONDEPEND}
 PLUGIN_NAMES="acpi-notifier address_keeper archive att-remover attachwarner clamd fancy fetchinfo gdata gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar"
 
 src_configure() {
-	local myconf
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus)
+		$(use_enable pda jpilot)
+		$(use_enable spell enchant)
+		$(use_enable xface compface)
+		$(use_enable doc manual)
+		$(use_enable startup-notification)
+		$(use_enable session libsm)
+		$(use_enable crypt pgpmime-plugin)
+		$(use_enable crypt pgpinline-plugin)
+		$(use_enable crypt pgpcore-plugin)
+		$(use_enable dillo dillo-viewer-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable smime smime-plugin)
+		--enable-trayicon-plugin
+		--disable-maemo
+	)
+
 	# libetpan is needed if user wants nntp or imap functionality
 	if use imap || use nntp; then
-		myconf="--enable-libetpan"
+		myeconfargs+=( --enable-libetpan )
 	else
-		myconf="--disable-libetpan"
+		myeconfargs+=( --disable-libetpan )
 	fi
 
 	# The usage of openssl was discarded once and USE=ssl is mapped to
 	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
 	if use ssl || use gnutls; then
-		myconf="${myconf} --enable-gnutls"
+		myeconfargs+=( --enable-gnutls )
 	else
-		myconf="${myconf} --disable-gnutls"
+		myeconfargs+=( --disable-gnutls )
 	fi
 
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable dbus) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell enchant) \
-		$(use_enable xface compface) \
-		$(use_enable doc manual) \
-		$(use_enable startup-notification) \
-		$(use_enable session libsm) \
-		$(use_enable crypt pgpmime-plugin) \
-		$(use_enable crypt pgpinline-plugin) \
-		$(use_enable crypt pgpcore-plugin) \
-		$(use_enable dillo dillo-viewer-plugin) \
-		$(use_enable spamassassin spamassassin-plugin) \
-		$(use_enable bogofilter bogofilter-plugin) \
-		$(use_enable smime smime-plugin) \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-trayicon-plugin \
-		--disable-maemo ${myconf}
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	autotools-utils_src_install
 
 	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
 	# => also install it in /usr/share/pixmaps for other desktop envs
@@ -97,7 +99,6 @@ src_install() {
 		newins ${PN}-${res}.png ${PN}.png || die
 	done
 
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 	docinto tools
 	dodoc tools/README*
 
@@ -109,9 +110,6 @@ src_install() {
 	exeinto /usr/$(get_libdir)/${PN}/tools
 	doexe *.pl *.py *.conf *.sh || die
 	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	# kill useless plugin files
-	rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
 }
 
 pkg_preinst() {