bump to 2.2.22, fix bug #217226 and bug #221711. gtk-doc is not RDEPEND, fix bug 221711.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-mactel x86_64

7 files changed, 109 insertions, 82 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index ad86902e9d08..f9f8f600d93a 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.71 2008/08/12 14:10:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.72 2008/08/17 21:02:40 eva Exp $
+
+  17 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> -gmime-2.1.19.ebuild,
+  gmime-2.2.3.ebuild, gmime-2.2.11.ebuild, gmime-2.2.17.ebuild:
+  gtk-doc is not RDEPEND, fix bug 221711.
+
+*gmime-2.2.22 (17 Aug 2008)
+
+  17 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> +gmime-2.2.22.ebuild:
+  bump to 2.2.22, fix bug #217226 and bug #221711.
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gmime-2.2.17.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index d8c5542cf04d..c6f4b61aea26 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,10 +1,20 @@
-DIST gmime-2.1.19.tar.gz 925637 RMD160 d1a7d41661abb82df81b25ae73915a68fdc50bd7 SHA1 7f39dbee03880a7b13fe77d849bdc27f1ca2d1ce SHA256 82bd80a4bbacfc0c482ee187587e6206b2f66e60e30a963a5248cfb3b7ebe822
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gmime-2.2.11.tar.gz 984612 RMD160 ccf010f8416b5a4b82727422febbffe37a958dab SHA1 5bd9fa5cf29ba0ab83011cf4c55dc1e60c885f3b SHA256 ec09c8c6de8a6bc58b067e4fb4fb02bc8413dd5288257bc0e21b78f34479c574
 DIST gmime-2.2.17.tar.gz 1033867 RMD160 70693dbc56345abf5bda1d9c3310f6543f155eb6 SHA1 aeb61c1a711c98885c54e7fdf0e248be0f1b94b4 SHA256 92006c075e1fe98f4fed4a976b622492f3bcb2044ebad3bc07b6bdf5d578307c
+DIST gmime-2.2.22.tar.gz 1064237 RMD160 fa4a93324b1fbca8f13eef6408196205c71db624 SHA1 25d5691df6b7e8fe1bc4288ce7cf22189db9c4d9 SHA256 e310868a0e95daa0f4878b0eed603fcb4ef31c767f7cfcc8c8143512ebf3ed8d
 DIST gmime-2.2.3.tar.gz 927173 RMD160 131429d77e5a1dd5202422067d31b1b3b5e40e11 SHA1 1ae5bb7577cc8ef7f1bd19fef573bfedc3274f12 SHA256 285f4ab080ce2fd11a52a181e682a64ba26cb1c814dc5829c553ecc0efc95126
-EBUILD gmime-2.1.19.ebuild 2000 RMD160 dffab706b007feed9b34438ac4f2e9b86f7db7db SHA1 dcff0ed30cfcb06cfded51052947b8b717cf258f SHA256 1f9cce81daa9002e5887ae5b93b457524dd5ba7f93cb5a665f05b011c8bfd51d
-EBUILD gmime-2.2.11.ebuild 2175 RMD160 c3136b07be20fff063c95d08588948072ae56781 SHA1 4edcd99578bb116b37b03d32a014563a76cbbbcc SHA256 d0efabcdf637efe727b4b3c6cd7770b07a5ad54e9c28e824b2771c287d1daada
-EBUILD gmime-2.2.17.ebuild 2177 RMD160 fc9ba40e8e713b7782d37140ec7563d90907939b SHA1 c261baeed95611addb9bf90cbafce8bd0d2d45fd SHA256 f10a9c86f6d7f34b0a5aa920fd17528ecc58d5ec93e045af65f593adc0a0a43c
-EBUILD gmime-2.2.3.ebuild 2176 RMD160 88977045c2b374483a703beb6688f1ca6b28fb38 SHA1 23348d9a5fbefeb4fd7d3a1ab7c5898850f6fd95 SHA256 24625c582594139dabd61546ff6f57f414f5e587e1b1d97d92e3130c3b6e0485
-MISC ChangeLog 10145 RMD160 2a30a78ba9163cc36c3d46f298618df5903e870e SHA1 8c68c078628179f64ee8f3199e2937ebbe9bd714 SHA256 30cf4c9eada150be59456bdb813f78e281b9e9da861b3cc88f788eb194283cf1
+EBUILD gmime-2.2.11.ebuild 2166 RMD160 6156ad7093ebc9bb818f4270e2e6b26bdd9aae9e SHA1 b73ac343c3f1e1b4c921350e9247c0740ec55dc6 SHA256 2c46d17d06dfc0a0e20abbf9f07bbc1aad2e00afda693c6cbe2bf0daf9af9b1d
+EBUILD gmime-2.2.17.ebuild 2169 RMD160 e557130d1e7a0d58ba2bcb94de6a1796b5408ea8 SHA1 2c2db03510ec80dec66758a1ce6b6f7d1841701c SHA256 96a184943873d744d67a03dedae71401ee758249a1051d7dfc361bfda151f3ce
+EBUILD gmime-2.2.22.ebuild 2148 RMD160 04eda6d6ecc7f20fe95db56129a2c684b453f8ea SHA1 533d512f157d26d6e3631012375d3c2b320bda5e SHA256 eb8b50578b2bfe6a2690922a16b54e10a32913fe77602f55981a3e4fa0edb49d
+EBUILD gmime-2.2.3.ebuild 2167 RMD160 66853d14650b92a9a5da3a9ccff31f5425ea7f3b SHA1 47ab607904391676dc2bdf0559fb4f7b17cb6707 SHA256 16d030d590d0fa3f72aedf6bc13cb52b625fdb824794fb4d3005b9effd656439
+MISC ChangeLog 10481 RMD160 8b2b58a95df33c0386fd24e7d16ba7a58ef38064 SHA1 edee278567f4da82891adf8d937bdfeabf9e6399 SHA256 cfd84965444f9ac77c3f68abbb159d7f77aa866d0c1682b3ba6320304d50feb4
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiokfUACgkQ1fmVwcYIWAZGkwCgmFinquU8JvWXm7r8qhDxTDtB
+S+cAnjRnV8ksUL7zI6LtWG6rT2+Zjmyj
+=15NN
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/gmime-2.1.19.ebuild b/dev-libs/gmime/gmime-2.1.19.ebuild
deleted file mode 100644
index 9d0714639de3..000000000000
--- a/dev-libs/gmime/gmime-2.1.19.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.1.19.ebuild,v 1.9 2007/11/18 00:58:23 compnerd Exp $
-
-inherit gnome2 eutils mono
-
-IUSE="doc ipv6 mono"
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-SRC_URI="http://spruce.sourceforge.net/gmime/sources/v${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc sparc x86"
-
-RDEPEND=">=dev-libs/glib-2
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	mono? ( dev-lang/mono
-			>=dev-dotnet/gtk-sharp-2.4.0 )"
-
-DEPEND="dev-util/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#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)"
-	# 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 (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)"
-}
-
-src_compile() {
-	econf \
-	    `use_enable ipv6` \
-		`use_enable mono` \
-	    `use_enable doc gtk-doc` || die "configure failed"
-	MONO_PATH=${S} emake -j1 || die
-}
-
-src_install() {
-	make GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
-		DESTDIR="${D}" install || die
-
-	if use doc ; then
-		docinto tutorial
-		dodoc docs/tutorial/html/*
-	fi
-
-	# 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"
-}
-
-DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
diff --git a/dev-libs/gmime/gmime-2.2.11.ebuild b/dev-libs/gmime/gmime-2.2.11.ebuild
index 839e44286bde..41eeeeb2c4a8 100644
--- a/dev-libs/gmime/gmime-2.2.11.ebuild
+++ b/dev-libs/gmime/gmime-2.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.11.ebuild,v 1.4 2008/03/02 09:35:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.11.ebuild,v 1.5 2008/08/17 21:02:40 eva Exp $
 
 inherit gnome2 eutils mono libtool
 
@@ -14,13 +14,14 @@ KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc mono"
 
 RDEPEND=">=dev-libs/glib-2
-	doc? ( >=dev-util/gtk-doc-1.0 )
 	mono? ( dev-lang/mono
 			>=dev-dotnet/gtk-sharp-2.4.0 )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		doc? ( app-text/docbook-sgml-utils )"
+		doc? (
+			>=dev-util/gtk-doc-1.0
+			app-text/docbook-sgml-utils )"
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
 
diff --git a/dev-libs/gmime/gmime-2.2.17.ebuild b/dev-libs/gmime/gmime-2.2.17.ebuild
index 91e1d8c9c7ff..c70ff3a70cd0 100644
--- a/dev-libs/gmime/gmime-2.2.17.ebuild
+++ b/dev-libs/gmime/gmime-2.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.17.ebuild,v 1.5 2008/08/12 14:10:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.17.ebuild,v 1.6 2008/08/17 21:02:40 eva Exp $
 
 inherit gnome2 eutils mono libtool
 
@@ -14,13 +14,14 @@ KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc mono"
 
 RDEPEND=">=dev-libs/glib-2
-	doc? ( >=dev-util/gtk-doc-1.0 )
 	mono? ( dev-lang/mono
 			>=dev-dotnet/gtk-sharp-2.4.0 )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		doc? ( app-text/docbook-sgml-utils )"
+		doc? (
+			>=dev-util/gtk-doc-1.0
+			app-text/docbook-sgml-utils )"
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
 
diff --git a/dev-libs/gmime/gmime-2.2.22.ebuild b/dev-libs/gmime/gmime-2.2.22.ebuild
new file mode 100644
index 000000000000..4ead1cc10e49
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.2.22.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.22.ebuild,v 1.1 2008/08/17 21:02:40 eva Exp $
+
+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"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc mono"
+
+RDEPEND=">=dev-libs/glib-2
+	mono? ( dev-lang/mono
+			>=dev-dotnet/gtk-sharp-2.4.0 )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		doc? (
+			>=dev-util/gtk-doc-1.0
+			app-text/docbook-sgml-utils )"
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use doc ; then
+		#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)"
+		# 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 (2)"
+
+	elibtoolize
+}
+
+src_compile() {
+	econf $(use_enable mono) $(use_enable doc gtk-doc)
+	MONO_PATH="${S}" emake -j1 || die "make failed"
+}
+
+src_install() {
+	make GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
+		DESTDIR="${D}" install || die
+
+	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 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"
+}
diff --git a/dev-libs/gmime/gmime-2.2.3.ebuild b/dev-libs/gmime/gmime-2.2.3.ebuild
index 033bdd20ce9f..1d1b25a18b89 100644
--- a/dev-libs/gmime/gmime-2.2.3.ebuild
+++ b/dev-libs/gmime/gmime-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.3.ebuild,v 1.9 2007/11/26 13:11:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.3.ebuild,v 1.10 2008/08/17 21:02:40 eva Exp $
 
 inherit gnome2 eutils mono libtool
 
@@ -14,13 +14,14 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/glib-2
-	doc? ( >=dev-util/gtk-doc-1.0 )
 	mono? ( dev-lang/mono
 			>=dev-dotnet/gtk-sharp-2.4.0 )
 	sys-libs/zlib"
 
 DEPEND="dev-util/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
+	doc? (
+		>=dev-util/gtk-doc-1.0
+		app-text/docbook-sgml-utils )
 	${RDEPEND}"
 
 src_unpack() {