sys-fs/squashfs-tools-ng: Simplified ebuilds a bit

Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> Signed-off-by: Matt Turner <mattst88@gentoo.org>
gentoo · Jul 23, 2019 · 810fc7b · 810fc7b
1 parent 4a75510
commit 810fc7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-[[ ${PV} == 9999* ]] && inherit autotools git-r3
 
 DESCRIPTION="A new set of tools for working with SquashFS images"
 HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
 if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64"
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
@@ -30,11 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
 	default
 	[[ ${PV} == "9999" ]] && eautoreconf

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-[[ ${PV} == 9999* ]] && inherit autotools git-r3
 
 DESCRIPTION="A new set of tools for working with SquashFS images"
 HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
 if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64"
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
@@ -30,11 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
 	default
 	[[ ${PV} == "9999" ]] && eautoreconf