commit for drac: make X not listen on tcp for xfce, bug 61852 thanks to Geoff <thunderlove@charter.net>

(Portage version: 2.1_rc4-r2)

4 files changed, 42 insertions, 5 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 7a85595b98d8..3715d131b8f5 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.67 2006/04/22 10:37:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.68 2006/06/05 22:40:09 genstef Exp $
+
+  05 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/nolisten-tcp.patch, xfce-utils-4.2.3.ebuild,
+  xfce-utils-4.3.90.1.ebuild:
+  commit for drac: make X not listen on tcp for xfce, bug 61852 thanks to
+  Geoff <thunderlove@charter.net>
 
   22 Apr 2006; Markus Rothe <corsair@gentoo.org> xfce-utils-4.2.3.ebuild:
   Stable on ppc64
diff --git a/xfce-base/xfce-utils/files/nolisten-tcp.patch b/xfce-base/xfce-utils/files/nolisten-tcp.patch
new file mode 100644
index 000000000000..f4f3b9cc5060
--- /dev/null
+++ b/xfce-base/xfce-utils/files/nolisten-tcp.patch
@@ -0,0 +1,19 @@
+diff -ur xfce-utils-4.2.3/scripts/startxfce4.in xfce-utils-4.2.3-r1/scripts/startxfce4.in
+--- xfce-utils-4.2.3/scripts/startxfce4.in	2005-11-05 19:03:34.000000000 +0200
++++ xfce-utils-4.2.3-r1/scripts/startxfce4.in	2006-06-06 01:02:47.000000000 +0300
+@@ -36,12 +36,12 @@
+ fi
+ 
+ if [ -f $BASEDIR/xinitrc ]; then
+-  exec $prog $BASEDIR/xinitrc $*
++  exec $prog $BASEDIR/xinitrc -- -nolisten tcp$*
+ elif [ -f $HOME/.xfce4/xinitrc ]; then
+   mkdir -p $BASEDIR
+   cp $HOME/.xfce4/xinitrc $BASEDIR/
+-  exec $prog $BASEDIR/xinitrc $*
++  exec $prog $BASEDIR/xinitrc -- -nolisten tcp$*
+ else
+-  exec $prog @sysconfdir@/xdg/xfce4/xinitrc $*
++  exec $prog @sysconfdir@/xdg/xfce4/xinitrc -- -nolisten tcp$*
+ fi  
+ 
diff --git a/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
index 84e62f10de18..4a0ea6546c26 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild,v 1.8 2006/04/22 10:37:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild,v 1.9 2006/06/05 22:40:09 genstef Exp $
 
-inherit xfce42
+inherit eutils xfce42
 
 DESCRIPTION="Xfce 4 utilities"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
@@ -20,3 +20,9 @@ DEPEND="${RDEPEND}
 
 XFCE_CONFIG="$(use_enable gtkhtml) --enable-gdm"
 core_package
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nolisten-tcp.patch
+}
diff --git a/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
index 92afa400baf2..c8c8612e8f0d 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild,v 1.2 2006/04/20 14:51:13 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild,v 1.3 2006/06/05 22:40:09 genstef Exp $
 
-inherit xfce44
+inherit eutils xfce44
 
 xfce44_beta
 
@@ -24,6 +24,12 @@ XFCE_CONFIG="--enable-gdm --with-vendor-info=Gentoo"
 
 xfce44_core_package
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nolisten-tcp.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die