6 files changed, 78 insertions, 4 deletions
diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 5091c7ad660d..3b932f3426da 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,14 @@
 # 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.28 2005/06/21 20:18:48 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.29 2005/06/22 00:08:29 dsd Exp $
+
+*gmime-2.1.15-r1 (22 Jun 2005)
+*gmime-2.1.14-r1 (22 Jun 2005)
+
+  22 Jun 2005; Daniel Drake <dsd@gentoo.org> +gmime-2.1.14-r1.ebuild,
+  -gmime-2.1.15.ebuild, +gmime-2.1.15-r1.ebuild:
+  Fix gmime-sharp pkgconfig file thanks to Michael <M.kiberu@t-online.de> in
+  bug 96742
 
 *gmime-2.1.15 (21 Jun 2005)
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 9e02e87dcbd9..91bd0d289561 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,12 +1,14 @@
 MD5 f870dc6d113a8688fe7163243a2a237d gmime-2.1.9-r1.ebuild 1250
 MD5 c770ce66857e851ed46b59d432987b8e gmime-2.1.9-r3.ebuild 1509
-MD5 454ddb11ef1f201127524e0f9dba6899 gmime-2.1.15.ebuild 1768
+MD5 ad3417f88efad9639d6dd6f054f41936 gmime-2.1.15-r1.ebuild 1802
 MD5 f5ec7c3a37845599767a1327305ab979 gmime-2.1.9-r2.ebuild 1266
 MD5 4345767587fd7035e552c725785ed959 gmime-2.1.14.ebuild 1767
 MD5 4ce40ef6c9e4332d4cf48a05cfe5e246 ChangeLog 4642
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 8e55fcbc10a90a8dd3b6c4910b6152b6 gmime-2.1.14-r1.ebuild 1806
 MD5 154afc14cd94dc661729bf4e4d8af00d files/digest-gmime-2.1.14 64
-MD5 a67db057ccf14eda425af7ef30bb7e52 files/digest-gmime-2.1.15 64
+MD5 154afc14cd94dc661729bf4e4d8af00d files/digest-gmime-2.1.14-r1 64
+MD5 a67db057ccf14eda425af7ef30bb7e52 files/digest-gmime-2.1.15-r1 64
 MD5 6d73d42404a0463371ca8623b16a5869 files/digest-gmime-2.1.9-r1 63
 MD5 6d73d42404a0463371ca8623b16a5869 files/digest-gmime-2.1.9-r2 63
 MD5 6d73d42404a0463371ca8623b16a5869 files/digest-gmime-2.1.9-r3 63
diff --git a/dev-libs/gmime/files/digest-gmime-2.1.14-r1 b/dev-libs/gmime/files/digest-gmime-2.1.14-r1
new file mode 100644
index 000000000000..7746d6d110b7
--- /dev/null
+++ b/dev-libs/gmime/files/digest-gmime-2.1.14-r1
@@ -0,0 +1 @@
+MD5 bf5c74ddaf6bc5e06d9f9abc423ca4db gmime-2.1.14.tar.gz 800074
diff --git a/dev-libs/gmime/files/digest-gmime-2.1.15 b/dev-libs/gmime/files/digest-gmime-2.1.15-r1
index 47f9668e6537..47f9668e6537 100644
--- a/dev-libs/gmime/files/digest-gmime-2.1.15
+++ b/dev-libs/gmime/files/digest-gmime-2.1.15-r1
diff --git a/dev-libs/gmime/gmime-2.1.14-r1.ebuild b/dev-libs/gmime/gmime-2.1.14-r1.ebuild
new file mode 100644
index 000000000000..c50187083459
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.1.14-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.14-r1.ebuild,v 1.1 2005/06/22 00:08:29 dsd 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 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2
+	doc? ( >=dev-util/gtk-doc-1.0 )"
+
+DEPEND="dev-util/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	mono? ( dev-lang/mono
+			=dev-dotnet/gtk-sharp-1.0*
+			>=dev-dotnet/gtk-sharp-1.0.6 )
+	${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 in pkgconfig file
+	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+		-e 's:^prefix=:exec_prefix=:' \	
+		mono/gmime-sharp.pc.in || die "sed failed (2)"
+}
+
+src_compile() {
+	econf \
+	    `use_enable ipv6` \
+	    `use_enable mono` \
+	    `use_enable doc gtk-doc` || die "configure failed"
+	MAKEOPTS="-j1" MONO_PATH=${S} emake || 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.1.15.ebuild b/dev-libs/gmime/gmime-2.1.15-r1.ebuild
index 65b1fbea6646..a28b5303565e 100644
--- a/dev-libs/gmime/gmime-2.1.15.ebuild
+++ b/dev-libs/gmime/gmime-2.1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.1 2005/06/21 20:18:48 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.1.15-r1.ebuild,v 1.1 2005/06/22 00:08:29 dsd Exp $
 
 inherit gnome2 eutils mono
 
@@ -32,6 +32,7 @@ src_unpack() {
 		|| die "sed failed (1)"
 	# Use correct libdir in pkgconfig file
 	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+		-e 's:^prefix=:exec_prefix=:' \
 		mono/gmime-sharp.pc.in || die "sed failed (2)"
 }