Version bump and remove oldest revision. Update to EAPI=3, add static-libs and xz USE flags, use src_prepare and src_configure phases instead of src_compile, replace einstall with emake, and clean up src_install.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 57 insertions, 22 deletions

diff --git a/sys-fs/avfs/ChangeLog b/sys-fs/avfs/ChangeLog
index 493d237feb1f..b08717b012db 100644
--- a/sys-fs/avfs/ChangeLog
+++ b/sys-fs/avfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/avfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.21 2010/09/10 12:39:56 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.22 2010/10/09 01:32:33 radhermit Exp $
+
+*avfs-0.9.9 (09 Oct 2010)
+
+  09 Oct 2010; Tim Harder <radhermit@gentoo.org> -avfs-0.9.7.ebuild,
+  +avfs-0.9.9.ebuild, metadata.xml:
+  Version bump and remove oldest revision. Update to EAPI=3, add static-libs
+  and xz USE flags, use src_prepare and src_configure phases instead of
+  src_compile, replace einstall with emake, and clean up src_install.
 
   10 Sep 2010; Tobias Klausmann <klausman@gentoo.org> avfs-0.9.8-r1.ebuild:
   Stable on alpha, bug #294831
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index c95cc2d870f5..1bf59c214918 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX avfs-0.9.8-gcc43_fix_open_missing_mode.patch 413 RMD160 a3c46733fa89423c0bcb559e4f04f33d7efdd711 SHA1 6e7ecbcc4b94539e23cba5e41ac9e5031ea3e34f SHA256 07bd153a3f81e1b2e59e6654c19c10e34b7df186bad57c9631770bfba3bca9f7
 DIST avfs-0.9.7.tar.bz2 575400 RMD160 5df6a81667e874987785fa2a932e449fcafb6913 SHA1 2ce3b006609a499bad99dff4549a733bc2502cd7 SHA256 5912997ab8b3f60674935db85891aecfc8cf3d86df593a5e115172d0b581d3aa
 DIST avfs-0.9.8.tar.bz2 641756 RMD160 d4ea9b0ba340bc504ae62e672bfbdfe85ea0855f SHA1 8307bdd646f4ea3e9da2365c701cfa110845bfc6 SHA256 5a45760889bdbe65a6ac11b926607681930746dff79924ad8418be1a8a10f5a7
+DIST avfs-0.9.9.tar.bz2 678451 RMD160 202b16761ef995323050c42b40fdd37c985a9770 SHA1 3bc812f6caffd17de38f839d20e99448f85474d3 SHA256 5e3100e99f6e136158a0d33045649959f830ddd31d57ec02f9e70cca421196cb
 EBUILD avfs-0.9.7-r1.ebuild 1604 RMD160 e963a64e1197fc42c8608981f48cef2a28d9b90a SHA1 1729ed102de6719d9b1bca3ab39712a5c2945652 SHA256 d1517bba22e87e8f999ab9f99f00b39afe1a6c7cfc6f8fee0eb8ad69d21eb249
-EBUILD avfs-0.9.7.ebuild 1550 RMD160 10ae787086574487ef247c19a2209011337733c7 SHA1 c185af6fa1079f3296af96d353553c854e729a10 SHA256 ac17f94c2f610652bc2a4c85ae036114ca3d6acfb7baa86431b92eb8247d0032
 EBUILD avfs-0.9.8-r1.ebuild 1705 RMD160 26ce26dffa3daa6bd451e9a698b2cea22198cd6f SHA1 a3cafaca9e49141092456256854251ddf082c498 SHA256 ac17c76fb50eed2569a1998a2f01a2384ef945bd87866567c3dc148cb50420c1
 EBUILD avfs-0.9.8.ebuild 1603 RMD160 833fbbf4fa05324561bdcee1ba70c51e348c573a SHA1 c57ef480041e7bb1132d239a9d3dea68549d3fef SHA256 14d7da9597a5f30c62073b770effcb72cf9ab16d981b5468398b010308c16d7d
-MISC ChangeLog 2920 RMD160 210ca08ae07a8f2918cb353d3bf947620a448f22 SHA1 8264929f9ea16995142bca4f01e135c5b1965a13 SHA256 daa0ca44d7a0572ef0692960d9148ef9b156c946b79c709e2411a87cb1dfd8e9
-MISC metadata.xml 266 RMD160 c0feb7c34ca51b03870a81c292be820946494791 SHA1 b62891b4420a45060425c36b4574c9f26b92fe80 SHA256 4b1357c29e2de325efcaed051c11f379bf035bc510caee8ab0b9dd777f8318db
+EBUILD avfs-0.9.9.ebuild 1856 RMD160 be316887464a94c96638443a462b691df939a61e SHA1 a9f550c57e92a9ac544f29530a2ff85b9f619b62 SHA256 0dbbac1bf2a3fda8f245252553e58cbd2698d433036be58c10461ab9e0b33f6c
+MISC ChangeLog 3273 RMD160 860d0c17fc1d12d4a0c1035f74ce6179ff15b86a SHA1 8b77edc926cd05c7a1e7b43fbd18ca05cf636ec6 SHA256 cf8527882eb21ea690b5fe43b1a1fa8e97cc61ecdfc3b82d14c957a5994ceed1
+MISC metadata.xml 341 RMD160 3cb2e6fd84a0095cb7c2066f38e190fa1cef6335 SHA1 b7d192169c035bf2fa453aaafd1cee6d0c0c9cc6 SHA256 4b77086c0284839708343645af316c83f9c475c861cee0121ce7bd0d42c5f022
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMr8Y7AAoJEEqz6FtPBkyj/KMH/RF/h+ijgKHsNpwF5lP43qnp
+yvi5eBs0IkKrn3JHRFOi/6J5x3CY0h92dyoDKyA2WoHqOq9CSrkmzFXJ+bR13mEa
++zc0Wpt0K/PDdpe2Ah5/jdPKJ/jwWtJ3H0xbIjmExJUoGPfWopLW1Rqrtkydx2lU
+NI2IaSqtdsQF7QfBAb8ejR3VZu/qfxGfvNeWtxgVFD2VXpEWcXkeHEXht5Kfd3sX
+WsHbOGAW3NUhEbfGUT5QprH6fdPzBZXnQ+ot6OWXeXhiUlolsKg2xMG64X9iubCC
+TOxrgbUOlZHVi+QHwKC3wxdFBudCVmhepc6XnoCxL0mNBLF8x356jZv4SxG05yg=
+=K7nS
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/avfs/avfs-0.9.7.ebuild b/sys-fs/avfs/avfs-0.9.9.ebuild
index c4d9cab52e93..17e2eee49bd6 100644
--- a/sys-fs/avfs/avfs-0.9.7.ebuild
+++ b/sys-fs/avfs/avfs-0.9.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.7.ebuild,v 1.5 2007/05/05 11:33:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.9.ebuild,v 1.1 2010/10/09 01:32:33 radhermit Exp $
 
-inherit linux-info
+EAPI=3
+inherit eutils linux-info
 
 DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files."
 HOMEPAGE="http://sourceforge.net/projects/avf"
@@ -10,34 +11,42 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="static-libs +xz"
 
-DEPEND=">=sys-fs/fuse-2.4"
+DEPEND=">=sys-fs/fuse-2.4
+	xz? ( app-arch/xz-utils )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	kernel_is lt 2 6 && die "Must have a version 2.6 kernel. Cannot continue. :("
 }
 
-src_compile() {
-	econf --enable-fuse || die "Sorry, can't configure :("
-	emake || die "Sorry make failed :("
+src_prepare() {
+	# Fixes bug #258295
+	epatch "${FILESDIR}/${PN}-0.9.8-gcc43_fix_open_missing_mode.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-fuse \
+		--enable-library \
+		$(use_enable static-libs static) \
+		$(use_with xz)
 }
 
 src_install() {
-	einstall || die "Sorry, make install failed :("
+	emake DESTDIR="${D}" install || die "emake install failed"
 	# remove cruft
-	cd ${D}/usr
-	rm -f bin/davpass bin/ftppass
-	rm -fr include sbin ../etc
-	cd ${S}
-	cd doc
-	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse
+	rm -f "${D}"/bin/davpass "${D}"/bin/ftppass || die "rm failed"
+	# install docs
+	cd "${S}"/doc
+	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse || die "dodoc failed"
 	cd ..
-	dodoc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO || die "dodoc failed"
 	docinto scripts
-	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs
-	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs || die "dodoc failed"
+	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs || die "dosym failed"
 }
 
 pkg_postinst() {
diff --git a/sys-fs/avfs/metadata.xml b/sys-fs/avfs/metadata.xml
index 3a96ed2fd049..827722690987 100644
--- a/sys-fs/avfs/metadata.xml
+++ b/sys-fs/avfs/metadata.xml
@@ -6,4 +6,7 @@
     <email>pete4abw@comcast.net</email>
     <name>Peter Hyman</name>
   </maintainer>
+  <use>
+    <flag name="xz">Enable LZMA/XZ archive support</flag>
+  </use>
 </pkgmetadata>