setup.py: Move sbin scripts in bin/

Remove unused *_sbin classes
Prevent the deprecated-path script from being installed with other PORTAGE_BIN_PATH scripts.
Update the version for testing the new ebuild generated deprecated-path symlinks, bugfixes.

1 files changed, 8 insertions, 21 deletions

diff --git a/setup.py b/setup.py
index 96cfadecb..22d779056 100755
--- a/setup.py
+++ b/setup.py
@@ -30,12 +30,10 @@ import sys
 
 x_scripts = {
 	'bin': [
-		'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync',
-		'bin/emirrordist', 'bin/portageq', 'bin/quickpkg', 'bin/repoman'
-	],
-	'sbin': [
-		'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 'bin/env-update',
-		'bin/etc-update', 'bin/fixpackages', 'bin/regenworld'
+		'bin/archive-conf', 'bin/dispatch-conf', 'bin/ebuild', 'bin/egencache',
+		'bin/emaint', 'bin/emerge', 'bin/emerge-webrsync', 'bin/emirrordist',
+		'bin/env-update', 'bin/etc-update', 'bin/fixpackages', 'bin/portageq',
+		'bin/quickpkg', 'bin/regenworld', 'bin/repoman',
 	],
 }
 
@@ -226,10 +224,6 @@ class x_build_scripts_bin(x_build_scripts_custom):
 	dir_name = 'bin'
 
 
-class x_build_scripts_sbin(x_build_scripts_custom):
-	dir_name = 'sbin'
-
-
 class x_build_scripts_portagebin(x_build_scripts_custom):
 	dir_name = 'portage'
 
@@ -244,7 +238,6 @@ class x_build_scripts(build_scripts):
 	def run(self):
 		self.run_command('build_scripts_bin')
 		self.run_command('build_scripts_portagebin')
-		self.run_command('build_scripts_sbin')
 
 
 class x_clean(clean):
@@ -480,11 +473,6 @@ class x_install_scripts_bin(x_install_scripts_custom):
 	var_name = 'bindir'
 
 
-class x_install_scripts_sbin(x_install_scripts_custom):
-	dir_name = 'sbin'
-	var_name = 'sbindir'
-
-
 class x_install_scripts_portagebin(x_install_scripts_custom):
 	dir_name = 'portage'
 	var_name = 'portage_bindir'
@@ -500,7 +488,6 @@ class x_install_scripts(install_scripts):
 	def run(self):
 		self.run_command('install_scripts_bin')
 		self.run_command('install_scripts_portagebin')
-		self.run_command('install_scripts_sbin')
 
 
 class x_sdist(sdist):
@@ -589,7 +576,8 @@ def find_packages():
 def find_scripts():
 	for dirpath, dirnames, filenames in os.walk('bin'):
 		for f in filenames:
-			yield os.path.join(dirpath, f)
+			if  f not in ['deprecated-path']:
+				yield os.path.join(dirpath, f)
 
 
 def get_manpages():
@@ -610,7 +598,7 @@ def get_manpages():
 
 setup(
 	name = 'portage',
-	version = '2.2.13',
+	version = '2.2.14_rc1',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',
@@ -627,6 +615,7 @@ setup(
 			'cnf/make.conf.example', 'cnf/make.globals', 'cnf/repos.conf']],
 		['$portage_setsdir', ['cnf/sets/portage.conf']],
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['$portage_base/bin', ['bin/deprecated-path']],
 	],
 
 	cmdclass = {
@@ -635,7 +624,6 @@ setup(
 		'build_scripts': x_build_scripts,
 		'build_scripts_bin': x_build_scripts_bin,
 		'build_scripts_portagebin': x_build_scripts_portagebin,
-		'build_scripts_sbin': x_build_scripts_sbin,
 		'build_tests': build_tests,
 		'clean': x_clean,
 		'docbook': docbook,
@@ -648,7 +636,6 @@ setup(
 		'install_scripts': x_install_scripts,
 		'install_scripts_bin': x_install_scripts_bin,
 		'install_scripts_portagebin': x_install_scripts_portagebin,
-		'install_scripts_sbin': x_install_scripts_sbin,
 		'sdist': x_sdist,
 		'test': test,
 	},