From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 02646138A1A for ; Fri, 13 Feb 2015 17:45:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 793C5E088A; Fri, 13 Feb 2015 17:45:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25B57E088A for ; Fri, 13 Feb 2015 17:45:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A805C3407D3 for ; Fri, 13 Feb 2015 17:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5328111AEA for ; Fri, 13 Feb 2015 17:45:03 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1423848921.06a4e7a09211c4a598a72a97c64daff13cd502ff.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 06a4e7a09211c4a598a72a97c64daff13cd502ff X-VCS-Branch: master Date: Fri, 13 Feb 2015 17:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc0878b5-a239-49fe-b42a-47f34a086021 X-Archives-Hash: 25ba93718eb11f34bec5b1d656d4cfed commit: 06a4e7a09211c4a598a72a97c64daff13cd502ff Author: Brian Dolbec gentoo org> AuthorDate: Fri Feb 13 17:35:21 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Feb 13 17:35:21 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=06a4e7a0 setup.py: Revert the select_plugins() changes Install everything, leave it all as automagic. --- setup.py | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/setup.py b/setup.py index 953023d..864580b 100755 --- a/setup.py +++ b/setup.py @@ -609,46 +609,6 @@ def get_manpages(): for g, mans in groups.items(): yield [os.path.join('$mandir', topdir, 'man%s' % g), mans] -# initialize the list here -# it can then be modified by the select_plugins() -PACKAGES = list(find_packages()) - -# the USE flag selectable list of modules -SELECTABLE = { - 'cvs': 'cvs', - 'git': 'git', - 'subversion': 'svn', - } - -# get the USE from the environment -# split them so we don't get substring matches -USE = os.environ.get("USE", "").split() - - -class select_plugins(Command): - """ Removes the plugin modules not selected from the packages list - so they won't be installed.""" - - user_options = [ - ] - - global PACKAGES - - def initialize_options(self): - self.build_base = None - - def finalize_options(self): - self.set_undefined_options('build', - ('build_base', 'build_base')) - - def run(self): - for plugin in sorted(SELECTABLE): - if plugin not in USE: - module = os.path.join('portage', 'sync', 'modules', - SELECTABLE[plugin]) - PACKAGES.remove(module) - remove_tree(os.path.join('pym', module)) - setup( name = 'portage', @@ -658,7 +618,7 @@ setup( author_email = 'dev-portage@gentoo.org', package_dir = {'': 'pym'}, - packages = PACKAGES, + packages = list(find_packages()), # something to cheat build & install commands scripts = list(find_scripts()), @@ -694,7 +654,6 @@ setup( 'install_scripts_portagebin': x_install_scripts_portagebin, 'install_scripts_sbin': x_install_scripts_sbin, 'sdist': x_sdist, - 'select_plugins': select_plugins, 'test': test, },