aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 18:33:48 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 18:33:48 +0100
commitf6b265538d15fe0d0b3e7906e0a2ffcd98fec4d5 (patch)
tree1b61a86ee5b9eaf13b2fbf2fda1b3c2febc1c471 /paludis/repositories/e
parent15792dbb2affa34cb6a9790a53f20ca9a024e72e (diff)
downloadpaludis-f6b265538d15fe0d0b3e7906e0a2ffcd98fec4d5.tar.gz
paludis-f6b265538d15fe0d0b3e7906e0a2ffcd98fec4d5.tar.xz
Don't load repositories from .sos
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/Makefile.am54
-rw-r--r--paludis/repositories/e/qa/Makefile.am49
-rw-r--r--paludis/repositories/e/qa/qa.cc20
-rw-r--r--paludis/repositories/e/qa/stray_files_TEST.cc40
-rw-r--r--paludis/repositories/e/registration.cc72
-rw-r--r--paludis/repositories/e/xml_things.cc6
6 files changed, 50 insertions, 191 deletions
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 8ff10260c..8e13e2bc6 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -14,17 +14,13 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-paludis_repositories_libdir = $(libdir)/paludis/repositories
-paludis_repositories_lib_LTLIBRARIES = libpaludiserepository_@PALUDIS_PC_SLOT@.la
+noinst_LTLIBRARIES = libpaludiserepository.la
if ENABLE_XML
lib_LTLIBRARIES = libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@.la
endif
-paludis_repositories_e_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/e/
-libpaludiserepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-paludis_repositories_e_include_HEADERS = \
+noinst_HEADERS = \
aa_visitor.hh \
can_skip_phase.hh \
check_fetched_files_visitor.hh \
@@ -87,7 +83,7 @@ paludis_repositories_e_include_HEADERS = \
vdb_repository.hh \
vdb_unmerger.hh
-libpaludiserepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludiserepository_la_SOURCES = \
aa_visitor.cc \
can_skip_phase.cc \
check_fetched_files_visitor.cc \
@@ -144,18 +140,11 @@ libpaludiserepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
vdb_merger.cc \
vdb_repository.cc \
vdb_unmerger.cc \
- $(paludis_repositories_e_include_HEADERS)
-
-libpaludiserepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(DYNAMIC_LD_LIBS)
+ $(noinst_HEADERS)
e_repository_TEST_SOURCES = e_repository_TEST.cc
e_repository_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -168,8 +157,6 @@ e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO
depend_rdepend_TEST_SOURCES = depend_rdepend_TEST.cc
depend_rdepend_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -182,8 +169,6 @@ depend_rdepend_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_
e_repository_TEST_ever_SOURCES = e_repository_TEST_ever.cc
e_repository_TEST_ever_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -196,8 +181,6 @@ e_repository_TEST_ever_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLA
e_repository_TEST_phases_SOURCES = e_repository_TEST_phases.cc
e_repository_TEST_phases_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -210,8 +193,6 @@ e_repository_TEST_phases_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXF
e_repository_TEST_exlibs_SOURCES = e_repository_TEST_exlibs.cc
e_repository_TEST_exlibs_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -224,8 +205,6 @@ e_repository_TEST_exlibs_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXF
e_repository_TEST_replacing_SOURCES = e_repository_TEST_replacing.cc
e_repository_TEST_replacing_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -238,8 +217,6 @@ e_repository_TEST_replacing_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_C
vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
vdb_repository_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -252,8 +229,6 @@ vdb_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_
exndbam_repository_TEST_SOURCES = exndbam_repository_TEST.cc
exndbam_repository_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -266,7 +241,6 @@ exndbam_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFL
vdb_merger_TEST_SOURCES = vdb_merger_TEST.cc
vdb_merger_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -279,7 +253,6 @@ vdb_merger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_D
vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
vdb_unmerger_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -292,13 +265,10 @@ vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO
e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc
e_repository_sets_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -307,8 +277,6 @@ e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLA
dep_spec_pretty_printer_TEST_SOURCES = dep_spec_pretty_printer_TEST.cc
dep_spec_pretty_printer_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -321,8 +289,6 @@ dep_spec_pretty_printer_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING
dep_parser_TEST_SOURCES = dep_parser_TEST.cc
dep_parser_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -335,8 +301,6 @@ dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
aa_visitor_TEST_SOURCES = aa_visitor_TEST.cc
aa_visitor_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -349,8 +313,6 @@ aa_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
fetch_visitor_TEST_SOURCES = fetch_visitor_TEST.cc
fetch_visitor_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -363,8 +325,6 @@ fetch_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
source_uri_finder_TEST_SOURCES = source_uri_finder_TEST.cc
source_uri_finder_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -377,8 +337,6 @@ source_uri_finder_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc
fix_locked_dependencies_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -391,8 +349,6 @@ fix_locked_dependencies_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBU
ebuild_flat_metadata_cache_TEST_SOURCES = ebuild_flat_metadata_cache_TEST.cc
ebuild_flat_metadata_cache_TEST_LDADD = \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -530,7 +486,6 @@ libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @L
libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@LIBXML2DEPS_LIBS@
libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
@@ -543,7 +498,6 @@ xml_things_TEST_SOURCES = xml_things_TEST.cc
xml_things_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiserepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/repositories/e/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index aae19ec90..8f9af3e15 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -28,8 +28,7 @@ dist_paludis_qa_data_DATA = \
spec_keys_pds_blacklist.SDEPEND.conf \
spec_keys_pds_blacklist.PROVIDE.conf
-paludis_repositories_e_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/e/
-paludis_repositories_e_include_HEADERS = \
+noinst_HEADERS = \
eapi_supported.hh \
metadata_keys.hh \
extractors.hh \
@@ -66,6 +65,9 @@ paludis_repositories_e_include_HEADERS = \
lib_LTLIBRARIES = libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la
+libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_LDFLAGS = \
+ $(PCRECPPDEPS_LIBS)
+
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_SOURCES = \
qa.cc \
eapi_supported.cc \
@@ -103,15 +105,6 @@ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_SOURCES = \
categories.cc \
$(paludis_repositories_e_include_HEADERS)
-libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_LDFLAGS = \
- -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 \
- $(PCRECPPDEPS_LIBS)
-
-libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-
dist_check_SCRIPTS = \
visibility_TEST_setup.sh \
visibility_TEST_cleanup.sh \
@@ -153,7 +146,6 @@ TESTS = \
extractors_TEST \
homepage_key_TEST \
spec_keys_TEST \
- stray_files_TEST \
default_functions_TEST \
kv_variables_TEST \
visibility_TEST \
@@ -167,8 +159,6 @@ check_PROGRAMS = $(TESTS)
spec_keys_TEST_SOURCES = spec_keys_TEST.cc
spec_keys_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -177,24 +167,9 @@ spec_keys_TEST_LDADD = \
spec_keys_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-stray_files_TEST_SOURCES = stray_files_TEST.cc
-stray_files_TEST_LDADD = \
- libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/test/libtest.a
-
-stray_files_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-
extractors_TEST_SOURCES = extractors_TEST.cc
extractors_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -206,8 +181,6 @@ extractors_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
homepage_key_TEST_SOURCES = homepage_key_TEST.cc
homepage_key_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -219,8 +192,6 @@ homepage_key_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
visibility_TEST_SOURCES = visibility_TEST.cc
visibility_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -232,8 +203,6 @@ visibility_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
default_functions_TEST_SOURCES = default_functions_TEST.cc
default_functions_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -245,8 +214,6 @@ default_functions_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
kv_variables_TEST_SOURCES = kv_variables_TEST.cc
kv_variables_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -258,8 +225,6 @@ kv_variables_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
misc_files_TEST_SOURCES = misc_files_TEST.cc
misc_files_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -271,8 +236,6 @@ misc_files_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
manifest_TEST_SOURCES = manifest_TEST.cc
manifest_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -284,8 +247,6 @@ manifest_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
subshell_die_TEST_SOURCES = subshell_die_TEST.cc
subshell_die_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -297,8 +258,6 @@ subshell_die_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
function_keyword_TEST_SOURCES = function_keyword_TEST.cc
function_keyword_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/repositories/e/qa/qa.cc b/paludis/repositories/e/qa/qa.cc
index e76239007..8aa4ef1b6 100644
--- a/paludis/repositories/e/qa/qa.cc
+++ b/paludis/repositories/e/qa/qa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 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
@@ -31,24 +31,6 @@ namespace paludis
class ERepository;
}
-extern "C"
-{
- void PALUDIS_VISIBLE paludis_initialise_repository_so(paludis::RepositoryFactory * const);
-
- void PALUDIS_VISIBLE check_qa(
- const Environment * const,
- const std::tr1::shared_ptr<const ERepository> &,
- const QACheckProperties &,
- const QACheckProperties &,
- const QAMessageLevel,
- QAReporter &,
- const FSEntry &);
-}
-
-void paludis_initialise_repository_so(paludis::RepositoryFactory * const)
-{
-}
-
void check_qa(
const Environment * const env,
const std::tr1::shared_ptr<const ERepository> & repo,
diff --git a/paludis/repositories/e/qa/stray_files_TEST.cc b/paludis/repositories/e/qa/stray_files_TEST.cc
deleted file mode 100644
index 8607d5244..000000000
--- a/paludis/repositories/e/qa/stray_files_TEST.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 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
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "stray_files.hh"
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
-
-using namespace paludis;
-using namespace paludis::erepository;
-using namespace test;
-
-namespace test_cases
-{
- struct StrayFilesTest : TestCase
- {
- StrayFilesTest() : TestCase("stray files") { }
-
- void run()
- {
- TEST_CHECK(true);
- }
- } test_stray_files;
-}
-
diff --git a/paludis/repositories/e/registration.cc b/paludis/repositories/e/registration.cc
index b263a833b..4000ed2b4 100644
--- a/paludis/repositories/e/registration.cc
+++ b/paludis/repositories/e/registration.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, 2009 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
@@ -25,6 +25,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/destringify.hh>
+#include "config.h"
using namespace paludis;
@@ -41,42 +42,49 @@ namespace
}
}
-extern "C" void paludis_initialise_repository_so(RepositoryFactory * const factory) PALUDIS_VISIBLE;
-
-void paludis_initialise_repository_so(RepositoryFactory * const factory)
+namespace paludis
{
- std::tr1::shared_ptr<Set<std::string> > ebuild_formats(new Set<std::string>);
- ebuild_formats->insert("ebuild");
- ebuild_formats->insert("exheres");
+ namespace repository_groups
+ {
+ REPOSITORY_GROUPS_DECLS;
+ }
- factory->add_repository_format(
- ebuild_formats,
- &ERepository::repository_factory_name,
- &generic_importance,
- &ERepository::repository_factory_create,
- &ERepository::repository_factory_dependencies
- );
+ template <>
+ void register_repositories<repository_groups::e>(RepositoryFactory * const factory)
+ {
+ std::tr1::shared_ptr<Set<std::string> > ebuild_formats(new Set<std::string>);
+ ebuild_formats->insert("ebuild");
+ ebuild_formats->insert("exheres");
+
+ factory->add_repository_format(
+ ebuild_formats,
+ &ERepository::repository_factory_name,
+ &generic_importance,
+ &ERepository::repository_factory_create,
+ &ERepository::repository_factory_dependencies
+ );
- std::tr1::shared_ptr<Set<std::string> > vdb_formats(new Set<std::string>);
- vdb_formats->insert("vdb");
+ std::tr1::shared_ptr<Set<std::string> > vdb_formats(new Set<std::string>);
+ vdb_formats->insert("vdb");
- factory->add_repository_format(
- vdb_formats,
- &VDBRepository::repository_factory_name,
- &generic_importance,
- &VDBRepository::repository_factory_create,
- &VDBRepository::repository_factory_dependencies
- );
+ factory->add_repository_format(
+ vdb_formats,
+ &VDBRepository::repository_factory_name,
+ &generic_importance,
+ &VDBRepository::repository_factory_create,
+ &VDBRepository::repository_factory_dependencies
+ );
- std::tr1::shared_ptr<Set<std::string> > exndbam_formats(new Set<std::string>);
- exndbam_formats->insert("exndbam");
+ std::tr1::shared_ptr<Set<std::string> > exndbam_formats(new Set<std::string>);
+ exndbam_formats->insert("exndbam");
- factory->add_repository_format(
- exndbam_formats,
- &ExndbamRepository::repository_factory_name,
- &generic_importance,
- &ExndbamRepository::repository_factory_create,
- &ExndbamRepository::repository_factory_dependencies
- );
+ factory->add_repository_format(
+ exndbam_formats,
+ &ExndbamRepository::repository_factory_name,
+ &generic_importance,
+ &ExndbamRepository::repository_factory_create,
+ &ExndbamRepository::repository_factory_dependencies
+ );
+ }
}
diff --git a/paludis/repositories/e/xml_things.cc b/paludis/repositories/e/xml_things.cc
index 9ad1efcb5..904a4dd3e 100644
--- a/paludis/repositories/e/xml_things.cc
+++ b/paludis/repositories/e/xml_things.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, 2009 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
@@ -437,7 +437,3 @@ namespace paludis
class RepositoryFactory;
}
-extern "C" void PALUDIS_VISIBLE paludis_initialise_repository_so(paludis::RepositoryFactory * const)
-{
-}
-