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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 20 insertions, 50 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/Manifest b/dev-cpp/cairomm/Manifest
index 51999a8c4d14..f3d38a74c09e 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,8 +1,16 @@
-DIST cairomm-1.8.2.tar.gz 1125381 RMD160 8d3a8f87b25a8117f53805bc72b7eed3b9673984 SHA1 f3324c1659c0293335cb10b7431c73a3d4d994af SHA256 9bf111528227dd414926ecc51e4a7a155a1c8640b919d41950beea5e0a9563af
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cairomm-1.8.6.tar.gz 850311 RMD160 b972a877a0ee8b7edf60ee8f039c6f31d44a02a9 SHA1 5ed780cd1ea78f3c2c9dd8c1265bb93b288d738f SHA256 138368d0200c18735ae544983516d10721158d0c6c6723c885952da88f7321ef
 DIST cairomm-1.9.8.tar.gz 959531 RMD160 241c4bb36dff91b9d07ee752ebcd84f6c660df9b SHA1 ce27835ac69f5b4bd88653655dabf09c868accf9 SHA256 3ca041ba995c6667a5ddb98f59288ac8e526f10003768be2ad3d6e70a1bb8328
-EBUILD cairomm-1.8.2.ebuild 1263 RMD160 ea908c2d0540b55d500581b0abb1c46a1e787169 SHA1 c7f9ced443ae31002d9e692e8c70f4f8cb6ccc08 SHA256 eb3e65fdc0d6010e6fbd98d31f3eb262ec8b8873438c024827d695a581095f81
 EBUILD cairomm-1.8.6.ebuild 1301 RMD160 297769777c849b22dc4c131a9df1d3a69bb523fa SHA1 95b2f949b7b26b3134c6aa0f4047064a136c90f6 SHA256 1409081b4c3021cbdcaa5e9c396b92f85ccb43be6732772f416b9f6e0fa35761
-EBUILD cairomm-1.9.8.ebuild 1393 RMD160 3d4566e987188aa4a0ddeb2fdd6eded49b0d38ce SHA1 f2871706d87ca88893f8c130c4c74268ccd62e99 SHA256 fef9bfe93afa1d32b6430c9f86f26b01927d2f27254382f0b92af7b3d1cdb2e3
-MISC ChangeLog 6204 RMD160 a7fb1a4c31b7ba0be1e831a482089ce4a6e2bbc9 SHA1 d8180527450a25ed64f51c786cfd5a316323da79 SHA256 fc7b35a95fe0fdd8f2ae735fa76f592c8f45a7a3278142b8613390482b983af0
+EBUILD cairomm-1.9.8.ebuild 1371 RMD160 46262f5d7429e8714616a4861ac4aab2f8f76ba7 SHA1 6b976725eadf4d47a0ad437a00ebe088499f13bf SHA256 b0b41cfa8aded1a9435b8c531a5c71a20bb99238d9812dc3683a6cabbd6a30b1
+MISC ChangeLog 6378 RMD160 9d1a5db837fac87de582f61d63422f0e13497582 SHA1 5661590be1d3decc9531e7a573cb034ad2abf3ff SHA256 bd813b26bf848ccdc7f0b16d311d631bf385436e35b13589c1b70b17eafc629f
 MISC metadata.xml 208 RMD160 b54aac1a2550226c8ff1ee6aa33f42311586e77f SHA1 a818eb4c8668033af53b806b9fa9b31fe7c8ae6b SHA256 69ef7f5652bec39fc0f3997de5517448b92d43ba6236e14492c70abcd67b5d9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2a9X0ACgkQ1fmVwcYIWAaznwCfVDBx5Ng/2cDFtQ5IR/UuGv+S
+iwEAnRSktzxZUDBx1wCMKwN2yzrWDVIk
+=nx7S
+-----END PGP SIGNATURE-----
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"
 }