Version bump. Fixes a memory leak, improves build system, allowing simpler ebuilds.

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

6 files changed, 260 insertions, 7 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 247979b958ae..fc524e2a648b 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.177 2012/01/18 20:18:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.178 2012/01/20 10:21:27 tetromino Exp $
+
+*gmime-2.6.4 (20 Jan 2012)
+*gmime-2.4.31 (20 Jan 2012)
+
+  20 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gmime-2.4.31.ebuild, +files/gmime-2.4.31-fix-tutorial.patch,
+  +gmime-2.6.4.ebuild, +files/gmime-2.6.4-fix-tutorial.patch:
+  Version bump. Fixes a memory leak, improves build system, allowing simpler
+  ebuilds.
 
   18 Jan 2012; Markus Meier <maekke@gentoo.org> gmime-2.6.1.ebuild:
   arm stable, bug #393007
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index faafdfe38306..db364cb46060 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,29 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gmime-2.2.23-sign-assembly.patch 1380 RMD160 11c26f8686e1ae226e3a69432d5168b260e0e036 SHA1 2a478724ac93d68f86b89fab33d9ea1304f936a0 SHA256 086c23ebb3b7c5f8e1e2133ab41fea623947cbbc790af25efb8e3d2e64111a8f
 AUX gmime-2.2.26-uuencode-buffer-overflow.patch 522 RMD160 9527fe525f78fd0e378e40ff61a44adde7d52669 SHA1 2bb41b87c2285af880de3d12b7582e5b0781da48 SHA256 4f8f79f32850ec7160542abd2a75722d01e45e57c12a61fb2a735cadc3ac26d3
+AUX gmime-2.4.31-fix-tutorial.patch 1599 RMD160 159b43d546093793f4a6eb48236a10f5135d2746 SHA1 e93922f00e41eff9e121cbf7ac593f0af934c130 SHA256 db560ecab447b1e0ee07ef7d92354dcfc36398a2018fa7b1a82f8931e794946b
+AUX gmime-2.6.4-fix-tutorial.patch 1599 RMD160 902889265a519720841a57156637448fbcd16115 SHA1 943fcd437f7fc38b999b9c186923e94a159228e1 SHA256 c10fbe676f481dee38339de7f23a590771bec4dd8fd8fc8c0a5525a6cdf80113
 DIST gmime-2.2.27.tar.bz2 790878 RMD160 43a7c2cac36e97ad1391a33fce9ca4bc53ff1704 SHA1 3dbde8bc3e8c1380b7d94de193aa407dfa46e887 SHA256 73b0ffb5c6cfb8614a5fb0d3a9fd75856d65905be39133baf1dd12efe51f24eb
 DIST gmime-2.4.26.tar.xz 729020 RMD160 5bc32a1afd87e41134ed2381e1044aab3703fddc SHA1 e91ecae390e11b062fea8354e097195368ce11a5 SHA256 bad2c9ceb36a685a8f31eccf047be9d761da781c777c7657b093f9ff0bba401f
 DIST gmime-2.4.28.tar.xz 730112 RMD160 15d2dc3ee365fe60c13ffde8466f38c5cebb1677 SHA1 0006053f3eedae80fed0d62dae8abcd331f55754 SHA256 8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e
 DIST gmime-2.4.30.tar.xz 731224 RMD160 9adc5282fa8b3bdf3da111a1d8ff17d1b195ab74 SHA1 c8f0814dcf4ea3cde53f9a698a680ba5402dc42d SHA256 8a25f511734d3ec01938a1915c7d64571f4b92e1ff6f76c363ed94b83616d44e
+DIST gmime-2.4.31.tar.xz 684740 RMD160 e7927334759cd3e4152db1bed1419445c71245e8 SHA1 60ac46236bf621676dab607568a182633a4f91d9 SHA256 d9601328ee3d2d5be57ac8397571af4835dba8eb2c68ad224de3ec722a81fd04
 DIST gmime-2.6.0.tar.xz 775012 RMD160 ac0b9a6e59c3abdf1b4ece55b3cc9a2ba7a1c0e3 SHA1 a78b4afab2664586145e49c4673d1351a7fbf813 SHA256 bc71b1860ea85efd3e17d9d8edef6ef7ba9880bc34d73dc683d36d8a48dcad17
 DIST gmime-2.6.1.tar.xz 775204 RMD160 6d8cfc8cd0ea1a1b03efe3282cffcd976d1f8bc6 SHA1 fe977dfbeb05a44028f60204022f9cb895da9eac SHA256 89864f8dd7e9c8d1e8abb762401ef54123d2a1f456d41dcd63364a42ac0cc80e
 DIST gmime-2.6.3.tar.xz 776216 RMD160 64b17b477147892a54b66fd256f7826ce67e8cd3 SHA1 31193111d3b54809b3af8bb60775a535d2c4946c SHA256 6284fde1c73a1944d1a3529ab792bb7984633f619c8f74eb7fe2dfb0fd7c030b
+DIST gmime-2.6.4.tar.xz 719668 RMD160 62b5b39ee6fbb3febfd7cb5f08da1ebd5c6da16e SHA1 5ccf322d69870b29d82f3df2c4d82e954399171d SHA256 2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163
 DIST gmime-sharp.snk 596 RMD160 62a475a0a29bc8823ddcd25211e417bd0ee26221 SHA1 106d8812445a6fcd52526b2bc1184249dda6f4b8 SHA256 f71eb61399bb038acc847298b74eee6c03a8773309dc5c10929ee4aa0aeb3948
 EBUILD gmime-2.2.27.ebuild 2219 RMD160 71f16d844c41dd62ec3eb5fff9a47c62e5ff9cbb SHA1 40fef0b44f90dbbef1e5168ced67a571cc192938 SHA256 84590ce22015c12b5087ee5f7f27a45eb37492ad7eb1fad405cda6b895832d66
 EBUILD gmime-2.4.26.ebuild 2439 RMD160 487591cdea5bb508478075b03c886478cde4f5b1 SHA1 d3a92933e1c1b5de5d7be0a5c20a03ddfd77f2d2 SHA256 469156ca1a2084da5dce1e5b12474ee660f92b58e2ea6654a793a822edb7f82b
 EBUILD gmime-2.4.28.ebuild 2443 RMD160 465928e26321d4b66a4312d435f1b1b08d466331 SHA1 db4b17f4b36dabd7e3b6b1e9e4dc954fc71336bb SHA256 5704dd1ce550f1dd9edddddf61bd4dc5e8c6bd310e363e430ad5770d51f149e2
 EBUILD gmime-2.4.30.ebuild 2446 RMD160 3d10fbca9612d07bbe63f15c5172de2bfc203c16 SHA1 6883537bdc278ea417124147aa4cd1415b114be1 SHA256 bb61f46fc8de804f2bf8afc5fcec0cdb7efb5d10e7ab4b88f7cb1943d4454815
+EBUILD gmime-2.4.31.ebuild 1855 RMD160 74720c0cc0e903c46ef6221890f1b61d8e65139b SHA1 8fb7b0376dcb6e3d0272787e211338d8fbce54f0 SHA256 b82ac661c55af4ed64e7babcd8e2d1f1f93a880d677f148dcc07e839bfa93621
 EBUILD gmime-2.6.0.ebuild 2487 RMD160 2e2a25fe34319707a7d74d69afe89f3b1a038d5d SHA1 0c880fbcf88e7b40485e40f0655f29ad1a3e9cee SHA256 0257ca18432ecb516e1b4df567a4c9ab8879a6367ee92bdf395497453ab08694
 EBUILD gmime-2.6.1.ebuild 2491 RMD160 6830999fdddafca3c29177c1fac7d8327e4919c6 SHA1 6eb69feb4691b0985ea2d8c0c7045a4bc9af0303 SHA256 72b9b84efb1c9f23c75cb134f98de4997b9a484191dd5acd1c197a02472985d1
 EBUILD gmime-2.6.3.ebuild 2582 RMD160 68ec5ec651c0fb6a35d661896e23ff9898306e79 SHA1 76f24fe6a439dbf57d58ea7ad5c82822d801cb8a SHA256 8b9c4318cf3382612fdd7505c9dfaced9b60c6d57400c83d669ac9c61d09817d
-MISC ChangeLog 25112 RMD160 9f4cb770dc364593c4a22b6eadbbfdc0646e7c3a SHA1 a4c26e4f8ec3fbb6182120aa26cef6c81f8f2a8e SHA256 837a0358c02fbdf08d037af5e1502043d49ccbd7ce1f95382bc6f3c6987c623e
+EBUILD gmime-2.6.4.ebuild 1907 RMD160 6323aab721a72c9a905552d6c416344011b0b852 SHA1 de2d22c5bba2693178c2fef81ba4a38d4a79d524 SHA256 7c9c42092b5598268461626bfa08770c7a9eeed0219fc84634597af003f5a979
+MISC ChangeLog 25445 RMD160 709820ee3056b40834f3f31cb853f98b24181cf8 SHA1 2dd2eb00da9bc95eacf3f607fa3a2836d312acf1 SHA256 4ab3d4c2634b8ba79498436656291c7a59df554e4b1752a70f34852e5e2caca7
 MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8XKZsACgkQkKaRLQcq0GLSAgCbBnuLnJKQee530jzBxqAbVv87
-ohcAoI3rUOJe65BH4qhYEt5k9SrOCxxk
-=KN3D
+iF4EAREIAAYFAk8ZQC0ACgkQdjK8w9WeBnCnfgD/VRzIxmybD0nGoMLgyMqhuHTT
+FuIJWsn5hEaR/csjQkoA/0IsHQlNMOINdvMLKARghVr6ys7GRcsdGbV/dxKQ+v7O
+=OChn
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch b/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch
new file mode 100644
index 000000000000..acf0819f6b4c
--- /dev/null
+++ b/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch
@@ -0,0 +1,49 @@
+From a876678c4bee4a969ad66d0701869df06b1d10ea Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Jan 2012 02:27:34 -0500
+Subject: [PATCH] Fix tutorial generation for DB2HTML changes
+
+DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test
+it for non-emptiness instead of trying to execute it.
+
+docbook2html uses . as the default output directory, while db2html uses
+gmime-tut by default. We therefore need to explicitly set the output
+directory by calling $DB2HTML with "-o html".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667070
+---
+ configure.in              |    2 +-
+ docs/tutorial/Makefile.am |    4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 89304d3..93997c8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -133,7 +133,7 @@ dnl ************************************
+ GTK_DOC_CHECK([1.8])
+ 
+ AC_PATH_PROGS([DB2HTML], [db2html docbook2html])
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"])
+ 
+ dnl NOTE: We need to use a separate automake conditional for this
+ dnl       to make this work with the tarballs.
+diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
+index 71d70be..13e713d 100644
+--- a/docs/tutorial/Makefile.am
++++ b/docs/tutorial/Makefile.am
+@@ -6,9 +6,7 @@ html:
+ if HAVE_DOCBOOK
+ 	if test -w $(srcdir); then \
+ 	  (cd $(srcdir); \
+-	   $(DB2HTML) gmime-tut.sgml; \
+-	   test -d html && rm -r html; \
+-	   mv gmime-tut html); \
++	   $(DB2HTML) -o html gmime-tut.sgml); \
+ 	fi
+ else
+ 	echo "***"
+-- 
+1.7.8.3
+
diff --git a/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch b/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch
new file mode 100644
index 000000000000..814d432876bc
--- /dev/null
+++ b/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch
@@ -0,0 +1,49 @@
+From 2c2a72338c1f5af69d8173d4fb5d2e0076d30238 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Jan 2012 02:27:34 -0500
+Subject: [PATCH] Fix tutorial generation for DB2HTML changes
+
+DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test
+it for non-emptiness instead of trying to execute it.
+
+docbook2html uses . as the default output directory, while db2html uses
+gmime-tut by default. We therefore need to explicitly set the output
+directory by calling $DB2HTML with "-o html".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667070
+---
+ configure.ac              |    2 +-
+ docs/tutorial/Makefile.am |    4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c799346..da7325e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,7 +199,7 @@ dnl ************************************
+ GTK_DOC_CHECK([1.8])
+ 
+ AC_PATH_PROGS([DB2HTML], [db2html docbook2html])
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"])
+ 
+ dnl NOTE: We need to use a separate automake conditional for this
+ dnl       to make this work with the tarballs.
+diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
+index 71d70be..13e713d 100644
+--- a/docs/tutorial/Makefile.am
++++ b/docs/tutorial/Makefile.am
+@@ -6,9 +6,7 @@ html:
+ if HAVE_DOCBOOK
+ 	if test -w $(srcdir); then \
+ 	  (cd $(srcdir); \
+-	   $(DB2HTML) gmime-tut.sgml; \
+-	   test -d html && rm -r html; \
+-	   mv gmime-tut html); \
++	   $(DB2HTML) -o html gmime-tut.sgml); \
+ 	fi
+ else
+ 	echo "***"
+-- 
+1.7.8.3
+
diff --git a/dev-libs/gmime/gmime-2.4.31.ebuild b/dev-libs/gmime/gmime-2.4.31.ebuild
new file mode 100644
index 000000000000..93efe3ef8ea7
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.4.31.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.31.ebuild,v 1.1 2012/01/20 10:21:27 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 eutils mono
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/"
+
+SLOT="2.4"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc mono static-libs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	sys-libs/zlib
+	mono? (
+		dev-lang/mono
+		>=dev-dotnet/glib-sharp-2.4.0:2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+
+	dev-util/gtk-doc-am"
+# eautoreconf requires dev-util/gtk-doc-am
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
+	G2CONF="${G2CONF}
+		--enable-cryptography
+		$(use_enable mono)
+		$(use_enable static-libs static)"
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=667070
+	epatch "${FILESDIR}/${P}-fix-tutorial.patch" # needs eautoreconf
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_compile() {
+	MONO_PATH="${S}" gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \
+		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/*
+	fi
+
+	# rename these two, so they don't conflict with slot 0
+	mv "${ED}/usr/bin/gmime-uuencode"{,-${SLOT}} || die
+	mv "${ED}/usr/bin/gmime-uudecode"{,-${SLOT}} || die
+}
diff --git a/dev-libs/gmime/gmime-2.6.4.ebuild b/dev-libs/gmime/gmime-2.6.4.ebuild
new file mode 100644
index 000000000000..1f1f186ac5e8
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.6.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.4.ebuild,v 1.1 2012/01/20 10:21:27 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 eutils mono
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/"
+
+SLOT="2.6"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc mono static-libs"
+
+RDEPEND=">=dev-libs/glib-2.18.0:2
+	sys-libs/zlib
+	>=app-crypt/gpgme-1.1.6
+	mono? (
+		dev-lang/mono
+		>=dev-dotnet/glib-sharp-2.4.0:2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+
+	dev-util/gtk-doc-am"
+# eautoreconf requires dev-util/gtk-doc-am
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
+	G2CONF="${G2CONF}
+		--enable-cryptography
+		--disable-strict-parser
+		$(use_enable mono)
+		$(use_enable static-libs static)"
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=667070
+	epatch "${FILESDIR}/${P}-fix-tutorial.patch" # needs eautoreconf
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_compile() {
+	MONO_PATH="${S}" gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \
+		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/*
+	fi
+
+	# rename these two, so they don't conflict with slot 0
+	mv "${ED}/usr/bin/gmime-uuencode"{,-${SLOT}} || die
+	mv "${ED}/usr/bin/gmime-uudecode"{,-${SLOT}} || die
+}