diff --git a/build/jam/repositories/HaikuPortsCross/arm b/build/jam/repositories/HaikuPortsCross/arm
index 2d982679ad..f28978812a 100644
--- a/build/jam/repositories/HaikuPortsCross/arm
+++ b/build/jam/repositories/HaikuPortsCross/arm
@@ -42,8 +42,6 @@ BootstrapPackageRepository HaikuPortsCross
 	zstd_bootstrap_devel-1.5.5-1
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
 	:
 	# source packages
 	bash_bootstrap
@@ -60,7 +58,6 @@ BootstrapPackageRepository HaikuPortsCross
 	grep_bootstrap
 	less_bootstrap
 	libffi_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/arm64 b/build/jam/repositories/HaikuPortsCross/arm64
index 34b55da7ec..b2e7ff96b3 100644
--- a/build/jam/repositories/HaikuPortsCross/arm64
+++ b/build/jam/repositories/HaikuPortsCross/arm64
@@ -42,8 +42,6 @@ BootstrapPackageRepository HaikuPortsCross
 	zstd_bootstrap_devel-1.5.5-1
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
 	:
 	# source packages
 	bash_bootstrap
@@ -60,7 +58,6 @@ BootstrapPackageRepository HaikuPortsCross
 	grep_bootstrap
 	less_bootstrap
 	libffi_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/m68k b/build/jam/repositories/HaikuPortsCross/m68k
index 6e7245f628..fa50d6ea57 100644
--- a/build/jam/repositories/HaikuPortsCross/m68k
+++ b/build/jam/repositories/HaikuPortsCross/m68k
@@ -39,8 +39,6 @@ BootstrapPackageRepository HaikuPortsCross
 	zlib_bootstrap_devel-1.2.13-1
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
 	:
 	# source packages
 	bash_bootstrap
@@ -56,7 +54,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	less_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/ppc b/build/jam/repositories/HaikuPortsCross/ppc
index 7cb44ff95f..b616acaac1 100644
--- a/build/jam/repositories/HaikuPortsCross/ppc
+++ b/build/jam/repositories/HaikuPortsCross/ppc
@@ -39,8 +39,6 @@ BootstrapPackageRepository HaikuPortsCross
 	zlib_bootstrap_devel-1.2.13-1
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
 	:
 	# source packages
 	bash_bootstrap
@@ -57,7 +55,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	libffi_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/riscv64 b/build/jam/repositories/HaikuPortsCross/riscv64
index 0334aac652..5c97aee203 100644
--- a/build/jam/repositories/HaikuPortsCross/riscv64
+++ b/build/jam/repositories/HaikuPortsCross/riscv64
@@ -42,8 +42,6 @@ BootstrapPackageRepository HaikuPortsCross
 	zstd_bootstrap_devel-1.5.5-1
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
 	:
 	# source packages
 	bash_bootstrap
@@ -60,7 +58,6 @@ BootstrapPackageRepository HaikuPortsCross
 	grep_bootstrap
 	less_bootstrap
 	libffi_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/sparc b/build/jam/repositories/HaikuPortsCross/sparc
index 1fe1b39a34..00d0c19673 100644
--- a/build/jam/repositories/HaikuPortsCross/sparc
+++ b/build/jam/repositories/HaikuPortsCross/sparc
@@ -40,12 +40,8 @@ BootstrapPackageRepository HaikuPortsCross
 	zlib_bootstrap_devel-1.2.11-1
 	zstd_bootstrap-1.5.0-2
 	zstd_bootstrap_devel-1.5.0-2
-
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
-
 	:
 	# source packages
 	bash_bootstrap
@@ -61,7 +57,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	less_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/x86 b/build/jam/repositories/HaikuPortsCross/x86
index a7d2af3292..f88267cec2 100644
--- a/build/jam/repositories/HaikuPortsCross/x86
+++ b/build/jam/repositories/HaikuPortsCross/x86
@@ -58,13 +58,6 @@ BootstrapPackageRepository HaikuPortsCross
 	}@ # secondary_x86_gcc2
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
-
-	secondary_x86_gcc2 @{
-		libsolv_bootstrap_x86_gcc2-0.3.0_haiku_2014_12_22-1
-		libsolv_bootstrap_x86_gcc2_devel-0.3.0_haiku_2014_12_22-1
-	}@ # secondary_x86_gcc2
 	:
 	# source packages
 	bash_bootstrap
@@ -80,7 +73,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	less_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 b/build/jam/repositories/HaikuPortsCross/x86_64
index 652835646d..b3f8caf288 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -78,18 +78,6 @@ BootstrapPackageRepository HaikuPortsCross
 	}@ # secondary_x86_gcc2
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
-
-	secondary_x86 @{
-		libsolv_bootstrap_x86-0.3.0_haiku_2014_12_22-1
-		libsolv_bootstrap_x86_devel-0.3.0_haiku_2014_12_22-1
-	}@ # secondary_x86
-
-	secondary_x86_gcc2 @{
-		libsolv_bootstrap_x86_gcc2-0.3.0_haiku_2014_12_22-1
-		libsolv_bootstrap_x86_gcc2_devel-0.3.0_haiku_2014_12_22-1
-	}@ # secondary_x86_gcc2
 	:
 	# source packages
 	bash_bootstrap
@@ -105,7 +93,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	less_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index 251b029f62..caa4284406 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -58,13 +58,6 @@ BootstrapPackageRepository HaikuPortsCross
 	}@ # secondary_x86
 	:
 	# repository architecture packages (stage 2)
-	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
-	libsolv_bootstrap_devel-0.3.0_haiku_2014_12_22-1
-
-	secondary_x86 @{
-		libsolv_bootstrap_x86-0.3.0_haiku_2014_12_22-1
-		libsolv_bootstrap_x86_devel-0.3.0_haiku_2014_12_22-1
-	}@ # secondary_x86
 	:
 	# source packages
 	bash_bootstrap
@@ -80,7 +73,6 @@ BootstrapPackageRepository HaikuPortsCross
 	gcc_bootstrap
 	grep_bootstrap
 	less_bootstrap
-	libsolv_bootstrap
 	m4_bootstrap
 	make_bootstrap
 	ncurses6_bootstrap