| 1 |
commit: 48e41ae051935e15ee7b5232f512259693240ff6 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 25 18:43:21 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Sep 26 01:18:12 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=48e41ae0 |
| 7 |
|
| 8 |
setup.py: Move sbin scripts in bin/ |
| 9 |
|
| 10 |
Remove unused *_sbin classes |
| 11 |
Prevent the deprecated-path script from being installed with other PORTAGE_BIN_PATH scripts. |
| 12 |
Update the version for testing the new ebuild generated deprecated-path symlinks, bugfixes. |
| 13 |
|
| 14 |
--- |
| 15 |
setup.py | 29 ++++++++--------------------- |
| 16 |
1 file changed, 8 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/setup.py b/setup.py |
| 19 |
index 96cfade..22d7790 100755 |
| 20 |
--- a/setup.py |
| 21 |
+++ b/setup.py |
| 22 |
@@ -30,12 +30,10 @@ import sys |
| 23 |
|
| 24 |
x_scripts = { |
| 25 |
'bin': [ |
| 26 |
- 'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync', |
| 27 |
- 'bin/emirrordist', 'bin/portageq', 'bin/quickpkg', 'bin/repoman' |
| 28 |
- ], |
| 29 |
- 'sbin': [ |
| 30 |
- 'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 'bin/env-update', |
| 31 |
- 'bin/etc-update', 'bin/fixpackages', 'bin/regenworld' |
| 32 |
+ 'bin/archive-conf', 'bin/dispatch-conf', 'bin/ebuild', 'bin/egencache', |
| 33 |
+ 'bin/emaint', 'bin/emerge', 'bin/emerge-webrsync', 'bin/emirrordist', |
| 34 |
+ 'bin/env-update', 'bin/etc-update', 'bin/fixpackages', 'bin/portageq', |
| 35 |
+ 'bin/quickpkg', 'bin/regenworld', 'bin/repoman', |
| 36 |
], |
| 37 |
} |
| 38 |
|
| 39 |
@@ -226,10 +224,6 @@ class x_build_scripts_bin(x_build_scripts_custom): |
| 40 |
dir_name = 'bin' |
| 41 |
|
| 42 |
|
| 43 |
-class x_build_scripts_sbin(x_build_scripts_custom): |
| 44 |
- dir_name = 'sbin' |
| 45 |
- |
| 46 |
- |
| 47 |
class x_build_scripts_portagebin(x_build_scripts_custom): |
| 48 |
dir_name = 'portage' |
| 49 |
|
| 50 |
@@ -244,7 +238,6 @@ class x_build_scripts(build_scripts): |
| 51 |
def run(self): |
| 52 |
self.run_command('build_scripts_bin') |
| 53 |
self.run_command('build_scripts_portagebin') |
| 54 |
- self.run_command('build_scripts_sbin') |
| 55 |
|
| 56 |
|
| 57 |
class x_clean(clean): |
| 58 |
@@ -480,11 +473,6 @@ class x_install_scripts_bin(x_install_scripts_custom): |
| 59 |
var_name = 'bindir' |
| 60 |
|
| 61 |
|
| 62 |
-class x_install_scripts_sbin(x_install_scripts_custom): |
| 63 |
- dir_name = 'sbin' |
| 64 |
- var_name = 'sbindir' |
| 65 |
- |
| 66 |
- |
| 67 |
class x_install_scripts_portagebin(x_install_scripts_custom): |
| 68 |
dir_name = 'portage' |
| 69 |
var_name = 'portage_bindir' |
| 70 |
@@ -500,7 +488,6 @@ class x_install_scripts(install_scripts): |
| 71 |
def run(self): |
| 72 |
self.run_command('install_scripts_bin') |
| 73 |
self.run_command('install_scripts_portagebin') |
| 74 |
- self.run_command('install_scripts_sbin') |
| 75 |
|
| 76 |
|
| 77 |
class x_sdist(sdist): |
| 78 |
@@ -589,7 +576,8 @@ def find_packages(): |
| 79 |
def find_scripts(): |
| 80 |
for dirpath, dirnames, filenames in os.walk('bin'): |
| 81 |
for f in filenames: |
| 82 |
- yield os.path.join(dirpath, f) |
| 83 |
+ if f not in ['deprecated-path']: |
| 84 |
+ yield os.path.join(dirpath, f) |
| 85 |
|
| 86 |
|
| 87 |
def get_manpages(): |
| 88 |
@@ -610,7 +598,7 @@ def get_manpages(): |
| 89 |
|
| 90 |
setup( |
| 91 |
name = 'portage', |
| 92 |
- version = '2.2.13', |
| 93 |
+ version = '2.2.14_rc1', |
| 94 |
url = 'https://wiki.gentoo.org/wiki/Project:Portage', |
| 95 |
author = 'Gentoo Portage Development Team', |
| 96 |
author_email = 'dev-portage@g.o', |
| 97 |
@@ -627,6 +615,7 @@ setup( |
| 98 |
'cnf/make.conf.example', 'cnf/make.globals', 'cnf/repos.conf']], |
| 99 |
['$portage_setsdir', ['cnf/sets/portage.conf']], |
| 100 |
['$docdir', ['NEWS', 'RELEASE-NOTES']], |
| 101 |
+ ['$portage_base/bin', ['bin/deprecated-path']], |
| 102 |
], |
| 103 |
|
| 104 |
cmdclass = { |
| 105 |
@@ -635,7 +624,6 @@ setup( |
| 106 |
'build_scripts': x_build_scripts, |
| 107 |
'build_scripts_bin': x_build_scripts_bin, |
| 108 |
'build_scripts_portagebin': x_build_scripts_portagebin, |
| 109 |
- 'build_scripts_sbin': x_build_scripts_sbin, |
| 110 |
'build_tests': build_tests, |
| 111 |
'clean': x_clean, |
| 112 |
'docbook': docbook, |
| 113 |
@@ -648,7 +636,6 @@ setup( |
| 114 |
'install_scripts': x_install_scripts, |
| 115 |
'install_scripts_bin': x_install_scripts_bin, |
| 116 |
'install_scripts_portagebin': x_install_scripts_portagebin, |
| 117 |
- 'install_scripts_sbin': x_install_scripts_sbin, |
| 118 |
'sdist': x_sdist, |
| 119 |
'test': test, |
| 120 |
}, |
Archives