sys-fs/cromfs: Update from 1.2.5 to 1.5.6.2 and revision of the ebuild for better programming pratices.

svn path=/sunrise/; revision=7804

4 files changed, 42 insertions, 54 deletions

diff --git a/sys-fs/cromfs/ChangeLog b/sys-fs/cromfs/ChangeLog
index 886e9a257..18dcc2966 100644
--- a/sys-fs/cromfs/ChangeLog
+++ b/sys-fs/cromfs/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-fs/cromfs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jan 2009; Jérôme Poulin (TiCPU) <jeromepoulin@gmail.com>
+  -cromfs-1.2.5.ebuild, +cromfs-1.5.6.2.ebuild:
+  Update from 1.2.5 to 1.5.6.2 and revision of the ebuild for better
+  programming pratices.
+
   27 May 2007; Markus Ullmann <jokey@gentoo.org> -cromfs-1.2.3.ebuild:
   Nuke old
 
diff --git a/sys-fs/cromfs/Manifest b/sys-fs/cromfs/Manifest
index 1a2ec6039..544286508 100644
--- a/sys-fs/cromfs/Manifest
+++ b/sys-fs/cromfs/Manifest
@@ -1,4 +1,4 @@
-DIST cromfs-1.2.5.tar.bz2 407660 RMD160 05dc75e9cbd843fe6ee596dfdaba015a5b97089d SHA1 e7b3914cec4aa62eb0f59f2c756e92633423f2f6 SHA256 475d655244443576f9de007774e0c73e03bd7367839551f366f6d5c53766cb30
-EBUILD cromfs-1.2.5.ebuild 1226 RMD160 bb30519636a94d06579f3a1d92b8cc2fcc39ea5d SHA1 7078e1782b7f95010f46cb37254bb1ee76141e2e SHA256 b256192a165c07719be3468ad00baf64a7832bcd61247371b1494ff139c2b4f8
-MISC ChangeLog 671 RMD160 a5a1f7e45c63a6f90d71fc5acf3563b9b91f229f SHA1 b643b8bc5e6ab70704265a732e6687a9b0d6824e SHA256 76f0b4266b4dbde91643a2e6375100076567bcecb24507089541b53e13cc7573
+DIST cromfs-1.5.6.2.tar.bz2 499828 RMD160 eac1eda46a02eb407d5429a3ee5c911373c42bb6 SHA1 8514022a3aa6cb7c83fae351d3625c74527311d7 SHA256 bbe5db623d3c0d2b92fe877d8c8e22a8f8d84210739313bf691d42c05406464d
+EBUILD cromfs-1.5.6.2.ebuild 880 RMD160 dacc1138df6f7e3f95eb0267c6d2d964d0539319 SHA1 d447c3c0fd66b4f4792c9da3298230d6853dedc3 SHA256 cef8e27afdd6c29ebd04c82356fd93e1e0ed16c1a149c020eaf373f0167a1a27
+MISC ChangeLog 877 RMD160 09774b20ba4c9eea6e7b8e8034b95cfed61fa9f9 SHA1 6c098f6e171e33dcc77465e0c734bccc231a53f6 SHA256 4dc97c4bc998225065e1cd16a582f1fb63f25d8b29f85768deeb84d12e6ae4dd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sys-fs/cromfs/cromfs-1.2.5.ebuild b/sys-fs/cromfs/cromfs-1.2.5.ebuild
deleted file mode 100644
index 328b717b2..000000000
--- a/sys-fs/cromfs/cromfs-1.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs
-
-DESCRIPTION="a FUSE-based compressed read-only filesystem"
-HOMEPAGE="http://bisqwit.iki.fi/source/cromfs.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="static"
-
-DEPEND=">=sys-fs/fuse-2.5.2"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/upx/d' -e '/strip/d' Makefile \
-		|| die "sed failed in Makefile"
-	for i in Makefile util/Makefile ; do
-		sed -i -e "/^CXXFLAGS +=/s:-O3::" \
-			-e "/OPTIM +=/s:-O3::" ${i} \
-		|| die "sed failed in ${i}"
-	done
-	for i in Makefile.sets util/Makefile.sets ; do
-		sed -i -e "/^CC=/s:gcc:$(tc-getCC):" \
-			-e "/^CPP=/s:g++:$(tc-getCPP):" \
-			-e "/^CXX=/s:g++:$(tc-getCXX):" \
-			-e "/^CPPFLAGS=/s:-pipe -g::" \
-			-e "/^OPTIM/s:=.*:=${CXXFLAGS}:" \
-			-e "/^LDFLAGS/s:=.*:+=:" ${i} \
-		|| die "sed failed in ${i}"
-	done
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	use static && dobin cromfs-driver-static
-	dobin cromfs-driver util/{mkcromfs,unmkcromfs,cvcromfs}
-
-	dodoc doc/*.txt doc/{FORMAT,ChangeLog}
-	dohtml doc/*.{html,png}
-}
diff --git a/sys-fs/cromfs/cromfs-1.5.6.2.ebuild b/sys-fs/cromfs/cromfs-1.5.6.2.ebuild
new file mode 100644
index 000000000..d58f86f3d
--- /dev/null
+++ b/sys-fs/cromfs/cromfs-1.5.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Cromfs is a FUSE based compressed read-only filesystem for Linux."
+HOMEPAGE="http://bisqwit.iki.fi/source/cromfs.html"
+SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="static"
+
+DEPEND=">=sys-fs/fuse-2.5.2"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	sed -i -e '/upx/d' -e '/- strip/d' Makefile || die "sed failed to remove UPX
+	and strip."
+	econf
+	emake || die "Make failed."
+}
+
+src_install() {
+	if use static; then
+		dobin cromfs-driver-static || die "Couldn't find the static binary to
+		install."
+	fi
+	dobin cromfs-driver util/mkcromfs util/unmkcromfs util/cvcromfs || die "Some
+	binaries failed to install."
+	dodoc doc/*.txt doc/FORMAT doc/ChangeLog || die
+	dohtml doc/*.html doc/*.png || die
+}