Pull back 2.1.16-r1, no revbump is needed. Added mono support to 2.1.16 instead. Bug #106071.

(Portage version: 2.0.52-r1)

5 files changed, 15 insertions, 85 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 96c0ae8acc1f..33c348b56a53 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,12 +1,16 @@
 # 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.35 2005/09/22 10:01:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.36 2005/09/22 10:25:03 ticho Exp $
+
+  22 Sep 2005; Andrej Kacian <ticho@gentoo.org> gmime-2.1.16.ebuild,
+  -gmime-2.1.16-r1.ebuild:
+  Pull back 2.1.16-r1, no revbump is needed. Added mono support to 2.1.16
+  instead. Bug #106071.
 
 *gmime-2.1.16-r1 (22 Sep 2005)
 
   22 Sep 2005; Andrej Kacian <ticho@gentoo.org> +gmime-2.1.16-r1.ebuild:
-  Readded mono support, as >=gtk-sharp-1.9.5 has been unmasked. Fixes bug
-  #106071 by David Raison <david at ion.lu>.
+  Readded mono support, as >=gtk-sharp-1.9.5 has been unmasked.
 
   14 Sep 2005; Daniel Drake <dsd@gentoo.org> gmime-2.1.16.ebuild:
   Really remove mono support
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 6f11c7669051..e000f6396665 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f870dc6d113a8688fe7163243a2a237d gmime-2.1.9-r1.ebuild 1250
 MD5 c770ce66857e851ed46b59d432987b8e gmime-2.1.9-r3.ebuild 1509
-MD5 6ece941f3c899cd1a6f52bf770ec14fc gmime-2.1.16-r1.ebuild 1931
 MD5 5e193e601763e4022d2377be3aefc15f gmime-2.1.15-r1.ebuild 1964
 MD5 f5ec7c3a37845599767a1327305ab979 gmime-2.1.9-r2.ebuild 1266
-MD5 12e9edc04639f510b654170dbcdb4568 ChangeLog 5956
+MD5 eb93e7e3bd99c0cb741144e386bdddf3 ChangeLog 5901
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 4ed8f14f646f2de63609532992c1b74e gmime-2.1.14-r1.ebuild 1792
-MD5 28b2c1072b70e4258c25024ac203df0f gmime-2.1.16.ebuild 1837
+MD5 80a446d5a1f0f19495a45445fa6361d9 gmime-2.1.16.ebuild 1921
 MD5 ebdde046305100715cd847ee5d6546b7 files/digest-gmime-2.1.16 64
 MD5 154afc14cd94dc661729bf4e4d8af00d files/digest-gmime-2.1.14-r1 64
 MD5 a67db057ccf14eda425af7ef30bb7e52 files/digest-gmime-2.1.15-r1 64
-MD5 ebdde046305100715cd847ee5d6546b7 files/digest-gmime-2.1.16-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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMoHMQlM6RnzZP+IRAmVIAKDBNaYPFixlQApluzJAxvByKZaqAwCgjDnd
-+ILxJ4KdkIKoSfa32/aKj1M=
-=sLpf
------END PGP SIGNATURE-----
diff --git a/dev-libs/gmime/files/digest-gmime-2.1.16-r1 b/dev-libs/gmime/files/digest-gmime-2.1.16-r1
deleted file mode 100644
index c4c93ce20b25..000000000000
--- a/dev-libs/gmime/files/digest-gmime-2.1.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca1992fba086c5dd0e7523b5eab4057c gmime-2.1.16.tar.gz 917350
diff --git a/dev-libs/gmime/gmime-2.1.16-r1.ebuild b/dev-libs/gmime/gmime-2.1.16-r1.ebuild
deleted file mode 100644
index 8c11b873716d..000000000000
--- a/dev-libs/gmime/gmime-2.1.16-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.16-r1.ebuild,v 1.1 2005/09/22 10:01:23 ticho 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 )
-	mono? ( dev-lang/mono
-			>=dev-dotnet/gtk-sharp-1.9.5 )"
-
-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 in pkgconfig file
-	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-		-e 's:^prefix=:exec_prefix=:' \
-		mono/gmime-sharp.pc.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.1.16.ebuild b/dev-libs/gmime/gmime-2.1.16.ebuild
index 79529cb16b46..6b7d66921fcc 100644
--- a/dev-libs/gmime/gmime-2.1.16.ebuild
+++ b/dev-libs/gmime/gmime-2.1.16.ebuild
@@ -1,8 +1,8 @@
 # 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.16.ebuild,v 1.3 2005/09/14 18:18:19 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.1.16.ebuild,v 1.4 2005/09/22 10:25:03 ticho Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils mono
 
 IUSE="doc ipv6"
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
@@ -14,7 +14,9 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=dev-libs/glib-2
-	doc? ( >=dev-util/gtk-doc-1.0 )"
+	doc? ( >=dev-util/gtk-doc-1.0 )
+	mono? ( dev-lang/mono
+			>=dev-dotnet/gtk-sharp-1.9.5 )"
 
 DEPEND="dev-util/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
@@ -39,6 +41,7 @@ src_unpack() {
 src_compile() {
 	econf \
 	    `use_enable ipv6` \
+		`use_enable mono` \
 	    `use_enable doc gtk-doc` || die "configure failed"
 	MONO_PATH=${S} emake -j1 || die
 }