commit: 2fa221124d8f84c3bddb973cc2df823571bf1a63 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sat Apr 16 18:12:28 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Apr 16 18:27:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fa22112
dev-ml/pci: update HOMEPAGE Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> dev-ml/pci/files/pci-1.0.1-ounit2.patch | 84 +++++++++++++++++++++++++++++++++ dev-ml/pci/pci-1.0.1.ebuild | 12 +++-- 2 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dev-ml/pci/files/pci-1.0.1-ounit2.patch b/dev-ml/pci/files/pci-1.0.1-ounit2.patch new file mode 100644 index 000000000..e57055197 --- /dev/null +++ b/dev-ml/pci/files/pci-1.0.1-ounit2.patch @@ -0,0 +1,84 @@ +From 9015f66fae0eddaac7080fd0ef164015c7d73865 Mon Sep 17 00:00:00 2001 +From: Alessandro-Barbieri <lssndrbarbi...@gmail.com> +Date: Sat, 16 Apr 2022 20:10:49 +0200 +Subject: [PATCH] use ounit2 + +Signed-off-by: Alessandro-Barbieri <lssndrbarbi...@gmail.com> +--- + .merlin | 2 +- + _oasis | 2 +- + _tags | 4 ++-- + opam | 2 +- + setup.ml | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/.merlin b/.merlin +index f18d84c..e5b208a 100644 +--- a/.merlin ++++ b/.merlin +@@ -1,7 +1,7 @@ + PRJ pci + PKG ctypes + PKG ctypes.stubs +-PKG oUnit ++PKG ounit2 + + S lib + S lib_test +diff --git a/_oasis b/_oasis +index 53db238..0443598 100644 +--- a/_oasis ++++ b/_oasis +@@ -58,7 +58,7 @@ Executable test_pci + CompiledObject: best + ByteOpt: -warn-error +1..45 + NativeOpt: -warn-error +1..45 +- BuildDepends: pci, oUnit ++ BuildDepends: pci, ounit2 + + Test test_pci + Command: $test_pci -runner sequential +diff --git a/_tags b/_tags +index 81eaa26..b8e20fc 100644 +--- a/_tags ++++ b/_tags +@@ -63,11 +63,11 @@ true: annot, bin_annot + <lib_test/test_pci.{native,byte}>: oasis_executable_test_pci_native + <lib_test/*.ml{,i,y}>: oasis_executable_test_pci_native + <lib_test/test_pci.{native,byte}>: pkg_ctypes.stubs +-<lib_test/test_pci.{native,byte}>: pkg_oUnit ++<lib_test/test_pci.{native,byte}>: pkg_ounit2 + <lib_test/test_pci.{native,byte}>: use_pci + <lib_test/test_pci.{native,byte}>: use_pci_bindings + <lib_test/*.ml{,i,y}>: pkg_ctypes.stubs +-<lib_test/*.ml{,i,y}>: pkg_oUnit ++<lib_test/*.ml{,i,y}>: pkg_ounit2 + <lib_test/*.ml{,i,y}>: use_pci + <lib_test/*.ml{,i,y}>: use_pci_bindings + # Executable lspci +diff --git a/opam b/opam +index bc03b69..6e5e197 100644 +--- a/opam ++++ b/opam +@@ -21,7 +21,7 @@ remove: [ + depends: [ + "ctypes" {>= "0.4"} + "ocamlfind" {build} +- "ounit" {test} ++ "ounit2" {test} + ] + available: [ocaml-version >= "4.01.0" & os = "linux"] + depexts: [ +diff --git a/setup.ml b/setup.ml +index c3907bf..b1f3074 100644 +--- a/setup.ml ++++ b/setup.ml +@@ -7681,7 +7681,7 @@ let setup_t = + bs_build_depends = + [ + InternalLibrary "pci"; +- FindlibPackage ("oUnit", None) ++ FindlibPackage ("ounit2", None) + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; + bs_interface_patterns = diff --git a/dev-ml/pci/pci-1.0.1.ebuild b/dev-ml/pci/pci-1.0.1.ebuild index 070a12855..634e6cd74 100644 --- a/dev-ml/pci/pci-1.0.1.ebuild +++ b/dev-ml/pci/pci-1.0.1.ebuild @@ -8,7 +8,10 @@ inherit findlib opam MY_P="ocaml-${P}" DESCRIPTION="OCaml bindings to libpci using Ctypes" -HOMEPAGE="https://github.com/simonjbeaumont/ocaml-pci" +HOMEPAGE=" + https://github.com/simonjbeaumont/ocaml-pci + https://opam.ocaml.org/packages/pci/ +" SRC_URI="https://github.com/simonjbeaumont/ocaml-pci/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" @@ -19,19 +22,20 @@ IUSE="test" RDEPEND=" sys-apps/pciutils - dev-ml/ocaml-ctypes + dev-ml/ocaml-ctypes:= " DEPEND=" ${RDEPEND} - dev-ml/ounit + test? ( dev-ml/ounit2 ) " RESTRICT="!test? ( test )" +PATCHES="${FILESDIR}/${P}-ounit2.patch" OPAM_FILE=opam src_configure() { myconf=( - $(usex test '--enable-test' '') + $(usex test '--enable-tests' '') --prefix "/usr" --destdir "${D}" --libdir "/usr/$(get_libdir)"