Drop binary from CVS (bug #373259 by Matt Turner), use eapi4 in latest version.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

4 files changed, 18 insertions, 10 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 6f228bcee240..f1c798ea2dc7 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,11 @@
 # 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.147 2011/06/11 15:17:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.148 2011/06/28 13:00:10 pacho Exp $
+
+  28 Jun 2011; Pacho Ramos <pacho@gentoo.org> gmime-2.2.26.ebuild,
+  gmime-2.2.27.ebuild, -files/gmime-sharp.snk:
+  Drop binary from CVS (bug #373259 by Matt Turner), use eapi4 in latest
+  version.
 
 *gmime-2.4.25 (11 Jun 2011)
 
diff --git a/dev-libs/gmime/files/gmime-sharp.snk b/dev-libs/gmime/files/gmime-sharp.snk
deleted file mode 100644
index 5c62e8ca3a33..000000000000
--- a/dev-libs/gmime/files/gmime-sharp.snk
+++ /dev/null
diff --git a/dev-libs/gmime/gmime-2.2.26.ebuild b/dev-libs/gmime/gmime-2.2.26.ebuild
index be3bf3583b79..942c7f9d8152 100644
--- a/dev-libs/gmime/gmime-2.2.26.ebuild
+++ b/dev-libs/gmime/gmime-2.2.26.ebuild
@@ -1,11 +1,11 @@
-# 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.2.26.ebuild,v 1.8 2010/08/20 19:45:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.26.ebuild,v 1.9 2011/06/28 13:00:10 pacho Exp $
 
 inherit gnome2 eutils mono libtool autotools
 
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
-#SRC_URI="http://spruce.sourceforge.net/${PN}/sources/v${PV%.*}/${P}.tar.gz"
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gmime-sharp.snk"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
 SLOT="0"
@@ -37,7 +37,7 @@ src_unpack() {
 	# by an uuencode operation, bug 308051
 	epatch "${FILESDIR}/gmime-2.2.26-uuencode-buffer-overflow.patch"
 
-	cp "${FILESDIR}/gmime-sharp.snk" mono/
+	cp "${DISTDIR}/gmime-sharp.snk" mono/ || die
 	if use doc ; then
 		#db2html should be docbook2html
 		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
diff --git a/dev-libs/gmime/gmime-2.2.27.ebuild b/dev-libs/gmime/gmime-2.2.27.ebuild
index aafd00e23562..c79448a729eb 100644
--- a/dev-libs/gmime/gmime-2.2.27.ebuild
+++ b/dev-libs/gmime/gmime-2.2.27.ebuild
@@ -1,8 +1,9 @@
 # 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.2.27.ebuild,v 1.1 2011/03/08 14:19:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.27.ebuild,v 1.2 2011/06/28 13:00:10 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="no"
 
 inherit gnome2 eutils mono libtool autotools
@@ -10,6 +11,8 @@ inherit gnome2 eutils mono libtool autotools
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gmime-sharp.snk"
+
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -36,7 +39,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/gmime-2.2.23-sign-assembly.patch"
 
-	cp "${FILESDIR}/gmime-sharp.snk" mono/
+	cp "${DISTDIR}/gmime-sharp.snk" mono/ || die
 	if use doc ; then
 		#db2html should be docbook2html
 		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
@@ -52,11 +55,11 @@ src_prepare() {
 }
 
 src_compile() {
-	MONO_PATH="${S}" emake || die "make failed"
+	MONO_PATH="${S}" emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
+	emake DESTDIR="${D}" install
 
 	if use doc ; then
 		# we don't use docinto/dodoc, because we don't want html doc gzipped