Version bump, remove old.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 15 insertions, 150 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index c8a0d81cf49b..e03bfc99e0b4 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.135 2011/01/29 16:38:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.136 2011/01/30 13:59:37 pacho Exp $
+
+*gmime-2.4.22 (30 Jan 2011)
+
+  30 Jan 2011; Pacho Ramos <pacho@gentoo.org> -gmime-2.4.15.ebuild,
+  -gmime-2.4.17.ebuild, -gmime-2.4.20.ebuild, +gmime-2.4.22.ebuild:
+  Version bump, remove old.
 
   29 Jan 2011; Fabian Groffen <grobian@gentoo.org> gmime-2.4.21.ebuild:
   Fix for Prefix, transfer Prefix keywords
diff --git a/dev-libs/gmime/gmime-2.4.15.ebuild b/dev-libs/gmime/gmime-2.4.15.ebuild
deleted file mode 100644
index d19e923f8204..000000000000
--- a/dev-libs/gmime/gmime-2.4.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.15.ebuild,v 1.6 2010/07/21 12:04:09 jer Exp $
-
-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.0
-		app-text/docbook-sgml-utils )
-	mono? ( dev-dotnet/gtk-sharp-gapi )"
-
-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-2.4.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 || die "emake failed"
-}
-
-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
-
-	# 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}"
-}
diff --git a/dev-libs/gmime/gmime-2.4.17.ebuild b/dev-libs/gmime/gmime-2.4.17.ebuild
deleted file mode 100644
index 1d5b2334f51e..000000000000
--- a/dev-libs/gmime/gmime-2.4.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.17.ebuild,v 1.9 2010/09/05 15:48:20 armin76 Exp $
-
-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 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-2.4.pc.in mono/Makefile.{am,in} || die "sed failed (2)"
-
-	elibtoolize
-}
-
-src_compile() {
-	econf $(use_enable mono) $(use_enable doc gtk-doc) --enable-cryptography
-	MONO_PATH="${S}" emake || die "emake failed"
-}
-
-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
-
-	# 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}"
-}
diff --git a/dev-libs/gmime/gmime-2.4.20.ebuild b/dev-libs/gmime/gmime-2.4.22.ebuild
index 41044a4f7543..794fb0348c9e 100644
--- a/dev-libs/gmime/gmime-2.4.20.ebuild
+++ b/dev-libs/gmime/gmime-2.4.22.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.22.ebuild,v 1.1 2011/01/30 13:59:37 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="no"
 
 inherit gnome2 eutils mono libtool
 
@@ -11,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mono"
 
 RDEPEND=">=dev-libs/glib-2.12
@@ -64,7 +65,7 @@ src_compile() {
 }
 
 src_install() {
-	emake GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
+	emake GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir ${EPREFIX}/usr/$(get_libdir) /package ${PN}" \
 		DESTDIR="${D}" install || die "installation failed"
 
 	if use doc ; then
@@ -77,6 +78,6 @@ src_install() {
 
 	# 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}"
+	mv "${ED}/usr/bin/uuencode" "${ED}/usr/bin/gmime-uuencode-${SLOT}"
+	mv "${ED}/usr/bin/uudecode" "${ED}/usr/bin/gmime-uudecode-${SLOT}"
 }