diff options
author | Jeroen Roovers <jer@gentoo.org> | 2015-05-23 06:22:50 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2015-05-23 06:22:50 +0000 |
commit | 490a800e182a26c4defb86ee132207cc38fd5db2 (patch) | |
tree | 6cfc363bbb9b49e704d250b18a4b168ea07bfc7d /sys-fs | |
parent | Bump to latest aufs, genpatches and linux release (diff) | |
download | gentoo-2-490a800e182a26c4defb86ee132207cc38fd5db2.tar.gz gentoo-2-490a800e182a26c4defb86ee132207cc38fd5db2.tar.bz2 gentoo-2-490a800e182a26c4defb86ee132207cc38fd5db2.zip |
EAPI bump.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild | 22 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild | 22 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild | 56 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild | 54 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild | 54 |
6 files changed, 28 insertions, 187 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 7a807bb454ef..7062ccb3ada5 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/squashfs-tools # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.117 2015/04/17 08:35:17 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.118 2015/05/23 06:22:50 jer Exp $ + + 23 May 2015; Jeroen Roovers <jer@gentoo.org> squashfs-tools-3.2_p2.ebuild, + squashfs-tools-3.4.ebuild, -squashfs-tools-4.2.ebuild, + -squashfs-tools-4.2-r1.ebuild, -squashfs-tools-4.2_p20140119.ebuild: + EAPI bump. 17 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> squashfs-tools-4.3.ebuild: sparc stable wrt bug #542226 diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild index 8464d70cbfa8..980a8a5178b5 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2010 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-3.2_p2.ebuild,v 1.8 2010/11/14 13:49:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.9 2015/05/23 06:22:50 jer Exp $ +EAPI=5 inherit toolchain-funcs MY_PV=${PV/_p/-r} @@ -12,29 +13,28 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="3.0" # squashfs filesystem version KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -i \ -e 's:-O2:$(CFLAGS):' \ -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile + Makefile || die + echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - newbin mksquashfs mksquashfs-${SLOT} || die - newbin unsquashfs unsquashfs-${SLOT} || die + newbin mksquashfs mksquashfs-${SLOT} + newbin unsquashfs unsquashfs-${SLOT} cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 || die + dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 } diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild index 3d9262c8e610..aca1a290cd44 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2011 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-3.4.ebuild,v 1.6 2011/02/06 11:03:19 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.7 2015/05/23 06:22:50 jer Exp $ +EAPI=5 inherit toolchain-funcs MY_PV=${PV/_p/-r} @@ -12,29 +13,28 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="3.1" # squashfs filesystem version KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -i \ -e 's:-O2:$(CFLAGS):' \ -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die "sed failed" + Makefile || die + sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - newbin mksquashfs mksquashfs-${SLOT} || die - newbin unsquashfs unsquashfs-${SLOT} || die + newbin mksquashfs mksquashfs-${SLOT} + newbin unsquashfs unsquashfs-${SLOT} cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README || die + dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README } diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild deleted file mode 100644 index cb4977f58a45..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild +++ /dev/null @@ -1,56 +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-r1.ebuild,v 1.2 2014/01/18 11:37:50 vapier Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="+xz lzma lzo xattr" - -RDEPEND=" - sys-libs/zlib - xz? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - lzma? ( app-arch/xz-utils ) - !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_configure() { - tc-export CC - sed -i -r \ - -e "$(use_sed xz XZ)" \ - -e "$(use_sed lzo)" \ - -e "$(use_sed xattr)" \ - -e "$(use_sed lzma LZMA_XZ)" \ - Makefile || die -} - -src_install() { - dobin mksquashfs unsquashfs - cd .. || die - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.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" -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild deleted file mode 100644 index 87b699b8b989..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild +++ /dev/null @@ -1,54 +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 - -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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux" -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_configure() { - 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.2_p20140119.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild deleted file mode 100644 index 56336904ba83..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild +++ /dev/null @@ -1,54 +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_p20140119.ebuild,v 1.1 2014/01/23 12:40:10 jer Exp $ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net" -SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" -IUSE="+xz lzma lzo xattr" - -RDEPEND=" - xattr? ( sys-apps/attr ) - sys-libs/zlib - !xz? ( !lzo? ( sys-libs/zlib ) ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xz? ( app-arch/xz-utils ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${P}/squashfs-tools" - -src_configure() { - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - $(usex lzma LZMA_XZ_SUPPORT= LZMA_XS_SUPPORT= 1 0) - $(usex lzo LZO_SUPPORT= LZO_SUPPORT= 1 0) - $(usex xattr XATTR_SUPPORT= XATTR_SUPPORT= 1 0) - $(usex xz XZ_SUPPORT= XZ_SUPPORT= 1 0) - ) - - tc-export CC -} - -src_compile() { - emake ${EMAKE_SQUASHFS_CONF[@]} -} - -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" -} |