10 files changed, 87 insertions, 94 deletions
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
deleted file mode 100644
index 0015a5f..0000000
--- a/dev-cpp/highway/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST highway-0.15.0.tar.gz 1598512 BLAKE2B f0ee61b5f19591d88d6fd3950072c9302b13e589ac9e8759444c0bcde2c804438313b1b37c2e3d9c40296898c8fc938a2ae57eba3e17d73a9388c21f20b97b59 SHA512 ed07e855721f87ea67d762b30e001643a76bd16d70372415023c8e6f1a43c58759a14a638e8eb20566863d8358d994153bf7a660fcf604e808adfea5f938a013
diff --git a/dev-cpp/highway/highway-0.15.0.ebuild b/dev-cpp/highway/highway-0.15.0.ebuild
deleted file mode 100644
index 6111907..0000000
--- a/dev-cpp/highway/highway-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
-HOMEPAGE="https://github.com/google/highway"
-SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-RDEPEND=""
-BDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DHWY_SYSTEM_GTEST=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml
deleted file mode 100644
index 004555a..0000000
--- a/dev-cpp/highway/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu (Hello71)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
deleted file mode 100644
index 1a4cc83..0000000
--- a/dev-cpp/pangomm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
diff --git a/dev-cpp/pangomm/files/pangomm-pango-1.50.patch b/dev-cpp/pangomm/files/pangomm-pango-1.50.patch
deleted file mode 100644
index 9f2d14e..0000000
--- a/dev-cpp/pangomm/files/pangomm-pango-1.50.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pango/pangomm/attributes.h
-+++ b/pango/pangomm/attributes.h
-@@ -30,6 +30,9 @@
- #include <pangomm/color.h>
- #include <pangomm/fontdescription.h>
- #include <pango/pango-attributes.h>
-+#if __has_include(<pango/pango-markup.h>)
-+#include <pango/pango-markup.h>
-+#endif
- #include <glibmm/slisthandle.h>
diff --git a/dev-cpp/pangomm/metadata.xml b/dev-cpp/pangomm/metadata.xml
deleted file mode 100644
index 7c900b1..0000000
--- a/dev-cpp/pangomm/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild
deleted file mode 100644
index 45d4050..0000000
--- a/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/pangomm-pango-1.50.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/tbb-compat/Manifest b/dev-cpp/tbb-compat/Manifest
new file mode 100644
index 0000000..d2d3f1d
--- /dev/null
+++ b/dev-cpp/tbb-compat/Manifest
@@ -0,0 +1 @@
+DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
diff --git a/dev-cpp/tbb-compat/metadata.xml b/dev-cpp/tbb-compat/metadata.xml
new file mode 100644
index 0000000..fc9202e
--- /dev/null
+++ b/dev-cpp/tbb-compat/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription lang="en">
+  The Intel Threading Building Blocks is a library that helps you
+  leverage multi-core processor performance without having to be a
+  threading expert. It represents a higher-level, task-based
+  parallelism that abstracts platform details and threading mechanism
+  for performance and scalability.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">intel/tbb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild
new file mode 100644
index 0000000..55d3c63
--- /dev/null
+++ b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PV="$(ver_cut 1)_U$(ver_cut 2)"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/intel/tbb/archive/${MY_PV}.tar.gz -> tbb-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!=dev-cpp/tbb-2020.3*"
+S="${WORKDIR}/oneTBB-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# Give it a soname on FreeBSD
+	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
+	# Set proper versionning on FreeBSD
+	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+}
+
+local_src_compile() {
+	local comp arch
+
+	case ${MULTILIB_ABI_FLAG} in
+		abi_x86_64) arch=x86_64 ;;
+		abi_x86_32) arch=ia32 ;;
+#		abi_ppc_64) arch=ppc64 ;;
+#		abi_ppc_32) arch=ppc32 ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*clang*) comp="clang" ;;
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	tc-export AS CC CXX
+
+	arch=${arch} \
+	CPLUS_FLAGS="${CXXFLAGS}" \
+	emake -C "${S}" compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=release $@
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	local_src_compile test
+}
+
+multilib_src_install() {
+	cd "${BUILD_DIR}_release" || die
+	local l
+	for l in $(find . -name lib\*$(get_libname \*)); do
+		dolib.so ${l}
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+	done
+}