Bump to EAPI=3, add prefix keywords

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

3 files changed, 28 insertions, 7 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index fd27cdb4631b..880a06c7d192 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.159 2010/03/24 18:03:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.160 2010/04/06 03:00:14 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  shared-mime-info-0.71.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   24 Mar 2010; Raúl Porcel <armin76@gentoo.org>
   shared-mime-info-0.70.ebuild:
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 5fa312cabb4e..dc6380320b9a 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX shared-mime-info-0.60-parallel-make.patch 418 RMD160 e329a8abff7e730a5aba4582ff2a3e1d6f2b4112 SHA1 42542aeff7c5ac0efab1304fbf2c58da4a680ead SHA256 e0f07fa76db6fb4adaae295b15c089a6a0c290e46678160b687fd8d64f13fa0e
 DIST shared-mime-info-0.60.tar.bz2 457377 RMD160 b7f781b248c2dd65e51575502fe427f964866e65 SHA1 5c071da5a6fca3116ac39a1b06c10d52d85e37ec SHA256 a0d0a948fbb8d0de576876791d53efd1c5e8dd782eb9e5369cafc06c3969de22
 DIST shared-mime-info-0.70.tar.bz2 497575 RMD160 7511c56ef39144011b6e0ca78eb95436616c3dc6 SHA1 7c3b50f9c68a58760ec9cf020b24a05f98f3edb7 SHA256 0f9a3a6af30c43611db7b7873b91e96197ffc0c89b8e1ee16bc9f893e12c0ca0
 DIST shared-mime-info-0.71.tar.bz2 493216 RMD160 4b228ce926c60e11afacc8804772f423d9b73158 SHA1 6f3d3379662857646b0c5b95d5d26e47c0b6250a SHA256 1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f
 EBUILD shared-mime-info-0.60.ebuild 1480 RMD160 1192df81bbaf298738e57b31119e99e074662517 SHA1 fe7b71364f865a84fd40168e84f433501704566c SHA256 27936fc03f6bd238ba54065b65f95cecc23f88c2735a0569008237e5e1f9bdbd
 EBUILD shared-mime-info-0.70.ebuild 1266 RMD160 f1e5ceb0a57dc6b50a5fcf57a90413e017106f3a SHA1 e3a6015d087b45e3188ca24320ccae49e1f12e5c SHA256 a6d1e381c1f3e4d0f791f1f48094a9a6e1c9b1a11ca3abbb927f281a73439c19
-EBUILD shared-mime-info-0.71.ebuild 1276 RMD160 21d1a529bfc553d49e282c08d145760c5cd287ca SHA1 0463d61f9895accf0f71195ff0063782c40cbfe1 SHA256 1849d4eaff92fb12e5ec503bfb08bcf3da2c0f5e25a2dc30d943c57bc388bb16
-MISC ChangeLog 20223 RMD160 869fa883459485fca567f5ce3c502349ebe06d15 SHA1 f2f870dcadb6587560dd69a190915a689ab4fcc8 SHA256 efe53251910ef5b0de0fd38fccc1d55821197f56b3ba17cc4aa1723790a1d776
+EBUILD shared-mime-info-0.71.ebuild 1678 RMD160 d3ffbe1867142285b750cd620558093b6d9f4cfc SHA1 8b674ba42b930c7a73b0280b0ddddca2362aa053 SHA256 5bd8a6d4e3d5daa4eb2f20dfcd9aceed82b21f507e1e1006ba282699dd41e862
+MISC ChangeLog 20340 RMD160 ebd223be8df86cc8afe2cf83e7bdeca445e6c22c SHA1 f3a6e22a48ed3fa63875e85e93e6a05fedc22918 SHA256 814058a79f2147cc111f6781afff9c83b89b9dcdc3891d550e7e59c8dbcf7576
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku6o8UACgkQOypDUo0oQOrTUQCfTa69f4Mb/otOVJ0kPi8mtLqY
+wRkAn0Gn0wE1veyfUfPolb5ujZATJhb9
+=uHBU
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild
index 84b9a4e13f2c..5cd2994de602 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild,v 1.1 2010/03/09 05:10:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.71.ebuild,v 1.2 2010/04/06 03:00:14 abcd Exp $
+
+EAPI="3"
 
-EAPI=2
 inherit fdo-mime
 
 DESCRIPTION="The Shared MIME-info Database specification"
@@ -11,7 +12,7 @@ SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.bz2"
 
 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.6
@@ -30,15 +31,21 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog HACKING NEWS README
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+		doenvd "${T}"/50mimeinfo
+	fi
 }
 
 pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
 	fdo-mime_mime_database_update
 	elog
 	elog "The database format has changed between 0.60 and 0.70."
 	elog "You may need to update all your local databases and caches."
 	elog "To do so, please run the following commands:"
 	elog "(for each user) $ update-mime-database ~/.local/share/mime/"
-	elog "(as root)       # update-mime-database /usr/local/share/mime/"
+	elog "(as root)       # update-mime-database ${EPREFIX}/usr/local/share/mime/"
 	elog
 }