diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-02-08 18:44:18 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-02-08 18:44:18 +0000 |
| commit | d163c30135f0a0cc933e133d70c7bd37b2ca80e5 (patch) | |
| tree | ec9e2bf836bdc799203c30eb4981ed5fd90b9618 /sys-fs | |
| parent | Fix dependency on dev-java/bcprov, drop old version (diff) | |
| download | gentoo-2-d163c30135f0a0cc933e133d70c7bd37b2ca80e5.tar.gz gentoo-2-d163c30135f0a0cc933e133d70c7bd37b2ca80e5.tar.bz2 gentoo-2-d163c30135f0a0cc933e133d70c7bd37b2ca80e5.zip | |
Rip out the stuff that makes gzip optional (bug #366607).
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild | 26 |
2 files changed, 7 insertions, 24 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 68e29d86b5e6..60afd9d4e888 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/squashfs-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.79 2012/02/08 18:25:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.80 2012/02/08 18:44:18 jer Exp $ + + 08 Feb 2012; Jeroen Roovers <jer@gentoo.org> squashfs-tools-4.2.ebuild: + Rip out the stuff that makes gzip optional (bug #366607). 08 Feb 2012; Jeroen Roovers <jer@gentoo.org> squashfs-tools-4.2.ebuild, metadata.xml: diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild index 69408f5d8843..4992c44f7dfb 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.5 2012/02/08 18:25:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild,v 1.6 2012/02/08 18:44:18 jer Exp $ EAPI="2" @@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="+gzip +xz lzo xattr" +IUSE="+xz lzo xattr" RDEPEND=" - gzip? ( sys-libs/zlib ) + sys-libs/zlib xz? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) !xz? ( !lzo? ( sys-libs/zlib ) ) @@ -34,27 +34,7 @@ use_sed() { src_configure() { tc-export CC - local def - if [[ -n ${SQUASH_FS_DEFAULT_COMP} ]]; then - def=${SQUASH_FS_DEFAULT_COMP} - else - einfo "You can set the default compression (gzip, xz or lzo) by exporting SQUASH_FS_DEFAULT_COMP" - if use gzip; then - def="gzip" - elif use xz; then - def="xz" - elif use lzo; then - def="lzo" - else - die "Please set at least one of the gzip, xz and lzo USE flags as compression algorithm." - fi - fi - - einfo "Using ${def} as compression algorithm." - sed -i -r \ - -e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \ - -e "$(use_sed gzip)" \ -e "$(use_sed xz XZ)" \ -e "$(use_sed lzo)" \ -e "$(use_sed xattr)" \ |