gentoo resync : 15.12.2019

3 files changed, 73 insertions, 2 deletions

diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index a61d135d9ebd..a64f240a9e39 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,9 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
+DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
 EBUILD gmime-2.6.23-r1.ebuild 1497 BLAKE2B 5526b533983b0cc9cfbf6787b8e02652c91abdb3b5403d68dbe01b94f150307e549014f924d430c06eccb3e82ec19ce5e6e4b40a16ed04e4f30f683c31b04924 SHA512 20830a222e7c0ea845168c0a76be0efad72474078f93e65f4025a70b4cfebd9fa2a667c49be7d445b50d342e456b714bf6b78040266fbb80778af93ca99e2a86
 EBUILD gmime-3.2.3.ebuild 1581 BLAKE2B d3b4f70d96de01af0cc7062245b218b246dbf71e21bde1a384f8b05ffd6ca2f71e1628f41ec7ad07188469aa00269cdd0aa3932c97240758c2fae2b3247d15a4 SHA512 33b540735166e91d3f2fbf2cd4bf3e41f700e950295a0d6116f0679e1a94cbdf0705bdd1f973c08258f445d10e4782f022b67ea338c6a1ff8cfd0b309e9adb5e
-EBUILD gmime-3.2.4.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
+EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B 961589b4af1f857d8967ab18eb74795241498ccf7ff47f263454884b5fbcbbacbee6f8bc3f133b75e97f225894cbd3789a70f39bb0656323475f75007d8f2543 SHA512 eb4cacf826c436b4329234327b57f78e9de8c221f5bb9e10745aefe44e0aa097121e6d9c81812f28043611f3f11a2f697191c5988c9f06400e271aca1d46b4d2
+EBUILD gmime-3.2.5.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index 3ae7bfbbc5f2..f5d59010489b 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.5.ebuild b/dev-libs/gmime/gmime-3.2.5.ebuild
new file mode 100644
index 000000000000..3ae7bfbbc5f2
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		$(use_enable crypt crypto) \
+		$(use_enable static-libs static) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}