Update to EAPI4 and prune_libtool_files.

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

3 files changed, 36 insertions, 23 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 837334a012af..0e5c7b0fd069 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.64 2012/05/04 08:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.65 2012/06/18 18:45:24 ssuominen Exp $
+
+  18 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> compiz-0.8.8.ebuild:
+  Update to EAPI4 and prune_libtool_files.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> compiz-0.8.6-r3.ebuild,
   compiz-0.8.8.ebuild:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index ecc03757701c..802a4ce21889 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1 f710dcfbd6274ff7bed3f264d284a4dcecb27254 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4
 AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
@@ -17,6 +20,17 @@ AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244
 DIST compiz-0.8.6.tar.bz2 1162334 RMD160 7a5476a21143e29ac2e35465c49e8a52b629a864 SHA1 8d5998cb18418283cbd367f126a65dde4062ad00 SHA256 c4df69b59b5660a37462de9ff0212af024ccf9c8038651bfda3557c955ab4f8c
 DIST compiz-0.8.8.tar.bz2 1123892 RMD160 430e6ce18e2fc7f6b95907dbc089ec26c2629773 SHA1 ca86f8586f921f084d32c2548a5d2170179a5caf SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3
 EBUILD compiz-0.8.6-r3.ebuild 4031 RMD160 ba58a7ade6870230c4364771499c06060c8309c6 SHA1 ef09a6fb3d4b83673abd33e088fa53880fe24fc3 SHA256 6ed060498d8b4b6585370b394accd3919e33f458a9b8ef9ac9ac00b9f489a8f0
-EBUILD compiz-0.8.8.ebuild 3943 RMD160 b52c2d96334cc984e04db5d9d067d0dcc5e25dfa SHA1 6088afb0261f2d03bb86ffcbb7e3d69d2ef46f04 SHA256 c1631019b2181d953cbccdfd16c631a3e57b55011d41d7bac18a549fff8e20d6
-MISC ChangeLog 12454 RMD160 93374ce83cfd19ba502b252cc0fb1bf5d9ed159d SHA1 beb569d1ed621a90ed3716525ce578086dea6276 SHA256 54b0c72e4f8cf157f7ff7b94ccdae5c898079a43ce3166e81ef48cb08e94d118
+EBUILD compiz-0.8.8.ebuild 3675 RMD160 821adc1907e6ac3adc7e23686bb09634674d6d7e SHA1 531d7ba12846d914c4415dcf4531121775bc580b SHA256 528c29f3e9706bcc4bd36dd738e9c0f85adad8c07e3e74f9dccd514dc931547d
+MISC ChangeLog 12576 RMD160 03b9afcfa5129739f26315af6cb7b4a9b69bdbee SHA1 c9923ec5a94df0129aa82873ae77b20d6dd73fb9 SHA256 af2a4929fc4e2ac8c8baab7c0512e6d2ad472ab5971f9dc937c8b2accf367e25
 MISC metadata.xml 948 RMD160 b92454f5231c2a4be6e92ef6de5aeea52215d080 SHA1 7d6a786e5b058fbe8bafbc395efa220f0dcc4d6e SHA256 f34fc44d503b1b45ed18d4ec2d7905c5320348a24b26a6b300d50793a3f5e3af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP33Y3AAoJEEdUh39IaPFN+v4H/RucrUxfVQTLfX5Em71inPqy
+t77Kzpo81/GAGxgIr9XASypx+Q+iD65PAlA3g9V4A/AlDtW2SBjG4i/7ulEYu+O1
+aT9q3uzHCnUm297Amd/wfqezlqmriSZqZkLEul/VgJf2C2FOhDq1xclmfQcRf2It
+1RyAwGiwDIDtZ6WgUQkvjZypy6R13IMJWarpxsmOkNTb2f2JSqcCay32zMg/fMwK
+NsuxWUK8zPMwd70OYjzqBT7G8hIlrjygai6tsBto/Hd/k3XhBxSIi/LroURSbn9T
+iLPZXMSYPJQ7orj3pTuZYWBjKNbYsLIyCnDUSrkkrrJ1KzJo1Sw2PIGzmDxlSRA=
+=efVM
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.8.8.ebuild b/x11-wm/compiz/compiz-0.8.8.ebuild
index b7eb4b27ade4..38b6f177234a 100644
--- a/x11-wm/compiz/compiz-0.8.8.ebuild
+++ b/x11-wm/compiz/compiz-0.8.8.ebuild
@@ -1,9 +1,8 @@
 # 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.8.ebuild,v 1.2 2012/05/04 08:58:56 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.8.ebuild,v 1.3 2012/06/18 18:45:24 ssuominen Exp $
 
+EAPI=4
 inherit autotools eutils gnome2-utils
 
 DESCRIPTION="OpenGL window and compositing manager"
@@ -16,10 +15,10 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cairo dbus fuse gnome gconf gtk kde +svg"
 
 COMMONDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
+	>=dev-libs/glib-2
+	dev-libs/libxml2
 	dev-libs/libxslt
-	media-libs/libpng
+	media-libs/libpng:0
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
 	>=x11-libs/libX11-1.4
@@ -71,9 +70,8 @@ RDEPEND="${COMMONDEPEND}
 "
 
 src_prepare() {
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
+	echo metadata/core.xml.in >> po/POTFILES.skip
 
 	if ! use gnome || ! use gconf; then
 		epatch "${FILESDIR}"/${PN}-no-gconf.patch
@@ -86,7 +84,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=
+	local myconf
 
 	# We make gconf optional by itself, but only if gnome is also
 	# enabled, otherwise we simply disable it.
@@ -97,7 +95,6 @@ src_configure() {
 	fi
 
 	econf \
-		--disable-dependency-tracking \
 		--enable-fast-install \
 		--disable-static \
 		--disable-gnome-keybindings \
@@ -116,21 +113,21 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
-	find "${D}" -name '*.la' -delete || die
+	prune_libtool_files --all
 
 	# 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"
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die
 
 	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die
 
 	# 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/"
@@ -142,10 +139,9 @@ 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"
+	domenu "${FILESDIR}"/compiz.desktop
 }
 
 pkg_preinst() {