diff options
-rw-r--r-- | .gitignore | 6 | ||||
-rw-r--r-- | doc/api/ruby/create_ruby_doc.rb | 7 | ||||
-rw-r--r-- | paludis/Makefile.am.m4 | 11 | ||||
-rw-r--r-- | paludis/args/legacy/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/args/legacy/dep_list_args_group.hh | 4 | ||||
-rw-r--r-- | paludis/args/legacy/deps_option_arg.hh | 4 | ||||
-rw-r--r-- | paludis/args/legacy/install_args_group.hh | 6 | ||||
-rw-r--r-- | paludis/files.m4 | 12 | ||||
-rw-r--r-- | paludis/legacy/Makefile.am | 97 | ||||
-rw-r--r-- | paludis/legacy/dep_list-fwd.hh (renamed from paludis/dep_list-fwd.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/dep_list.cc (renamed from paludis/dep_list.cc) | 12 | ||||
-rw-r--r-- | paludis/legacy/dep_list.hh (renamed from paludis/dep_list.hh) | 6 | ||||
-rw-r--r-- | paludis/legacy/dep_list_TEST.cc (renamed from paludis/dep_list_TEST.cc) | 0 | ||||
-rw-r--r-- | paludis/legacy/dep_list_TEST.hh (renamed from paludis/dep_list_TEST.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/dep_list_TEST_blockers.cc (renamed from paludis/dep_list_TEST_blockers.cc) | 0 | ||||
-rw-r--r-- | paludis/legacy/dep_list_exceptions.cc (renamed from paludis/dep_list_exceptions.cc) | 0 | ||||
-rw-r--r-- | paludis/legacy/dep_list_exceptions.hh (renamed from paludis/dep_list_exceptions.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/dep_list_options.cc (renamed from paludis/dep_list_options.cc) | 4 | ||||
-rw-r--r-- | paludis/legacy/dep_list_options.hh (renamed from paludis/dep_list_options.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/dep_list_options.se (renamed from paludis/dep_list_options.se) | 0 | ||||
-rw-r--r-- | paludis/legacy/find_unused_packages_task.cc (renamed from paludis/find_unused_packages_task.cc) | 2 | ||||
-rw-r--r-- | paludis/legacy/find_unused_packages_task.hh (renamed from paludis/find_unused_packages_task.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/handled_information-fwd.hh (renamed from paludis/handled_information-fwd.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/handled_information.cc (renamed from paludis/handled_information.cc) | 2 | ||||
-rw-r--r-- | paludis/legacy/handled_information.hh (renamed from paludis/handled_information.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/install_task.cc (renamed from paludis/install_task.cc) | 8 | ||||
-rw-r--r-- | paludis/legacy/install_task.hh (renamed from paludis/install_task.hh) | 8 | ||||
-rw-r--r-- | paludis/legacy/install_task.se (renamed from paludis/install_task.se) | 0 | ||||
-rw-r--r-- | paludis/legacy/query_visitor.cc (renamed from paludis/query_visitor.cc) | 6 | ||||
-rw-r--r-- | paludis/legacy/query_visitor.hh (renamed from paludis/query_visitor.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/range_rewriter.cc (renamed from paludis/range_rewriter.cc) | 2 | ||||
-rw-r--r-- | paludis/legacy/range_rewriter.hh (renamed from paludis/range_rewriter.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/range_rewriter_TEST.cc (renamed from paludis/range_rewriter_TEST.cc) | 2 | ||||
-rw-r--r-- | paludis/legacy/show_suggest_visitor.cc (renamed from paludis/show_suggest_visitor.cc) | 4 | ||||
-rw-r--r-- | paludis/legacy/show_suggest_visitor.hh (renamed from paludis/show_suggest_visitor.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/sync_task.cc (renamed from paludis/sync_task.cc) | 2 | ||||
-rw-r--r-- | paludis/legacy/sync_task.hh (renamed from paludis/sync_task.hh) | 4 | ||||
-rw-r--r-- | paludis/legacy/tasks_exceptions.cc (renamed from paludis/tasks_exceptions.cc) | 4 | ||||
-rw-r--r-- | paludis/legacy/tasks_exceptions.hh (renamed from paludis/tasks_exceptions.hh) | 0 | ||||
-rw-r--r-- | paludis/legacy/uninstall_task.cc (renamed from paludis/uninstall_task.cc) | 4 | ||||
-rw-r--r-- | paludis/legacy/uninstall_task.hh (renamed from paludis/uninstall_task.hh) | 0 | ||||
-rw-r--r-- | python/Makefile.am | 1 | ||||
-rw-r--r-- | python/dep_list.cc | 4 | ||||
-rw-r--r-- | ruby/Makefile.am | 1 | ||||
-rw-r--r-- | ruby/dep_label.cc | 1 | ||||
-rw-r--r-- | ruby/dep_list.cc | 2 | ||||
-rw-r--r-- | ruby/find_unused_packages_task.cc | 2 | ||||
-rw-r--r-- | ruby/paludis_ruby.cc | 2 | ||||
-rw-r--r-- | src/clients/adjutrix/Makefile.am | 1 | ||||
-rw-r--r-- | src/clients/adjutrix/display_default_system_resolution.cc | 4 | ||||
-rw-r--r-- | src/clients/adjutrix/find_unused_packages.cc | 2 | ||||
-rw-r--r-- | src/clients/adjutrix/keywords_graph.cc | 2 | ||||
-rw-r--r-- | src/clients/adjutrix/what_needs_keywording.cc | 4 | ||||
-rw-r--r-- | src/clients/importare/Makefile.am | 1 | ||||
-rw-r--r-- | src/clients/importare/install.cc | 4 | ||||
-rw-r--r-- | src/clients/paludis/Makefile.am | 1 | ||||
-rw-r--r-- | src/clients/paludis/install.cc | 4 | ||||
-rw-r--r-- | src/clients/paludis/sync.cc | 4 | ||||
-rw-r--r-- | src/clients/paludis/uninstall.cc | 6 | ||||
-rw-r--r-- | src/output/console_install_task.cc | 2 | ||||
-rw-r--r-- | src/output/console_install_task.hh | 2 |
61 files changed, 181 insertions, 107 deletions
diff --git a/.gitignore b/.gitignore index 26097ac4f..8f8481b63 100644 --- a/.gitignore +++ b/.gitignore @@ -233,8 +233,6 @@ paludis-*.*.*.tar.bz2 /paludis/args/args_TEST /paludis/broken_linkage_configuration_TEST /paludis/comma_separated_dep_parser_TEST -/paludis/dep_list_TEST -/paludis/dep_list_TEST_blockers /paludis/dep_spec_TEST /paludis/elike_dep_parser_TEST /paludis/elike_use_requirement_TEST @@ -254,10 +252,12 @@ paludis-*.*.*.tar.bz2 /paludis/hooker_TEST /paludis/host_tuple_name_TEST /paludis/ihateautomake.cc +/paludis/legacy/dep_list_TEST +/paludis/legacy/dep_list_TEST_blockers +/paludis/legacy/range_rewriter_TEST /paludis/name_TEST /paludis/package_database_TEST /paludis/paludis.hh -/paludis/range_rewriter_TEST /paludis/repositories/accounts/accounts_repository_TEST /paludis/repositories/cran/cran_dep_parser_TEST /paludis/repositories/cran/cran_installed_repository_TEST diff --git a/doc/api/ruby/create_ruby_doc.rb b/doc/api/ruby/create_ruby_doc.rb index 84db5cd81..3ae25f63c 100644 --- a/doc/api/ruby/create_ruby_doc.rb +++ b/doc/api/ruby/create_ruby_doc.rb @@ -62,7 +62,12 @@ module RDoc def generate_consts(header, type, in_class) consts = [] - file = File.read(ENV["TOP_SRCDIR"] + "/#{header}") + if File.exist?(ENV["TOP_SRCDIR"] + "/#{header}") + file = File.read(ENV["TOP_SRCDIR"] + "/#{header}") + else + file = File.read(ENV["TOP_SRCDIR"] + "/#{header.sub(%r[^paludis/], "paludis/legacy/")}") + end + match = Regexp.new(/enum\s+#{type}\s+\{([^}]+)\}/)#, Regexp::MULTILINE) if file =~ match enum = $1 diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4 index 2071a0a8f..a12601283 100644 --- a/paludis/Makefile.am.m4 +++ b/paludis/Makefile.am.m4 @@ -134,17 +134,6 @@ libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \ libpaludismanpagethings_@PALUDIS_PC_SLOT@_la_LIBADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la -dep_list_TEST_SOURCES += dep_list_TEST.hh -define(`testlist', testlist `dep_list_TEST_blockers')dnl -dep_list_TEST_blockers_SOURCES = dep_list_TEST_blockers.cc dep_list_TEST.hh -dep_list_TEST_blockers_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ - $(top_builddir)/test/libtest.a \ - libpaludis_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(DYNAMIC_LD_LIBS) -dep_list_TEST_blockers_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ - TESTS = testlist check_PROGRAMS = $(TESTS) stripper_TEST_binary diff --git a/paludis/args/legacy/Makefile.am b/paludis/args/legacy/Makefile.am index a62d70103..7f9262845 100644 --- a/paludis/args/legacy/Makefile.am +++ b/paludis/args/legacy/Makefile.am @@ -22,6 +22,7 @@ libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \ libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_LIBADD = \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la diff --git a/paludis/args/legacy/dep_list_args_group.hh b/paludis/args/legacy/dep_list_args_group.hh index 0cfd1332c..1a50a529a 100644 --- a/paludis/args/legacy/dep_list_args_group.hh +++ b/paludis/args/legacy/dep_list_args_group.hh @@ -24,8 +24,8 @@ #include <paludis/args/args_option.hh> #include <paludis/args/legacy/deps_option_arg.hh> #include <paludis/args/args_group.hh> -#include <paludis/dep_list.hh> -#include <paludis/install_task.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/install_task.hh> namespace paludis { diff --git a/paludis/args/legacy/deps_option_arg.hh b/paludis/args/legacy/deps_option_arg.hh index f138f52b7..9595ad79c 100644 --- a/paludis/args/legacy/deps_option_arg.hh +++ b/paludis/args/legacy/deps_option_arg.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -21,7 +21,7 @@ #define PALUDIS_GUARD_SRC_COMMON_ARGS_DEPS_OPTION_ARG_HH 1 #include <paludis/args/args_option.hh> -#include <paludis/dep_list.hh> +#include <paludis/legacy/dep_list.hh> /** \file * Declarations for the DepsOptionArg class. diff --git a/paludis/args/legacy/install_args_group.hh b/paludis/args/legacy/install_args_group.hh index 22204675c..acada1e10 100644 --- a/paludis/args/legacy/install_args_group.hh +++ b/paludis/args/legacy/install_args_group.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * Copyright (c) 2007 David Leverton * * This file is part of the Paludis package manager. Paludis is free software; @@ -25,8 +25,8 @@ #include <paludis/args/args_option.hh> #include <paludis/args/args_group.hh> -#include <paludis/dep_list-fwd.hh> -#include <paludis/install_task.hh> +#include <paludis/legacy/dep_list-fwd.hh> +#include <paludis/legacy/install_task.hh> /** \file * Declarations for the InstallArgsGroup class. diff --git a/paludis/files.m4 b/paludis/files.m4 index c8c10e9cc..58d8c75df 100644 --- a/paludis/files.m4 +++ b/paludis/files.m4 @@ -24,9 +24,6 @@ add(`common_sets', `hh', `cc', `fwd') add(`contents', `hh', `cc', `fwd') add(`create_output_manager_info', `hh', `cc', `fwd', `se') add(`dep_label', `hh', `cc', `fwd') -add(`dep_list', `hh', `cc', `fwd', `test') -add(`dep_list_exceptions', `hh', `cc') -add(`dep_list_options', `hh', `cc', `se') add(`dep_spec', `hh', `cc', `test', `fwd') add(`dep_spec_data', `hh', `cc', `fwd') add(`dep_spec_flattener', `hh', `cc') @@ -47,7 +44,6 @@ add(`file_output_manager', `hh', `cc', `fwd') add(`filter', `hh', `cc', `fwd', `test') add(`filter_handler', `hh', `cc', `fwd') add(`filtered_generator', `hh', `cc', `fwd', `test') -add(`find_unused_packages_task', `hh', `cc') add(`format_messages_output_manager', `hh', `fwd', `cc') add(`formatter', `hh', `fwd', `cc') add(`forward_at_finish_output_manager', `hh', `fwd', `cc') @@ -55,10 +51,8 @@ add(`fs_merger', `hh', `cc', `fwd', `se', `tes add(`fuzzy_finder', `hh', `cc', `test') add(`generator', `hh', `cc', `fwd', `test') add(`generator_handler', `hh', `cc', `fwd') -add(`handled_information', `hh', `fwd', `cc') add(`hook', `hh', `cc', `fwd', `se') add(`hooker', `hh', `cc', `test', `testscript') -add(`install_task', `hh', `cc', `se') add(`ipc_output_manager', `hh', `cc', `fwd') add(`libtool_linkage_checker', `hh', `cc') add(`linkage_checker', `hh', `cc') @@ -86,8 +80,6 @@ add(`package_id', `hh', `cc', `fwd', `se') add(`paludis', `hh') add(`paludislike_options_conf', `hh', `cc', `fwd') add(`partially_made_package_dep_spec', `hh', `cc', `fwd', `se') -add(`query_visitor', `hh', `cc') -add(`range_rewriter', `hh', `cc', `test') add(`report_task', `hh', `cc') add(`repository', `hh', `fwd', `cc') add(`repository_factory', `hh', `fwd', `cc') @@ -97,20 +89,16 @@ add(`selection_cache', `hh', `cc', `fwd') add(`selection_handler', `hh', `cc', `fwd') add(`serialise', `hh', `cc', `fwd', `impl') add(`set_file', `hh', `cc', `se', `test', `testscript') -add(`show_suggest_visitor', `hh', `cc') add(`slot_requirement', `hh', `fwd', `cc') add(`spec_tree', `hh', `fwd', `cc') add(`standard_output_manager', `hh', `cc', `fwd') add(`stringify_formatter', `hh', `cc', `fwd', `impl', `test') add(`stripper', `hh', `cc', `fwd', `test', `testscript') add(`syncer', `hh', `cc') -add(`sync_task', `hh', `cc') add(`tar_merger', `hh', `cc', `fwd', `test', `testscript', `se') -add(`tasks_exceptions', `hh', `cc') add(`tee_output_manager', `hh', `cc', `fwd') add(`unchoices_key', `hh', `cc', `fwd') add(`uninstall_list', `hh', `cc', `se', `test') -add(`uninstall_task', `hh', `cc') add(`unmerger', `hh', `cc') add(`user_dep_spec', `hh', `cc', `se', `fwd', `test') add(`version_operator', `hh', `cc', `fwd', `se', `test') diff --git a/paludis/legacy/Makefile.am b/paludis/legacy/Makefile.am index 46b34e833..3d4497d20 100644 --- a/paludis/legacy/Makefile.am +++ b/paludis/legacy/Makefile.am @@ -1,17 +1,49 @@ include $(top_srcdir)/misc/common-makefile.am -DISTCLEANFILES = +DISTCLEANFILES = \ + dep_list_options-se.hh dep_list_options-se.cc \ + install_task-se.hh install_task-se.cc + AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@ -EXTRA_DIST = -BUILT_SOURCES = -TESTS = +EXTRA_DIST = \ + dep_list_options-se.hh dep_list_options-se.cc dep_list_options.se \ + install_task-se.hh install_task-se.cc install_task.se + +BUILT_SOURCES = \ + dep_list_options-se.hh dep_list_options-se.cc \ + install_task-se.hh install_task-se.cc paludis_legacy_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/legacy -paludis_legacy_include_HEADERS = +paludis_legacy_include_HEADERS = \ + dep_list.hh dep_list-fwd.hh \ + dep_list_exceptions.hh \ + dep_list_options.hh dep_list_options-se.hh \ + find_unused_packages_task.hh \ + handled_information.hh handled_information-fwd.hh \ + install_task.hh install_task-se.hh \ + query_visitor.hh \ + range_rewriter.hh \ + show_suggest_visitor.hh \ + sync_task.hh \ + tasks_exceptions.hh \ + uninstall_task.hh + +libpaludislegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \ + dep_list.cc \ + dep_list_exceptions.cc \ + dep_list_options.cc \ + find_unused_packages_task.cc \ + handled_information.cc \ + install_task.cc \ + query_visitor.cc \ + range_rewriter.cc \ + show_suggest_visitor.cc \ + sync_task.cc \ + tasks_exceptions.cc \ + uninstall_task.cc -libpaludislegacy_@PALUDIS_PC_SLOT@_la_SOURCES = libpaludislegacy_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 libpaludislegacy_@PALUDIS_PC_SLOT@_la_LIBADD = \ @@ -20,11 +52,64 @@ libpaludislegacy_@PALUDIS_PC_SLOT@_la_LIBADD = \ lib_LTLIBRARIES = libpaludislegacy_@PALUDIS_PC_SLOT@.la +TESTS = \ + dep_list_TEST \ + dep_list_TEST_blockers \ + range_rewriter_TEST + check_PROGRAMS = $(TESTS) +dep_list_TEST_SOURCES = dep_list_TEST.cc dep_list_TEST.hh + +dep_list_TEST_LDADD = \ + $(top_builddir)/paludis/util/test_extras.o \ + $(top_builddir)/test/libtest.a \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ + $(DYNAMIC_LD_LIBS) + +dep_list_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ + +dep_list_TEST_blockers_SOURCES = dep_list_TEST_blockers.cc dep_list_TEST.hh + +dep_list_TEST_blockers_LDADD = \ + $(top_builddir)/paludis/util/test_extras.o \ + $(top_builddir)/test/libtest.a \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ + $(DYNAMIC_LD_LIBS) + +dep_list_TEST_blockers_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ + +range_rewriter_TEST_SOURCES = range_rewriter_TEST.cc + +range_rewriter_TEST_LDADD = \ + $(top_builddir)/paludis/util/test_extras.o \ + $(top_builddir)/test/libtest.a \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ + $(DYNAMIC_LD_LIBS) + +range_rewriter_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ + test_ldadd = \ $(top_builddir)/paludis/util/test_extras.o \ libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la +dep_list_options-se.hh : dep_list_options.se $(top_srcdir)/misc/make_se.bash + if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/dep_list_options.se > $@ ; then rm -f $@ ; exit 1 ; fi + +dep_list_options-se.cc : dep_list_options.se $(top_srcdir)/misc/make_se.bash + if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/dep_list_options.se > $@ ; then rm -f $@ ; exit 1 ; fi + +install_task-se.hh : install_task.se $(top_srcdir)/misc/make_se.bash + if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/install_task.se > $@ ; then rm -f $@ ; exit 1 ; fi + +install_task-se.cc : install_task.se $(top_srcdir)/misc/make_se.bash + if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/install_task.se > $@ ; then rm -f $@ ; exit 1 ; fi + diff --git a/paludis/dep_list-fwd.hh b/paludis/legacy/dep_list-fwd.hh index 4ed074643..4ed074643 100644 --- a/paludis/dep_list-fwd.hh +++ b/paludis/legacy/dep_list-fwd.hh diff --git a/paludis/dep_list.cc b/paludis/legacy/dep_list.cc index c6a0552d3..8558dbb96 100644 --- a/paludis/dep_list.cc +++ b/paludis/legacy/dep_list.cc @@ -17,12 +17,12 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/dep_list.hh> -#include <paludis/dep_list_exceptions.hh> -#include <paludis/query_visitor.hh> -#include <paludis/range_rewriter.hh> -#include <paludis/show_suggest_visitor.hh> -#include <paludis/handled_information.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> +#include <paludis/legacy/query_visitor.hh> +#include <paludis/legacy/show_suggest_visitor.hh> +#include <paludis/legacy/range_rewriter.hh> +#include <paludis/legacy/handled_information.hh> #include <paludis/dep_spec.hh> #include <paludis/user_dep_spec.hh> diff --git a/paludis/dep_list.hh b/paludis/legacy/dep_list.hh index c46dfa1f9..778201cd7 100644 --- a/paludis/dep_list.hh +++ b/paludis/legacy/dep_list.hh @@ -23,9 +23,9 @@ #include <paludis/dep_spec-fwd.hh> #include <paludis/mask-fwd.hh> #include <paludis/dep_tag.hh> -#include <paludis/dep_list_options.hh> -#include <paludis/dep_list-fwd.hh> -#include <paludis/handled_information-fwd.hh> +#include <paludis/legacy/dep_list_options.hh> +#include <paludis/legacy/dep_list-fwd.hh> +#include <paludis/legacy/handled_information-fwd.hh> #include <paludis/name.hh> #include <paludis/environment.hh> #include <paludis/match_package.hh> diff --git a/paludis/dep_list_TEST.cc b/paludis/legacy/dep_list_TEST.cc index 287355384..287355384 100644 --- a/paludis/dep_list_TEST.cc +++ b/paludis/legacy/dep_list_TEST.cc diff --git a/paludis/dep_list_TEST.hh b/paludis/legacy/dep_list_TEST.hh index 9ade902c6..c5d0e851c 100644 --- a/paludis/dep_list_TEST.hh +++ b/paludis/legacy/dep_list_TEST.hh @@ -20,8 +20,8 @@ #ifndef PALUDIS_GUARD_PALUDIS_DEP_LIST_TEST_HH #define PALUDIS_GUARD_PALUDIS_DEP_LIST_TEST_HH 1 -#include <paludis/dep_list.hh> -#include <paludis/dep_list_exceptions.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> #include <paludis/repositories/fake/fake_repository.hh> #include <paludis/repositories/fake/fake_installed_repository.hh> #include <paludis/util/fs_entry.hh> diff --git a/paludis/dep_list_TEST_blockers.cc b/paludis/legacy/dep_list_TEST_blockers.cc index cef81eb62..cef81eb62 100644 --- a/paludis/dep_list_TEST_blockers.cc +++ b/paludis/legacy/dep_list_TEST_blockers.cc diff --git a/paludis/dep_list_exceptions.cc b/paludis/legacy/dep_list_exceptions.cc index fe8aeab85..fe8aeab85 100644 --- a/paludis/dep_list_exceptions.cc +++ b/paludis/legacy/dep_list_exceptions.cc diff --git a/paludis/dep_list_exceptions.hh b/paludis/legacy/dep_list_exceptions.hh index f981ec81d..f981ec81d 100644 --- a/paludis/dep_list_exceptions.hh +++ b/paludis/legacy/dep_list_exceptions.hh diff --git a/paludis/dep_list_options.cc b/paludis/legacy/dep_list_options.cc index 72676e2fc..1303e6aa8 100644 --- a/paludis/dep_list_options.cc +++ b/paludis/legacy/dep_list_options.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -24,5 +24,5 @@ using namespace paludis; -#include <paludis/dep_list_options-se.cc> +#include <paludis/legacy/dep_list_options-se.cc> diff --git a/paludis/dep_list_options.hh b/paludis/legacy/dep_list_options.hh index ecd29e601..8255e46ea 100644 --- a/paludis/dep_list_options.hh +++ b/paludis/legacy/dep_list_options.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -35,7 +35,7 @@ namespace paludis { -#include <paludis/dep_list_options-se.hh> +#include <paludis/legacy/dep_list_options-se.hh> } #endif diff --git a/paludis/dep_list_options.se b/paludis/legacy/dep_list_options.se index be548576a..be548576a 100644 --- a/paludis/dep_list_options.se +++ b/paludis/legacy/dep_list_options.se diff --git a/paludis/find_unused_packages_task.cc b/paludis/legacy/find_unused_packages_task.cc index 173dd164e..c896e1ff4 100644 --- a/paludis/find_unused_packages_task.cc +++ b/paludis/legacy/find_unused_packages_task.cc @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/find_unused_packages_task.hh> +#include <paludis/legacy/find_unused_packages_task.hh> #include <paludis/environment.hh> #include <paludis/repository.hh> #include <paludis/package_database.hh> diff --git a/paludis/find_unused_packages_task.hh b/paludis/legacy/find_unused_packages_task.hh index 7e56566d7..7e56566d7 100644 --- a/paludis/find_unused_packages_task.hh +++ b/paludis/legacy/find_unused_packages_task.hh diff --git a/paludis/handled_information-fwd.hh b/paludis/legacy/handled_information-fwd.hh index 2942b9a2b..2942b9a2b 100644 --- a/paludis/handled_information-fwd.hh +++ b/paludis/legacy/handled_information-fwd.hh diff --git a/paludis/handled_information.cc b/paludis/legacy/handled_information.cc index 6df89fe25..882cd0ce8 100644 --- a/paludis/handled_information.cc +++ b/paludis/legacy/handled_information.cc @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/handled_information.hh> +#include <paludis/legacy/handled_information.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/dep_spec.hh> diff --git a/paludis/handled_information.hh b/paludis/legacy/handled_information.hh index 53c0ca32a..cbf8c9e93 100644 --- a/paludis/handled_information.hh +++ b/paludis/legacy/handled_information.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -20,7 +20,7 @@ #ifndef PALUDIS_GUARD_PALUDIS_HANDLED_INFORMATION_HH #define PALUDIS_GUARD_PALUDIS_HANDLED_INFORMATION_HH 1 -#include <paludis/handled_information-fwd.hh> +#include <paludis/legacy/handled_information-fwd.hh> #include <paludis/util/simple_visitor.hh> #include <paludis/util/attributes.hh> #include <paludis/util/pimp.hh> diff --git a/paludis/install_task.cc b/paludis/legacy/install_task.cc index 35d40efd5..ea78a6386 100644 --- a/paludis/install_task.cc +++ b/paludis/legacy/install_task.cc @@ -17,7 +17,8 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/install_task.hh> +#include <paludis/legacy/install_task.hh> +#include <paludis/legacy/handled_information.hh> #include <paludis/dep_spec.hh> #include <paludis/user_dep_spec.hh> #include <paludis/action.hh> @@ -30,7 +31,7 @@ #include <paludis/package_database.hh> #include <paludis/package_id.hh> #include <paludis/version_requirements.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/selection.hh> #include <paludis/filter.hh> #include <paludis/generator.hh> @@ -49,7 +50,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/accept_visitor.hh> #include <paludis/util/return_literal_function.hh> -#include <paludis/handled_information.hh> #include <paludis/create_output_manager_info.hh> #include <paludis/output_manager_from_environment.hh> #include <paludis/output_manager.hh> @@ -63,7 +63,7 @@ using namespace paludis; -#include <paludis/install_task-se.cc> +#include <paludis/legacy/install_task-se.cc> namespace { diff --git a/paludis/install_task.hh b/paludis/legacy/install_task.hh index c1b077cae..98378f156 100644 --- a/paludis/install_task.hh +++ b/paludis/legacy/install_task.hh @@ -22,9 +22,9 @@ #include <paludis/util/pimp.hh> #include <paludis/util/wrapped_forward_iterator.hh> -#include <paludis/dep_list.hh> -#include <paludis/dep_list_exceptions.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/repository-fwd.hh> #include <paludis/action-fwd.hh> #include <paludis/package_database-fwd.hh> @@ -44,7 +44,7 @@ namespace paludis { class Environment; -#include <paludis/install_task-se.hh> +#include <paludis/legacy/install_task-se.hh> /** * Task used to install one or more targets. diff --git a/paludis/install_task.se b/paludis/legacy/install_task.se index a78a14011..a78a14011 100644 --- a/paludis/install_task.se +++ b/paludis/legacy/install_task.se diff --git a/paludis/query_visitor.cc b/paludis/legacy/query_visitor.cc index 9b3f0c639..9755ef9a3 100644 --- a/paludis/query_visitor.cc +++ b/paludis/legacy/query_visitor.cc @@ -17,9 +17,9 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/query_visitor.hh> -#include <paludis/dep_list.hh> -#include <paludis/range_rewriter.hh> +#include <paludis/legacy/query_visitor.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/range_rewriter.hh> #include <paludis/package_database.hh> #include <paludis/selection.hh> #include <paludis/generator.hh> diff --git a/paludis/query_visitor.hh b/paludis/legacy/query_visitor.hh index f889a1813..c8cd9ebe3 100644 --- a/paludis/query_visitor.hh +++ b/paludis/legacy/query_visitor.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -20,7 +20,7 @@ #ifndef PALUDIS_GUARD_PALUDIS_QUERY_VISITOR_HH #define PALUDIS_GUARD_PALUDIS_QUERY_VISITOR_HH 1 -#include <paludis/dep_list-fwd.hh> +#include <paludis/legacy/dep_list-fwd.hh> #include <paludis/util/pimp.hh> #include <paludis/dep_spec-fwd.hh> diff --git a/paludis/range_rewriter.cc b/paludis/legacy/range_rewriter.cc index 4f9907431..39002ee2d 100644 --- a/paludis/range_rewriter.cc +++ b/paludis/legacy/range_rewriter.cc @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/range_rewriter.hh> +#include <paludis/legacy/range_rewriter.hh> #include <paludis/util/sequence.hh> #include <paludis/version_requirements.hh> #include <paludis/package_dep_spec_properties.hh> diff --git a/paludis/range_rewriter.hh b/paludis/legacy/range_rewriter.hh index 41962f682..41962f682 100644 --- a/paludis/range_rewriter.hh +++ b/paludis/legacy/range_rewriter.hh diff --git a/paludis/range_rewriter_TEST.cc b/paludis/legacy/range_rewriter_TEST.cc index b2f6181f4..9cadfbf84 100644 --- a/paludis/range_rewriter_TEST.cc +++ b/paludis/legacy/range_rewriter_TEST.cc @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/range_rewriter.hh> +#include <paludis/legacy/range_rewriter.hh> #include <paludis/dep_spec.hh> #include <paludis/user_dep_spec.hh> #include <paludis/util/options.hh> diff --git a/paludis/show_suggest_visitor.cc b/paludis/legacy/show_suggest_visitor.cc index 93486698e..cbb63638a 100644 --- a/paludis/show_suggest_visitor.cc +++ b/paludis/legacy/show_suggest_visitor.cc @@ -17,8 +17,8 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/show_suggest_visitor.hh> -#include <paludis/dep_list.hh> +#include <paludis/legacy/show_suggest_visitor.hh> +#include <paludis/legacy/dep_list.hh> #include <paludis/dep_spec.hh> #include <paludis/package_id.hh> #include <paludis/package_database.hh> diff --git a/paludis/show_suggest_visitor.hh b/paludis/legacy/show_suggest_visitor.hh index 253b7012b..99507e6ad 100644 --- a/paludis/show_suggest_visitor.hh +++ b/paludis/legacy/show_suggest_visitor.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -21,7 +21,7 @@ #define PALUDIS_GUARD_PALUDIS_SHOW_SUGGEST_VISITOR_HH 1 #include <paludis/util/pimp.hh> -#include <paludis/dep_list-fwd.hh> +#include <paludis/legacy/dep_list-fwd.hh> #include <paludis/dep_spec-fwd.hh> /** \file diff --git a/paludis/sync_task.cc b/paludis/legacy/sync_task.cc index cb88547ae..8586f91de 100644 --- a/paludis/sync_task.cc +++ b/paludis/legacy/sync_task.cc @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "sync_task.hh" +#include <paludis/legacy/sync_task.hh> #include <paludis/environment.hh> #include <paludis/syncer.hh> #include <paludis/util/pimp-impl.hh> diff --git a/paludis/sync_task.hh b/paludis/legacy/sync_task.hh index 04fed38d1..35c865dea 100644 --- a/paludis/sync_task.hh +++ b/paludis/legacy/sync_task.hh @@ -22,7 +22,9 @@ #include <paludis/util/pimp.hh> #include <paludis/util/wrapped_forward_iterator-fwd.hh> -#include <paludis/dep_list.hh> +#include <paludis/util/attributes.hh> +#include <paludis/name-fwd.hh> +#include <string> /** \file * Declarations for SyncTask. diff --git a/paludis/tasks_exceptions.cc b/paludis/legacy/tasks_exceptions.cc index 4d31735a2..33565f76c 100644 --- a/paludis/tasks_exceptions.cc +++ b/paludis/legacy/tasks_exceptions.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -17,7 +17,7 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "tasks_exceptions.hh" +#include <paludis/legacy/tasks_exceptions.hh> using namespace paludis; diff --git a/paludis/tasks_exceptions.hh b/paludis/legacy/tasks_exceptions.hh index 9d8a73306..9d8a73306 100644 --- a/paludis/tasks_exceptions.hh +++ b/paludis/legacy/tasks_exceptions.hh diff --git a/paludis/uninstall_task.cc b/paludis/legacy/uninstall_task.cc index 73edda5a5..57c16a04a 100644 --- a/paludis/uninstall_task.cc +++ b/paludis/legacy/uninstall_task.cc @@ -17,12 +17,12 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <paludis/uninstall_task.hh> +#include <paludis/legacy/uninstall_task.hh> #include <paludis/environment.hh> #include <paludis/action.hh> #include <paludis/uninstall_list.hh> #include <paludis/dep_spec_flattener.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/user_dep_spec.hh> #include <paludis/selection.hh> #include <paludis/generator.hh> diff --git a/paludis/uninstall_task.hh b/paludis/legacy/uninstall_task.hh index e64655736..e64655736 100644 --- a/paludis/uninstall_task.hh +++ b/paludis/legacy/uninstall_task.hh diff --git a/python/Makefile.am b/python/Makefile.am index 795c18240..eb1841dc8 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -136,6 +136,7 @@ libpaludispython_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_PYTHON_SOURCES) TESTS = $(IF_PYTHON_TESTS) libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD = \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la diff --git a/python/dep_list.cc b/python/dep_list.cc index 36b49d078..c8ba1e612 100644 --- a/python/dep_list.cc +++ b/python/dep_list.cc @@ -20,8 +20,8 @@ #include <python/paludis_python.hh> #include <python/exception.hh> -#include <paludis/dep_list.hh> -#include <paludis/dep_list_exceptions.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> #include <paludis/util/wrapped_forward_iterator.hh> diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 60187783e..472f9864c 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -106,6 +106,7 @@ libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES) TESTS = $(IF_RUBY_TESTS) libpaludisruby_@PALUDIS_PC_SLOT@_la_LIBADD = \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ $(PTHREAD_LIBS) diff --git a/ruby/dep_label.cc b/ruby/dep_label.cc index e202ab28f..f9e1ba6b9 100644 --- a/ruby/dep_label.cc +++ b/ruby/dep_label.cc @@ -19,7 +19,6 @@ */ #include <paludis_ruby.hh> -#include <paludis/dep_list.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/sequence.hh> #include <paludis/util/options.hh> diff --git a/ruby/dep_list.cc b/ruby/dep_list.cc index b64d6fb85..d57ab368d 100644 --- a/ruby/dep_list.cc +++ b/ruby/dep_list.cc @@ -18,7 +18,7 @@ */ #include <paludis_ruby.hh> -#include <paludis/dep_list.hh> +#include <paludis/legacy/dep_list.hh> #include <paludis/dep_tag.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/set.hh> diff --git a/ruby/find_unused_packages_task.cc b/ruby/find_unused_packages_task.cc index 4c2f6d512..df149c265 100644 --- a/ruby/find_unused_packages_task.cc +++ b/ruby/find_unused_packages_task.cc @@ -18,7 +18,7 @@ */ #include <paludis_ruby.hh> -#include <paludis/find_unused_packages_task.hh> +#include <paludis/legacy/find_unused_packages_task.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/sequence-impl.hh> #include <ruby.h> diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc index e25e2e6b9..2bed22d63 100644 --- a/ruby/paludis_ruby.cc +++ b/ruby/paludis_ruby.cc @@ -22,7 +22,7 @@ #include <paludis/util/config_file.hh> #include <paludis/util/singleton-impl.hh> #include <paludis/util/pimp-impl.hh> -#include <paludis/dep_list_exceptions.hh> +#include <paludis/legacy/dep_list_exceptions.hh> #include <paludis/match_package.hh> #include <paludis/version_spec.hh> #include <paludis/version_operator.hh> diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am index 785296bba..fcd123898 100644 --- a/src/clients/adjutrix/Makefile.am +++ b/src/clients/adjutrix/Makefile.am @@ -44,6 +44,7 @@ adjutrix_SOURCES = \ adjutrix.cc adjutrix_LDADD = \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc index 7d61991ff..f14cc95a2 100644 --- a/src/clients/adjutrix/display_default_system_resolution.cc +++ b/src/clients/adjutrix/display_default_system_resolution.cc @@ -30,8 +30,8 @@ #include <paludis/util/strip.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/dep_list.hh> -#include <paludis/dep_list_exceptions.hh> +#include <paludis/legacy/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> #include <iostream> #include <iomanip> diff --git a/src/clients/adjutrix/find_unused_packages.cc b/src/clients/adjutrix/find_unused_packages.cc index c7d7ffd47..9d1deb412 100644 --- a/src/clients/adjutrix/find_unused_packages.cc +++ b/src/clients/adjutrix/find_unused_packages.cc @@ -20,7 +20,7 @@ #include "find_unused_packages.hh" #include "command_line.hh" -#include <paludis/find_unused_packages_task.hh> +#include <paludis/legacy/find_unused_packages_task.hh> #include <paludis/util/tokeniser.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/set.hh> diff --git a/src/clients/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc index 9f9bb76d0..581b12787 100644 --- a/src/clients/adjutrix/keywords_graph.cc +++ b/src/clients/adjutrix/keywords_graph.cc @@ -21,7 +21,7 @@ #include "command_line.hh" #include <output/colour.hh> -#include <paludis/find_unused_packages_task.hh> +#include <paludis/legacy/find_unused_packages_task.hh> #include <paludis/util/tokeniser.hh> #include <paludis/util/sequence.hh> #include <paludis/util/set.hh> diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc index 5bf4f6a7b..7ecb9ff80 100644 --- a/src/clients/adjutrix/what_needs_keywording.cc +++ b/src/clients/adjutrix/what_needs_keywording.cc @@ -29,8 +29,8 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/make_named_values.hh> #include <paludis/repositories/fake/fake_installed_repository.hh> -#include <paludis/dep_list_exceptions.hh> -#include <paludis/dep_list.hh> +#include <paludis/legacy/dep_list_exceptions.hh> +#include <paludis/legacy/dep_list.hh> #include <paludis/override_functions.hh> #include <paludis/package_id.hh> #include <paludis/metadata_key.hh> diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am index eaad88253..6f2fbaa5c 100644 --- a/src/clients/importare/Makefile.am +++ b/src/clients/importare/Makefile.am @@ -33,6 +33,7 @@ importare_SOURCES = \ importare_LDADD = \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/src/clients/importare/install.cc b/src/clients/importare/install.cc index d2360c576..24a36e474 100644 --- a/src/clients/importare/install.cc +++ b/src/clients/importare/install.cc @@ -26,8 +26,8 @@ #include <cstdlib> #include <cstring> -#include <paludis/install_task.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/install_task.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/util/log.hh> #include <paludis/util/tokeniser.hh> diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am index bc5a2aac2..d7390b0d9 100644 --- a/src/clients/paludis/Makefile.am +++ b/src/clients/paludis/Makefile.am @@ -51,6 +51,7 @@ paludis_SOURCES = \ paludis_LDADD = \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ + $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc index 71e35d2f6..6b4259287 100644 --- a/src/clients/paludis/install.cc +++ b/src/clients/paludis/install.cc @@ -25,8 +25,8 @@ #include <cstdlib> #include <cstring> -#include <paludis/install_task.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/install_task.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/util/log.hh> #include <paludis/util/tokeniser.hh> diff --git a/src/clients/paludis/sync.cc b/src/clients/paludis/sync.cc index f181c928c..b3715a489 100644 --- a/src/clients/paludis/sync.cc +++ b/src/clients/paludis/sync.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -19,7 +19,7 @@ #include <src/output/colour.hh> #include "sync.hh" -#include <paludis/sync_task.hh> +#include <paludis/legacy/sync_task.hh> #include <paludis/syncer.hh> #include <iomanip> #include <iostream> diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc index 02983406e..ae63b9350 100644 --- a/src/clients/paludis/uninstall.cc +++ b/src/clients/paludis/uninstall.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -20,8 +20,8 @@ #include <src/output/colour.hh> #include "uninstall.hh" -#include <paludis/uninstall_task.hh> -#include <paludis/tasks_exceptions.hh> +#include <paludis/legacy/uninstall_task.hh> +#include <paludis/legacy/tasks_exceptions.hh> #include <paludis/util/set.hh> #include <paludis/uninstall_list.hh> #include <paludis/package_database.hh> diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc index cd895df26..dc860ccd7 100644 --- a/src/output/console_install_task.cc +++ b/src/output/console_install_task.cc @@ -51,7 +51,7 @@ #include <paludis/choice.hh> #include <paludis/output_manager_from_environment.hh> #include <paludis/output_manager.hh> -#include <paludis/dep_list.hh> +#include <paludis/legacy/dep_list.hh> #include <paludis/notifier_callback.hh> #include <paludis/partially_made_package_dep_spec.hh> diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh index ca4392e09..09591e69c 100644 --- a/src/output/console_install_task.hh +++ b/src/output/console_install_task.hh @@ -20,7 +20,7 @@ #ifndef PALUDIS_GUARD_SRC_CONSOLE_INSTALL_TASK_HH #define PALUDIS_GUARD_SRC_CONSOLE_INSTALL_TASK_HH 1 -#include <paludis/install_task.hh> +#include <paludis/legacy/install_task.hh> #include <paludis/util/set.hh> #include <paludis/choice.hh> #include <paludis/name.hh> |