dev-gap/*: relocate $S directly beneath $SRC_URI

This is where skel.ebuild puts it.

Suggested-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>

11 files changed, 11 insertions, 22 deletions

diff --git a/dev-gap/autodoc/autodoc-2022.10.20.ebuild b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
index eeef229dec42..f1afd9595445 100644
--- a/dev-gap/autodoc/autodoc-2022.10.20.ebuild
+++ b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
@@ -8,12 +8,11 @@ inherit gap-pkg
 DESCRIPTION="Generate documentation from GAP source code"
 SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/AutoDoc-${PV}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/AutoDoc-${PV}"
-
 # The test suite tries to LoadPackage this
 BDEPEND="test? ( dev-gap/io )"
 gap-pkg_enable_tests
diff --git a/dev-gap/browse/browse-1.8.21-r1.ebuild b/dev-gap/browse/browse-1.8.21-r1.ebuild
index 00796d0371ae..42e9e4ec6a4e 100644
--- a/dev-gap/browse/browse-1.8.21-r1.ebuild
+++ b/dev-gap/browse/browse-1.8.21-r1.ebuild
@@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GAP ncurses interface for browsing two-dimensional data"
 SLOT="0"
 SRC_URI="https://www.math.rwth-aachen.de/homes/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64"
@@ -18,8 +19,6 @@ KEYWORDS="~amd64"
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 GAP_PKG_EXTRA_INSTALL=( app bibl )
 gap-pkg_enable_tests
 
diff --git a/dev-gap/cryst/cryst-4.1.26.ebuild b/dev-gap/cryst/cryst-4.1.26.ebuild
index 3630d8d8abcb..0b21d0ee0457 100644
--- a/dev-gap/cryst/cryst-4.1.26.ebuild
+++ b/dev-gap/cryst/cryst-4.1.26.ebuild
@@ -8,13 +8,12 @@ inherit gap-pkg
 DESCRIPTION="GAP package for computing with crystallographic groups"
 SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/Cryst/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
 
 RDEPEND="dev-gap/polycyclic"
 
-S="${WORKDIR}/${PN}"
-
 GAP_PKG_EXTRA_INSTALL=( grp )
 gap-pkg_enable_tests
diff --git a/dev-gap/crystcat/crystcat-1.1.10.ebuild b/dev-gap/crystcat/crystcat-1.1.10.ebuild
index dca592752ed5..a28fb1ae0366 100644
--- a/dev-gap/crystcat/crystcat-1.1.10.ebuild
+++ b/dev-gap/crystcat/crystcat-1.1.10.ebuild
@@ -8,13 +8,12 @@ inherit gap-pkg
 DESCRIPTION="The crystallographic groups catalog"
 SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/CrystCat/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
 
 RDEPEND="dev-gap/cryst"
 
-S="${WORKDIR}/${PN}"
-
 GAP_PKG_EXTRA_INSTALL=( grp )
 gap-pkg_enable_tests
diff --git a/dev-gap/edim/edim-1.3.7.ebuild b/dev-gap/edim/edim-1.3.7.ebuild
index 03657e40bb0d..292e252f717b 100644
--- a/dev-gap/edim/edim-1.3.7.ebuild
+++ b/dev-gap/edim/edim-1.3.7.ebuild
@@ -9,11 +9,10 @@ MY_PN=EDIM
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Elementary Divisors of Integer Matrices (EDIM) for GAP"
 SRC_URI="https://www.math.rwth-aachen.de/~Frank.Luebeck/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 gap-pkg_enable_tests
diff --git a/dev-gap/factint/factint-1.6.3.ebuild b/dev-gap/factint/factint-1.6.3.ebuild
index 7882fd7a226d..754ccbd02167 100644
--- a/dev-gap/factint/factint-1.6.3.ebuild
+++ b/dev-gap/factint/factint-1.6.3.ebuild
@@ -10,11 +10,10 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Advanced Methods for Factoring Integers"
 SLOT="0"
 SRC_URI="https://github.com/gap-packages/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 GAP_PKG_EXTRA_INSTALL=( tables )
 gap-pkg_enable_tests
diff --git a/dev-gap/gapdoc/gapdoc-1.6.6.ebuild b/dev-gap/gapdoc/gapdoc-1.6.6.ebuild
index 3d61575cb76f..29ef04cc2723 100644
--- a/dev-gap/gapdoc/gapdoc-1.6.6.ebuild
+++ b/dev-gap/gapdoc/gapdoc-1.6.6.ebuild
@@ -10,6 +10,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GAP documentation structure and tooling"
 SLOT="0"
 SRC_URI="https://github.com/frankluebeck/${MY_PN}/archive/relv${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-relv${PV}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
@@ -21,8 +22,6 @@ RESTRICT=test
 
 DOCS=( CHANGES README.md )
 
-S="${WORKDIR}/${MY_PN}-relv${PV}"
-
 GAP_PKG_EXTRA_INSTALL=(
 	bibxmlext.dtd
 	gapdoc.dtd
diff --git a/dev-gap/mapclass/mapclass-1.4.6.ebuild b/dev-gap/mapclass/mapclass-1.4.6.ebuild
index b55ae7a0ea90..17b93c0c8360 100644
--- a/dev-gap/mapclass/mapclass-1.4.6.ebuild
+++ b/dev-gap/mapclass/mapclass-1.4.6.ebuild
@@ -8,10 +8,9 @@ inherit gap-pkg
 DESCRIPTION="A GAP package to compute mapping-class group orbits"
 SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/MapClass-${PV}"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/MapClass-${PV}"
-
 gap-pkg_enable_tests
diff --git a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
index 087d9333870a..4908c6c75b2e 100644
--- a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
+++ b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
@@ -9,6 +9,7 @@ MY_P="SmallGrp-${PV}"
 DESCRIPTION="The GAP Small Groups Library"
 SLOT="0"
 SRC_URI="https://github.com/gap-packages/smallgrp/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2"
 KEYWORDS="~amd64"
@@ -16,8 +17,6 @@ KEYWORDS="~amd64"
 RDEPEND="dev-gap/gapdoc"
 gap-pkg_enable_tests
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	# Define the variable here so globbing will work
 	GAP_PKG_EXTRA_INSTALL=( id* small* )
diff --git a/dev-gap/toric/toric-1.9.5.ebuild b/dev-gap/toric/toric-1.9.5.ebuild
index a292282033b6..6cdfa8db665d 100644
--- a/dev-gap/toric/toric-1.9.5.ebuild
+++ b/dev-gap/toric/toric-1.9.5.ebuild
@@ -9,11 +9,10 @@ MY_PN="Toric"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GAP package for computing with toric varieties"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 gap-pkg_enable_tests
diff --git a/dev-gap/transgrp/transgrp-3.6.4.ebuild b/dev-gap/transgrp/transgrp-3.6.4.ebuild
index 7ce80afe9b39..f18c4de8ff0b 100644
--- a/dev-gap/transgrp/transgrp-3.6.4.ebuild
+++ b/dev-gap/transgrp/transgrp-3.6.4.ebuild
@@ -8,14 +8,13 @@ inherit gap-pkg
 DESCRIPTION="GAP transitive groups library"
 SLOT="0"
 SRC_URI="https://www.math.colostate.edu/~hulpke/${PN}/${PN}${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 # Data format is licensed Artistic-2
 # Code is licensed GPL-3
 LICENSE="GPL-3 Artistic-2"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${PN}"
-
 # This is one of the four required packages whose dependencies are all
 # listed explicitly.
 BDEPEND="test? ( dev-gap/gapdoc )"