From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 116AA138359 for ; Sat, 17 Oct 2020 08:53:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56B4CE077A; Sat, 17 Oct 2020 08:53:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D67BE077A for ; Sat, 17 Oct 2020 08:53:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0A74340FD4 for ; Sat, 17 Oct 2020 08:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B9FB396 for ; Sat, 17 Oct 2020 08:53:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1602924722.4b3ab9374d35d9971a12648c7b080ab3c72e7c58.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/unison/unison-2.48.15_p4.ebuild net-misc/unison/unison-2.48.4-r1.ebuild net-misc/unison/unison-2.48.4-r2.ebuild net-misc/unison/unison-2.51.2-r1.ebuild net-misc/unison/unison-2.51.3_rc2.ebuild X-VCS-Directories: net-misc/unison/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4b3ab9374d35d9971a12648c7b080ab3c72e7c58 X-VCS-Branch: master Date: Sat, 17 Oct 2020 08:53:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 266ff853-46f6-4aaa-8711-65d4a2d757ef X-Archives-Hash: 5a933e3ef7761cd20dffd78ce68323a7 commit: 4b3ab9374d35d9971a12648c7b080ab3c72e7c58 Author: Sam James gentoo org> AuthorDate: Sat Oct 17 08:52:02 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 17 08:52:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3ab937 net-misc/unison: apply 'tidying' changes to old See also: 8d942e2283a9cab3747101e8771816dab1d7fe37 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-misc/unison/unison-2.48.15_p4.ebuild | 6 +----- net-misc/unison/unison-2.48.4-r1.ebuild | 8 +------- net-misc/unison/unison-2.48.4-r2.ebuild | 6 +----- net-misc/unison/unison-2.51.2-r1.ebuild | 8 ++------ net-misc/unison/unison-2.51.3_rc2.ebuild | 3 +-- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild b/net-misc/unison/unison-2.48.15_p4.ebuild index 771b3e609dd..a1fb30478f4 100644 --- a/net-misc/unison/unison-2.48.15_p4.ebuild +++ b/net-misc/unison/unison-2.48.15_p4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> ${P/ LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="gtk static debug threads +ocamlopt test" +IUSE="debug gtk +ocamlopt threads" # Upstream, for this version, has explicitly disabled test with marker # "Skipping some tests -- remove me!". Given the potentially destructive nature @@ -45,10 +45,6 @@ src_compile() { myconf="$myconf THREADS=true" fi - if use static; then - myconf="$myconf STATIC=true" - fi - if use debug; then myconf="$myconf DEBUGGING=true" fi diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild index c8cdf88bf1f..11de4808528 100644 --- a/net-misc/unison/unison-2.48.4-r1.ebuild +++ b/net-misc/unison/unison-2.48.4-r1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -IUSE="gtk doc static debug threads +ocamlopt test" - DESCRIPTION="Two-way cross-platform file synchronizer" HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz @@ -14,7 +12,7 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P} LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" - +IUSE="debug doc gtk +ocamlopt threads" # Upstream, for this version, has explicitly disabled test with marker # "Skipping some tests -- remove me!". Given the potentially destructive nature # of those tests, let's not try to run them (they're re-enabled in subsequent @@ -41,10 +39,6 @@ src_compile() { myconf="$myconf THREADS=true" fi - if use static; then - myconf="$myconf STATIC=true" - fi - if use debug; then myconf="$myconf DEBUGGING=true" fi diff --git a/net-misc/unison/unison-2.48.4-r2.ebuild b/net-misc/unison/unison-2.48.4-r2.ebuild index da2e58c430d..99d421e0e95 100644 --- a/net-misc/unison/unison-2.48.4-r2.ebuild +++ b/net-misc/unison/unison-2.48.4-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P} LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="gtk doc static debug threads +ocamlopt test" +IUSE="debug doc gtk +ocamlopt threads" # Upstream, for this version, has explicitly disabled test with marker # "Skipping some tests -- remove me!". Given the potentially destructive nature @@ -44,10 +44,6 @@ src_compile() { myconf="$myconf THREADS=true" fi - if use static; then - myconf="$myconf STATIC=true" - fi - if use debug; then myconf="$myconf DEBUGGING=true" fi diff --git a/net-misc/unison/unison-2.51.2-r1.ebuild b/net-misc/unison/unison-2.51.2-r1.ebuild index c7b05df33aa..9b7c3a033ec 100644 --- a/net-misc/unison/unison-2.51.2-r1.ebuild +++ b/net-misc/unison/unison-2.51.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P} LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="gtk doc static debug threads +ocamlopt test" +IUSE="debug doc gtk +ocamlopt threads" # ocaml version so we are sure it has ocamlopt use flag DEPEND="