Version bump. Fix various ebuild issues and most notably html tutorial generation, bug #340198.

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

4 files changed, 113 insertions, 21 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 0f0e01d49e1a..62543d850200 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,13 @@
 # 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.124 2010/09/13 16:33:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.125 2010/10/28 21:15:38 eva Exp $
+
+*gmime-2.4.20 (28 Oct 2010)
+
+  28 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> gmime-2.4.19.ebuild,
+  +gmime-2.4.20.ebuild:
+  Version bump. Fix various ebuild issues and most notably html tutorial
+  generation, bug #340198.
 
 *gmime-2.4.19 (13 Sep 2010)
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 8d49788f9479..26952d9882d5 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,17 +6,12 @@ DIST gmime-2.4.15.tar.bz2 859146 RMD160 45825c3563591e0210815fcc919180114dc0d052
 DIST gmime-2.4.17.tar.bz2 859982 RMD160 4f4396c1fe8c2d1c35f496b9bfcbc717292d152c SHA1 8ed7580724bd39a6591f2840ea0cd1e03cd0508f SHA256 c1078928426f821ec7089301f981a39ece8a71eaa5ea578cbd1e0be62c9d27b2
 DIST gmime-2.4.18.tar.bz2 858174 RMD160 9fc483364296f5de99df2f3654877a8af0556524 SHA1 34e036dbada47f72b87d8b78a7c2d6ebca46ed50 SHA256 4dcb38b35a9caefa43a8ac5c6cb91f771506996da152df6cfeb0ae433cff521f
 DIST gmime-2.4.19.tar.bz2 858822 RMD160 376a95e93b4c23a8592c17eb1e26aafb0cb0232b SHA1 c481c4d893f0b70efebb1be042dfb269a8b27f26 SHA256 0fa34162a77889c4d6038d8e1c482e0e3dc21310ec378811192547051640f528
+DIST gmime-2.4.20.tar.bz2 855886 RMD160 8afcc6aa7dd9e209894c32c47da4ac9075872fe0 SHA1 17b746c1a78c068523c68b195f17d1dbb1c7bfed SHA256 e13ea84678d92fd08a44b06b589a25e07af093634d490caad123b2eead14b990
 EBUILD gmime-2.2.26.ebuild 2234 RMD160 368d5bdd2bd13764b9a290eb57214323a41d8dd9 SHA1 4975df6fd6b3434b2e8eb9589107db19a15c10e6 SHA256 09a54fc314e711e3c3db718dc783216adc49aabe5cb0f7986a56d1869aade3fb
 EBUILD gmime-2.4.15.ebuild 2149 RMD160 064e6f37733c97ac564883ff00ac6177da195912 SHA1 c88637368630778dd510661d92e54500d0dc2196 SHA256 3ff126fb52747774499e30b074678473991f4a7891ee087e7d1321db0bc2c577
 EBUILD gmime-2.4.17.ebuild 2159 RMD160 01caa50720e83b0ff3fd6f4e64c697177469b75f SHA1 d524d9df9a91efdf1c36e168277b8e031c20b100 SHA256 53759e9e8044891b8724c83e16bf24a2a262db508250c3c98db8db15f5efb9c9
 EBUILD gmime-2.4.18.ebuild 2163 RMD160 08cc2703200af3de9ac5786d967ccc376e14f3e5 SHA1 b22f3e661ea153b36f74f5507da96200ecdc6296 SHA256 4354932c8cecbd76d1caf2d1e069458ab683e2bcc55ea010190ad23b71f0236e
-EBUILD gmime-2.4.19.ebuild 2165 RMD160 9b7fd8bd612617be245b1750e4a1efa399163d93 SHA1 1b423866758b6d389aaeba46f872cbf130f6f941 SHA256 ed5cbf518914b14579ab229d8e32290dcd4d167a8d54b62a4d069554e17a7987
-MISC ChangeLog 18231 RMD160 3d1423206d7502b44d83d38abe96db3f06836ef4 SHA1 50f1c86f723b8fa4860d1e5fae4d3d151d50ccf2 SHA256 2f1cf5f4ca654b86c9e8871018733669670809210fa1f1f7aa44144e261c0e46
+EBUILD gmime-2.4.19.ebuild 2386 RMD160 ad9ad862c80644382466abd9c22d0cbc3ff6e8e1 SHA1 110af20d284fb5afc2ed3b4ec65311e43b177cdc SHA256 e41bf0818eb7c54307b286db75a3ac23db143cf1573982e40b4751f7fbe58a97
+EBUILD gmime-2.4.20.ebuild 2386 RMD160 aa26f06c26705c7feea86c127f4d50bac3eaccdf SHA1 4d3d5eba69a963df52e8e0e1fa6d10ce08785609 SHA256 2412698b6003cbf1764d8acc1ce7b1532e8f6a8c7212c599634ecaf0c9b1f507
+MISC ChangeLog 18458 RMD160 a45b0b28eda56d86e545a8e7dff69c1dc66f3a0c SHA1 91decb577fce40555c0b95b0c44dc38eb2d63b3c SHA256 74480a19387eb01f13578d028f8d4aeed201e5f910c9db443438672e34503c0d
 MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyOUnUACgkQCaWpQKGI+9R7MACeIVFwTHB460RGF1dmq+BlEtki
-tKEAnj+92iSU/6Cp6ng8UoIyhYG1uzEs
-=/h/p
------END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/gmime-2.4.19.ebuild b/dev-libs/gmime/gmime-2.4.19.ebuild
index ed48651248dc..679810958904 100644
--- a/dev-libs/gmime/gmime-2.4.19.ebuild
+++ b/dev-libs/gmime/gmime-2.4.19.ebuild
@@ -1,6 +1,8 @@
 # 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.19.ebuild,v 1.1 2010/09/13 16:33:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.19.ebuild,v 1.2 2010/10/28 21:15:38 eva Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils mono libtool
 
@@ -24,17 +26,18 @@ DEPEND="${RDEPEND}
 		app-text/docbook-sgml-utils )
 	mono? ( dev-dotnet/gtk-sharp-gapi )"
 
-DOCS="AUTHORS ChangeLog NEWS PORTING README TODO doc/html/"
+DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	gnome2_src_prepare
 
 	if use doc ; then
 		# db2html should be docbook2html
+		sed -i -e 's:db2html:docbook2html:' \
+			configure.in configure || die "sed failed (1)"
 		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
 			docs/tutorial/Makefile.am docs/tutorial/Makefile.in \
-			|| die "sed failed (1)"
+			|| 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)"
@@ -44,14 +47,20 @@ src_unpack() {
 	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)"
+		mono/gmime-sharp-2.4.pc.in mono/Makefile.{am,in} || die "sed failed (4)"
 
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable mono) $(use_enable doc gtk-doc) --enable-cryptography
+}
+
+src_compile() {
 	MONO_PATH="${S}" emake || die "emake failed"
+	if use doc; then
+		emake -C docs/tutorial html || die "emake html failed"
+	fi
 }
 
 src_install() {
@@ -64,6 +73,8 @@ src_install() {
 		doins docs/tutorial/html/*
 	fi
 
+	dodoc $DOCS || die "dodoc failed"
+
 	# 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}"
diff --git a/dev-libs/gmime/gmime-2.4.20.ebuild b/dev-libs/gmime/gmime-2.4.20.ebuild
new file mode 100644
index 000000000000..41044a4f7543
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.4.20.ebuild
@@ -0,0 +1,82 @@
+# 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.20.ebuild,v 1.1 2010/10/28 21:15:38 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils mono libtool
+
+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"
+IUSE="doc mono"
+
+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
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi )"
+
+DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if use doc ; then
+		# db2html should be docbook2html
+		sed -i -e 's:db2html:docbook2html:' \
+			configure.in configure || die "sed failed (1)"
+		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
+			docs/tutorial/Makefile.am docs/tutorial/Makefile.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)"
+	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 (4)"
+
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable mono) $(use_enable doc gtk-doc) --enable-cryptography
+}
+
+src_compile() {
+	MONO_PATH="${S}" emake || die "emake failed"
+	if use doc; then
+		emake -C docs/tutorial html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	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
+		insinto /usr/share/doc/${PF}/tutorial
+		doins docs/tutorial/html/*
+	fi
+
+	dodoc $DOCS || die "dodoc failed"
+
+	# 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}"
+}