Use EAPI 3, re-add missing NEWS from dodoc. Drop unneeded WANT_AUTOMAKE.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 8 insertions, 46 deletions

diff --git a/dev-cpp/cairomm/ChangeLog b/dev-cpp/cairomm/ChangeLog
index 236a8f79b92c..8babc1855fab 100644
--- a/dev-cpp/cairomm/ChangeLog
+++ b/dev-cpp/cairomm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/cairomm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.51 2011/03/22 19:58:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.52 2011/04/05 10:56:56 eva Exp $
+
+  05 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> -cairomm-1.8.2.ebuild,
+  cairomm-1.9.8.ebuild:
+  Use EAPI 3, re-add missing NEWS from dodoc. Drop unneeded WANT_AUTOMAKE.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> cairomm-1.8.6.ebuild:
   Marking cairomm-1.8.6 ppc stable for bug 353436
diff --git a/dev-cpp/cairomm/cairomm-1.8.2.ebuild b/dev-cpp/cairomm/cairomm-1.8.2.ebuild
deleted file mode 100644
index f297b96392e1..000000000000
--- a/dev-cpp/cairomm/cairomm-1.8.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.8.2.ebuild,v 1.8 2011/01/04 18:11:15 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="http://cairographics.org/cairomm"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc svg"
-
-# FIXME: svg support is automagic
-RDEPEND=">=x11-libs/cairo-1.8[svg?]
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# don't waste time building examples because they are marked as "noinst"
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die "sed failed"
-
-	# don't waste time building tests
-	# they require the boost Unit Testing framework, that's not in base boost
-	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf $(use_enable doc docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README ChangeLog || die "dodoc failed"
-}
diff --git a/dev-cpp/cairomm/cairomm-1.9.8.ebuild b/dev-cpp/cairomm/cairomm-1.9.8.ebuild
index 37724000d803..b224a433d8a0 100644
--- a/dev-cpp/cairomm/cairomm-1.9.8.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.9.8.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.9.8.ebuild,v 1.1 2011/01/22 07:31:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.9.8.ebuild,v 1.2 2011/04/05 10:56:56 eva Exp $
 
-EAPI="2"
-
-WANT_AUTOMAKE="1.10"
+EAPI="3"
 
 inherit eutils
 
@@ -44,5 +42,5 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README ChangeLog || die "dodoc failed"
+	dodoc NEWS README ChangeLog || die "dodoc failed"
 }