Fixed collision bug #70392.

(Portage version: 2.0.51.22-r1)

4 files changed, 57 insertions, 13 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index f8df6993beae..06cbe7d205e4 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.21 2005/05/06 16:00:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.22 2005/05/21 19:04:30 ticho Exp $
+
+*gmime-2.1.9-r2 (21 May 2005)
+
+  21 May 2005; Andrej Kacian <ticho@gentoo.org> +gmime-2.1.9-r2.ebuild:
+  Fixed collision bug #70392 at last by moving the mv calls to pkg_preinst().
 
   06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gmime-2.1.9-r1.ebuild,
   gmime-2.1.14.ebuild:
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 4e2f80dea834..c93255eb665a 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2f196bcaf2769ffbda114c8ed02a6fac ChangeLog 3571
-MD5 8242862bf76fadaa0d949519be623c80 gmime-2.1.14.ebuild 1640
 MD5 f870dc6d113a8688fe7163243a2a237d gmime-2.1.9-r1.ebuild 1250
+MD5 1162a15bbfc3de5b2a8a76ff4cacd15d gmime-2.1.9-r2.ebuild 1269
+MD5 8242862bf76fadaa0d949519be623c80 gmime-2.1.14.ebuild 1640
+MD5 2f196bcaf2769ffbda114c8ed02a6fac ChangeLog 3571
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 154afc14cd94dc661729bf4e4d8af00d files/digest-gmime-2.1.14 64
 MD5 6d73d42404a0463371ca8623b16a5869 files/digest-gmime-2.1.9-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCe5SfKRy60XGEcJIRAlf+AJ9HlEJ5ZwIBFSOwAQ9JiPaKvfp8sgCbBlen
-IykVsQakBX8/xmE5ROFJ5jo=
-=jZUB
------END PGP SIGNATURE-----
+MD5 6d73d42404a0463371ca8623b16a5869 files/digest-gmime-2.1.9-r2 63
diff --git a/dev-libs/gmime/files/digest-gmime-2.1.9-r2 b/dev-libs/gmime/files/digest-gmime-2.1.9-r2
new file mode 100644
index 000000000000..67fd5187ffea
--- /dev/null
+++ b/dev-libs/gmime/files/digest-gmime-2.1.9-r2
@@ -0,0 +1 @@
+MD5 8bd24a56d5f56be9150deb9840a0812a gmime-2.1.9.tar.gz 784545
diff --git a/dev-libs/gmime/gmime-2.1.9-r2.ebuild b/dev-libs/gmime/gmime-2.1.9-r2.ebuild
new file mode 100644
index 000000000000..09538d7e2fff
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.1.9-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.1.9-r2.ebuild,v 1.1 2005/05/21 19:04:30 ticho Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc ipv6"
+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="x86 amd64 ppc sparc ~alpha"
+
+RDEPEND=">=dev-libs/glib-2
+	doc? ( >=dev-util/gtk-doc-1.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:g' \
+		docs/tutorial/Makefile.am docs/tutorial/Makefile.in \
+		|| die "sed failed (1)"
+}
+
+src_compile() {
+	econf \
+	    `use_enable ipv6` \
+	    `use_enable doc gtk-doc` || die "configure failed"
+
+	# rename these two, so they don't conflict with app-arch/sharutils
+	# (bug #70392)	Ticho, 2004-11-10
+}
+
+pkg_preinst() {
+	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/"