Remove old.

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

5 files changed, 7 insertions, 159 deletions

diff --git a/x11-misc/xdg-utils/ChangeLog b/x11-misc/xdg-utils/ChangeLog
index 2afc72a5fd08..0ac1aed5a281 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.64 2010/07/24 16:09:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.65 2010/07/24 16:13:06 scarabeus Exp $
+
+  24 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xdg-utils-1.0.2-r3.ebuild, -files/xdg-utils-1.0.2-arb-comm-exec.patch,
+  -files/xdg-utils-1.0.2-kdedirs.patch,
+  -files/xdg-utils-1.0.2-xdgopen-kde.patch:
+  Remove old.
 
   24 Jul 2010; Raúl Porcel <armin76@gentoo.org>
   xdg-utils-1.0.2_p20100618.ebuild:
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-arb-comm-exec.patch b/x11-misc/xdg-utils/files/xdg-utils-1.0.2-arb-comm-exec.patch
deleted file mode 100644
index f3e0ed65c7be..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-arb-comm-exec.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Miroslav Lichvar discovered that xdg-open allows for arbitrary command
-execution in case the URL can not be handled by KDE, GNOME, XFCE or
-mimeopen.
-
-https://bugs.gentoo.org/show_bug.cgi?id=207331
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-0386
-
-http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-open?r1=1.32&r2=1.33&view=patch
-http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-email?r1=1.36&r2=1.37&view=patch
-
---- xdg-open	2008/01/18 15:00:38	1.32
-+++ xdg-open	2008/01/24 20:24:51	1.33
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #---------------------------------------------
- #   xdg-open
- #
-@@ -382,7 +382,8 @@
-     for browser in $BROWSER; do
-         if [ x"$browser" != x"" ]; then
- 
--            browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
-+            IFS=' '
-+            browser_with_arg=${browser//'%s'/"$1"}
- 
-             if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-             else $browser_with_arg;
---- xdg-email	2006/11/21 20:29:55	1.36
-+++ xdg-email	2008/01/24 20:24:50	1.37
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #---------------------------------------------
- #   xdg-email
- #
-@@ -435,7 +435,8 @@
-     for browser in $BROWSER; do
-         if [ x"$browser" != x"" ]; then
- 
--            browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
-+            IFS=' '
-+            browser_with_arg=${browser//'%s'/"$1"}
- 
-             if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-             else $browser_with_arg;
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch b/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch
deleted file mode 100644
index 69c92d7fe062..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: xdg-utils-1.0.2/scripts/xdg-mime
-===================================================================
---- xdg-utils-1.0.2.orig/scripts/xdg-mime
-+++ xdg-utils-1.0.2/scripts/xdg-mime
-@@ -840,17 +840,11 @@ DEBUG 3 "xdg_user_dir: $xdg_user_dir"
- DEBUG 3 "xdg_global_dir: $xdg_global_dir"
- 
- # Find KDE3 mimelnk directory
--kde_user_dir=
-+kde_user_dir=${KDEHOME:-${HOME}/.kde}/share/mimelnk/
- kde_global_dir=
--kde_global_dirs=`kde-config --path mime 2> /dev/null`
--DEBUG 3 "kde_global_dirs: $kde_global_dirs"
--first=
--for x in `echo $kde_global_dirs | sed 's/:/ /g'` ; do
--    if [ -z "$first" ] ; then
--        first=false
--        kde_user_dir="$x"
--    elif [ -w $x ] ; then
--        kde_global_dir="$x"
-+for x in `echo $KDEDIRS | tr ':' ' '` ; do
-+    if [ -w $x/share/mimelnk ] ; then
-+        kde_global_dir="$x/share/mimelnk"
-     fi
- done
- DEBUG 3 "kde_user_dir: $kde_user_dir"
-Index: xdg-utils-1.0.2/scripts/xdg-desktop-menu
-===================================================================
---- xdg-utils-1.0.2.orig/scripts/xdg-desktop-menu
-+++ xdg-utils-1.0.2/scripts/xdg-desktop-menu
-@@ -1178,9 +1178,13 @@ for x in `echo $xdg_system_dirs | sed 's
-     fi
- done
- 
--kde_user_dir="$HOME/.kde/share/applnk"
--kde_global_dir="/usr/share/applnk"
--[ -w $kde_global_dir ] || kde_global_dir=
-+kde_user_dir=${KDEHOME:-${HOME}/.kde}/share/mimelnk/
-+kde_global_dir=
-+for x in `echo $KDEDIRS | tr ':' ' '` ; do
-+    if [ -w $x/share/applnk ] ; then
-+        kde_global_dir="$x/share/applnk"
-+    fi
-+done
- 
- gnome_user_dir="$HOME/.gnome/apps"
- gnome_global_dir="/usr/share/gnome/apps"
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-xdgopen-kde.patch b/x11-misc/xdg-utils/files/xdg-utils-1.0.2-xdgopen-kde.patch
deleted file mode 100644
index 80bbc9884f37..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-xdgopen-kde.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdg-utils-1.0.2/scripts/xdg-open.old	2009-02-02 19:40:23.000000000 +0100
-+++ xdg-utils-1.0.2/scripts/xdg-open	2009-02-02 19:40:52.000000000 +0100
-@@ -327,7 +327,7 @@
- open_kde()
- {
-     kfmclient exec "$1"
--    kfmclient_fix_exit_code $?
-+    #kfmclient_fix_exit_code $?
- 
-     if [ $? -eq 0 ]; then
-         exit_success
diff --git a/x11-misc/xdg-utils/xdg-utils-1.0.2-r3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.0.2-r3.ebuild
deleted file mode 100644
index 49feabe9a1f9..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-r3.ebuild,v 1.11 2010/01/10 18:36:25 fauli 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-# Report ?, some tests need root access
-RESTRICT="test"
-
-RDEPEND="x11-apps/xprop
-	x11-misc/shared-mime-info
-	x11-apps/xset"
-PDEPEND="dev-util/desktop-file-utils"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/scripts
-	epatch "${FILESDIR}"/${P}-arb-comm-exec.patch \
-		"${FILESDIR}"/${P}-kdedirs.patch \
-		"${FILESDIR}"/${P}-xdgopen-kde.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README RELEASE_NOTES TODO || die "dodoc failed."
-	newdoc scripts/README README.scripts || die "newdoc failed."
-
-	if use doc; then
-		dohtml -r scripts/html || die "dohtml failed."
-	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 "doenv failed"
-
-	echo 'XDG_DATA_DIRS="/usr/share"' > 90xdg-data-base
-	echo 'XDG_CONFIG_DIRS="/etc/xdg"' >> 90xdg-data-base
-	doenvd 90xdg-data-base || die "doenv failed"
-}
-
-pkg_postinst() {
-	elog "Install >=x11-libs/gtk+-2 if you need command gtk-update-icon-cache."
-}