summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-portage/trickyfetch/ChangeLog5
-rw-r--r--app-portage/trickyfetch/Manifest2
-rw-r--r--app-portage/trickyfetch/trickyfetch-6.6.ebuild (renamed from app-portage/trickyfetch/trickyfetch-6.5.ebuild)0
-rw-r--r--sys-fs/squashfs-tools/ChangeLog4
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild)0
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild)0
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild)12
7 files changed, 17 insertions, 6 deletions
diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog
index d0d27f94..1c565b83 100644
--- a/app-portage/trickyfetch/ChangeLog
+++ b/app-portage/trickyfetch/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header $
+*trickyfetch-6.6 (19 Apr 2012)
+
+ 19 Apr 2012; Martin Väth <martin@mvath.de>
+ Version bump, remove old ebuild.
+
*trickyfetch-6.5 (08 Apr 2012)
15 Apr 2012; Martin Väth <martin@mvath.de>
diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest
index ce506e43..8c92b386 100644
--- a/app-portage/trickyfetch/Manifest
+++ b/app-portage/trickyfetch/Manifest
@@ -1 +1 @@
-DIST trickyfetch-6.5.tar.gz 9048 RMD160 6e4f119a77f9e0c1710b9c77605455f4b5c7e072 SHA1 5dcb5cd3b5b46383176084ebe136b73b683e992a SHA256 3145c649272bd33434d01a2f453b22d702f968f50f52db774a1363f9abab5af3
+DIST trickyfetch-6.6.tar.gz 9052 RMD160 3b7909c64f4af1456bcfc535484ea047a5bab93a SHA1 4527302a9b3f154b04be44832eb47d196f0f63f2 SHA256 b3885707f855fe5102f5c79d1c3c7cab7c74775848d588b06e8b3a3e377776fc
diff --git a/app-portage/trickyfetch/trickyfetch-6.5.ebuild b/app-portage/trickyfetch/trickyfetch-6.6.ebuild
index cfdcb068..cfdcb068 100644
--- a/app-portage/trickyfetch/trickyfetch-6.5.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-6.6.ebuild
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 4e735fe0..a7576606 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -3,6 +3,10 @@
# $Header $
15 Apr 2012; Martin Väth <martin@mvath.de>
+ Add old LZMA support back (and revbump) as in the main tree.
+ Downgrade revision numbers to match with main tree.
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>
Inherit base
11 Feb 2012; Martin Väth <martin@mvath.de>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
index 3cfbac3e..3cfbac3e 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
index 4a8c1c94..4a8c1c94 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
index 83c7d3d6..0a1f8270 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
@@ -13,14 +13,15 @@ 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 lzo +progress-redirect xattr +xz"
-REQUIRED_USE="|| ( gzip lzo xz )"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-linux"
+IUSE="+gzip lzma lzo +progress-redirect xattr +xz"
+REQUIRED_USE="|| ( gzip lzma lzo xz )"
RDEPEND="
gzip? ( sys-libs/zlib )
xz? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
+ lzma? ( app-arch/xz-utils )
xattr? ( sys-apps/attr )"
DEPEND="${RDEPEND}"
@@ -42,15 +43,16 @@ src_configure() {
tc-export CC
sed -i -r \
-e "$(use_sed gzip)" \
- -e "$(use_sed xz)" \
+ -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 ..
+ cd .. || die
dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README
}