Fix installation when PORTAGE_TMPDIR != /var/tmp thanks to Lars (Polynomial-C) <polynomial-C@gmx.de> in bug 127525

(Portage version: 2.1.1_pre5-r1)

5 files changed, 14 insertions, 9 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index a1256270b0ff..ed056d379047 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.76 2006/06/24 00:29:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.77 2006/08/14 15:33:29 genstef Exp $
+
+  14 Aug 2006; Stefan Schweizer <genstef@gentoo.org> licq-1.2.7.ebuild,
+  licq-1.3.0.ebuild, licq-1.3.2.ebuild, licq-1.3.2-r1.ebuild:
+  Fix installation when PORTAGE_TMPDIR != /var/tmp thanks to Lars
+  (Polynomial-C) <polynomial-C@gmx.de> in bug 127525
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> licq-1.2.7.ebuild,
   licq-1.3.0.ebuild, licq-1.3.2.ebuild, licq-1.3.2-r1.ebuild:
diff --git a/net-im/licq/licq-1.2.7.ebuild b/net-im/licq/licq-1.2.7.ebuild
index c6e9b8069473..1b037dd45d12 100644
--- a/net-im/licq/licq-1.2.7.ebuild
+++ b/net-im/licq/licq-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.20 2006/06/24 00:29:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.21 2006/08/14 15:33:29 genstef Exp $
 
 inherit eutils kde-functions
 
@@ -143,5 +143,5 @@ src_install() {
 	dodoc README licq_rms.conf
 
 	# fixes bug #22136
-	rm -fR ${D}/var
+	rm -fR ${D}/$(echo ${D} | awk -F / '{print $2}')
 }
diff --git a/net-im/licq/licq-1.3.0.ebuild b/net-im/licq/licq-1.3.0.ebuild
index cdd20f199759..90290c91504b 100644
--- a/net-im/licq/licq-1.3.0.ebuild
+++ b/net-im/licq/licq-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0.ebuild,v 1.11 2006/06/24 00:29:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0.ebuild,v 1.12 2006/08/14 15:33:29 genstef Exp $
 
 inherit eutils kde-functions
 
@@ -154,7 +154,7 @@ src_install() {
 	doexe ${S}/upgrade/*
 
 	# fixes bug #22136
-	rm -fR ${D}/var
+	rm -fR ${D}/$(echo ${D} | awk -F / '{print $2}')
 }
 
 pkg_postinst() {
diff --git a/net-im/licq/licq-1.3.2-r1.ebuild b/net-im/licq/licq-1.3.2-r1.ebuild
index e889db2d148a..7b3becf12e60 100644
--- a/net-im/licq/licq-1.3.2-r1.ebuild
+++ b/net-im/licq/licq-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2-r1.ebuild,v 1.4 2006/06/24 00:29:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2-r1.ebuild,v 1.5 2006/08/14 15:33:29 genstef Exp $
 
 inherit eutils kde-functions multilib
 
@@ -205,7 +205,7 @@ src_install() {
 	doexe ${S}/upgrade/*
 
 	# fixes bug #22136
-	rm -fR ${D}/var
+	rm -fR ${D}/$(echo ${D} | awk -F / '{print $2}')
 }
 
 pkg_postinst() {
diff --git a/net-im/licq/licq-1.3.2.ebuild b/net-im/licq/licq-1.3.2.ebuild
index 45581e19921b..0e4ab3e555d3 100644
--- a/net-im/licq/licq-1.3.2.ebuild
+++ b/net-im/licq/licq-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2.ebuild,v 1.6 2006/06/24 00:29:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2.ebuild,v 1.7 2006/08/14 15:33:29 genstef Exp $
 
 inherit eutils kde-functions multilib
 
@@ -202,7 +202,7 @@ src_install() {
 	doexe ${S}/upgrade/*
 
 	# fixes bug #22136
-	rm -fR ${D}/var
+	rm -fR ${D}/$(echo ${D} | awk -F / '{print $2}')
 }
 
 pkg_postinst() {