CVS snapshot for e.g. KDE 4 and gvfs support.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 56 insertions, 39 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/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
+}