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 <sam@gentoo.org>

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 771b3e609dd6..a1fb30478f44 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 c8cdf88bf1f1..11de4808528b 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 da2e58c430dc..99d421e0e954 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 c7b05df33aab..9b7c3a033eca 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="<dev-lang/ocaml-4.10.0:=[ocamlopt?]
@@ -24,7 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk:2=
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
+RESTRICT="!ocamlopt? ( strip )"
 S="${WORKDIR}"/src
 
 PATCHES=(
@@ -40,10 +40,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.3_rc2.ebuild b/net-misc/unison/unison-2.51.3_rc2.ebuild
index dbcefecfbbfe..900baadd1480 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -15,9 +15,8 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="debug gtk threads +ocamlopt test"
+IUSE="debug gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )"
-RESTRICT+=" !test? ( test )"
 
 # ocaml version so we are sure it has ocamlopt use flag
 BDEPEND="dev-lang/ocaml:=[ocamlopt?]"