summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2017-03-20 09:12:14 +0100
committerMartin Väth <martin@mvath.de>2017-03-20 09:12:14 +0100
commitdcc26d65487104141e4af08e749d267fee1afd1d (patch)
tree33671b2c0162110e76698465da7eca2e2cd2a7ed /sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
parentapp-misc/knapsack: Version bump (diff)
downloadmv-dcc26d65487104141e4af08e749d267fee1afd1d.tar.gz
mv-dcc26d65487104141e4af08e749d267fee1afd1d.tar.bz2
mv-dcc26d65487104141e4af08e749d267fee1afd1d.zip
sys-fs/squashfs-tools: Version bump
Diffstat (limited to 'sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild')
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild41
1 files changed, 23 insertions, 18 deletions
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
index 2b6af3dd..9238ce6f 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
@@ -5,20 +5,17 @@ EAPI=6
inherit flag-o-matic toolchain-funcs
LIVE=false
-PVm=${PV}
+PVm=4.3
case ${PV} in
*9999)
- LIVE=:
- PVm=4.3;;
+ LIVE=:;;
esac
Pm=${PN}-${PVm}
DEB_VER="3"
-DESCRIPTION="Tool for creating compressed filesystem type squashfs. Patched to support -quiet"
-HOMEPAGE="http://squashfs.sourceforge.net"
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
- ${EXTRA_URI}"
LICENSE="GPL-2"
SLOT="0"
@@ -38,8 +35,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/squashfs${PV}/${PN}"
-if ${LIVE}
-then PROPERTIES="live"
+if ${LIVE}; then
+ PROPERTIES="live"
EGIT_REPO_URI="git://github.com/plougher/${PN}"
inherit git-r3
SRC_URI=${EXTRA_URI}
@@ -49,12 +46,23 @@ src_unpack() {
default
git-r3_src_unpack
}
+else
+ RESTRICT="mirror"
+ EGIT_COMMIT="94f557524a2a08bc48a13ffff1a3c8d7f6170f09"
+ SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+${EXTRA_URI}"
+ S="${WORKDIR}/${P}/${PN}"
+src_unpack() {
+ default
+ mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
+}
fi
src_prepare() {
local i j
- for i in "${WORKDIR}"/debian/patches/*.patch
- do ${LIVE} && j=${i##*/} && case ${j%.*} in
+ for i in "${WORKDIR}"/debian/patches/*.patch; do
+ j=${i##*/}
+ case ${j%.*} in
0002-fix_phys_mem_calculation)
continue;;
esac
@@ -62,16 +70,14 @@ src_prepare() {
done
eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
- ${LIVE} || eapply -p2 "${FILESDIR}"/${Pm}-2gb.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
- ${LIVE} || eapply -p2 "${FILESDIR}"/${Pm}-mem-overflow.patch
- eapply -p2 "${FILESDIR}"/${Pm}-xattrs.patch
eapply "${FILESDIR}"/${Pm}-static-inline.patch
- eapply "${FILESDIR}"/${Pm}-quiet.patch
eapply_user
}
-use10() { usex $1 1 0 ; }
+use10() {
+ usex $1 1 0
+}
src_configure() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
@@ -96,7 +102,6 @@ src_compile() {
src_install() {
dobin mksquashfs unsquashfs
cd ..
- dodoc CHANGES README*
- ${LIVE} || dodoc PERFORMANCE.README pseudo-file.example OLD-READMEs/*
+ dodoc CHANGES README RELEASE-README ACKNOWLEDGEMENTS RELEASE-READMEs/*
doman "${WORKDIR}"/debian/manpages/*.[0-9]
}