gentoo resync : 25.11.2020

3 files changed, 31 insertions, 7 deletions

diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
index 197b4816ce62..b814f6d1c99f 100644
--- a/dev-ml/camldbm/Manifest
+++ b/dev-ml/camldbm/Manifest
@@ -1,5 +1,7 @@
 AUX hasgotfix.patch 418 BLAKE2B f8f5a728cb1fa772db368faf3bfb6047fa570d0845155caff5d22e40b3a82d33b33844cf405ceb2021bfb5c3ec641cf59a0afe2546657cedc0f33c120b525c10 SHA512 3b936694976c962540734bcca51a762cd3a02f6d1d4678eeeb2c4ee283bd0defa0dcea90dc062475dbd542efe871041b7a76782b0437d34b682914b8f39a042d
 AUX include_fix.patch 512 BLAKE2B e99ff15b037c2db639f14ff234c51c2a34c7dc2a5c3395d58675c89c240e2f9928913f38956a70d87f7d6f522937f1f51a9f77d245f095df8ddb0c0a988c285f SHA512 46a05033c469ec8b668e044a799d230b82539e2bb43067383f89f46f9ac128a2b43e8a5439dda16e368f283c608d6561109389d2aab3c8cdde7fbdb957433cad
 DIST camldbm-1.0.tgz 14397 BLAKE2B 9b6971e30815ad6984254591af793819beb3859ddbf7bbd95ee744a2b09ce04968ecad9c7ff954e1606776d82988b3499f2569154586a937a61eb6d5c7b9465b SHA512 d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf
-EBUILD camldbm-1.0.ebuild 746 BLAKE2B d2152308d84b6e00168f1cac7d48a2882130cbe5878cf389ec2ab14c93d7ccbd1ba8adc2c75e56e148842a5ee2a256fc4aecd1d91a6817528b02dc438f6bb246 SHA512 4d6ad5c2c744ff310051c61c3cf122750a6510797f94af8124ea61e6088cc0bc9af39f851740463edd0b89c16a97d2cbf743d1ef6d4be1101ae85c5cb89d295b
+DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0
+EBUILD camldbm-1.0.ebuild 723 BLAKE2B bdf2c174ea1dd59f20976b4e5efe6050d7bd28aac4b0324c4e79b02e6c1ef31f4437ce19b5f1cb3409b371ea197effc92ad7d6400e70682dae98715e736c2a0f SHA512 daeda32929c10a8b39d84a46d1d64bbd9fad534b065710a34cae0a19d06d8388dde5bf67d577507938ef65a5f73dcf0e64e4eaacd8d1ddd150b34521ea848d5f
+EBUILD camldbm-1.2.ebuild 626 BLAKE2B e2856633e8be67abb1e8b6e4e193d55039944ae0b5f2355e7977a194562a800015185286bf6fdc00f599f7faa2c08da276d3ea87406bc2b6e45d25cc3cc3749c SHA512 99052fba71d6c59948764409d80169458ea748bc43acc00cc68927590f22e76cec1584435251de9101a3aad8f3e8c464dfbfdcf7f295c7d20e943bba34d0f0ab
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild
index 5286f0873c34..8f8d8b94854c 100644
--- a/dev-ml/camldbm/camldbm-1.0.ebuild
+++ b/dev-ml/camldbm/camldbm-1.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit base
+EAPI=7
 
 DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
 HOMEPAGE="http://forge.ocamlcore.org/projects/camldbm/"
@@ -12,13 +10,15 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/728/${P}.tgz"
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm ppc x86"
-IUSE=""
 
 DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
 	>=dev-lang/ocaml-3.12:=[ocamlopt]"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/hasgotfix.patch" "${FILESDIR}/include_fix.patch" )
+PATCHES=(
+	"${FILESDIR}/hasgotfix.patch"
+	"${FILESDIR}/include_fix.patch"
+)
 
 src_install() {
 	dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
new file mode 100644
index 000000000000..4bae2351d3f3
--- /dev/null
+++ b/dev-ml/camldbm/camldbm-1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
+HOMEPAGE="https://github.com/ocaml/dbm"
+SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz"
+S="${WORKDIR}/dbm-${P}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
+	>=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
+	emake LIBDIR="${D}/$(ocamlc -where)" install
+}