Version bump and remove old testing

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 42 insertions, 21 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 0f579eb18feb..4e3ea8bd197e 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,15 @@
 # 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.107 2010/04/05 14:54:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.108 2010/06/15 17:15:17 pacho Exp $
+
+*gmime-2.4.17 (15 Jun 2010)
+
+  15 Jun 2010; Pacho Ramos <pacho@gentoo.org> -gmime-2.2.25.ebuild,
+  +gmime-2.4.17.ebuild:
+  Version bump with bugfixes: preserve MIME-Version headers, don't register
+  an atexit() handler, allow re-initialization, use g_set_error_literal, use
+  glib's printf formatters for gint64 and size_t, added
+  --disable-cryptography configure flag and others. Remove old testing.
 
   05 Apr 2010; Raúl Porcel <armin76@gentoo.org> gmime-2.2.24.ebuild,
   gmime-2.2.25.ebuild, gmime-2.2.26.ebuild, gmime-2.4.9.ebuild:
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index cb315a2466c2..14d4f0656e4b 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,15 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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-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.2.25.tar.bz2 790770 RMD160 f78b576d30d9c47a42dc6a6ded571bed8111b7a7 SHA1 3184a447b300e93b00d672a7c3e698616b5c4893 SHA256 d31cff98b8518632bc9f5b1e4c503dfa9d647f1faae19d5cc2b54bdf4da7ec7a
 DIST gmime-2.2.26.tar.bz2 791090 RMD160 c69c620dbe55e5648e295c623ce2bbe3f7bfb050 SHA1 0f127789879cc6548242450d0b1f772155482344 SHA256 fb619afd17bff4e762582df12bceab6a07b8c7533ef929379e2d6205f1b9fdd5
 DIST gmime-2.4.15.tar.bz2 859146 RMD160 45825c3563591e0210815fcc919180114dc0d052 SHA1 b1f00a3bd4dde51c5c0fc8d0503440e21e91438a SHA256 a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1
+DIST gmime-2.4.17.tar.bz2 859982 RMD160 4f4396c1fe8c2d1c35f496b9bfcbc717292d152c SHA1 8ed7580724bd39a6591f2840ea0cd1e03cd0508f SHA256 c1078928426f821ec7089301f981a39ece8a71eaa5ea578cbd1e0be62c9d27b2
 DIST gmime-2.4.9.tar.bz2 837767 RMD160 78bea2b0443f5f9c4036ef6e712ef3d0d423659a SHA1 be7dcc89e0dbd409c491e06ba228df278627f378 SHA256 74ace088c6892da131fcc57f1ed4b5b802ac8f279aea1fed264b7f026af3b255
 EBUILD gmime-2.2.24.ebuild 2041 RMD160 24b862dabbb00ba5d480e1ee2046bdad58ebaaa5 SHA1 5735d836775a490f492124793585236901c79fe8 SHA256 f50c3661108cd7536e29b08ab5f7a79d115d01561538c92156fe62fe8ec4caa9
-EBUILD gmime-2.2.25.ebuild 2050 RMD160 c750a0400e5c2a7f5b48a75043124d73d52fdc95 SHA1 8785e69131526433056e6aa38bdf3f2e962e05d8 SHA256 30aabcdcbc833950a65c17cad7e63f662e0959db11099024d00e9e58787b3e15
 EBUILD gmime-2.2.26.ebuild 2241 RMD160 9f8327d09b025b110caf6391fb3530d3fda72dc1 SHA1 49493ebdfe5ae7f962b4017b3318aea211884acc SHA256 f343b1b83aa4d3074d8af88c08060ec54b99c95340c52c4887bf9af72dfb9ffe
 EBUILD gmime-2.4.15.ebuild 2157 RMD160 6de93fbee4d5ba1d7e5e120cf533a8f14c826c77 SHA1 307227c4d2dfbc3107e63d2431d67c06e0cd0039 SHA256 c8d605a8be8c34bf24fa7a658e472cb215e5aad28ba332e1e123ef8d5c84acf5
+EBUILD gmime-2.4.17.ebuild 2198 RMD160 66a9994a429bc4d14c59d562cf6d49dabd62a1ee SHA1 6b44604aff65e3c5f2635c38d57fdafe183e1cf5 SHA256 e44db77a9c422f8c591ebfd5d008d0630e6a6e6d5b46b00eadbe446c080c3f1b
 EBUILD gmime-2.4.9.ebuild 2150 RMD160 e2869d6357c04343aab8acc27691a39e17a7289b SHA1 9b1961e3d3f1f3c8f3c6a3116b2d8ba855fd0905 SHA256 494dcb55718d2afac1cac7fca0cc98b802fb365a01b2219ac4a4766b0a0bb9e0
-MISC ChangeLog 15834 RMD160 b4b333190efc2f8cede02c76841a8dc09b8488b4 SHA1 0c2cefeb5f69cec844d54776db7ff6726b2a927f SHA256 0cc4bc51ab86df18373be1abbd8286c6b2bc742b6af0631456ba67450b36cd17
+MISC ChangeLog 16235 RMD160 8e54d07990e3ff12f565bcf86827f3ecf62e4768 SHA1 e57569879c3e0eea7136ae4bf92a1884ed57a6ba SHA256 f8412850380c131c458a161bcfa997337c1ed9c2478343b97a077c6764979424
 MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwXtS4ACgkQCaWpQKGI+9SGigCeKa87VVDQVGJdWFI3zlDnJa/n
+yRsAn2pmLgy/UZM9Dw/MnGz2qtEwLqX+
+=uUXB
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/gmime-2.2.25.ebuild b/dev-libs/gmime/gmime-2.4.17.ebuild
index 1cae1e78cc9a..0cfe66f675b3 100644
--- a/dev-libs/gmime/gmime-2.2.25.ebuild
+++ b/dev-libs/gmime/gmime-2.4.17.ebuild
@@ -1,26 +1,24 @@
 # 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.2.25.ebuild,v 1.2 2010/04/05 14:54:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.17.ebuild,v 1.1 2010/06/15 17:15:17 pacho Exp $
 
-inherit gnome2 eutils mono libtool autotools
+inherit gnome2 eutils mono libtool
 
 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="0"
+SLOT="2.4"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc mono"
+IUSE="crypt doc mono"
 
-RDEPEND=">=dev-libs/glib-2
+RDEPEND=">=dev-libs/glib-2.12
 	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 )
@@ -31,10 +29,9 @@ 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)"
@@ -43,17 +40,23 @@ src_unpack() {
 			gtk-doc.make docs/reference/Makefile.in || die "sed failed (3)"
 	fi
 
-	eautoreconf
+	# 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)"
+
 	elibtoolize
 }
 
 src_compile() {
-	econf $(use_enable mono) $(use_enable doc gtk-doc)
-	MONO_PATH="${S}" emake || die "make failed"
+	econf $(use_enable mono) $(use_enable doc gtk-doc) $(use_enable crypt cryptography)
+	MONO_PATH="${S}" emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
+	emake GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
+		DESTDIR="${D}" install || die "installation failed"
 
 	if use doc ; then
 		# we don't use docinto/dodoc, because we don't want html doc gzipped
@@ -63,7 +66,6 @@ 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"
-	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode"
-	mono_multilib_comply
+	mv "${D}/usr/bin/uuencode" "${D}/usr/bin/gmime-uuencode-${SLOT}"
+	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode-${SLOT}"
 }