ソースを参照

Bump belle-sip with dependencies

Fixes #231 Fixes #232
Sergey Ilinykh 5 年 前
コミット
787a91c903

+ 1 - 2
dev-util/bcunit/Manifest

@@ -1,2 +1 @@
-DIST bcunit-3.0.1.tar.gz 378174 SHA256 ddc03979a913384c23fa9739e191b0625b51ad448e222c5e197fc1bedf06ac24 SHA512 65c4641fa7cca29ead39bf774b18ffd7e0e1f8175d2712b8df39394730e773afc2ff3762394834db65456aab9eb2264a7d07e6c3aa2b538c7d31f2a6707f3c9b WHIRLPOOL 371acd5efc641dc18c2b6a7917b1dfc4f3fb2360860d0444257a4a343df52bb3c67d275fc80a52a1cfb8b5ea833e64dec64d6964340ebc0eab54d4f5ae1a472c
-DIST bcunit-3.0.2.tar.gz 377172 SHA256 eb7090aca5006aa0cea425722cb3fa1a7139185a7d9d1734d57844f69084713f SHA512 dd7ff6f90565451b2f723472907c83154a149354c4689955611444469e33b66ea26152637a075f50f8e97d2c900b28745f8fa0c0d862dbfa005cbee2a68fd61c WHIRLPOOL cb67b032b4d5722fe874ff1a3b67f11b7bb3d21d83e1415e84c3ea43125915bb0f028c0da404e09c293ddfe3128341fcee5ff705c55ef39ddf1d64a5b828c5cc
+DIST bcunit-release-4.4.tar.bz2 248169 SHA256 3d838f680e6f9f9efdd42048fe727a439ad8b489503e5f24030639165a4723b9 SHA512 4912b3e84f911d6f93e97bc768bdab620506035dae03860a602756b0e825928ee345587176cce26bc690571b04f19fcc7f9956e1a07e7f869067af6a9adee0c5 WHIRLPOOL 404eae1ea297afa6312816111cbd0b968d47bc7ec8da66a36e9dcbe5e3d9ce339828bf1e52eec2ee017611246c5fe07287f2693e44b4b963e77d4dfa4698802f

+ 0 - 28
dev-util/bcunit/bcunit-3.0.2.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="C Unit Test Framework from Belledonne Comminications"
-SRC_URI="https://github.com/BelledonneCommunications/bcunit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcunit"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses static-libs"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-multilib_src_configure() {
-	local mycmakeargs=( "-DENABLE_CURSES=$(usex ncurses)" )
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}

+ 8 - 6
dev-util/bcunit/bcunit-3.0.1.ebuild → dev-util/bcunit/bcunit-4.4_beta20191119.ebuild

@@ -1,13 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-utils eutils flag-o-matic multilib-minimal toolchain-funcs
 
+MYVER=4.4
+
 DESCRIPTION="C Unit Test Framework from Belledonne Comminications"
-STABLE_REV=fe7c9c5bd32b72542dd96d772b9b5f70adc53117
-SRC_URI="https://github.com/BelledonneCommunications/bcunit/archive/${STABLE_REV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcunit"
+HOMEPAGE="https://gitlab.linphone.org/BC/public/bcunit"
+# It's untagged version. So beta?
+SRC_URI="https://gitlab.linphone.org/BC/public/bcunit/-/archive/release/${MYVER}/bcunit-release-${MYVER}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -17,9 +19,9 @@ IUSE="ncurses static-libs"
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}-${STABLE_REV}
+DOCS=( AUTHORS NEWS README.md ChangeLog )
 
-DOCS=( AUTHORS NEWS README ChangeLog )
+S="${WORKDIR}/${PN}-release-${MYVER}"
 
 multilib_src_configure() {
 	local mycmakeargs=( "-DENABLE_CURSES=$(usex ncurses)" )

+ 1 - 1
dev-util/cpp2text/cpp2text-1.1.ebuild

@@ -9,7 +9,7 @@ DESCRIPTION="String representation converter (text, cpp, json)"
 HOMEPAGE="https://github.com/Ri0n/cpp2text"
 SRC_URI="https://github.com/Ri0n/cpp2text/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

+ 27 - 0
dev-util/cpp2text/cpp2text-9999.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils git-r3
+
+DESCRIPTION="String representation converter (text, cpp, json)"
+HOMEPAGE="https://github.com/Ri0n/cpp2text"
+EGIT_REPO_URI="https://github.com/Ri0n/cpp2text"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+

+ 1 - 2
net-libs/bctoolbox/Manifest

@@ -1,2 +1 @@
-DIST bctoolbox-0.5.1.tar.gz 103040 SHA256 24ff61eb38324470006e26f2ae5a865ec8f10a55e6bf561cde334aebdd7c6fe1 SHA512 698abecb5f28c4e49b21a9296f5672a62f45d47693515e251fb952f62ca0843888e3b7d2a4c5aeba79da6cc94875f0cc0ab8d587cef92fe6604713a6b799fdca WHIRLPOOL 3fd3f206a8eed222713bed43c42ab97422157a7208dda539a264291362664fb4259f1fb694202192a200a299752ee6f7236fafe0b636d71e4a3bb7e6ff856aca
-DIST bctoolbox-0.6.0.tar.gz 111344 SHA256 4657e1970df262f77e47dee63b1135a5e063b63b0c42cfe7f41642b22e3831a8 SHA512 83179260632558de5604322e67fb90fb0c1d2c635ce7e9c378442d4fff2bda5ed7e2ba83b8118f04bc450b6de9869685f0a0fb67b020674e9ec484962d202e21 WHIRLPOOL d1610f3ffe6b2c5e2c604eb891269c17df23fd7b9d3df8c9b0c5edd7d21c3e5cb1928068acbc7d93af273122e383104f5bc900258a5a290da076ddb240f25ad3
+DIST bctoolbox-4.3.1.tar.bz2 107583 SHA256 1b7ec1a7fa2af2a6741ebda7602c82996752aa46fb17d6c9ddb2ed0846872384 SHA512 c3ce8fc240ec2739f949bba0f2dbd8ab0f18c02bc87b6d985a7b297f2077af5e53f1f9e2e163c8af9ee83d8fe2dde651e9690a5945e782768184900882a36c31 WHIRLPOOL e1605bae1777527ff53c2c6132fb2d265efed85225bfe8f7a88bc67f756b6bf310f5073ddfee4ffc1fda617269fa8a0ec210c8e6b8a32db90ea35f2565958544

+ 0 - 24
net-libs/bctoolbox/bctoolbox-0.5.1.ebuild

@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="Utilities library used by Belledonne Communications softwares"
-HOMEPAGE="https://savannah.nongnu.org/projects/linphone/"
-SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-util/bcunit
-	net-libs/mbedtls"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}

+ 4 - 4
net-libs/bctoolbox/bctoolbox-0.6.0.ebuild → net-libs/bctoolbox/bctoolbox-4.3.1.ebuild

@@ -1,19 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
 DESCRIPTION="Utilities library used by Belledonne Communications softwares"
-HOMEPAGE="https://savannah.nongnu.org/projects/linphone/"
-SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="https://gitlab.linphone.org/BC/public/bctoolbox"
+SRC_URI="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${PV}/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND=">=dev-util/bcunit-3.0.2
+DEPEND=">=dev-util/bcunit-4.3
 	net-libs/mbedtls"
 RDEPEND="${DEPEND}"

+ 1 - 1
net-voip/belle-sip/Manifest

@@ -1 +1 @@
-DIST belle-sip-1.6.3.tar.gz 610200 SHA256 3f3807078b177e50a5ed97aaf8d7f6e77532df3205153e1b2957f557df9ba568 SHA512 4f7049a06195a702a424fbec1671dc5075c3fbcd3fbb9dd990c15115d291ffcbde2b47440c479ef45d0f3251fa75774729c6a11ff1826adb53359c61e80c5df2 WHIRLPOOL 6d767820f0bc6ae3aec76ecb95948b669044d335d4b1d81c683d7705c3b8c38513454d8015d712d25a649040b8106997bd42aa9483cdf77ee4c51a89b6e12579
+DIST belle-sip-4.3.1.tar.bz2 3382270 SHA256 e3c8be3305d2bb545f250fc1c3fd7729ef0c1b4ee95d917fe95cbe4d37e4db5a SHA512 524e1a963c8d452a2274fc07f0440a6b2888c1e6b315241bf13f98f105ff2b4db5f20e76c4e4397d7190722ebd665f649ae1a7b56a071ac225e1f1323345339b WHIRLPOOL 1974e631ca31d4af1d404f7c688a7bbb08f4b65e0db0580052419685ca5c2c31df86cb2797d81726093e6b3c549d35ed3c7bf0cc4786bbb41d9a957e4e2a4e69

+ 5 - 6
net-voip/belle-sip/belle-sip-1.6.3.ebuild → net-voip/belle-sip/belle-sip-4.3.1.ebuild

@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="C object oriented SIP Stack."
-HOMEPAGE="http://www.linphone.org/technical-corner/belle-sip/overview"
-SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.linphone.org/technical-corner/belle-sip"
+SRC_URI="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -18,15 +18,14 @@ IUSE="examples test -tunnel"
 REQUIRED_USE=""
 
 DEPEND="${RDEPEND}
-	net-libs/bctoolbox
-	dev-java/antlr:3
+	>=net-libs/bctoolbox-4.3.1
+	dev-java/antlr:3.5
 	dev-libs/antlr-c
 	dev-util/intltool
 	sys-devel/libtool
 	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1_p3[ncurses] )"
+	test? ( dev-util/cunit[ncurses] )"
 
-S="${WORKDIR}/${P}-0"
 
 src_configure() {
 	local mycmakeargs=(