Bump ccache. Relax squash_dir dependency

6 files changed, 34 insertions, 12 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index e57de7e2..317908ca 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+*ccache-3.0-pre1 (22 May 2010)
+
+  22 May 2010; Martin Väth <martin@mvath.de>
+  revbump; remove old.
+  Add zlib dependency. Put CCACHE_COMPRESS=true into env.d
+
   07 Apr 2010; Martin Väth <martin@mvath.de>
   Add RESTRICT="mirror"
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0f7212c5..c7ff8030 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,5 @@
 AUX ccache-config 1627 RMD160 b5e6a9f509130abd657fd6ec297d7fcbdb094f9d SHA1 698c3235f0685e03f346e4b155897862560974ee SHA256 d438b7d266e17bf95d6c45e619ea8d9040217e70f34eac5cf6fae010f25bb72f
-DIST ccache-3.0pre0.tar.bz2 179291 RMD160 f3001bdb9a29aae874772a80cea2455c4fd5a275 SHA1 26bc8c67f0d7177cf6171cd3fdcd137dc8a67337 SHA256 dbdcbc9f10be423667f030a3a2bbd26b70ebb4821fcbd6547f6c9f9bb06d2b8f
-EBUILD ccache-3.0_pre0.ebuild 2478 RMD160 56b030f198e1a623fde48dec36ac9ac19aa4e99a SHA1 8f037f481db647b7f860c44e6e0eca27da8cbd73 SHA256 6bdc9b780f4d9a37cf7853ca6744d941d568852c2628129f0101083300dc057a
-MISC ChangeLog 367 RMD160 2345a0c579678d2a4bb4e03f1a6a2b3eef176761 SHA1 d3deaec4feadacaffe30bc6832f091588193f120 SHA256 d709342f0b9ff070fa328b1e5bc9df7950bf85cacc01bdf105dbcbf44ee47ebe
+DIST ccache-3.0pre1.tar.bz2 204331 RMD160 1e49880638dbe40544261964f829e5faf1278fd4 SHA1 7dd193bd92469162ab65ff53a78ad577e8f58813 SHA256 2c4c1f6b2b96e54b0702af0f1189fb903858a721a4534b8cc62e74ff320be073
+EBUILD ccache-3.0_pre1.ebuild 2606 RMD160 0034a073319bff6c5c9b14322de1bf7b5f035a5c SHA1 35adada58885ea38ab57e8654ff36a59e7886e15 SHA256 937e9609e6f14df51b34c923951d8aee836cff8c88dde811f5ae3fc4d7e68345
+MISC ChangeLog 546 RMD160 8faa491d5d6503e8884368463362a7dde30a7ce5 SHA1 f9d9d2cd953751f20c90df03b031bdce36adc767 SHA256 84cb11e247e3831eb86121ff6b01bdc7c71bffe929d0d99b54d21d45e96abf52
 MISC metadata.xml 444 RMD160 99f5113ff8f7ebb2f7ce3e33f855bc6846b8664e SHA1 fde0b5c2db7a88911d98a24052f39c1c525b872f SHA256 4ced2aa742fbd03c11aef10aecd4c62d93fd7f2036a69626d14eb762ae2c131d
diff --git a/dev-util/ccache/ccache-3.0_pre0.ebuild b/dev-util/ccache/ccache-3.0_pre1.ebuild
index 8d0b12a2..3a5a6f6c 100644
--- a/dev-util/ccache/ccache-3.0_pre0.ebuild
+++ b/dev-util/ccache/ccache-3.0_pre1.ebuild
@@ -11,11 +11,14 @@ MY_P="${P/_/}"
 SRC_URI="http://samba.org/ftp/ccache/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
 # Note: this version is designed to be auto-detected and used if
 # you happen to have Portage 2.0.X+ installed.
 
@@ -27,9 +30,11 @@ do_links() {
 }
 
 src_install() {
+	echo "CCACHE_COMPRESS=true" >"${S}/99ccache"
+	doenvd "${S}/99ccache"
 	dobin ccache || die
 	doman ccache.1
-	dodoc README
+	dodoc README.txt NEWS.txt
 
 	diropts -m0755
 	dodir /usr/$(get_libdir)/ccache/bin
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index e6e49f79..f51d9a8e 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  22 May 2010; Martin Väth <martin@mvath.de>
+  Do not require >=unionfs-fuse-0.25_alpha, but print a message
+  recommending it an earlier version is used.
+
   20 May 2010; Martin Väth <martin@mvath.de>
   +squash_dir-10.5.ebuild -squash_dir-10.4.ebuild:
   Version bump. Depend on >unionfs-fuse-0.24
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index 64e151d9..328bf1c6 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1,4 +1,4 @@
 DIST squash_dir-10.5.tar.bz2 18968 RMD160 6723cf59bda831ce3c942a1586625b235c1002e1 SHA1 eaf6dbd49a73305c6900ce8c8cef832034019ff6 SHA256 bc240b798201e103096afd7f9c5d7776af849262acf6644ee3d68c8916041b4b
-EBUILD squash_dir-10.5.ebuild 1604 RMD160 fd248bbcf74216be3be02a78e9af45d0fb880aad SHA1 6f6e7981a581c3f169dd07077fbb887841a6730d SHA256 f5a92d372517e34309618e009eb9b19cd1cf756d244a4ecee87275effa41c648
-MISC ChangeLog 1036 RMD160 858d61e5c8903eea9fe51b62bd7f2c61ec865853 SHA1 0bd82d95b0773c9075ded400791af787b9557045 SHA256 1dbf2760f9234b2d3db3a8956a9a4f92a4100350f4272f2dd8ba9e32087ae1f4
+EBUILD squash_dir-10.5.ebuild 1928 RMD160 47a2e2cf13384a5008ea66a8ab301842c22d91ad SHA1 cecc41428002f9d6073c4af7bea9a4918facab98 SHA256 28e0321faced4d172c7231e3ad58bc697ad130f2926d141d614a45012757181c
+MISC ChangeLog 1211 RMD160 d5f8198304c1ef84cc4e9c7f8869374df7b8fa7a SHA1 8eb562da23da4b0d0767c9c5eeab90ab58a940ee SHA256 634eeb2ff0dc850b6dc5e20367a2a72aa43fbc7885748112c730c9f7133fc44f
 MISC metadata.xml 524 RMD160 695348b2ec91e6e657132f92d92355b3a9aa9cb3 SHA1 031aa7e4a43e9653e6ff5f5760f109cff893278c SHA256 9f7f3ee8acbeea6d82c33bfbab9ddf6076bac7f80f5789c95173223c2c658037
diff --git a/sys-fs/squash_dir/squash_dir-10.5.ebuild b/sys-fs/squash_dir/squash_dir-10.5.ebuild
index 155c41c6..b03269f8 100644
--- a/sys-fs/squash_dir/squash_dir-10.5.ebuild
+++ b/sys-fs/squash_dir/squash_dir-10.5.ebuild
@@ -18,7 +18,7 @@ IUSE="readonly"
 RDEPEND="sys-fs/squashfs-tools
 	!readonly? ( || (
 		sys-fs/aufs2
-		>sys-fs/unionfs-fuse-0.24
+		sys-fs/unionfs-fuse
 		sys-fs/funionfs
 		sys-fs/unionfs
 		sys-fs/aufs
@@ -51,10 +51,17 @@ check_for_obsolete () {
 }
 
 pkg_postinst () {
-	check_for_obsolete && \
-		! has_version sys-fs/squashfs-tools[progress-redirect] || return 0
-	ewarn "For better output of ${PN}, it is recommended to install"
-	ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect"
+	if check_for_obsolete && \
+		! has_version sys-fs/squashfs-tools[progress-redirect]
+	then	ewarn "For better output of ${PN}, it is recommended to install"
+		ewarn "sys-fs/squashfs-tools from the mv overlay with USE=progress-redirect"
+	fi
+	if has_version "<sys-fs/unionfs-fuse-0.25_alpha"
+	then	ewarn "It is recommended to use >=unionfs-fuse-0.25_alpha"
+		ewarn "Otherwise, if you use squash_dir with unionfs-fuse for the portage tree, put"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"\${PORTAGE_RSYNC_EXTRA_OPTS} --exclude=/.unionfs\""
+		ewarn "into your /etc/make.conf"
+	fi
 	:
 }