Migrate live ebuild to git-2 eclass and update to eapi4.

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

3 files changed, 26 insertions, 30 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 2907469a54f2..b7fb9cfa72ec 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.279 2011/04/18 14:41:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.280 2011/04/20 11:21:30 scarabeus Exp $
+
+  20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cairo-9999.ebuild:
+  Migrate live ebuild to git-2 eclass and update to eapi4.
 
   18 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> +cairo-1.8.10.ebuild:
   Restore cairo 1.8. Still required.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 38a639647974..9ce377d088cd 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -10,13 +10,13 @@ DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3b
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r1.ebuild 3960 RMD160 b81a4f9eec25f08494981af37f03bb222331d7a5 SHA1 db5f68c7e9df7227a810a19fd1b4f712faaeb715 SHA256 897a08993f7f36305fc9581ef77302ef2439e39b57109a0a8545aed73a4637da
 EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
-EBUILD cairo-9999.ebuild 3784 RMD160 f56370b2b4e418a807ced415bfebad59dc4ced60 SHA1 e5cf23649f96e49f19f4a560f8ae27a3a445aee9 SHA256 9673949f04974ad603f2d054ce27ca7e57bd62ff5b8badd5677d508e6c4b5063
-MISC ChangeLog 39241 RMD160 0f20ffed64007102615cdfd210cdf374e3772ee1 SHA1 5f0f6f8b77533d032470eeb675f10624f2e0b5f1 SHA256 2c6708cca817bb358c853e86bfb09a32f8eb02cef205eb58bbef58eaa8295bdb
+EBUILD cairo-9999.ebuild 3589 RMD160 19671b9a107033345e85e6030fe1925c1fe4f6ec SHA1 dad28096c6fadb180eeb781970723c2705f4ca76 SHA256 9684f59e9038394bac58fe0d37b300d3c15f482e4c98ce2b5a4ec27ed96b1865
+MISC ChangeLog 39375 RMD160 12c430ef532a330c774286ab413f2fada525f748 SHA1 8b144089df9134d22e1e2ad82a05872bad27262a SHA256 7020d86c75d33607171cb41144287cb75ceb6fa0e909f9003564aee50823a80c
 MISC metadata.xml 932 RMD160 cc0c4b7847a6013632dd91b2034fe07aa63482f5 SHA1 48117b213b208968916097a15b05a97d9a4018a8 SHA256 cf46596700a664ea8cee8c99bfbe6c330948b2bf1c87584997766fc6c5ffdcc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2sTVMACgkQHB6c3gNBRYffKwCfcniCDvyGkVxEyM+nncZv5ySa
-Bu8AnjSu70dszVHvCKHymWkCjQQ9oNrw
-=O0Po
+iEYEARECAAYFAk2uwcAACgkQHB6c3gNBRYdojwCgyRygt+HmsVqZiT9vMYOgWuUu
+EG8An2fhySvX63zxjSew2CLy8HfNHNHp
+=bTx+
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 6ee89fb419ce..74f14fb68731 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.10 2011/04/10 10:25:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.11 2011/04/20 11:21:30 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git-2"
 
 inherit eutils flag-o-matic autotools ${GIT_ECLASS}
 
@@ -60,6 +60,13 @@ DEPEND="${RDEPEND}
 		)
 	)"
 
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 
@@ -85,29 +92,13 @@ src_configure() {
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
-	if use X; then
+	use X && myopts+=" --enable-tee=yes"
+	if use drm; then
 		myopts+="
-			--enable-tee=yes
-			$(use_enable drm)
+			$(use_enable xcb xcb-drm)
 		"
-
-		if use drm; then
-			myopts+="
-				$(use_enable gallium)
-				$(use_enable xcb xcb-drm)
-			"
-		else
-			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
-			myopts+="
-				--disable-gallium
-				--disable-xcb-drm
-			"
-		fi
 	else
-		use drm && ewarn "drm use requires X use enabled. So disabling for now."
 		myopts+="
-			--disable-drm
-			--disable-gallium
 			--disable-xcb-drm
 		"
 	fi
@@ -131,6 +122,8 @@ src_configure() {
 		$(use_enable svg) \
 		$(use_enable xcb) \
 		$(use_enable xcb xcb-shm) \
+		$(use_enable drm) \
+		$(use_enable gallium) \
 		--enable-ft \
 		--enable-pdf \
 		--enable-png \
@@ -141,7 +134,7 @@ src_configure() {
 
 src_install() {
 	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README || die
+	dodoc AUTHORS ChangeLog NEWS README
 }