Version bump, drop old

(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 20 insertions, 129 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 94110ccfb37d..5fe1eb51322c 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.214 2012/11/24 18:54:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.215 2012/12/24 09:39:58 pacho Exp $
+
+*gmime-2.6.13 (24 Dec 2012)
+
+  24 Dec 2012; Pacho Ramos <pacho@gentoo.org> +gmime-2.6.13.ebuild,
+  -files/gmime-2.6.4-fix-tutorial.patch, -gmime-2.6.11.ebuild,
+  -gmime-2.6.7.ebuild:
+  Version bump, drop old
 
 *gmime-2.6.12 (24 Nov 2012)
 
diff --git a/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch b/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch
deleted file mode 100644
index 814d432876bc..000000000000
--- a/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2c2a72338c1f5af69d8173d4fb5d2e0076d30238 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Jan 2012 02:27:34 -0500
-Subject: [PATCH] Fix tutorial generation for DB2HTML changes
-
-DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test
-it for non-emptiness instead of trying to execute it.
-
-docbook2html uses . as the default output directory, while db2html uses
-gmime-tut by default. We therefore need to explicitly set the output
-directory by calling $DB2HTML with "-o html".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667070
----
- configure.ac              |    2 +-
- docs/tutorial/Makefile.am |    4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c799346..da7325e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -199,7 +199,7 @@ dnl ************************************
- GTK_DOC_CHECK([1.8])
- 
- AC_PATH_PROGS([DB2HTML], [db2html docbook2html])
--AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
-+AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"])
- 
- dnl NOTE: We need to use a separate automake conditional for this
- dnl       to make this work with the tarballs.
-diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
-index 71d70be..13e713d 100644
---- a/docs/tutorial/Makefile.am
-+++ b/docs/tutorial/Makefile.am
-@@ -6,9 +6,7 @@ html:
- if HAVE_DOCBOOK
- 	if test -w $(srcdir); then \
- 	  (cd $(srcdir); \
--	   $(DB2HTML) gmime-tut.sgml; \
--	   test -d html && rm -r html; \
--	   mv gmime-tut html); \
-+	   $(DB2HTML) -o html gmime-tut.sgml); \
- 	fi
- else
- 	echo "***"
--- 
-1.7.8.3
-
diff --git a/dev-libs/gmime/gmime-2.6.11.ebuild b/dev-libs/gmime/gmime-2.6.13.ebuild
index dc32e689eeda..bfb4abdca4c1 100644
--- a/dev-libs/gmime/gmime-2.6.11.ebuild
+++ b/dev-libs/gmime/gmime-2.6.13.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.11.ebuild,v 1.2 2012/10/19 19:13:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.13.ebuild,v 1.1 2012/12/24 09:39:58 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils mono
 
-DESCRIPTION="Utilities for creating and parsing messages using MIME."
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/"
 
 SLOT="2.6"
@@ -16,28 +15,22 @@ LICENSE="LGPL-2.1"
 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 static-libs"
 
-RDEPEND=">=dev-libs/glib-2.18.0:2
+RDEPEND=">=dev-libs/glib-2.18:2
 	sys-libs/zlib
 	>=app-crypt/gpgme-1.1.6
 	mono? (
 		dev-lang/mono
-		>=dev-dotnet/glib-sharp-2.4.0:2 )"
+		>=dev-dotnet/glib-sharp-2.4.0:2 )
+"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
 	virtual/pkgconfig
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-sgml-utils )
-	mono? ( dev-dotnet/gtk-sharp-gapi:2 )"
-
-#	dev-util/gtk-doc-am"
-# eautoreconf requires dev-util/gtk-doc-am
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
-}
+	doc? ( app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+"
 
 src_configure() {
-	G2CONF="${G2CONF}
+	G2CONF+="
 		--enable-cryptography
 		--disable-strict-parser
 		$(use_enable mono)
@@ -57,7 +50,7 @@ src_install() {
 		gnome2_src_install
 
 	if use doc ; then
-		docinto tutorial/
+		docinto tutorial
 		dodoc docs/tutorial/html/*
 	fi
 }
diff --git a/dev-libs/gmime/gmime-2.6.7.ebuild b/dev-libs/gmime/gmime-2.6.7.ebuild
deleted file mode 100644
index 402b466d02e2..000000000000
--- a/dev-libs/gmime/gmime-2.6.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.7.ebuild,v 1.9 2012/07/15 16:18:40 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils mono
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/"
-
-SLOT="2.6"
-LICENSE="LGPL-2.1"
-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 static-libs"
-
-RDEPEND=">=dev-libs/glib-2.18.0:2
-	sys-libs/zlib
-	>=app-crypt/gpgme-1.1.6
-	mono? (
-		dev-lang/mono
-		>=dev-dotnet/glib-sharp-2.4.0:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-sgml-utils )
-	mono? ( dev-dotnet/gtk-sharp-gapi:2 )"
-
-#	dev-util/gtk-doc-am"
-# eautoreconf requires dev-util/gtk-doc-am
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS PORTING README TODO"
-	G2CONF="${G2CONF}
-		--enable-cryptography
-		--disable-strict-parser
-		$(use_enable mono)
-		$(use_enable static-libs static)"
-}
-
-src_compile() {
-	MONO_PATH="${S}" gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \
-		gnome2_src_install
-
-	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
-}