Stupid me, shouldn't jsut move a part of the patch

svn path=/main/trunk/; revision=5512

2 files changed, 12 insertions, 13 deletions

diff --git a/pym/portage.py b/pym/portage.py
index 21b8d1817..0f6f18376 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3818,19 +3818,6 @@ def getCPFromCPV(mycpv):
 	"""Calls pkgsplit on a cpv and returns only the cp."""
 	return pkgsplit(mycpv)[0]
 
-def cpvequal(cpv1, cpv2):
-	split1 = catpkgsplit(cpv1)
-	split2 = catpkgsplit(cpv2)
-	
-	if not split1 or not split2:
-		raise portage_exception.PortageException("Invalid data, parameter was not a CPV")
-	
-	if split1[0] != split2[0]:
-		return False
-	
-	return (pkgcmp(split1[1:], split2[1:]) == 0)
-
-
 def dep_virtual(mysplit, mysettings):
 	"Does virtual dependency conversion"
 	newsplit=[]
diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index 60b75e03a..0a1038419 100644
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -22,6 +22,18 @@ import re, string, sys, types
 import portage_exception
 from portage_versions import catpkgsplit, catsplit, pkgcmp, pkgsplit, ververify
 
+def cpvequal(cpv1, cpv2):
+	split1 = catpkgsplit(cpv1)
+	split2 = catpkgsplit(cpv2)
+	
+	if not split1 or not split2:
+		raise portage_exception.PortageException("Invalid data, parameter was not a CPV")
+	
+	if split1[0] != split2[0]:
+		return False
+	
+	return (pkgcmp(split1[1:], split2[1:]) == 0)
+
 def strip_empty(myarr):
 	"""
 	Strip all empty elements from an array