Bug #226505 - For compatibility with phase execution order in

>=portage-2.1.5, call has_version inside pkg_preinst instead of
pkg_postinst.
(Portage version: 2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686)

22 files changed, 380 insertions, 117 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e85639c73ef5..004466dd2326 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.388 2008/06/12 12:27:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.389 2008/06/15 05:54:32 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> udev-114.ebuild,
+  udev-114-r1.ebuild, udev-114-r2.ebuild, udev-115.ebuild,
+  udev-115-r1.ebuild, udev-115-r5.ebuild, udev-115-r6.ebuild,
+  udev-116.ebuild, udev-116-r1.ebuild, udev-117.ebuild, udev-118.ebuild,
+  udev-118-r1.ebuild, udev-118-r2.ebuild, udev-118-r3.ebuild,
+  udev-119.ebuild, udev-119-r1.ebuild, udev-120.ebuild, udev-121.ebuild,
+  udev-122.ebuild, udev-122-r1.ebuild, udev-124.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
 *udev-124 (12 Jun 2008)
 
diff --git a/sys-fs/udev/udev-114-r1.ebuild b/sys-fs/udev/udev-114-r1.ebuild
index e3b3c484b11c..abb49c113a9a 100644
--- a/sys-fs/udev/udev-114-r1.ebuild
+++ b/sys-fs/udev/udev-114-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r1.ebuild,v 1.4 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r1.ebuild,v 1.5 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 
@@ -222,6 +222,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -238,7 +250,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -253,12 +265,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -275,7 +287,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-114-r2.ebuild b/sys-fs/udev/udev-114-r2.ebuild
index 15a6972d5b40..bcc01c36f3fc 100644
--- a/sys-fs/udev/udev-114-r2.ebuild
+++ b/sys-fs/udev/udev-114-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r2.ebuild,v 1.4 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r2.ebuild,v 1.5 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -239,6 +239,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -255,7 +267,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -270,12 +282,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -292,7 +304,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-114.ebuild b/sys-fs/udev/udev-114.ebuild
index d097b0fb65b9..88522cbd4e9c 100644
--- a/sys-fs/udev/udev-114.ebuild
+++ b/sys-fs/udev/udev-114.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114.ebuild,v 1.15 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114.ebuild,v 1.16 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -215,6 +215,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -231,7 +243,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -246,12 +258,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -268,7 +280,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-115-r1.ebuild b/sys-fs/udev/udev-115-r1.ebuild
index 0fc912feeab4..bf41767235d3 100644
--- a/sys-fs/udev/udev-115-r1.ebuild
+++ b/sys-fs/udev/udev-115-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r1.ebuild,v 1.11 2007/12/11 23:57:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r1.ebuild,v 1.12 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -253,6 +253,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,12 +296,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -306,7 +318,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-115-r5.ebuild b/sys-fs/udev/udev-115-r5.ebuild
index 6ff3addea191..fb303039e908 100644
--- a/sys-fs/udev/udev-115-r5.ebuild
+++ b/sys-fs/udev/udev-115-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r5.ebuild,v 1.2 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r5.ebuild,v 1.3 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -251,6 +251,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -267,7 +279,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -282,12 +294,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -304,7 +316,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-115-r6.ebuild b/sys-fs/udev/udev-115-r6.ebuild
index 73e6a6fbcd74..70c793871ce7 100644
--- a/sys-fs/udev/udev-115-r6.ebuild
+++ b/sys-fs/udev/udev-115-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild,v 1.2 2007/09/25 08:50:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild,v 1.3 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -253,6 +253,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -270,7 +282,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -285,13 +297,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -310,7 +322,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-115.ebuild b/sys-fs/udev/udev-115.ebuild
index 8ba9bbdea5b9..c5f1295a75dd 100644
--- a/sys-fs/udev/udev-115.ebuild
+++ b/sys-fs/udev/udev-115.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115.ebuild,v 1.7 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115.ebuild,v 1.8 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -243,6 +243,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -259,7 +271,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3"; then
+	if [[ $previous_equal_to_103_r3 = 0 ]] ; then
 		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
 		then
 			ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -274,12 +286,12 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"; then
+	if [[ $previous_less_than_104_r5 = 0 ]] ; then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5"; then
+	if [[ $previous_less_than_106_r5 = 0 ]] ; then
 		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
 			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
 		fi
@@ -296,7 +308,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-116-r1.ebuild b/sys-fs/udev/udev-116-r1.ebuild
index 35952d04e893..bc179d3e879b 100644
--- a/sys-fs/udev/udev-116-r1.ebuild
+++ b/sys-fs/udev/udev-116-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-116-r1.ebuild,v 1.2 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-116-r1.ebuild,v 1.3 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -253,6 +253,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -270,7 +282,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -285,13 +297,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -310,7 +322,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-116.ebuild b/sys-fs/udev/udev-116.ebuild
index 14ed13893fc0..459d8b129549 100644
--- a/sys-fs/udev/udev-116.ebuild
+++ b/sys-fs/udev/udev-116.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-116.ebuild,v 1.2 2007/11/10 10:23:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-116.ebuild,v 1.3 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -251,6 +251,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -268,7 +280,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -283,13 +295,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -308,7 +320,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-117.ebuild b/sys-fs/udev/udev-117.ebuild
index 034ea0b62f32..75a7f3600d52 100644
--- a/sys-fs/udev/udev-117.ebuild
+++ b/sys-fs/udev/udev-117.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-117.ebuild,v 1.1 2007/11/13 22:40:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-117.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -244,6 +244,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -261,7 +273,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -276,13 +288,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -301,7 +313,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-118-r1.ebuild b/sys-fs/udev/udev-118-r1.ebuild
index 34e0faa3b76e..66401c2999e0 100644
--- a/sys-fs/udev/udev-118-r1.ebuild
+++ b/sys-fs/udev/udev-118-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r1.ebuild,v 1.1 2008/02/01 14:52:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r1.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -249,6 +249,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -266,7 +278,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -281,13 +293,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -306,7 +318,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-118-r2.ebuild b/sys-fs/udev/udev-118-r2.ebuild
index 687248e16c19..d345a3e89b26 100644
--- a/sys-fs/udev/udev-118-r2.ebuild
+++ b/sys-fs/udev/udev-118-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r2.ebuild,v 1.1 2008/02/02 20:36:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r2.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-118-r3.ebuild b/sys-fs/udev/udev-118-r3.ebuild
index 93d8a098b8b4..3f71ae7c9a01 100644
--- a/sys-fs/udev/udev-118-r3.ebuild
+++ b/sys-fs/udev/udev-118-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r3.ebuild,v 1.1 2008/02/08 10:39:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118-r3.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-118.ebuild b/sys-fs/udev/udev-118.ebuild
index 81d09759f4a6..34ee7c5ab2ee 100644
--- a/sys-fs/udev/udev-118.ebuild
+++ b/sys-fs/udev/udev-118.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118.ebuild,v 1.1 2007/12/19 10:05:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-118.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -249,6 +249,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -266,7 +278,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -281,13 +293,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -306,7 +318,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-119-r1.ebuild b/sys-fs/udev/udev-119-r1.ebuild
index 463891d5894c..87f63d77914d 100644
--- a/sys-fs/udev/udev-119-r1.ebuild
+++ b/sys-fs/udev/udev-119-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-119-r1.ebuild,v 1.1 2008/04/03 13:48:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-119-r1.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-119.ebuild b/sys-fs/udev/udev-119.ebuild
index 4ffcd8df9033..795b26b7bccd 100644
--- a/sys-fs/udev/udev-119.ebuild
+++ b/sys-fs/udev/udev-119.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-119.ebuild,v 1.7 2008/04/22 16:27:23 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-119.ebuild,v 1.8 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-120.ebuild b/sys-fs/udev/udev-120.ebuild
index 745f80560fc6..7ae3a6ae7af6 100644
--- a/sys-fs/udev/udev-120.ebuild
+++ b/sys-fs/udev/udev-120.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-120.ebuild,v 1.1 2008/04/03 22:14:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-120.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-121.ebuild b/sys-fs/udev/udev-121.ebuild
index 20e5bb9f0d83..8e05e3881307 100644
--- a/sys-fs/udev/udev-121.ebuild
+++ b/sys-fs/udev/udev-121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-121.ebuild,v 1.1 2008/05/14 15:36:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-121.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -253,6 +253,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -270,7 +282,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -285,13 +297,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -310,7 +322,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-122-r1.ebuild b/sys-fs/udev/udev-122-r1.ebuild
index e7229b85eb17..195d57653c7a 100644
--- a/sys-fs/udev/udev-122-r1.ebuild
+++ b/sys-fs/udev/udev-122-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.1 2008/06/09 19:42:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -254,6 +254,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -271,7 +283,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -286,13 +298,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -311,7 +323,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-122.ebuild b/sys-fs/udev/udev-122.ebuild
index 6e4635210b89..b574b5e4b751 100644
--- a/sys-fs/udev/udev-122.ebuild
+++ b/sys-fs/udev/udev-122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122.ebuild,v 1.1 2008/05/19 12:23:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -252,6 +252,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -269,7 +281,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -284,13 +296,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -309,7 +321,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
diff --git a/sys-fs/udev/udev-124.ebuild b/sys-fs/udev/udev-124.ebuild
index fd416320e248..80cf70120047 100644
--- a/sys-fs/udev/udev-124.ebuild
+++ b/sys-fs/udev/udev-124.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124.ebuild,v 1.1 2008/06/12 12:27:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -254,6 +254,18 @@ pkg_preinst() {
 	then
 		coldplug_stale="1"
 	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
 }
 
 pkg_postinst() {
@@ -271,7 +283,7 @@ pkg_postinst() {
 	fi
 
 	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
-	if has_version "=sys-fs/udev-103-r3" &&
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
 	then
 		ewarn "Deleting stray 40-scsi-hotplug.rules"
@@ -286,13 +298,13 @@ pkg_postinst() {
 	fi
 
 	# Removing some old file
-	if has_version "<sys-fs/udev-104-r5"
+	if [[ $previous_less_than_104_r5 = 0 ]]
 	then
 		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
 		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
 	fi
 
-	if has_version "<sys-fs/udev-106-r5" &&
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
 		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
 	then
 		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
@@ -311,7 +323,7 @@ pkg_postinst() {
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
+	if [[ $previous_less_than_113 = 0 ]] &&
 		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then