Rename slot-abi stuff to refer to slot-operator.

This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47

11 files changed, 104 insertions, 104 deletions

diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index f326e6828..dc0a3da68 100644
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -348,9 +348,9 @@ class dbapi(object):
 				continue
 			moves += 1
 			if "/" not in newslot and \
-				mycpv.slot_abi and \
-				mycpv.slot_abi not in (mycpv.slot, newslot):
-				newslot = "%s/%s" % (newslot, mycpv.slot_abi)
+				mycpv.sub_slot and \
+				mycpv.sub_slot not in (mycpv.slot, newslot):
+				newslot = "%s/%s" % (newslot, mycpv.sub_slot)
 			mydata = {"SLOT": newslot+"\n"}
 			self.aux_update(mycpv, mydata)
 		return moves
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b7bb46f75..4d85f945b 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -62,12 +62,12 @@ _extended_cat = r'[\w+*][\w+.*-]*'
 _slot_re_cache = {}
 
 def _get_slot_re(eapi_attrs):
-	cache_key = eapi_attrs.slot_abi
+	cache_key = eapi_attrs.slot_operator
 	slot_re = _slot_re_cache.get(cache_key)
 	if slot_re is not None:
 		return slot_re
 
-	if eapi_attrs.slot_abi:
+	if eapi_attrs.slot_operator:
 		slot_re = _slot + r'(/' + _slot + r'=?)?'
 	else:
 		slot_re = _slot
@@ -80,12 +80,12 @@ def _get_slot_re(eapi_attrs):
 _slot_dep_re_cache = {}
 
 def _get_slot_dep_re(eapi_attrs):
-	cache_key = eapi_attrs.slot_abi
+	cache_key = eapi_attrs.slot_operator
 	slot_re = _slot_dep_re_cache.get(cache_key)
 	if slot_re is not None:
 		return slot_re
 
-	if eapi_attrs.slot_abi:
+	if eapi_attrs.slot_operator:
 		slot_re = _slot + r'?(\*|=|/' + _slot + r'=?)?'
 	else:
 		slot_re = _slot
@@ -97,9 +97,9 @@ def _get_slot_dep_re(eapi_attrs):
 
 def _match_slot(atom, pkg):
 	if pkg.slot == atom.slot:
-		if not atom.slot_abi:
+		if not atom.sub_slot:
 			return True
-		elif atom.slot_abi == pkg.slot_abi:
+		elif atom.sub_slot == pkg.sub_slot:
 			return True
 	return False
 
@@ -1311,32 +1311,32 @@ class Atom(_unicode):
 		self.__dict__['repo'] = repo
 		if slot is None:
 			self.__dict__['slot'] = None
-			self.__dict__['slot_abi'] = None
-			self.__dict__['slot_abi_op'] = None
+			self.__dict__['sub_slot'] = None
+			self.__dict__['slot_operator'] = None
 		else:
 			slot_re = _get_slot_dep_re(eapi_attrs)
 			slot_match = slot_re.match(slot)
 			if slot_match is None:
 				raise InvalidAtom(self)
-			if eapi_attrs.slot_abi:
+			if eapi_attrs.slot_operator:
 				self.__dict__['slot'] = slot_match.group(1)
-				slot_abi =  slot_match.group(2)
-				if slot_abi is not None:
-					slot_abi = slot_abi.lstrip("/")
-				if slot_abi in ("*", "="):
-					self.__dict__['slot_abi'] = None
-					self.__dict__['slot_abi_op'] = slot_abi
+				sub_slot = slot_match.group(2)
+				if sub_slot is not None:
+					sub_slot = sub_slot.lstrip("/")
+				if sub_slot in ("*", "="):
+					self.__dict__['sub_slot'] = None
+					self.__dict__['slot_operator'] = sub_slot
 				else:
-					slot_abi_op = None
-					if slot_abi is not None and slot_abi[-1:] == "=":
-						slot_abi_op = slot_abi[-1:]
-						slot_abi = slot_abi[:-1]
-					self.__dict__['slot_abi'] = slot_abi
-					self.__dict__['slot_abi_op'] = slot_abi_op
+					slot_operator = None
+					if sub_slot is not None and sub_slot[-1:] == "=":
+						slot_operator = sub_slot[-1:]
+						sub_slot = sub_slot[:-1]
+					self.__dict__['sub_slot'] = sub_slot
+					self.__dict__['slot_operator'] = slot_operator
 			else:
 				self.__dict__['slot'] = slot
-				self.__dict__['slot_abi'] = None
-				self.__dict__['slot_abi_op'] = None
+				self.__dict__['sub_slot'] = None
+				self.__dict__['slot_operator'] = None
 		self.__dict__['operator'] = op
 		self.__dict__['extended_syntax'] = extended_syntax
 
@@ -1410,13 +1410,13 @@ class Atom(_unicode):
 						% (eapi, self), category='EAPI.incompatible')
 
 	@property
-	def slot_abi_built(self):
+	def slot_operator_built(self):
 		"""
-		Returns True if slot_abi_op == "=" and slot_abi is not None.
+		Returns True if slot_operator == "=" and sub_slot is not None.
 		NOTE: foo/bar:2= is unbuilt and returns False, whereas foo/bar:2/2=
 			is built and returns True.
 		"""
-		return self.slot_abi_op == "=" and self.slot_abi is not None
+		return self.slot_operator == "=" and self.sub_slot is not None
 
 	@property
 	def without_repo(self):
@@ -1427,7 +1427,7 @@ class Atom(_unicode):
 
 	@property
 	def without_slot(self):
-		if self.slot is None and self.slot_abi_op is None:
+		if self.slot is None and self.slot_operator is None:
 			return self
 		atom = remove_slot(self)
 		if self.repo is not None:
@@ -1439,14 +1439,14 @@ class Atom(_unicode):
 
 	def with_repo(self, repo):
 		atom = remove_slot(self)
-		if self.slot is not None or self.slot_abi_op is not None:
+		if self.slot is not None or self.slot_operator is not None:
 			atom += _slot_separator
 			if self.slot is not None:
 				atom += self.slot
-			if self.slot_abi is not None:
-				atom += "/%s" % self.slot_abi
-			if self.slot_abi_op is not None:
-				atom += self.slot_abi_op
+			if self.sub_slot is not None:
+				atom += "/%s" % self.sub_slot
+			if self.slot_operator is not None:
+				atom += self.slot_operator
 		atom += _repo_separator + repo
 		if self.use is not None:
 			atom += _unicode(self.use)
@@ -1506,14 +1506,14 @@ class Atom(_unicode):
 		if not (self.use and self.use.conditional):
 			return self
 		atom = remove_slot(self)
-		if self.slot is not None or self.slot_abi_op is not None:
+		if self.slot is not None or self.slot_operator is not None:
 			atom += _slot_separator
 			if self.slot is not None:
 				atom += self.slot
-			if self.slot_abi is not None:
-				atom += "/%s" % self.slot_abi
-			if self.slot_abi_op is not None:
-				atom += self.slot_abi_op
+			if self.sub_slot is not None:
+				atom += "/%s" % self.sub_slot
+			if self.slot_operator is not None:
+				atom += self.slot_operator
 		use_dep = self.use.evaluate_conditionals(use)
 		atom += _unicode(use_dep)
 		return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep)
@@ -1534,14 +1534,14 @@ class Atom(_unicode):
 		if not self.use:
 			return self
 		atom = remove_slot(self)
-		if self.slot is not None or self.slot_abi_op is not None:
+		if self.slot is not None or self.slot_operator is not None:
 			atom += _slot_separator
 			if self.slot is not None:
 				atom += self.slot
-			if self.slot_abi is not None:
-				atom += "/%s" % self.slot_abi
-			if self.slot_abi_op is not None:
-				atom += self.slot_abi_op
+			if self.sub_slot is not None:
+				atom += "/%s" % self.sub_slot
+			if self.slot_operator is not None:
+				atom += self.slot_operator
 		use_dep = self.use.violated_conditionals(other_use, is_valid_flag, parent_use)
 		atom += _unicode(use_dep)
 		return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep)
@@ -1550,14 +1550,14 @@ class Atom(_unicode):
 		if not (self.use and self.use.conditional):
 			return self
 		atom = remove_slot(self)
-		if self.slot is not None or self.slot_abi_op is not None:
+		if self.slot is not None or self.slot_operator is not None:
 			atom += _slot_separator
 			if self.slot is not None:
 				atom += self.slot
-			if self.slot_abi is not None:
-				atom += "/%s" % self.slot_abi
-			if self.slot_abi_op is not None:
-				atom += self.slot_abi_op
+			if self.sub_slot is not None:
+				atom += "/%s" % self.sub_slot
+			if self.slot_operator is not None:
+				atom += self.slot_operator
 		use_dep = self.use._eval_qa_conditionals(use_mask, use_force)
 		atom += _unicode(use_dep)
 		return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep)
diff --git a/pym/portage/dep/_slot_abi.py b/pym/portage/dep/_slot_abi.py
index 7c36e52dc..8a2b774a8 100644
--- a/pym/portage/dep/_slot_abi.py
+++ b/pym/portage/dep/_slot_abi.py
@@ -7,35 +7,35 @@ from portage.exception import InvalidData
 _dep_keys = ('DEPEND', 'PDEPEND', 'RDEPEND')
 _runtime_keys = ('PDEPEND', 'RDEPEND')
 
-def find_built_slot_abi_atoms(pkg):
+def find_built_slot_operator_atoms(pkg):
 	atoms = {}
 	for k in _dep_keys:
-		atom_list = list(_find_built_slot_abi_op(use_reduce(pkg.metadata[k],
+		atom_list = list(_find_built_slot_operator(use_reduce(pkg.metadata[k],
 			uselist=pkg.use.enabled, eapi=pkg.metadata['EAPI'],
 			token_class=Atom)))
 		if atom_list:
 			atoms[k] = atom_list
 	return atoms
 
-def _find_built_slot_abi_op(dep_struct):
+def _find_built_slot_operator(dep_struct):
 	for x in dep_struct:
 		if isinstance(x, list):
-			for atom in _find_built_slot_abi_op(x):
+			for atom in _find_built_slot_operator(x):
 				yield atom
-		elif isinstance(x, Atom) and x.slot_abi_built:
+		elif isinstance(x, Atom) and x.slot_operator_built:
 			yield x
 
-def ignore_built_slot_abi_deps(dep_struct):
+def ignore_built_slot_operator_deps(dep_struct):
 	for i, x in enumerate(dep_struct):
 		if isinstance(x, list):
-			ignore_built_slot_abi_deps(x)
-		elif isinstance(x, Atom) and x.slot_abi_built:
+			ignore_built_slot_operator_deps(x)
+		elif isinstance(x, Atom) and x.slot_operator_built:
 			# There's no way of knowing here whether the SLOT
-			# part of the SLOT/ABI pair should be kept, so we
+			# part of the slot/sub-slot pair should be kept, so we
 			# ignore both parts.
 			dep_struct[i] = x.without_slot
 
-def evaluate_slot_abi_equal_deps(settings, use, trees):
+def evaluate_slot_operator_equal_deps(settings, use, trees):
 
 	metadata = settings.configdict['pkg']
 	eapi = metadata['EAPI']
@@ -65,7 +65,7 @@ def _eval_deps(dep_struct, vardbs):
 	for i, x in enumerate(dep_struct):
 		if isinstance(x, list):
 			_eval_deps(x, vardbs)
-		elif isinstance(x, Atom) and x.slot_abi_op == "=":
+		elif isinstance(x, Atom) and x.slot_operator == "=":
 			for vardb in vardbs:
 				best_version = vardb.match(x)
 				if best_version:
@@ -77,7 +77,7 @@ def _eval_deps(dep_struct, vardbs):
 						pass
 					else:
 						slot_part = "%s/%s=" % \
-							(best_version.slot, best_version.slot_abi)
+							(best_version.slot, best_version.sub_slot)
 						x = x.with_slot(slot_part)
 						dep_struct[i] = x
 						break
diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py
index 1d8da39fe..f13e79121 100644
--- a/pym/portage/eapi.py
+++ b/pym/portage/eapi.py
@@ -14,7 +14,7 @@ def eapi_has_iuse_effective(eapi):
 def eapi_has_slot_deps(eapi):
 	return eapi != "0"
 
-def eapi_has_slot_abi(eapi):
+def eapi_has_slot_operator(eapi):
 	return eapi in ("4-slot-abi",)
 
 def eapi_has_src_uri_arrows(eapi):
@@ -80,7 +80,7 @@ def eapi_allows_dots_in_use_flags(eapi):
 _eapi_attrs = collections.namedtuple('_eapi_attrs',
 	'dots_in_PN dots_in_use_flags exports_EBUILD_PHASE_FUNC '
 	'iuse_defaults iuse_effective '
-	'repo_deps required_use required_use_at_most_one_of slot_abi slot_deps '
+	'repo_deps required_use required_use_at_most_one_of slot_operator slot_deps '
 	'src_uri_arrows strong_blocks use_deps use_dep_defaults')
 
 _eapi_attrs_cache = {}
@@ -111,7 +111,7 @@ def _get_eapi_attrs(eapi):
 		required_use = (eapi is None or eapi_has_required_use(eapi)),
 		required_use_at_most_one_of = (eapi is None or eapi_has_required_use_at_most_one_of(eapi)),
 		slot_deps = (eapi is None or eapi_has_slot_deps(eapi)),
-		slot_abi = (eapi is None or eapi_has_slot_abi(eapi)),
+		slot_operator = (eapi is None or eapi_has_slot_operator(eapi)),
 		src_uri_arrows = (eapi is None or eapi_has_src_uri_arrows(eapi)),
 		strong_blocks = (eapi is None or eapi_has_strong_blocks(eapi)),
 		use_deps = (eapi is None or eapi_has_use_deps(eapi)),
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 5856f69ce..4c0c45d65 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -26,7 +26,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.package.ebuild.digestgen:digestgen',
 	'portage.package.ebuild.fetch:fetch',
 	'portage.package.ebuild._ipc.QueryCommand:QueryCommand',
-	'portage.dep._slot_abi:evaluate_slot_abi_equal_deps',
+	'portage.dep._slot_abi:evaluate_slot_operator_equal_deps',
 	'portage.package.ebuild._spawn_nofetch:spawn_nofetch',
 	'portage.util._desktop_entry:validate_desktop_entry',
 	'portage.util.ExtractKernelVersion:ExtractKernelVersion'
@@ -1691,7 +1691,7 @@ def _post_src_install_write_metadata(settings):
 			continue
 
 		if k.endswith('DEPEND'):
-			if eapi_attrs.slot_abi:
+			if eapi_attrs.slot_operator:
 				continue
 			token_class = Atom
 		else:
@@ -1711,8 +1711,8 @@ def _post_src_install_write_metadata(settings):
 			errors='strict') as f:
 			f.write(_unicode_decode(v + '\n'))
 
-	if eapi_attrs.slot_abi:
-		deps = evaluate_slot_abi_equal_deps(settings, use, QueryCommand.get_db())
+	if eapi_attrs.slot_operator:
+		deps = evaluate_slot_operator_equal_deps(settings, use, QueryCommand.get_db())
 		for k, v in deps.items():
 			filename = os.path.join(build_info_dir, k)
 			if not v:
diff --git a/pym/portage/tests/dep/testAtom.py b/pym/portage/tests/dep/testAtom.py
index f5a7d3749..0c72fd0e6 100644
--- a/pym/portage/tests/dep/testAtom.py
+++ b/pym/portage/tests/dep/testAtom.py
@@ -150,14 +150,14 @@ class TestAtom(TestCase):
 
 	def testSlotAbiAtom(self):
 		tests = (
-			("virtual/ffmpeg:0/53", "4-slot-abi", {"slot": "0", "slot_abi": "53", "slot_abi_op": None}),
-			("virtual/ffmpeg:0/53=", "4-slot-abi", {"slot": "0", "slot_abi": "53", "slot_abi_op": "="}),
-			("virtual/ffmpeg:=", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": "="}),
-			("virtual/ffmpeg:0=", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": "="}),
-			("virtual/ffmpeg:*", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": "*"}),
-			("virtual/ffmpeg:0*", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": "*"}),
-			("virtual/ffmpeg:0", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": None}),
-			("virtual/ffmpeg", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": None}),
+			("virtual/ffmpeg:0/53", "4-slot-abi", {"slot": "0", "sub_slot": "53", "slot_operator": None}),
+			("virtual/ffmpeg:0/53=", "4-slot-abi", {"slot": "0", "sub_slot": "53", "slot_operator": "="}),
+			("virtual/ffmpeg:=", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": "="}),
+			("virtual/ffmpeg:0=", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": "="}),
+			("virtual/ffmpeg:*", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": "*"}),
+			("virtual/ffmpeg:0*", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": "*"}),
+			("virtual/ffmpeg:0", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": None}),
+			("virtual/ffmpeg", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": None}),
 		)
 
 		for atom, eapi, parts in tests:
diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py
index d5d718f74..2a1945b08 100644
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/pym/portage/tests/dep/test_match_from_list.py
@@ -17,14 +17,14 @@ class Package(object):
 		atom = Atom(atom, allow_repo=True)
 		self.cp = atom.cp
 		slot = atom.slot
-		if atom.slot_abi:
-			slot = "%s/%s" % (slot, atom.slot_abi)
+		if atom.sub_slot:
+			slot = "%s/%s" % (slot, atom.sub_slot)
 		if not slot:
 			slot = '0'
 		self.cpv = _pkg_str(atom.cpv, slot=slot, repo=atom.repo)
 		self.cpv_split = catpkgsplit(self.cpv)
 		self.slot = self.cpv.slot
-		self.slot_abi = self.cpv.slot_abi
+		self.sub_slot = self.cpv.sub_slot
 		self.repo = atom.repo
 		if atom.use:
 			self.use = self._use_class(atom.use.enabled)
diff --git a/pym/portage/tests/resolver/test_complete_graph.py b/pym/portage/tests/resolver/test_complete_graph.py
index 1b0342c67..95b1f8809 100644
--- a/pym/portage/tests/resolver/test_complete_graph.py
+++ b/pym/portage/tests/resolver/test_complete_graph.py
@@ -93,7 +93,7 @@ class CompleteGraphTestCase(TestCase):
 		test_cases = (
 			ResolverPlaygroundTestCase(
 				[">=sys-libs/x-2"],
-				options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot-abi": "n"},
+				options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot": "n"},
 				mergelist = ["sys-libs/x-2"],
 				success = True,
 			),
@@ -106,7 +106,7 @@ class CompleteGraphTestCase(TestCase):
 			),
 			ResolverPlaygroundTestCase(
 				["<sys-libs/x-1"],
-				options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot-abi": "n"},
+				options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot": "n"},
 				mergelist = ["sys-libs/x-0.1"],
 				success = True,
 			),
diff --git a/pym/portage/tests/resolver/test_slot_abi.py b/pym/portage/tests/resolver/test_slot_abi.py
index 6381bcc4d..8aed5d3d5 100644
--- a/pym/portage/tests/resolver/test_slot_abi.py
+++ b/pym/portage/tests/resolver/test_slot_abi.py
@@ -65,7 +65,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/icu"],
-				options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/icu-49"]),
 
@@ -83,7 +83,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/icu"],
-				options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]dev-libs/icu-49"]),
 
@@ -95,7 +95,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/icu-49"]),
 
@@ -113,7 +113,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]dev-libs/icu-49"]),
 
@@ -178,7 +178,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["sys-libs/db"],
-				options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["sys-libs/db-4.8"]),
 
@@ -196,7 +196,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["sys-libs/db"],
-				options = {"--oneshot": True, "--rebuild-if-new-slot-abi": "n"},
+				options = {"--oneshot": True, "--rebuild-if-new-slot": "n"},
 				success = True,
 				mergelist = ["sys-libs/db-4.8"]),
 
@@ -214,7 +214,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--usepkg": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--usepkg": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]sys-libs/db-4.8"]),
 
@@ -226,13 +226,13 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]sys-libs/db-4.8"]),
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--rebuild-if-new-slot-abi": "n"},
+				options = {"--update": True, "--deep": True, "--rebuild-if-new-slot": "n"},
 				success = True,
 				mergelist = []),
 
@@ -312,7 +312,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/glib"],
-				options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/glib-2.32.3"]),
 
@@ -330,7 +330,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/glib"],
-				options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]dev-libs/glib-2.32.3"]),
 
@@ -342,7 +342,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/glib-2.32.3"]),
 
@@ -360,7 +360,7 @@ class SlotAbiTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["[binary]dev-libs/glib-2.32.3"]),
 
diff --git a/pym/portage/tests/resolver/test_slot_abi_downgrade.py b/pym/portage/tests/resolver/test_slot_abi_downgrade.py
index 45a7555c2..08e9a9db2 100644
--- a/pym/portage/tests/resolver/test_slot_abi_downgrade.py
+++ b/pym/portage/tests/resolver/test_slot_abi_downgrade.py
@@ -61,7 +61,7 @@ class SlotAbiDowngradeTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/icu"],
-				options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/icu-4.8"]),
 
@@ -85,7 +85,7 @@ class SlotAbiDowngradeTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/icu-4.8"]),
 
@@ -173,7 +173,7 @@ class SlotAbiDowngradeTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/glib"],
-				options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/glib-2.30.2"]),
 
@@ -197,7 +197,7 @@ class SlotAbiDowngradeTestCase(TestCase):
 
 			ResolverPlaygroundTestCase(
 				["@world"],
-				options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"},
+				options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"},
 				success = True,
 				mergelist = ["dev-libs/glib-2.30.2"]),
 
diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 692256b24..242623fde 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -372,19 +372,19 @@ class _pkg_str(_unicode):
 			if slot_match is None:
 				# Avoid an InvalidAtom exception when creating SLOT atoms
 				self.__dict__['slot'] = '0'
-				self.__dict__['slot_abi'] = '0'
+				self.__dict__['sub_slot'] = '0'
 				self.__dict__['slot_invalid'] = slot
 			else:
-				if eapi_attrs.slot_abi:
+				if eapi_attrs.slot_operator:
 					slot_split = slot.split("/")
 					self.__dict__['slot'] = slot_split[0]
 					if len(slot_split) > 1:
-						self.__dict__['slot_abi'] = slot_split[1]
+						self.__dict__['sub_slot'] = slot_split[1]
 					else:
-						self.__dict__['slot_abi'] = slot_split[0]
+						self.__dict__['sub_slot'] = slot_split[0]
 				else:
 					self.__dict__['slot'] = slot
-					self.__dict__['slot_abi'] = slot
+					self.__dict__['sub_slot'] = slot
 
 		if repo is not None:
 			repo = _gen_valid_repo(repo)