Regression fix, default to -nolisten tcp again, thanks to amne for reporting.

Package-Manager: portage-2.1.4_rc4

5 files changed, 86 insertions, 5 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 64ff19529dcf..a9bb1268984c 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.117 2007/11/18 06:52:38 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.118 2007/12/03 16:36:09 drac Exp $
+
+*xfce-utils-4.4.2-r1 (03 Dec 2007)
+
+  03 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce-utils-4.4.2-nolisten-tcp.patch, +xfce-utils-4.4.2-r1.ebuild:
+  Regression fix, default to -nolisten tcp again, thanks to amne for reporting.
 
 *xfce-utils-4.4.2 (18 Nov 2007)
 
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 7f7d987fddc7..0a6cd0675a9f 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -6,20 +6,28 @@ AUX xfce-utils-4.4.1-xdg_data_dirs.patch 558 RMD160 92caf2870718a3ca2fd225460b1c
 MD5 ae66765a949d129427073cbdec3f651f files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
 RMD160 92caf2870718a3ca2fd225460b1cb5ddea37c676 files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
 SHA256 a25b288dd3b0ebd4f903b9ef6e335cadd8de140067f817a1201309b55d187140 files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
+AUX xfce-utils-4.4.2-nolisten-tcp.patch 812 RMD160 4101835fad4f3c0cd2ccde22bcf1919799f2b413 SHA1 39dbb88d7099cb74d57b5ba6ccd74febf42dff3a SHA256 4e1cf492a5743704952739e5533cc18e117328b0142acb1c4e375e9961d45f0a
+MD5 2d8b2ee3526c9fa1f54a8a1770bf9950 files/xfce-utils-4.4.2-nolisten-tcp.patch 812
+RMD160 4101835fad4f3c0cd2ccde22bcf1919799f2b413 files/xfce-utils-4.4.2-nolisten-tcp.patch 812
+SHA256 4e1cf492a5743704952739e5533cc18e117328b0142acb1c4e375e9961d45f0a files/xfce-utils-4.4.2-nolisten-tcp.patch 812
 DIST xfce-utils-4.4.1.tar.bz2 608154 RMD160 65ed96acb6491829d0f97e8b1e4b5cba64a73e63 SHA1 69ab30d45bbe252993f783e2f4d7f184226cacbb SHA256 80355762effab1e47110ac411d705b3044326e3b2cc357afefdb51e2c6f76cae
 DIST xfce-utils-4.4.2.tar.bz2 596712 RMD160 7be37ec67faba686d1d329318ca68f4dc0e81ce1 SHA1 b03b685743770b12157159f4b46bde9fb8c2f434 SHA256 eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
 EBUILD xfce-utils-4.4.1-r1.ebuild 1194 RMD160 9a9db0c9e6d3208ffc76e1cb01e9c7f377e7b8bd SHA1 8f139ccb77396d9b9f373e7a98234537c30345f9 SHA256 08a41b4cb2d80009112c643775b97ca5147443afb40f1c9d63d08721cb1beb8b
 MD5 24e21e8058a3d9688427ee1ab62c21e5 xfce-utils-4.4.1-r1.ebuild 1194
 RMD160 9a9db0c9e6d3208ffc76e1cb01e9c7f377e7b8bd xfce-utils-4.4.1-r1.ebuild 1194
 SHA256 08a41b4cb2d80009112c643775b97ca5147443afb40f1c9d63d08721cb1beb8b xfce-utils-4.4.1-r1.ebuild 1194
+EBUILD xfce-utils-4.4.2-r1.ebuild 1099 RMD160 13b45ba9a08114d0c9a2744a4886a6ead13d1982 SHA1 b637fe20aa66b6e9f22c37e5ec2d2c1874b6d179 SHA256 a1046662742c24d0dcdb865cbe4617f4f7f1374bf4d7cfbe0a9efabc89f25879
+MD5 37c9d94bea25bbcc1529d97df14db4b9 xfce-utils-4.4.2-r1.ebuild 1099
+RMD160 13b45ba9a08114d0c9a2744a4886a6ead13d1982 xfce-utils-4.4.2-r1.ebuild 1099
+SHA256 a1046662742c24d0dcdb865cbe4617f4f7f1374bf4d7cfbe0a9efabc89f25879 xfce-utils-4.4.2-r1.ebuild 1099
 EBUILD xfce-utils-4.4.2.ebuild 1001 RMD160 42dfa1baec3a0016ca311e85fceadf5fc5133033 SHA1 a735d70dc18291d102723f197fc1ba5f6a255419 SHA256 bf2077242bb39bc8ad052d0582108d1a0d8d87ecc0f7a5b3c60ddfd722401823
 MD5 6273e4efb4ff65aff316ba37da77a48c xfce-utils-4.4.2.ebuild 1001
 RMD160 42dfa1baec3a0016ca311e85fceadf5fc5133033 xfce-utils-4.4.2.ebuild 1001
 SHA256 bf2077242bb39bc8ad052d0582108d1a0d8d87ecc0f7a5b3c60ddfd722401823 xfce-utils-4.4.2.ebuild 1001
-MISC ChangeLog 14815 RMD160 1dbf98162a66c99faca58f5cdee182bfe782495d SHA1 ef9099bfc81460fce8f3a08299c221a85b3c3b3d SHA256 73fc87dc44a750f0b374181d2cbced1405bf5534c4a064b446a363f47278d677
-MD5 44cf4f9617eedb48d48e1e0e02c77378 ChangeLog 14815
-RMD160 1dbf98162a66c99faca58f5cdee182bfe782495d ChangeLog 14815
-SHA256 73fc87dc44a750f0b374181d2cbced1405bf5534c4a064b446a363f47278d677 ChangeLog 14815
+MISC ChangeLog 15056 RMD160 dba986a480e2be93515b2891b5d764d90c63ae22 SHA1 eef59a09d65a153e40ac7b56f8948b0a4274c977 SHA256 f09724b4e44b6b1ab3056ad3d53eba1c7a44f7c73d169dda7c65da447ceb517b
+MD5 687bd830fc3e0e7785adccbcd411bc6f ChangeLog 15056
+RMD160 dba986a480e2be93515b2891b5d764d90c63ae22 ChangeLog 15056
+SHA256 f09724b4e44b6b1ab3056ad3d53eba1c7a44f7c73d169dda7c65da447ceb517b ChangeLog 15056
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -30,3 +38,6 @@ SHA256 63e872c24850434e986cf46833cd1d42100f8ae83096dce411fdfc96208588d2 files/di
 MD5 8479a10eea421e1c3008443daef92aa3 files/digest-xfce-utils-4.4.2 253
 RMD160 44e6be38319122129b0d0f105fee33a176dad79d files/digest-xfce-utils-4.4.2 253
 SHA256 8f76a2936053773cb6c72073e3327cefc733fee2f43d372de1ecad52142c26b2 files/digest-xfce-utils-4.4.2 253
+MD5 8479a10eea421e1c3008443daef92aa3 files/digest-xfce-utils-4.4.2-r1 253
+RMD160 44e6be38319122129b0d0f105fee33a176dad79d files/digest-xfce-utils-4.4.2-r1 253
+SHA256 8f76a2936053773cb6c72073e3327cefc733fee2f43d372de1ecad52142c26b2 files/digest-xfce-utils-4.4.2-r1 253
diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.2-r1 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.2-r1
new file mode 100644
index 000000000000..8cfbeda63456
--- /dev/null
+++ b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.2-r1
@@ -0,0 +1,3 @@
+MD5 119dd3f1daedfa41e3be89bad8997336 xfce-utils-4.4.2.tar.bz2 596712
+RMD160 7be37ec67faba686d1d329318ca68f4dc0e81ce1 xfce-utils-4.4.2.tar.bz2 596712
+SHA256 eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c xfce-utils-4.4.2.tar.bz2 596712
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.2-nolisten-tcp.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.2-nolisten-tcp.patch
new file mode 100644
index 000000000000..5dcac6db1bae
--- /dev/null
+++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.2-nolisten-tcp.patch
@@ -0,0 +1,19 @@
+diff -ur xfce-utils-4.4.2.orig/scripts/startxfce4.in xfce-utils-4.4.2/scripts/startxfce4.in
+--- xfce-utils-4.4.2.orig/scripts/startxfce4.in	2007-11-17 21:31:32.000000000 +0200
++++ xfce-utils-4.4.2/scripts/startxfce4.in	2007-12-03 18:30:36.000000000 +0200
+@@ -67,12 +67,12 @@
+ fi
+ 
+ if [ -f $BASEDIR/xinitrc ]; then
+-  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
++  exec $prog $BASEDIR/xinitrc $CLIENTRC -- -nolisten tcp $SERVERRC
+ elif [ -f $HOME/.xfce4/xinitrc ]; then
+   mkdir -p $BASEDIR
+   cp $HOME/.xfce4/xinitrc $BASEDIR/
+-  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
++  exec $prog $BASEDIR/xinitrc $CLIENTRC -- -nolisten tcp $SERVERRC
+ else
+-  exec $prog @sysconfdir@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
++  exec $prog @sysconfdir@/xdg/xfce4/xinitrc $CLIENTRC -- -nolisten tcp $SERVERRC
+ fi  
+ 
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.2-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..400529c5ea90
--- /dev/null
+++ b/xfce-base/xfce-utils/xfce-utils-4.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 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.4.2-r1.ebuild,v 1.1 2007/12/03 16:36:09 drac Exp $
+
+inherit eutils xfce44
+
+XFCE_VERSION=4.4.2
+xfce44
+
+DESCRIPTION="Collection of utils"
+HOMEPAGE="http://www.xfce.org/projects/xfce-utils"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus debug"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libX11
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	dbus? ( dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+xfce44_core_package
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nolisten-tcp.patch
+}
+
+src_install() {
+	xfce44_src_install
+	insinto /usr/share/xfce4
+	doins "${FILESDIR}"/Gentoo
+}