Remove checks for virtuals

11 files changed, 0 insertions, 88 deletions

diff --git a/misc/common-makefile.am b/misc/common-makefile.am
index 41b1627f4..ebad0f4d7 100644
--- a/misc/common-makefile.am
+++ b/misc/common-makefile.am
@@ -63,7 +63,6 @@ LOG_COMPILER = \
 		PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
 		PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
 		PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
-		PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
 		PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
 		PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
 		PALUDIS_FAILURE_IS_FATAL="" \
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index 1e1d39980..ccae556a1 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -93,12 +93,6 @@ namespace
 
 TEST_P(DependRdependTest, Works)
 {
-#ifdef ENABLE_VIRTUALS_REPOSITORY
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "yes", 1);
-#else
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
-#endif
-
     TestEnvironment env;
 
     FSPath root(FSPath::cwd() / "depend_rdepend_TEST_dir" / "root");
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index 112147e21..fccec254e 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -90,12 +90,6 @@ namespace
 
 TEST(ERepository, InstallEAPI0)
 {
-#ifdef ENABLE_VIRTUALS_REPOSITORY
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "yes", 1);
-#else
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
-#endif
-
     TestEnvironment env;
 
     std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
diff --git a/paludis/repositories/e/e_repository_TEST_1_setup.sh b/paludis/repositories/e/e_repository_TEST_1_setup.sh
index bdde541ba..4ed17e413 100755
--- a/paludis/repositories/e/e_repository_TEST_1_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_1_setup.sh
@@ -416,22 +416,6 @@ pkg_setup() {
 
     BV2=$(best_version cat/doesnotexist )
     [[ "$BV2" == "" ]] || die "BV2 is $BV2"
-
-    if [[ -n "$PALUDIS_ENABLE_VIRTUALS_REPOSITORY" ]] ; then
-        if ! best_version virtual/virtual-pretend-installed >/dev/null ; then
-            die "failed virtual/virtual-pretend-installed"
-        fi
-
-        BV3=$(best_version virtual/virtual-pretend-installed )
-        [[ "$BV3" == "cat/pretend-installed-1" ]] || die "BV3 is $BV3"
-
-        if best_version virtual/virtual-doesnotexist >/dev/null ; then
-            die "not failed virtual/virtual-doesnotexist"
-        fi
-
-        BV2=$(best_version virtual/virtual-doesnotexist )
-        [[ "$BV4" == "" ]] || die "BV4 is $BV4"
-    fi
 }
 END
 mkdir -p "cat/has-version"
diff --git a/paludis/repositories/e/e_repository_TEST_2_setup.sh b/paludis/repositories/e/e_repository_TEST_2_setup.sh
index 32af66396..301c075b0 100755
--- a/paludis/repositories/e/e_repository_TEST_2_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_2_setup.sh
@@ -416,22 +416,6 @@ pkg_setup() {
 
     BV2=$(best_version cat/doesnotexist )
     [[ "$BV2" == "" ]] || die "BV2 is $BV2"
-
-    if [[ -n "$PALUDIS_ENABLE_VIRTUALS_REPOSITORY" ]] ; then
-        if ! best_version virtual/virtual-pretend-installed >/dev/null ; then
-            die "failed virtual/virtual-pretend-installed"
-        fi
-
-        BV3=$(best_version virtual/virtual-pretend-installed )
-        [[ "$BV3" == "cat/pretend-installed-1" ]] || die "BV3 is $BV3"
-
-        if best_version virtual/virtual-doesnotexist >/dev/null ; then
-            die "not failed virtual/virtual-doesnotexist"
-        fi
-
-        BV2=$(best_version virtual/virtual-doesnotexist )
-        [[ "$BV4" == "" ]] || die "BV4 is $BV4"
-    fi
 }
 END
 mkdir -p "cat/has-version"
diff --git a/paludis/repositories/e/e_repository_TEST_4_setup.sh b/paludis/repositories/e/e_repository_TEST_4_setup.sh
index 5c7d93929..fbf5b0fd5 100755
--- a/paludis/repositories/e/e_repository_TEST_4_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_4_setup.sh
@@ -426,22 +426,6 @@ pkg_setup() {
 
     BV2=$(best_version cat/doesnotexist )
     [[ "$BV2" == "" ]] || die "BV2 is $BV2"
-
-    if [[ -n "$PALUDIS_ENABLE_VIRTUALS_REPOSITORY" ]] ; then
-        if ! best_version virtual/virtual-pretend-installed >/dev/null ; then
-            die "failed virtual/virtual-pretend-installed"
-        fi
-
-        BV3=$(best_version virtual/virtual-pretend-installed )
-        [[ "$BV3" == "cat/pretend-installed-1" ]] || die "BV3 is $BV3"
-
-        if best_version virtual/virtual-doesnotexist >/dev/null ; then
-            die "not failed virtual/virtual-doesnotexist"
-        fi
-
-        BV2=$(best_version virtual/virtual-doesnotexist )
-        [[ "$BV4" == "" ]] || die "BV4 is $BV4"
-    fi
 }
 END
 mkdir -p "cat/has-version"
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 880a09714..edc580f17 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -100,11 +100,6 @@ namespace
 
 TEST_P(EverTest, Works)
 {
-#ifdef ENABLE_VIRTUALS_REPOSITORY
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "yes", 1);
-#else
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
-#endif
     TestEnvironment env;
     std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
     keys->insert("format", "e");
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index def437b4a..855f1ffc5 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -90,11 +90,6 @@ namespace
 
 TEST(ERepository, InstallExheres0)
 {
-#ifdef ENABLE_VIRTUALS_REPOSITORY
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "yes", 1);
-#else
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
-#endif
     TestEnvironment env;
     std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
     keys->insert("format", "e");
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index c0f6998ab..68b0e0ae1 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -109,11 +109,6 @@ namespace
 
 TEST_P(PhasesTest, Works)
 {
-#ifdef ENABLE_VIRTUALS_REPOSITORY
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "yes", 1);
-#else
-    ::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
-#endif
     TestEnvironment env;
     std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
     keys->insert("format", "e");
diff --git a/python/Makefile.am b/python/Makefile.am
index 4a275959e..61efbd79e 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -91,12 +91,6 @@ EXTRA_DIST = $(IF_PYTHON_TESTS) $(IF_PYTHON_SOURCES) \
 	repository_TEST_setup.sh repository_TEST_cleanup.sh \
 	paludis_output_wrapper.py
 
-if ENABLE_VIRTUALS_REPOSITORY
-PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=yes
-else
-PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=no
-endif
-
 if ENABLE_PYTHON
 
 lib_LTLIBRARIES = libpaludispython_@PALUDIS_PC_SLOT@.la
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index ade8df5ca..eae6ac15a 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -72,12 +72,6 @@ EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
 	repository_TEST_setup.sh repository_TEST_cleanup.sh \
 	action_TEST_setup.sh action_TEST_cleanup.sh
 
-if ENABLE_VIRTUALS_REPOSITORY
-PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=yes
-else
-PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=no
-endif
-
 if ENABLE_RUBY
 
 lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la