From 6ac4f65950b56864dacb9a164f16dc63d608d9bc Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Tue, 5 Jun 2012 13:33:17 +0400
Subject: [PATCH] compiz: bump EAPI version, remove unneeded '|| die'
 constructions

---
 x11-wm/compiz/Manifest                  |  2 +-
 x11-wm/compiz/compiz-0.8.8-r9999.ebuild | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 1047093..d4e50fc 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -3,5 +3,5 @@ AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff3
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
 DIST compiz-0.8.8.tar.bz2 1123892 RMD160 430e6ce18e2fc7f6b95907dbc089ec26c2629773 SHA1 ca86f8586f921f084d32c2548a5d2170179a5caf SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3
-EBUILD compiz-0.8.8-r9999.ebuild 4099 RMD160 dba149ddbe7bcba96386692b43f3cff3df37d955 SHA1 92b10e36baca2463602f3725688e2d1092959bf6 SHA256 6147360a9606905e9c4e5513788c21628b1266a88282e49ab0dde9f95d395e9d
+EBUILD compiz-0.8.8-r9999.ebuild 3961 RMD160 1dfe066a2c1be5b7b525ec70fb0c741b0375c72f SHA1 3c971e5b358601850ceae8c091b6f2b04aac6460 SHA256 636922f17ca4e631dce3e2b7502768c15e4dbd7f53098c7c99738b015bbe2e3b
 MISC metadata.xml 948 RMD160 b92454f5231c2a4be6e92ef6de5aeea52215d080 SHA1 7d6a786e5b058fbe8bafbc395efa220f0dcc4d6e SHA256 f34fc44d503b1b45ed18d4ec2d7905c5320348a24b26a6b300d50793a3f5e3af
diff --git a/x11-wm/compiz/compiz-0.8.8-r9999.ebuild b/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
index 173525b..299215d 100644
--- a/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
+++ b/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.3 2011/11/11 22:54:51 ssuominen Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit autotools eutils gnome2-utils
 
@@ -120,12 +120,12 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	find "${D}" -name '*.la' -delete || die
 
 	# Install compiz-manager
-	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
+	dobin "${FILESDIR}/compiz-manager"
 
 	# Add the full-path to lspci
 	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
@@ -134,7 +134,7 @@ src_install() {
 	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
 
 	# Create gentoo's config file
-	dodir /etc/xdg/compiz || die "dodir failed"
+	dodir /etc/xdg/compiz
 
 	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
 	COMPIZ_BIN_PATH="/usr/bin/"
@@ -146,10 +146,10 @@ src_install() {
 	SKIP_CHECKS="yes"
 	EOF
 
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	insinto "/usr/share/applications"
-	doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
+	doins "${FILESDIR}/compiz.desktop"
 }
 
 pkg_preinst() {