gentoo resync : 31.05.2021

4 files changed, 26 insertions, 18 deletions

diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 73a2f4a23cc6..544b68bb13b5 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
-DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
-DIST libyang-1.0.225.tar.gz 1667054 BLAKE2B eb1bfd555d72aceba7da7ade1a55985caad9d3cc904c5504978c298ef9e08a6848c810d1b62b1fa7076a9f30638b6080a3546c07892d3e8980eb1db337dc4deb SHA512 3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
-EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
-EBUILD libyang-1.0.225.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308
-MISC metadata.xml 326 BLAKE2B e52c1d56ed6f14dee505e8db5bfede4cb326e8a98a50df576244e8f2ce44d964449acbf00ad9bcd27f22546e1a029cfdec22919edd887a2db9e10f471f322af5 SHA512 bb91dc41fa93fae47c0ad7fa99868284e61a3d24b261cb5feb44cdcd91255744de1d860b1b98374e8d4a8ed4e931c2298c28527709f3e8c5b4bb223484edc076
+DIST libyang-1.0.236.tar.gz 1669013 BLAKE2B c977c4abd2466e88519e91483d876bf0b9397b32bcca017eaa948d638a70d3275cdec36070bad8925c87e3a6756df924ed043a14ecb6d23de8b63992f8607e58 SHA512 7e8be96bc87ea5c906d90e09f4fbae0ed96718894d3fbc784172cdc68e9e2c034fc8a114bc1389fb74ef32dfb65e447acff24b82967af1530ffba94cd204e6e9
+DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
+EBUILD libyang-1.0.236.ebuild 988 BLAKE2B 5c426507aa166549c283169f65ac56136fa62857db55dad0d145d5a67c6ad99b9b6a34cf280063b0923c97441bf23625ab35449c14fb7375e27f32dad71c0d5f SHA512 cc300ada4d32f432a88da55eea518748774b7f7642738ac5e9c7b206c46ac0bcad2ae36a2c5af22655796a3ea3183360ca2e410655aa23d86a6849c06ca5125d
+EBUILD libyang-2.0.7.ebuild 861 BLAKE2B d0fd56392c038e0ea9a338fc5b6013c4871d0f463f60acdc6c09c86b3a41a01d6a750c57b8adad1ab305aa39aec4915472e2ea8873347f53230767a72bad8a9e SHA512 114e1c5c874d8c7fe74de3b0808f83c0e625a19e0b82059eda67a2d213208ec988d1f8c5d1e0cfb6bb5a58c90f21e7de0090803090bd8b47ff65bd3496d61340
+MISC metadata.xml 585 BLAKE2B b4ee06f08fd3f10d45796cb0b3bde13c0790c4883b3408f3c89f7b0812b49206b741556ad2b28772ff1b18a40ad517f988ff4301c1a4270d127ab6ba0632c752 SHA512 54ccc9ecd6b9981ce5544174a74c8d9d5517e8c56b7a28402cac8af3d854c7e41ab8e2a0ad5a0fbd4d6460f848ee9a31f64b6b74cc1b7a1333e2899ceae9ba6f
diff --git a/net-libs/libyang/libyang-1.0.225.ebuild b/net-libs/libyang/libyang-1.0.236.ebuild
index 463140a483d6..efde262106a0 100644
--- a/net-libs/libyang/libyang-1.0.225.ebuild
+++ b/net-libs/libyang/libyang-1.0.236.ebuild
@@ -6,13 +6,15 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
+MY_COMMIT="587a1e973ea6463e4dd3c935b6f97da909f8ac24"
 DESCRIPTION="YANG data modeling language library"
 HOMEPAGE="https://github.com/CESNET/libyang"
-SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/CESNET/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
diff --git a/net-libs/libyang/libyang-1.0.215.ebuild b/net-libs/libyang/libyang-2.0.7.ebuild
index 4d3674d9b3ad..6254659806fa 100644
--- a/net-libs/libyang/libyang-1.0.215.ebuild
+++ b/net-libs/libyang/libyang-2.0.7.ebuild
@@ -12,25 +12,23 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
 "
 
-RESTRICT="!test? ( test )"
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BUILD_TESTS=$(usex test)
-		-DENABLE_LYD_PRIV=yes
-		-DGEN_LANGUAGE_BINDINGS=no
 	)
 	cmake_src_configure
 }
@@ -42,5 +40,5 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	use doc && dodoc -r "${S}"/doc/*
+	use doc && dodoc -r doc/.
 }
diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml
index 7e90f003c441..7e80d8aa1297 100644
--- a/net-libs/libyang/metadata.xml
+++ b/net-libs/libyang/metadata.xml
@@ -5,6 +5,14 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">CESNET/libyang</remote-id>
 	</upstream>