dev-cpp/libvmime: Use EAPI-2 and virtuals.

svn path=/sunrise/; revision=8874

diff --git a/dev-cpp/libvmime/ChangeLog b/dev-cpp/libvmime/ChangeLog
index ed193468d868984a638a771aa908175d19e22f61..1caa62aeb57ec2a3ce617209f68b4bae1e097edc 100644 (file)
--- a/dev-cpp/libvmime/ChangeLog
+++ b/dev-cpp/libvmime/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jul 2009; Tiziano Müller <dev-zero@gentoo.org> libvmime-0.9.0.ebuild:
+  Use EAPI-2 and virtuals.
+
   24 Jun 2009; Markos Chandras <hwoarang@gentoo.org> libvmime-0.9.0.ebuild:
   removing whitespaces
 

diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest
index 166c05a4088e194762b141f6f3c08f4f591dfdda..7e280081e84bb669bf7ece2c0d729f0a97cfcd9d 100644 (file)
--- a/dev-cpp/libvmime/Manifest
+++ b/dev-cpp/libvmime/Manifest
@@ -1,5 +1,5 @@
 AUX libvmime-0.9.0-gcc4_4.patch 351 RMD160 dd8a63aff5763f2b7375e6daaa76094dd36094a3 SHA1 6c0239e34e1790bd030c407385419a4239b82930 SHA256 0e05499ab46d764a2d53e6131f4d5be0dc50bbf6d3eb8c481490ef92f716ca8c
 DIST libvmime-0.9.0.tar.bz2 501168 RMD160 220c51f38587d503a9eaff58bc54d20af986b02f SHA1 02215e1d8ea758f486c32e7bff63a04f71a9b736 SHA256 941aa406e7a287e7981ac49f5665663d2d5feed0dd55a5459a311bf806b64363
-EBUILD libvmime-0.9.0.ebuild 1635 RMD160 379a5cf2f38870e9679a0debf10e798a65bfc592 SHA1 2f10300d3503e77b522570df3db6bdb817e6b2ad SHA256 69b62e3755998f87adf964836cee50ef5854f671008d40fdb6d6f3b8a43bf2c4
-MISC ChangeLog 1534 RMD160 27897d929a298ae7a258e39ebcb7851d44af6a41 SHA1 70ec5aeba0a84dd2cf4da688a6810df8a970cff8 SHA256 50122fcfb060d241dc9d2b89982d12af298d98f2a5c45c4d6ded838732094e2d
+EBUILD libvmime-0.9.0.ebuild 1558 RMD160 4c5277167707687bb03d4d243eb1abdc857d2337 SHA1 4e01fbc6604ba7494ed8fb6db9146e4b0e05a03c SHA256 c9008ea406317fe59cfb7dde5f40e7adff2cdba827e2308ac39e3677eaa4fb90
+MISC ChangeLog 1638 RMD160 1758e7497b8c71b34a481010f31800386c1c35db SHA1 47a3f8d32c45b421f06c9908d9dd74323e90dee8 SHA256 027c0e04f83217b1040696e0c3259e59885ed72ec511406d7eb4065ab86179bd
 MISC metadata.xml 402 RMD160 917bbe540ac49bef7417f612373861866d947f7b SHA1 94477c84465834ceff5286f4c0c53ee54e390bb3 SHA256 3ff4d8c8f42c03ec0d62522b4be18312d30951e88c404ab82f1ca35909e7463c

diff --git a/dev-cpp/libvmime/libvmime-0.9.0.ebuild b/dev-cpp/libvmime/libvmime-0.9.0.ebuild
index 372d4fb571d48a15a2b129905e343af0abde089b..ce3aa8fb504227cb7e9d1536d995d7ffb7e69b14 100644 (file)
--- a/dev-cpp/libvmime/libvmime-0.9.0.ebuild
+++ b/dev-cpp/libvmime/libvmime-0.9.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
+
 inherit eutils
 
 DESCRIPTION="Library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP"
@@ -16,15 +17,12 @@ IUSE="debug doc examples +imap +maildir +pop sasl sendmail +smtp ssl"
 
 RDEPEND="virtual/libiconv
        ssl? ( >=net-libs/gnutls-1.2.0 )
-       sasl? ( || ( net-libs/libgsasl net-misc/gsasl ) )
-       sendmail? ( || ( mail-mta/ssmtp mail-mta/sendmail ) )"
+       sasl? ( virtual/gsasl )
+       sendmail? ( virtual/mta )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        sed -i \
                -e "s|doc/\${PACKAGE_TARNAME}|doc/${PF}|" \
                -e "s|doc/\$(GENERIC_LIBRARY_NAME)|doc/${PF}|" \
@@ -33,7 +31,7 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-gcc4_4.patch"
 }
 
-src_compile() {
+src_configure() {
        econf $(use_enable debug) \
                $(use_enable sasl) \
                $(use_enable ssl tls) \
@@ -42,8 +40,10 @@ src_compile() {
                $(use_enable imap messaging-proto-imap) \
                $(use_enable maildir messaging-proto-maildir) \
                $(use_enable sendmail messaging-proto-sendmail)
+}
 
-       emake || die "emake failed"
+src_compile() {
+       default
        if use doc ; then
                doxygen vmime.doxygen || die "doxygen failed"
        fi