Version bump. Pass -fno-strict-aliasing to workaround gcc misoptimizations. Fix in :2.4 to avoid possible buffer overflows.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 34 insertions, 28 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 2b8a58fad3d0..5bb067677185 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.104 2010/01/21 22:25:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.105 2010/02/14 23:50:43 eva Exp $
+
+*gmime-2.4.15 (14 Feb 2010)
+*gmime-2.2.25 (14 Feb 2010)
+
+  14 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> +gmime-2.2.25.ebuild,
+  -gmime-2.4.11.ebuild, -gmime-2.4.13.ebuild, +gmime-2.4.15.ebuild:
+  Version bump. Pass -fno-strict-aliasing to workaround gcc
+  misoptimizations. Fix in :2.4 to avoid possible buffer overflows.
 
 *gmime-2.4.13 (21 Jan 2010)
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 5907355ff288..ed56d6f94e42 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
 AUX gmime-2.2.23-sign-assembly.patch 1380 RMD160 11c26f8686e1ae226e3a69432d5168b260e0e036 SHA1 2a478724ac93d68f86b89fab33d9ea1304f936a0 SHA256 086c23ebb3b7c5f8e1e2133ab41fea623947cbbc790af25efb8e3d2e64111a8f
 AUX gmime-sharp.snk 596 RMD160 62a475a0a29bc8823ddcd25211e417bd0ee26221 SHA1 106d8812445a6fcd52526b2bc1184249dda6f4b8 SHA256 f71eb61399bb038acc847298b74eee6c03a8773309dc5c10929ee4aa0aeb3948
 DIST gmime-2.2.24.tar.bz2 770572 RMD160 b2381b85093b51fb00d006ab465037502891e863 SHA1 315976bf2f8a79ab45e822a72d929352240f848a SHA256 16863692b6c92640a7c7ece5e4f0e510bb7114c1c7fe89da241d78d1eea530b4
-DIST gmime-2.4.11.tar.bz2 834813 RMD160 ee74ecf18bf3bfe769013f12ba1426a158e99ff0 SHA1 5ba2b6484170751e09ad604b272f958ed36db2a1 SHA256 57944978c2a930791a446f8337513fd36e2126276a45bdb8652f90d9da83f4c3
-DIST gmime-2.4.13.tar.bz2 858289 RMD160 3962bebea1a390ebcd7a80c9b79161a122983c1d SHA1 936864d14ac0692fb9d645ebc433b089637beb7f SHA256 f29a4f96801dca573743ad75ea9e07a82be514638cbf56c0c1c3a1d212ae699f
+DIST gmime-2.2.25.tar.bz2 790770 RMD160 f78b576d30d9c47a42dc6a6ded571bed8111b7a7 SHA1 3184a447b300e93b00d672a7c3e698616b5c4893 SHA256 d31cff98b8518632bc9f5b1e4c503dfa9d647f1faae19d5cc2b54bdf4da7ec7a
+DIST gmime-2.4.15.tar.bz2 859146 RMD160 45825c3563591e0210815fcc919180114dc0d052 SHA1 b1f00a3bd4dde51c5c0fc8d0503440e21e91438a SHA256 a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1
 DIST gmime-2.4.9.tar.bz2 837767 RMD160 78bea2b0443f5f9c4036ef6e712ef3d0d423659a SHA1 be7dcc89e0dbd409c491e06ba228df278627f378 SHA256 74ace088c6892da131fcc57f1ed4b5b802ac8f279aea1fed264b7f026af3b255
 EBUILD gmime-2.2.24.ebuild 2036 RMD160 64b97054cdee4ddeed47c65228a61b9cb91e825b SHA1 e791e29c985cd4c3410000f1233045829e4e0997 SHA256 c53a7039c764d173901cd46b3fd613c94c2a7b60028c83a29b0e8079f394eab7
-EBUILD gmime-2.4.11.ebuild 2160 RMD160 47998852bf3225d5853079d4289f361a0c9038a9 SHA1 75473077bdf451b4efb9644bd0d2a92ea1a25499 SHA256 97f94eb36250c0c5a2e92384a8d5dad80ea6ef81ae15e5ed1d1bd995c29d2d94
-EBUILD gmime-2.4.13.ebuild 2157 RMD160 84c3c2b0c631cc7891c3e3e262f9a3237b935af1 SHA1 74bf985f7da355f9f8880468524ded9350266f64 SHA256 622ce87262116ad3f72a8a095fee3bc2e218520b70a158dcb78cbdb6ef0d1332
+EBUILD gmime-2.2.25.ebuild 2041 RMD160 088ecf7d89eb91dee82882ef02aacd2da90bacea SHA1 4d26ff3b45ff6e4038fbcfe012da78d3b0471df7 SHA256 f06801ca59d0bb88ba2e4287eb5deee2c61d8ae36249103940bd2d23c210d41a
+EBUILD gmime-2.4.15.ebuild 2157 RMD160 6de93fbee4d5ba1d7e5e120cf533a8f14c826c77 SHA1 307227c4d2dfbc3107e63d2431d67c06e0cd0039 SHA256 c8d605a8be8c34bf24fa7a658e472cb215e5aad28ba332e1e123ef8d5c84acf5
 EBUILD gmime-2.4.9.ebuild 2145 RMD160 e5d52e4bf160196c838eb06cd1cab31d71859c97 SHA1 c0f7cd6dcd0ab8199eb2045457a801ae8686a775 SHA256 3222e42d3e2c9a7a361a407e7f870784a01a9adfc3b4211c314484df61c240c5
-MISC ChangeLog 15126 RMD160 2426b9d005b1d25bdd2568cf6001d9b03d2cbbd1 SHA1 91622592c1c89b1f5abf25ea9ed5d1bd57bef87a SHA256 29afa62842217fca523d02f7acc5535b79a2c443d96deca752326f5309aeb784
+MISC ChangeLog 15456 RMD160 9fb7569c6bb28f933ea17f11a6f42c26d21b363a SHA1 20b6f50c3aafbe745d6273610e1001ba5b93828a SHA256 e2685f7d28468d343954acbbf180761e4a4989d15a492e88a42ba074a81d4d7c
 MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktY1HcACgkQ1fmVwcYIWAaqdgCfZ17dU4aieiO8rs1gDLpJJF1U
-hTIAnj18BZGIIZ1FYesq84G+Zxzz7Lz0
-=kiMX
+iEYEARECAAYFAkt4jGMACgkQ1fmVwcYIWAZujACeI3ojJF5StSdk5J7+CFWk1mi2
+K7YAoI2PeJrMyMPdsk6SGCZY7pFZvtC1
+=X3S/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/gmime-2.4.11.ebuild b/dev-libs/gmime/gmime-2.2.25.ebuild
index ab1b98981163..3593ff0b3357 100644
--- a/dev-libs/gmime/gmime-2.4.11.ebuild
+++ b/dev-libs/gmime/gmime-2.2.25.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.11.ebuild,v 1.4 2010/01/10 15:22:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.25.ebuild,v 1.1 2010/02/14 23:50:43 eva Exp $
 
-inherit gnome2 eutils mono libtool
+inherit gnome2 eutils mono libtool autotools
 
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
+#SRC_URI="http://spruce.sourceforge.net/${PN}/sources/v${PV%.*}/${P}.tar.gz"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
-SLOT="2.4"
+SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc mono"
 
-RDEPEND=">=dev-libs/glib-2.12
+RDEPEND=">=dev-libs/glib-2
 	sys-libs/zlib
 	mono? (
 		dev-lang/mono
 		>=dev-dotnet/gtk-sharp-2.4.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	dev-util/gtk-doc-am
 	doc? (
 		>=dev-util/gtk-doc-1.0
 		app-text/docbook-sgml-utils )
@@ -29,9 +31,10 @@ DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	epatch "${FILESDIR}/gmime-2.2.23-sign-assembly.patch"
+	cp "${FILESDIR}/gmime-sharp.snk" mono/
 	if use doc ; then
-		# db2html should be docbook2html
+		#db2html should be docbook2html
 		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
 			docs/tutorial/Makefile.am docs/tutorial/Makefile.in \
 			|| die "sed failed (1)"
@@ -40,23 +43,17 @@ src_unpack() {
 			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-2.4.pc.in mono/Makefile.{am,in} || die "sed failed (2)"
-
+	eautoreconf
 	elibtoolize
 }
 
 src_compile() {
 	econf $(use_enable mono) $(use_enable doc gtk-doc)
-	MONO_PATH="${S}" emake || die "emake failed"
+	MONO_PATH="${S}" emake || die "make failed"
 }
 
 src_install() {
-	emake GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
-		DESTDIR="${D}" install || die "installation failed"
+	emake DESTDIR="${D}" install || die "installation failed"
 
 	if use doc ; then
 		# we don't use docinto/dodoc, because we don't want html doc gzipped
@@ -66,6 +63,7 @@ src_install() {
 
 	# rename these two, so they don't conflict with app-arch/sharutils
 	# (bug #70392)	Ticho, 2004-11-10
-	mv "${D}/usr/bin/uuencode" "${D}/usr/bin/gmime-uuencode-${SLOT}"
-	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode-${SLOT}"
+	mv "${D}/usr/bin/uuencode" "${D}/usr/bin/gmime-uuencode"
+	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode"
+	mono_multilib_comply
 }
diff --git a/dev-libs/gmime/gmime-2.4.13.ebuild b/dev-libs/gmime/gmime-2.4.15.ebuild
index bc363522c252..64c8a59bde58 100644
--- a/dev-libs/gmime/gmime-2.4.13.ebuild
+++ b/dev-libs/gmime/gmime-2.4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.13.ebuild,v 1.1 2010/01/21 22:25:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.15.ebuild,v 1.1 2010/02/14 23:50:43 eva Exp $
 
 inherit gnome2 eutils mono libtool