* [gentoo-commits] proj/musl:master commit in: sys-fs/squashfs-tools/
@ 2015-07-15 11:31 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2015-07-15 11:31 UTC (permalink / raw
To: gentoo-commits
commit: bca1aaa5718406eae6cec849b641f26efb62a5f0
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 11:31:56 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 11:31:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bca1aaa5
sys-fs/squashfs-tools: cleanup.
sys-fs/squashfs-tools/Manifest | 6 +--
sys-fs/squashfs-tools/metadata.xml | 4 ++
.../squashfs-tools/squashfs-tools-4.2-r99.ebuild | 59 ----------------------
.../squashfs-tools/squashfs-tools-4.3-r99.ebuild | 10 +---
4 files changed, 8 insertions(+), 71 deletions(-)
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 120cdfe..c4a8899 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,6 +1,4 @@
AUX squashfs-tools-4.2-missing-includes.patch 236 SHA256 3e88e86568146d80733d52bcdd28405e3f02120e8ca408c5fc995f37d30006f1 SHA512 8f18536e59708475d210e7a2fb4ff4dd3fa29441ea6881ddd21f1a5aadb5686647d45961de832384e356cc011fcb74ebabb8d52816a64db3adb3a9a3a37e785e WHIRLPOOL fb7eb189ddd120e291b11a927ff3ee9871d187530c49729c9fb3d0becff9cfe89e89d0e308bdddde33252caff5949c26263f18712429507b27eeef61b70ae322
-DIST squashfs4.2.tar.gz 133173 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96 SHA512 4b69c5d3008803347d0ce7628957e3873c9ebd799662b25dfb739afb6a1ce97bdd02b0465ac4d949bc38af2155880ac068209dc638b94e5c86a8011ec3a00de0 WHIRLPOOL c69d403b9775ecebfba02c2ae395b3e5ed8f832caf80417863e5df861b60462b97ac3d10ee027cc96c6f8146450bd8fe8cf715574d41ed47abcc7abc9423ce52
DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
-EBUILD squashfs-tools-4.2-r99.ebuild 1452 SHA256 21d0faeec0b21f801de63770b454273d2e9baa5320334fdbf72ac7a25c6a7d0f SHA512 64a7e21aea34462b91ea4dfb3c934c4f44ad43eff09884722a3c59e8a4c8b2859ad8fa3fc8422ef916285c2edad76cc90adcb4b7c6e554bf62d7e08895694ea6 WHIRLPOOL 31aa501b6c4ae2c149bcfcbdc03d0d17dc7e44aaaa71e3d61b5a4c4a78091ccd91450a9a132580a0dccb914278c1be45df5b6fb67a16e9c395600c8302ce5638
-EBUILD squashfs-tools-4.3-r99.ebuild 1522 SHA256 549d659c5a2f2a76e6dab8a7e32cfd76fe81733b5c0d1ca71461461ee1aff5dc SHA512 d08074bd1d6b90d2739e63d0164f9cc7886d06cfb6dac7aabfa3d5d034402acd74c9830f0cffbcdcd6068a6e95ba36cbde51dfd32176dd9d2cfc0c2f59d7f685 WHIRLPOOL 3dfb210820065645205607faad4bdfd302861bcbdfd1533a09de7027e7ab7e85eb1ab7d00caece0055c0db6f3dd70bbdac9f709b9bac8a6af4252468e78d2797
-MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
+EBUILD squashfs-tools-4.3-r99.ebuild 1361 SHA256 15ed7dfce289b6ecf956b4279a521769b61a61b77ea2d5a7daed48337ca5e041 SHA512 dff818d68d844a09fdbdda35f505c32eadae350696f823e25055dfe7158da0a3a3240b0caa18114b4edac27da1362c4a15c63a0d39a459a9f7761682450d48db WHIRLPOOL d28b1cf3def869b42e9fa80b3f1284b7f2d84e3ce9e82790563b3d1aa206b678065199f9b29b172e3bfa64a958ce1b79d98cc7a800c630e26e49c6a9724e36f6
+MISC metadata.xml 459 SHA256 8f8c19cd9a14822bd70aabed32919ba027bd1bd723db60eeb03c64f9dddc7f60 SHA512 a4034c66f10f7b677d23d3aea8f507075cece2a1527885954bb172927de7f154d069ea3aa93244af17a5c7b927aa7197977a32a16e034c57621ba40351cd1d15 WHIRLPOOL 72377f160f6a0234476942d16ae43edb00694ba2f05dfe3f924eb1ca1ce0a725d7d7d840f6dd704aa78976f3ef7b4727fbce124e48b6cb348e31874d6bf70a06
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index e1c66a4..5613e68 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -4,5 +4,9 @@
<herd>livecd</herd>
<use>
<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
+ <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
</use>
+ <upstream>
+ <remote-id type="sourceforge">squashfs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild
deleted file mode 100644
index 5ed51e5..0000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild,v 1.12 2014/01/18 11:37:50 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV=${PV}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+xz lzo xattr"
-
-RDEPEND="
- sys-libs/zlib
- xz? ( app-arch/xz-utils )
- lzo? ( dev-libs/lzo )
- !xz? ( !lzo? ( sys-libs/zlib ) )
- xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-use_sed() {
- local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT"
- printf '/^#?%s =/%s\n' "${s}" \
- "$( use $u && echo s:.*:${s} = 1: || echo d )"
-}
-
-src_prepare() {
- epatch ${FILESDIR}/${P}-missing-includes.patch
-}
-
-src_configure() {
- append-cppflags -DFNM_EXTMATCH=0
- tc-export CC
- sed -i -r \
- -e "$(use_sed xz XZ)" \
- -e "$(use_sed lzo)" \
- -e "$(use_sed xattr)" \
- Makefile || die
-}
-
-src_install() {
- dobin mksquashfs unsquashfs || die
- cd ..
- dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
-}
-
-pkg_postinst() {
- ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
- use xz &&
- ewarn "XZ support requires a 2.6.38 kernel or better"
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
index f186f88..e04f226 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.6 2014/09/28 11:02:46 blueness Exp $
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 arm ~mips ppc x86"
IUSE="+xz lzma lz4 lzo xattr"
RDEPEND="
@@ -53,9 +53,3 @@ src_install() {
dobin mksquashfs unsquashfs
dodoc ../README
}
-
-pkg_postinst() {
- ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
- use xz &&
- ewarn "XZ support requires a 2.6.38 kernel or better"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/squashfs-tools/
@ 2015-07-15 11:31 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2015-07-15 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 92cd5874527a9e625e3f25552b452e8e3d5b0b38
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 11:34:00 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 11:34:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=92cd5874
sys-fs/squashfs-tools: quote variable.
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA
sys-fs/squashfs-tools/Manifest | 2 +-
sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index c4a8899..ff814aa 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,4 +1,4 @@
AUX squashfs-tools-4.2-missing-includes.patch 236 SHA256 3e88e86568146d80733d52bcdd28405e3f02120e8ca408c5fc995f37d30006f1 SHA512 8f18536e59708475d210e7a2fb4ff4dd3fa29441ea6881ddd21f1a5aadb5686647d45961de832384e356cc011fcb74ebabb8d52816a64db3adb3a9a3a37e785e WHIRLPOOL fb7eb189ddd120e291b11a927ff3ee9871d187530c49729c9fb3d0becff9cfe89e89d0e308bdddde33252caff5949c26263f18712429507b27eeef61b70ae322
DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
-EBUILD squashfs-tools-4.3-r99.ebuild 1361 SHA256 15ed7dfce289b6ecf956b4279a521769b61a61b77ea2d5a7daed48337ca5e041 SHA512 dff818d68d844a09fdbdda35f505c32eadae350696f823e25055dfe7158da0a3a3240b0caa18114b4edac27da1362c4a15c63a0d39a459a9f7761682450d48db WHIRLPOOL d28b1cf3def869b42e9fa80b3f1284b7f2d84e3ce9e82790563b3d1aa206b678065199f9b29b172e3bfa64a958ce1b79d98cc7a800c630e26e49c6a9724e36f6
+EBUILD squashfs-tools-4.3-r99.ebuild 1363 SHA256 1c01be5b6bfbe3cd04729b412d1818fcdadd35f84bb697ac4ac328e2b843ab62 SHA512 0c2501f31f04f96293cb0d0877a655660fe6dd66dddb79ddb7161b59b0215aec3d71eea9647be83b36d125f638520893ca1929050cdbcf3ad6ad4f640b7402f3 WHIRLPOOL 01a191cf3587dffbd688d6e037cc9354bcf11490bd28c92d40ed53961910690a87d37ff95976fbea6573b37f6d1c81deb4f8d9b89fbe6b8cb8dc087e44c2d672
MISC metadata.xml 459 SHA256 8f8c19cd9a14822bd70aabed32919ba027bd1bd723db60eeb03c64f9dddc7f60 SHA512 a4034c66f10f7b677d23d3aea8f507075cece2a1527885954bb172927de7f154d069ea3aa93244af17a5c7b927aa7197977a32a16e034c57621ba40351cd1d15 WHIRLPOOL 72377f160f6a0234476942d16ae43edb00694ba2f05dfe3f924eb1ca1ce0a725d7d7d840f6dd704aa78976f3ef7b4727fbce124e48b6cb348e31874d6bf70a06
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
index e04f226..676b3a4 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/squashfs${PV}/${PN}"
src_prepare() {
- epatch ${FILESDIR}/${PN}-4.2-missing-includes.patch
+ epatch "${FILESDIR}"/${PN}-4.2-missing-includes.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-15 11:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-15 11:31 [gentoo-commits] proj/musl:master commit in: sys-fs/squashfs-tools/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2015-07-15 11:31 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox