5 files changed, 19 insertions, 13 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1895514fcf20..da350624643f 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.444 2006/04/25 15:45:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.445 2006/04/26 19:08:16 iluxa Exp $
+
+  26 Apr 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  glibc-2.3.6.ebuild, glibc-2.3.6-r1.ebuild, glibc-2.3.6-r2.ebuild,
+  glibc-2.3.6-r3.ebuild:
+  replace "portageq has_version" with "has_version" to make paludis with
+  root!=/ happy
 
   25 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> glibc-2.3.6-r3.ebuild:
   Stable on sparc
diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild
index 14df6c904cc8..5bf442c19ba8 100644
--- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-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/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.20 2006/04/17 07:33:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.21 2006/04/26 19:08:16 iluxa Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1074,8 +1074,8 @@ else
 fi
 
 pkg_setup() {
-	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
-	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+	if has_version '>=sys-libs/glibc-2.3.5.20050201' && \
+	   has_version '<sys-libs/glibc-2.3.6' ; then
 		eerror "Portage have a serious bug in regards to symlinks, and merging"
 		eerror "this with current versions will fail!  See:"
 		echo
diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild
index 741852d9b7ae..0e353e693289 100644
--- a/sys-libs/glibc/glibc-2.3.6-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r2.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/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.17 2006/04/17 07:33:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.18 2006/04/26 19:08:16 iluxa Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -1082,8 +1082,8 @@ else
 fi
 
 pkg_setup() {
-	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
-	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+	if has_version '>=sys-libs/glibc-2.3.5.20050201' && \
+	   has_version '<sys-libs/glibc-2.3.6' ; then
 		eerror "Portage have a serious bug in regards to symlinks, and merging"
 		eerror "this with current versions will fail!  See:"
 		echo
diff --git a/sys-libs/glibc/glibc-2.3.6-r3.ebuild b/sys-libs/glibc/glibc-2.3.6-r3.ebuild
index 655837f5b748..38ec2c835d95 100644
--- a/sys-libs/glibc/glibc-2.3.6-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r3.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/sys-libs/glibc/glibc-2.3.6-r3.ebuild,v 1.12 2006/04/26 05:41:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r3.ebuild,v 1.13 2006/04/26 19:08:16 iluxa Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -1089,8 +1089,8 @@ else
 fi
 
 pkg_setup() {
-	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
-	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+	if has_version '>=sys-libs/glibc-2.3.5.20050201' && \
+	   has_version '<sys-libs/glibc-2.3.6' ; then
 		eerror "Portage have a serious bug in regards to symlinks, and merging"
 		eerror "this with current versions will fail!  See:"
 		echo
diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild
index 79623d7f5347..a3e1757663f0 100644
--- a/sys-libs/glibc/glibc-2.3.6.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6.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/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.19 2006/04/17 07:33:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.20 2006/04/26 19:08:16 iluxa Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1041,8 +1041,8 @@ else
 fi
 
 pkg_setup() {
-	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
-	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+	if has_version '>=sys-libs/glibc-2.3.5.20050201' && \
+	   has_version '<sys-libs/glibc-2.3.6' ; then
 		eerror "Portage have a serious bug in regards to symlinks, and merging"
 		eerror "this with current versions will fail!  See:"
 		echo