4 files changed, 59 insertions, 51 deletions
diff --git a/x11-misc/xdg-utils/ChangeLog b/x11-misc/xdg-utils/ChangeLog
index 7e61f5a5571d..e831097c4773 100644
--- a/x11-misc/xdg-utils/ChangeLog
+++ b/x11-misc/xdg-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xdg-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.58 2010/01/10 18:36:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.59 2010/06/18 09:06:14 ssuominen Exp $
+
+*xdg-utils-1.0.2_p20100618 (18 Jun 2010)
+
+  18 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xdg-utils-1.0.2_p20100618.ebuild:
+  CVS snapshot for e.g. KDE 4 and gvfs support.
 
   10 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   xdg-utils-1.0.2-r3.ebuild:
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 5f9b072c0db8..abac798a89ad 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xdg-utils-1.0.2-arb-comm-exec.patch 1529 RMD160 ebac9959e142b2cec088e58b7ce81e8bc714aeef SHA1 9bac70b8fe02ba0def6114c9339a99dcfcd25538 SHA256 f921450acf0158848e82a19a46bc2c9158f4b13cb1ef0c24dd5553253492792d
 AUX xdg-utils-1.0.2-kdedirs.patch 1585 RMD160 bdeac05b4f12227c265849a7eaab3d8a2e7f0712 SHA1 eb4835fa5ef1c2a81c7e6abd945a85234c4aeee3 SHA256 3b54b7aa26c383c0604a43c422cc26e8808bd2c1627825833114f27b4433b812
 AUX xdg-utils-1.0.2-xdgopen-kde.patch 326 RMD160 a37c4c3b536d8ef242b6271e79a849b472339a8c SHA1 947bbdb60c11e32dbd414761673a7c4f55c6901b SHA256 e6a1b653fac2a2c30ea12c4c0443872cbd57cb2e33557df1e02a611cb8467c90
 DIST xdg-utils-1.0.2.tgz 282262 RMD160 344482917e8c780613ec20b103f8e51322540c04 SHA1 e41a04cbf9ff8d743397a2bc23c6ca82e8b59d2c SHA256 21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-EBUILD xdg-utils-1.0.2-r1.ebuild 1064 RMD160 89a296c9eefbff310e805942422a9ead76bd57be SHA1 872bc351be2c461dcb8e5a0db6c80c2ce37c2b98 SHA256 5593ce5482f65f00704e3c514646f6126914f7d40131ca4997cdd12c5df7fdb2
+DIST xdg-utils-1.0.2_p20100618.tar.bz2 304333 RMD160 aa0f9c69ae60d2d70be57e93494ed459caa504fe SHA1 58c49e2fc5685c55539136bb05829a144dc891ae SHA256 fbd68c577ad3d1860f75438bc6b2ed9746523e358fc2cb18821063e82d179b54
 EBUILD xdg-utils-1.0.2-r3.ebuild 1758 RMD160 7e565216d7e6f0706809512d57bc34d1cfe1b84c SHA1 fde76ee06810d785e591ab51bdc80556ea2cb5d0 SHA256 51eac5f720ef7f2b52f74591c952d615df358b7b6e9797346d32fb04eafdbcb8
-MISC ChangeLog 7574 RMD160 eb67ade0499a43b05182511cb0ed25829fd96a3a SHA1 d6a1d22461f29204423fd79b65847f0bcd34e568 SHA256 67b9bc3a1ee7fc612305c12e3eacdfce82914a15aa15e1c18c56f3c3dfd2c312
+EBUILD xdg-utils-1.0.2_p20100618.ebuild 1526 RMD160 b71649d21daa6f6ebfab83604ef6d7cf4de2637d SHA1 b84d78ddb5b0134db19b8ee074142f577e9a84b8 SHA256 61030a837bb1deca209e1ddd3d8b839dd3b9818076d07645b07682e43a65b8ce
+MISC ChangeLog 7760 RMD160 75451dc0d890fc46981336c2d930289eceb7d542 SHA1 ca71d78eb0c6ec62f6a1b36488d89bfb2c0a6a8f SHA256 e12ec1ff905b817ed81c559ca9d39a8add22c35efd413625f96ce5b454e1dcb0
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktKHi8ACgkQNQqtfCuFneOMvwCcCN1ZPmTiV3qorYWCAEo5d6nH
-VCMAn06pm4TMkb1Ife+ZdNq6gIf3exkN
-=csFr
------END PGP SIGNATURE-----
diff --git a/x11-misc/xdg-utils/xdg-utils-1.0.2-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.0.2-r1.ebuild
deleted file mode 100644
index 41713c0c9a23..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.0.2-r1.ebuild,v 1.4 2008/02/22 13:32:35 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="http://portland.freedesktop.org/wiki"
-SRC_URI="http://portland.freedesktop.org/download/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RESTRICT="test"
-
-RDEPEND="x11-apps/xprop
-	x11-misc/shared-mime-info"
-PDEPEND="dev-util/desktop-file-utils"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/scripts
-	epatch "${FILESDIR}"/${P}-arb-comm-exec.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README RELEASE_NOTES TODO
-	newdoc scripts/README README.scripts
-	use doc && dohtml -r scripts/html
-}
-
-pkg_postinst() {
-	elog "Install >=x11-libs/gtk+-2 if you need command gtk-update-icon-cache."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.0.2_p20100618.ebuild b/x11-misc/xdg-utils/xdg-utils-1.0.2_p20100618.ebuild
new file mode 100644
index 000000000000..b444e66454ac
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.0.2_p20100618.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.0.2_p20100618.ebuild,v 1.1 2010/06/18 09:06:14 ssuominen Exp $
+
+EAPI=2
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="x11-apps/xprop
+	x11-apps/xset
+	x11-misc/shared-mime-info"
+PDEPEND="dev-util/desktop-file-utils"
+DEPEND=""
+
+RESTRICT="test" # Need root access
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README RELEASE_NOTES TODO || die
+	newdoc scripts/README README.scripts || die
+
+	if use doc; then
+		dohtml -r scripts/html || die
+	fi
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo 'XDG_DATA_DIRS="/usr/local/share"' > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local || die
+
+	echo 'XDG_DATA_DIRS="/usr/share"' > 90xdg-data-base
+	echo 'XDG_CONFIG_DIRS="/etc/xdg"' >> 90xdg-data-base
+	doenvd 90xdg-data-base || die
+}
+
+pkg_postinst() {
+	if ! has_version "x11-libs/gtk+:2"; then
+		echo
+		elog "Install x11-libs/gtk+:2 if you need the gtk-update-icon-cache command."
+		echo
+	fi
+}