Tidy up ebuild by using EAPI=3

Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386

3 files changed, 17 insertions, 18 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c4cb7c5fc1b9..ad0b3beb0744 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.455 2010/05/11 19:46:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.456 2010/06/03 11:10:27 grobian Exp $
+
+  03 Jun 2010; Fabian Groffen <grobian@gentoo.org> gtk+-2.18.9.ebuild:
+  Tidy up ebuild by using EAPI=3
 
   11 May 2010; Brent Baude <ranger@gentoo.org> gtk+-2.18.6.ebuild:
   Marking gtk+-2.18.6 ppc64 for bug 304777
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index eb3fdeb2991e..f0757efa7a2e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -21,6 +21,6 @@ EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9b
 EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93
 EBUILD gtk+-2.18.6.ebuild 5680 RMD160 a3bd7b9ca61f298d0164a53cde2c5e220d669836 SHA1 b18587878f3796d51d8f6a4244d4c915165959fe SHA256 7572ae590585f2ef94ad73f2ddf605c1ba8a1b16f3457b70abbd1f69d1348d77
 EBUILD gtk+-2.18.7.ebuild 5883 RMD160 1f8f3ad8ba596d2ace059cad8d838af8f569ceb7 SHA1 2658f1b41c1648c312d1b5de24c6190be1d1447f SHA256 3f392441329741992c57cb4d39240b47d55d1b03402399ebe0628541e94049df
-EBUILD gtk+-2.18.9.ebuild 6037 RMD160 14fbf921bd2f619c0a626af0066036205326916d SHA1 20a67d901589e74f66f182f29d51a626e90cd33e SHA256 b35ed0aac8c5e13ea3cf5c8cceb8a3f397bebb14f63b2a15d50ed3e05241f3e4
-MISC ChangeLog 67034 RMD160 2f5b76c9e2302241a81441064dd3237714b223fe SHA1 11d5c68673ba24727fd3c7418ed2cc7f6dfef9b2 SHA256 6b5f13379fd1b4da830690438ff1c10b538a800ec82eec06e72f18182e0dc1d2
+EBUILD gtk+-2.18.9.ebuild 5913 RMD160 cddafda90c5da7a000ec39ba2cf960042f61477f SHA1 e7ea0d257516d4d267d185c7d9b20daadff7c91a SHA256 1d14a056fd728d40cd3072820799d61eba79d85f3109451b2b37ce917cc71f3a
+MISC ChangeLog 67140 RMD160 307f3e70c876d300960299bf16fdd4c66a7f8391 SHA1 9fa51acd29fca03bbdbc7c822d65b5e861e237e8 SHA256 af221ed3af6bd058a4d49de18c5c998cfca72b8f62739cf1a900de9331ef5c8e
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
diff --git a/x11-libs/gtk+/gtk+-2.18.9.ebuild b/x11-libs/gtk+/gtk+-2.18.9.ebuild
index 0e82a38c5d3e..0a1f95d1ef22 100644
--- a/x11-libs/gtk+/gtk+-2.18.9.ebuild
+++ b/x11-libs/gtk+/gtk+-2.18.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v 1.3 2010/05/12 09:50:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v 1.4 2010/06/03 11:10:27 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit gnome.org flag-o-matic eutils libtool virtualx
 
@@ -71,10 +71,6 @@ set_gtk2_confdir() {
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
-pkg_setup() {
-	use prefix || EPREFIX=
-}
-
 src_prepare() {
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
@@ -159,31 +155,31 @@ src_install() {
 
 	# This has to be removed, because it's multilib specific; generated in
 	# postinst
-	rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules"
+	rm "${ED%/}/etc/gtk-2.0/gtk.immodules"
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed"
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
 	done
 }
 
 pkg_postinst() {
 	set_gtk2_confdir
 
-	if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
 	else
-		ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;"
 		ewarn "to complete the installation of GTK+, please create the"
 		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}"
+		ewarn "  cd ${EROOT%/}${GTK2_CONFDIR}"
 		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
 		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
 	fi
 
-	if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]*
+	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
 		elog "to do that you can use qfile from portage-utils:"
 		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
 	fi