public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/tox/
Date: Sun, 12 Aug 2018 16:58:19 +0000 (UTC)	[thread overview]
Message-ID: <1534093091.558cefd73a8842436c1d8cfa56aac6c0e12caa7c.mgorny@gentoo> (raw)

commit:     558cefd73a8842436c1d8cfa56aac6c0e12caa7c
Author:     François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
AuthorDate: Wed Jul 11 03:11:50 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 16:58:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558cefd7

net-libs/tox: version bump to 0.2.5

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/tox/Manifest                              |  1 +
 net-libs/tox/{tox-9999.ebuild => tox-0.2.5.ebuild} | 56 ++++++++++++----------
 net-libs/tox/tox-9999.ebuild                       | 46 ++++++++----------
 3 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b1fd636c002..a8f6d5d5509 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,3 +1,4 @@
 DIST c-toxcore-0.1.10.tar.gz 820090 BLAKE2B 071e530db2dd6ca387a6cd88f1145515ab8741017626fcb744fdc9940263b6c2604b456b6d1357bc78be5e33b544ecf882e608bc7b4a4227d44c5507e5dbad56 SHA512 428fee2d811d0b6d5d005f082aa06f95765794b1a8bc77ec4411bb9ec9085b99675535b88db50f5ad7313850a0bb3c54c4e2e8d8864cea7c0c7d81be9879b157
+DIST c-toxcore-0.2.5.tar.gz 482160 BLAKE2B b56511d9cf7bd3a9d2b9177b33bdbf60ac571f6c95d7ee26e6ecae7c9395d8cdd4f6650025f8b727ad9b825b304c4555efaee0f17d60a26bc5bf599905ec27ab SHA512 a425a106054f29533b43b14cb8916706d04158d91b66cdada0e9e007aebd3f68a253b8519a75ca94bffba3adc57362b4e7c44e9356fce416f081a7eda6a61e18
 DIST tox-0.1.6.tar.lz 314837 BLAKE2B 087a6f5d5ef55709b5f6188d661d556326bb3e6eac33e55f9faf598d433e33dabbd983ab452e948bff97f82cdc336e0fd48d3f0a6ec57551914884a809b9118d SHA512 57ed7cee2c621c57e24f5ab36d68d99414d9820cdb3e8b7c4390818222f9d885f352f9cf76c8eb522c238bebc7d420bcf3cdd5f6ab65b9801aadbd225765166c
 DIST tox-0_pre20160904.tar.gz 395495 BLAKE2B d59358c5ff904b17e9c5297a0ce2aff39777f8dd4bfeba1e5e78a284a5016921794d0e0699f91a99f53428809a859ce959e17b4ae9fffdd691005c377834057d SHA512 c0da52ac908141e97e96510a05431cbfb4b9aae81faf4c136c95e21b90a23e3bbe6db88303e48c0f4f3c74ca954229787564b7aa41bfb462afb0d8f8430cdaa1

diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-0.2.5.ebuild
similarity index 55%
copy from net-libs/tox/tox-9999.ebuild
copy to net-libs/tox/tox-0.2.5.ebuild
index e7b2b5569ca..71e771406fa 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-0.2.5.ebuild
@@ -1,53 +1,57 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools git-r3 user systemd
+inherit cmake-utils systemd user
 
+MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
-SLOT="0/0.1"
-KEYWORDS=""
-IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon log-debug log-trace +no-log static-libs test"
 
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
+REQUIRED_USE="^^ ( no-log log-trace log-debug )"
 
 RDEPEND="
 	av? ( media-libs/libvpx:=
 		media-libs/opus )
 	daemon? ( dev-libs/libconfig )
-	ntox? ( sys-libs/ncurses:0= )
 	>=dev-libs/libsodium-0.6.1:=[asm,urandom]"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
-	default
-	eautoreconf
+	cmake-utils_src_prepare
+	# disable tests that need internet
+	for testname in bootstrap lan_discovery tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
 }
 
 src_configure() {
-	econf \
-		$(usex log-trace "--enable-logging --with-log-level=TRACE" "") \
-		$(usex log-debug "--enable-logging --with-log-level=DEBUG" "") \
-		$(usex log-info "--enable-logging --with-log-level=INFO" "") \
-		$(usex log-warn "--enable-logging --with-log-level=WARNING" "") \
-		$(usex log-error "--enable-logging --with-log-level=ERROR" "") \
-		$(use_enable av) \
-		$(use_enable test tests) \
-		$(use_enable ntox) \
-		$(use_enable daemon) \
-		$(use_enable static-libs static)
+	local mycmakeargs=(
+		-DTRACE=$(usex log-trace)
+		-DDEBUG=$(usex log-debug)
+		-DBUILD_TOXAV=$(usex av)
+		-DMUST_BUILD_TOXAV=$(usex av)
+		-DBUILD_AV_TEST=$(usex av)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
+
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon
 		newconfd "${FILESDIR}"/confd tox-dht-daemon
@@ -61,8 +65,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 -1 ${PN}
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
 		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"

diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index e7b2b5569ca..6480c17e2cc 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools git-r3 user systemd
+inherit cmake-utils git-r3 systemd user
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
@@ -11,43 +11,37 @@ SRC_URI=""
 EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 
 LICENSE="GPL-3+"
-SLOT="0/0.1"
+SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test"
+IUSE="+av daemon log-debug log-trace +no-log static-libs test"
 
-REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )"
+REQUIRED_USE="^^ ( no-log log-trace log-debug )"
 
 RDEPEND="
 	av? ( media-libs/libvpx:=
 		media-libs/opus )
 	daemon? ( dev-libs/libconfig )
-	ntox? ( sys-libs/ncurses:0= )
 	>=dev-libs/libsodium-0.6.1:=[asm,urandom]"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
 	virtual/pkgconfig"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	econf \
-		$(usex log-trace "--enable-logging --with-log-level=TRACE" "") \
-		$(usex log-debug "--enable-logging --with-log-level=DEBUG" "") \
-		$(usex log-info "--enable-logging --with-log-level=INFO" "") \
-		$(usex log-warn "--enable-logging --with-log-level=WARNING" "") \
-		$(usex log-error "--enable-logging --with-log-level=ERROR" "") \
-		$(use_enable av) \
-		$(use_enable test tests) \
-		$(use_enable ntox) \
-		$(use_enable daemon) \
-		$(use_enable static-libs static)
+	local mycmakeargs=(
+		-DTRACE=$(usex log-trace)
+		-DDEBUG=$(usex log-debug)
+		-DBUILD_TOXAV=$(usex av)
+		-DMUST_BUILD_TOXAV=$(usex av)
+		-DBUILD_AV_TEST=$(usex av)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
+
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon
 		newconfd "${FILESDIR}"/confd tox-dht-daemon
@@ -61,8 +55,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 -1 ${PN}
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
 		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"


             reply	other threads:[~2018-08-12 16:58 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-12 16:58 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-25 20:47 [gentoo-commits] repo/gentoo:master commit in: net-libs/tox/ Jimi Huotari
2025-01-25 20:47 Jimi Huotari
2024-11-14  1:49 Sam James
2024-11-14  0:36 Sam James
2024-07-30 19:09 Pacho Ramos
2024-01-16  7:59 Sam James
2024-01-16  7:59 Sam James
2024-01-16  7:59 Sam James
2023-02-07 11:16 Marek Szuba
2022-07-19 18:29 Sam James
2022-06-16 19:33 Sam James
2022-06-16 16:32 Sam James
2022-06-16 16:32 Sam James
2022-06-16 16:32 Sam James
2022-02-21  9:43 Jakov Smolić
2022-02-21  9:43 Jakov Smolić
2022-01-07  5:14 Sam James
2022-01-07  5:14 Sam James
2022-01-07  5:14 Sam James
2021-05-14  9:36 Agostino Sarubbo
2021-05-14  9:30 Agostino Sarubbo
2021-01-02  1:43 Sam James
2021-01-02  0:35 Sam James
2020-09-04 20:57 Sam James
2020-09-04 20:53 Sam James
2020-09-04 20:53 Sam James
2020-09-04 20:53 Sam James
2020-07-05 13:44 Agostino Sarubbo
2020-07-02  6:25 Agostino Sarubbo
2020-06-08  7:46 Joonas Niilola
2020-06-08  7:46 Joonas Niilola
2020-04-26 15:29 Agostino Sarubbo
2020-04-26 14:16 Agostino Sarubbo
2020-03-28 14:21 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-01-13  6:10 Joonas Niilola
2020-01-13  6:10 Joonas Niilola
2020-01-04 10:26 Agostino Sarubbo
2020-01-03 12:00 Agostino Sarubbo
2019-11-04  6:23 Joonas Niilola
2019-11-04  6:23 Joonas Niilola
2019-05-26  9:43 Michał Górny
2019-04-21 21:31 Michał Górny
2018-12-22 11:43 Andreas Sturmlechner
2018-10-27  8:03 Michał Górny
2018-10-22 20:21 Michał Górny
2018-07-19 19:51 Jonas Stein
2017-08-18 22:13 Michał Górny
2017-08-18 22:13 Michał Górny
2017-07-30  9:45 Michał Górny
2017-01-29 17:07 Göktürk Yüksek
2017-01-16  3:33 Göktürk Yüksek
2016-12-28  0:18 Patrice Clement
2016-12-19 20:17 Michał Górny
2016-12-19 20:17 Michał Górny
2016-12-10 10:43 Michał Górny
2016-12-06 18:28 Göktürk Yüksek
2016-12-05 22:48 Patrice Clement
2016-09-21 21:58 Göktürk Yüksek
2016-09-21 21:58 Göktürk Yüksek
2016-06-15 14:21 Amy Winston
2016-02-06 11:42 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1534093091.558cefd73a8842436c1d8cfa56aac6c0e12caa7c.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox