commit:     810fc7b7e33434e249d847c126e0db58091e2ea1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 08:03:06 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 21:44:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810fc7b7

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 <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild | 10 ++--------
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild  | 10 ++--------
 2 files changed, 4 insertions(+), 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
index 88b9fdc8179..a57e5398eef 100644
--- 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
index 88b9fdc8179..a57e5398eef 100644
--- 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

Reply via email to