From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E5F513827E for ; Sun, 22 Dec 2013 21:52:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 904DEE0A03; Sun, 22 Dec 2013 21:52:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93739E0A03 for ; Sun, 22 Dec 2013 21:52:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8813333F622 for ; Sun, 22 Dec 2013 21:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 15526E545E for ; Sun, 22 Dec 2013 21:52:47 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1387747986.e677d568c5554cfebe19d266e1a4845c2fa2f810.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/gmime/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/gmime/gmime-9999.ebuild dev-libs/gmime/metadata.xml X-VCS-Directories: dev-libs/gmime/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: e677d568c5554cfebe19d266e1a4845c2fa2f810 X-VCS-Branch: master Date: Sun, 22 Dec 2013 21:52:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6e5d7a34-adb9-4b67-8766-ef3bdfff85c1 X-Archives-Hash: 5a93aaf893d8074a3030dda4244f12af commit: e677d568c5554cfebe19d266e1a4845c2fa2f810 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Dec 22 21:33:06 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Dec 22 21:33:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e677d568 dev-libs/gmime: sync with gentoo-x86 --- dev-libs/gmime/gmime-9999.ebuild | 85 +++++++++++++++++----------------------- dev-libs/gmime/metadata.xml | 6 +++ 2 files changed, 43 insertions(+), 48 deletions(-) diff --git a/dev-libs/gmime/gmime-9999.ebuild b/dev-libs/gmime/gmime-9999.ebuild index 3ed8f40..2c54a8e 100644 --- a/dev-libs/gmime/gmime-9999.ebuild +++ b/dev-libs/gmime/gmime-9999.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.25.ebuild,v 1.1 2011/06/11 15:17:27 pacho Exp $ +# $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" -inherit gnome2 eutils mono libtool +inherit eutils mono-env gnome2 vala if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi DESCRIPTION="Utilities for creating and parsing messages using MIME" -HOMEPAGE="http://spruce.sourceforge.net/gmime/" +HOMEPAGE="http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/" SLOT="2.6" LICENSE="LGPL-2.1" @@ -21,54 +21,51 @@ if [[ ${PV} = 9999 ]]; then else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" fi -IUSE="doc mono static-libs" +IUSE="doc mono static-libs vala" -RDEPEND=">=dev-libs/glib-2.18:2 - >=app-crypt/gpgme-1.1.6 +RDEPEND=" + >=dev-libs/glib-2.18:2 sys-libs/zlib + >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono - >=dev-dotnet/glib-sharp-2.4.0:2 )" + >=dev-dotnet/glib-sharp-2.4.0:2 ) +" DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig - doc? ( - >=dev-util/gtk-doc-1.8 - app-text/docbook-sgml-utils ) - mono? ( dev-dotnet/gtk-sharp-gapi:2 )" + doc? ( app-text/docbook-sgml-utils ) + mono? ( dev-dotnet/gtk-sharp-gapi:2 ) + vala? ( + $(vala_depend) + >=dev-libs/gobject-introspection-1.30.0 ) +" + +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.8 )" +fi pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS PORTING README TODO" - G2CONF="${G2CONF} - $(use_enable mono) - $(use_enable static-libs static) - --enable-cryptography" + use mono && mono-env_pkg_setup } src_prepare() { + use vala && vala_src_prepare gnome2_src_prepare +} - if use doc ; then - # db2html should be docbook2html - sed -i -e 's:db2html:docbook2html:' \ - configure.ac configure || die "sed failed (1)" - sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \ - docs/tutorial/Makefile.* || die "sed failed (2)" - # Fix doc targets (bug #97154) - sed -i -e 's!\<\(tmpl-build.stamp\): !\1 $(srcdir)/tmpl/*.sgml: !' \ - gtk-doc.make docs/reference/Makefile.in || die "sed failed (3)" - fi - - # Use correct libdir for mono assembly - sed -i -e 's:^libdir.*:libdir=@libdir@:' \ - -e 's:^prefix=:exec_prefix=:' \ - -e 's:prefix)/lib:libdir):' \ - mono/gmime-sharp.pc.in mono/Makefile.{am,in} || die "sed failed (4)" - - elibtoolize +src_configure() { + gnome2_src_configure \ + --enable-cryptography \ + --disable-strict-parser \ + $(use_enable mono) \ + $(use_enable static-libs static) \ + $(use_enable vala) } src_compile() { - MONO_PATH="${S}" emake + MONO_PATH="${S}" gnome2_src_compile if use doc; then emake -C docs/tutorial html fi @@ -79,15 +76,7 @@ src_install() { gnome2_src_install if use doc ; then - # we don't use docinto/dodoc, because we don't want html doc gzipped - insinto /usr/share/doc/${PF}/tutorial - doins docs/tutorial/html/* + docinto tutorial + dodoc docs/tutorial/html/* fi - - dodoc $DOCS - - # rename these two, so they don't conflict with app-arch/sharutils - # (bug #70392) Ticho, 2004-11-10 - mv "${ED}/usr/bin/uuencode" "${ED}/usr/bin/gmime-uuencode-${SLOT}" - mv "${ED}/usr/bin/uudecode" "${ED}/usr/bin/gmime-uudecode-${SLOT}" } diff --git a/dev-libs/gmime/metadata.xml b/dev-libs/gmime/metadata.xml new file mode 100644 index 0000000..d3b647f --- /dev/null +++ b/dev-libs/gmime/metadata.xml @@ -0,0 +1,6 @@ + + + + net-mail + gnome +