Bump to EAPI=3, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 29 insertions, 19 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index 626c6dd33c63..2287182e541d 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libwmf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.66 2009/12/28 00:41:30 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.67 2010/04/06 17:14:52 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> libwmf-0.2.8.4-r3.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   28 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   libwmf-0.2.8.4-r3.ebuild:
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index efc8ad467582..9f19cc629bcd 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
 AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
 AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8ea1 SHA1 f392fd1a1053b84336bfb72e27aebbb78826239a SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006
 DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
-EBUILD libwmf-0.2.8.4-r3.ebuild 2955 RMD160 f16f0bb984e934d212d31ba07799dbd105536928 SHA1 925d961112e13dec5e2fb0f062892bbbf23b1a46 SHA256 b302ab066eb38ba08771c3355e49ef124fd21d501f7861a828df36ac330d2500
-MISC ChangeLog 9537 RMD160 3e4ffd305d339fc70745014e1261dfc95fc214d4 SHA1 fa208de95d19149e56232d9d467915888b7262fb SHA256 7318db0f68f7770d8465a65b61705919b2fa44c8499c3adcea972c555943e27c
+EBUILD libwmf-0.2.8.4-r3.ebuild 2996 RMD160 93ae56d8bf950e401dbd8246ca3e847dc2cf579e SHA1 a4eddf740afd8358178edf1b531d628b248f6706 SHA256 ec1a6b1ddb9c851b6ca2af440e7fad7b60806d3b0e5ee383430da07a18a021ea
+MISC ChangeLog 9646 RMD160 1fd80edf1f64716c4b105e96a99c73f21e02da9b SHA1 84ceec0dfd71b75b915b13415ce6bffae602d88a SHA256 bcdccbe69578b493dba1079b941568f7d07294471aac069f74ab892d5abe3495
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku7bBIACgkQOypDUo0oQOqEVQCg3nv0p3aHHxC9FHu9iVx2WpWB
+lc0AnR/teRTQJdftTEPiVx7aSOSEvPH2
+=0qAc
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
index 35c4c9ce8b16..39baefe661ae 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v 1.9 2009/12/28 00:41:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v 1.10 2010/04/06 17:14:52 abcd Exp $
+
+EAPI="3"
 
 inherit eutils autotools
 
@@ -14,7 +16,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="X expat xml debug doc gtk"
 
 RDEPEND="app-text/ghostscript-gpl
@@ -38,9 +40,7 @@ DEPEND="${RDEPEND}
 	)"
 # plotutils are not really supported yet, so looks like that's it
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	if ! use doc ; then
 		sed -e 's:doc::' -i Makefile.am
 	fi
@@ -54,7 +54,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	if use expat && use xml ; then
 		elog "You can specify only one USE flag from expat and xml, to use expat"
 		elog "or libxml2, respectively."
@@ -74,12 +74,9 @@ src_compile() {
 		--disable-gd \
 		--with-sys-gd \
 		${myconf} \
-		--with-gsfontdir=/usr/share/ghostscript/fonts \
-		--with-fontdir=/usr/share/libwmf/fonts/ \
-		--with-docdir=/usr/share/doc/${PF} \
-		|| die "./configure failed"
-
-	emake || die
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts \
+		--with-fontdir="${EPREFIX}"/usr/share/libwmf/fonts/ \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
 
 src_install() {
@@ -90,8 +87,8 @@ src_install() {
 
 set_gtk_confdir() {
 	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR="${GTK2_CONFDIR:-/etc/gtk-2.0}"
+	has_multilib_profile && GTK2_CONFDIR="${EROOT}etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR="${GTK2_CONFDIR:-${EROOT}etc/gtk-2.0}"
 }
 
 pkg_postinst() {