gentoo auto-resync : 10:05:2024 - 00:01:13

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-libs/fddl/Manifest b/dev-libs/fddl/Manifest
index 60e8fafee3d3..2bf3492c3ce2 100644
--- a/dev-libs/fddl/Manifest
+++ b/dev-libs/fddl/Manifest
@@ -1,3 +1,5 @@
+AUX fddl-20111124-disambiguate-variable-name.patch 2912 BLAKE2B e705af11ff36f771fb0520b61d57974cc0c50a4746810ae32e2294b85803ac8d8e183cada2d45701e3e963925d7d233c04d47c078e1903a748d20c6b554846be SHA512 50f24f08dbcc1067a968004494f9391f45895f85ee660491d4cd2aaa806e41fe66c40a73e7683ce1208d3af9bbc7d9a17c9eefe73f2fdab19f7e6de75acd315d
 DIST fddl-20111124.tar.gz 29608 BLAKE2B 5769edc935c4606cbc9662712ea05ff2cdd44646e36ef71a2b185a9efdd8655fd8ff0c7a0f0ed105cfee44f18c43815984771e7a74a2329adc29f6ff544fe64d SHA512 d9c4f3f4e10b92ffc158a8cd24726ac6f95050256178a17b6d11aefd4b5786452b17ee96e4d4f4762d07c372c248aba1f22cbe2c03cd6b0f709aeeb4d15a0266
 EBUILD fddl-20111124-r1.ebuild 1013 BLAKE2B c074eae4236d6cb6e58fa50484a4d128cb69351b1f0ce312b54aecfa1493924d7a527346b431dcb2baf824df690e03f6bfba8b6afd57c11d6a0500106b14b7f8 SHA512 8870e1d3cf7af6b6ce2421ae2b5e817fd0dad12ad9af68e3f8c524f508311224452a878825e9c50dfd31ae74165f12dfdf885609453e5b6c8e84586f3d637080
+EBUILD fddl-20111124-r2.ebuild 1095 BLAKE2B e0bea427b657614f7e8f6a6b9096317c53394b8561419c735146d94996dc81a0f52eb6eaa9289449a11305baf6e888a3e456ef096466dc786988d434e2b5301e SHA512 637bdb2d423f2e5f32e5a7b764268bfe7e10621e32d1792e4a4642a877f4462866017b5141176da5b9b01f96ed96b5dc596b8b8d672b221552bab515f73165e6
 MISC metadata.xml 304 BLAKE2B 54999e09ff8bdc75a3f6e5765f4f68ff80f9c4f211ec4f284c7d2a98999e67b287765f3a4849230456b8928a539c1d48c4c23748608479013f4a5cbf5e05f91f SHA512 8aadb3cedf647b45308e8d817105ddd7157354b1e57f9599e32509ce344b1111152616370671396d6c7467f186875317c005cc9d44fcf827a9e6ee5081405696
diff --git a/dev-libs/fddl/fddl-20111124-r2.ebuild b/dev-libs/fddl/fddl-20111124-r2.ebuild
new file mode 100644
index 000000000000..681f180b4619
--- /dev/null
+++ b/dev-libs/fddl/fddl-20111124-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Free Decision Diagram Library"
+HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
+
+PATCHES=( "${FILESDIR}/${P}-disambiguate-variable-name.patch" )
+
+S="${WORKDIR}"/FDDL-master
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove references to files that were not shipped,
+	# prefer dynamic linking
+	sed -i \
+		-e 's|unaryoperation.cpp||g' \
+		-e 's|unaryoperation.h||g' \
+		-e 's|binaryoperation.cpp||g' \
+		-e 's|binaryoperation.h||g' \
+		-e '/add_library/s/FDDL /FDDL SHARED /' \
+		-e '/add_library/s/FDDL /FDDL SHARED /' \
+		-e "/^install/s:DESTINATION lib:DESTINATION $(get_libdir):" \
+		src/CMakeLists.txt || die
+	# Do not build tests that depend on above files
+	sed -i   \
+		{,tests/}CMakeLists.txt \
+		-e '/test_unaryop/d' \
+		-e '/test_binaryop/d' \
+		|| die
+}
diff --git a/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch b/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch
new file mode 100644
index 000000000000..c357f0574d29
--- /dev/null
+++ b/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch
@@ -0,0 +1,65 @@
+Disambiguate variable name from std::array.
+
+FAILED: tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o
+/usr/bin/x86_64-pc-linux-gnu-g++    -O2 -pipe -march=x86-64 -mtune=generic -MD -MT tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o -MF tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o.d -o tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o -c /var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp
+/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp: In function ‘bool test_access()’:
+/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:9:11: error: reference to ‘array’ is ambiguous
+    9 |         *(array[0])=50;
+      |           ^~~~~
+In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/memory_resource.h:47,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/string:58,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/locale_classes.h:40,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/ios_base.h:41,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/ios:44,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/ostream:40,
+                 from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/iostream:41,
+                 from /var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:1:
+/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/tuple:2005:45: note: candidates are: ‘template<class _Tp, long unsigned int _Nm> struct std::array’
+ 2005 |   template<typename _Tp, size_t _Nm> struct array;
+      |                                             ^~~~~
+/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:6:15: note:                 ‘DynArray<int> array’
+    6 | DynArray<int> array;
+      |               ^~~~~
+
+diff -Nuar a/tests/test_dynarray.cpp b/tests/test_dynarray.cpp
+--- a/tests/test_dynarray.cpp	2024-03-28 14:52:14.811666764 +0000
++++ b/tests/test_dynarray.cpp	2024-03-28 14:51:55.379667423 +0000
+@@ -3,18 +3,18 @@
+ 
+ using namespace std;
+ 
+-DynArray<int> array;
++DynArray<int> test_array;
+ 
+ bool test_access(){
+-	*(array[0])=50;
+-	if (*(array[0]) != 50)
++	*(test_array[0])=50;
++	if (*(test_array[0]) != 50)
+ 		return false;
+ 	return true;
+ }
+ 
+ bool test_extend(){
+-	*(array[1024]) = 9999;
+-	if (*(array[1024]) != 9999)
++	*(test_array[1024]) = 9999;
++	if (*(test_array[1024]) != 9999)
+ 		return false;
+ 	return true;
+ }
+@@ -23,12 +23,12 @@
+ 	unsigned int fac = 1;
+ 	for (unsigned int i=1;i<11;i++){
+ 		fac = fac * i;
+-		*(array[fac]) = i;
++		*(test_array[fac]) = i;
+ 	}
+ 	fac = 1;
+ 	for (unsigned int i=1; i<11;i++){
+ 		fac = fac * i;
+-		if (*(array[fac]) != i){
++		if (*(test_array[fac]) != i){
+ 			return false;
+ 		}
+ 	}