Drop old version, fix compile failure against kernel-2.6.31

Package-Manager: portage-2.2_rc44-r1/cvs/Linux x86_64

5 files changed, 35 insertions, 112 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 5ba92c717486..b2aecb39bae9 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.9 2009/09/20 20:37:55 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.10 2009/10/09 18:08:02 tommy Exp $
+
+  09 Oct 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -aufs2-0_p20090727.ebuild, aufs2-0_p20090916.ebuild,
+  +files/utils-2.6.31.patch:
+  Drop old version, fix compile failure against kernel-2.6.31
 
   20 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   aufs2-0_p20090916.ebuild, +files/aufs2-base-28.patch,
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index b525bd794dea..540f465f4851 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -11,18 +11,18 @@ AUX aufs2-standalone-28.patch 3930 RMD160 40c2efb98084887425e3de60e44c893624e058
 AUX aufs2-standalone-29.patch 5748 RMD160 67fdda784ef736559e4b12038e625f5422351005 SHA1 8feb9ed859c239cda93863c8a965b3a13c563f71 SHA256 1b6d93c6b0fedbed48caa539ec231196f84cf697ca5bfe117f64a87aa17db33b
 AUX aufs2-standalone-30.patch 5432 RMD160 4a9979bb29164ee81e25c920df0dadbb6c496698 SHA1 1bcebf7b22f784834e5d5f0a25467de31f12320f SHA256 c2972ecca3562b34a2b68800b2322801f614d1945923b6fe7da711392ec37484
 AUX aufs2-standalone-31.patch 5826 RMD160 e7405edce064d3a163fccd390845442926b9c490 SHA1 e626a1632ba55b43b46449020b2a547e9572f417 SHA256 b6e61dd2cf5919879de6c668b8de6e0661dbaa0ac1ebe25868513360a6602601
+AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
 AUX utils-Makefile.patch 526 RMD160 9c580ad02f9b7398cead7e3d86d03e696b214f18 SHA1 cc22287e7b89d8640989ee38c0293e0933693699 SHA256 fdad12ea3339b4532b00269326951ec848534c4da53c365e9806f859cb4b40e1
 DIST aufs2-0_p20090916.tar.bz2 3239334 RMD160 619c1656514ddaf4b046b27d065208823d4c502e SHA1 aaae8f72a9388c40bca68ae2147afa32ad930ac7 SHA256 a68818cd382cf93ed7a32839a6ec6b23c0291b8125657db8b559659bbb89db10
-EBUILD aufs2-0_p20090727.ebuild 2996 RMD160 0b7c90ec77c0e33c0fe79e0f4dfa9dd4f98e004d SHA1 69fdcf09197cd166148fe7575ac8dd32c449e529 SHA256 671a7cc8175c1eb4565316194ffe62e0f2483351b05a4de4b0f2b9bd7a335b8e
-EBUILD aufs2-0_p20090916.ebuild 2818 RMD160 bac40cafa5fb638eb8096b9c83b7e6fde074db46 SHA1 295aa4d6134a67a8e8690b32a2c05862a45ec4aa SHA256 64c85092c522df39ab51fb6f2220fb77e4a8f6db317253044d0672b7f9a7ddd5
-MISC ChangeLog 2236 RMD160 0401564b673a4fdcfdfc72cc8d8ac711010491d4 SHA1 b9cc9fac1907fb96e754844ab3c9d1c0ee05e6af SHA256 c3e1a178a5770e7c7243bf7dcbd49bc5d3298f7c54f60a62fe764a8fa4b150d8
+EBUILD aufs2-0_p20090916.ebuild 2839 RMD160 a7034452cf0b8acc621ff598b275c0ab3bd8dd82 SHA1 3e82990cb2c6689ef8421320307fbeef7efe0caa SHA256 9d368ce57d1084b4405e795bcf56c912b7c54f6c3e7286bc5458e9afe7ef2b63
+MISC ChangeLog 2443 RMD160 0154942086a82fe228fbfbba4c62a5697b4a20cd SHA1 22b46805bd5c7df0d2f19de25b9bd995da835b86 SHA256 91bd4064590ee6a7c321cf35c8ad9be570b4a5e78525f9d39ddc4624e5a96634
 MISC metadata.xml 494 RMD160 f6073b31787a8f1472d9773b0e8f6359c11cb723 SHA1 ee378b887abc6a6d07b594d865ee0f0be770f508 SHA256 a42943fcc489495e6c9437fee486eace6b46edfaefb611081ed09eb82ef83957
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkq2kqsACgkQG7kqcTWJkGcFEQP+Ozpx45dCfGMm8GawlYepbQ54
-owga2oYrtWnXRcgMeFOhZ1VKUj17jEbUzeK9c15xz1AkKEy879+wEMR/D96C9kXy
-8fuJm+fvqE2/aw2zDcKwR+Is0wKIGME9tnxT17iPywyF3HlIJvVClsqITD/UHL7h
-FdoGpwGd48K+uzEu2Ek=
-=FhM4
+iJwEAQECAAYFAkrPfA8ACgkQG7kqcTWJkGc9GwP7Bt36b1lh9XQeKDXsMqy7PjSA
+wf8lQRlTRfsMc1FIjCYct+RVzMUEWjIg3G9YYBQYxBAmhTPKMLOCfKNXwR4zii2z
+ALAWjA55MzwYnGemc/tIEvvqxqF0gDuuS5rNgi9MN5HJo8yU4Q+1v9E9tXUK00Cb
+tgxyjnIYfsmGaqXDahU=
+=E0Fd
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20090727.ebuild b/sys-fs/aufs2/aufs2-0_p20090727.ebuild
deleted file mode 100644
index 0f3819d692f4..000000000000
--- a/sys-fs/aufs2/aufs2-0_p20090727.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090727.ebuild,v 1.1 2009/07/28 18:43:26 tommy Exp $
-
-EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
-
-inherit git linux-mod toolchain-funcs
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug inotify kernel-patch ramfs"
-
-DEPEND=""
-RDEPEND="!sys-fs/aufs"
-
-MODULE_NAMES="aufs(misc:${S})"
-
-get_kernelpatch() {
-	if kernel_is eq 2 6 27; then
-		KERNELPATCH="aufs2-standalone-27.patch"
-		EGIT_BRANCH="aufs2-27"
-		EGIT_TREE="957d5a6b6408016f9b074eccc7bffd1429d0a64d"
-	elif kernel_is eq 2 6 28; then
-		KERNELPATCH="aufs2-standalone-28.patch"
-		EGIT_BRANCH="aufs2-28"
-		EGIT_TREE="2e3a4181f3d391c72e086fb7ca23b151fc961371"
-	elif kernel_is eq 2 6 29; then
-		KERNELPATCH="aufs2-standalone-29.patch"
-		EGIT_BRANCH="aufs2-29"
-		EGIT_TREE="dc5a4600a23ba474a5eb941d4379330e0f36141e"
-	elif kernel_is eq 2 6 30; then
-		KERNELPATCH="aufs2-standalone-30.patch"
-		EGIT_BRANCH="aufs2-30"
-		EGIT_TREE="b599d87c0ad475e309f81d9b85ba56527371db81"
-	else
-		die "no supported kernel found"
-	fi
-}
-
-pkg_setup() {
-	get_version
-	get_kernelpatch
-	if ! patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${KERNELPATCH} >/dev/null; then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${KERNELPATCH} >/dev/null
-			epatch "${FILESDIR}"/${KERNELPATCH}
-			einfo "You need to compile your kernel with the applied patch"
-			einfo "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the aufs2 module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${KERNELPATCH} by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-
-	use debug || sed -i "s:DEBUG = y:DEBUG =:g" config.mk
-	use inotify && sed -i  "s:HINOTIFY =:HINOTIFY = y:g" config.mk
-	use ramfs && sed -i  "s:RAMFS =:RAMFS = y:g" config.mk
-
-	EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git"
-	EGIT_TREE="8d4217be37b74732afa80bc6e6519bd9df7ea1af"
-	EGIT_PROJECT="aufs2-utils"
-	EGIT_BRANCH=""
-	local S=${S}-utils
-	git_src_unpack
-	cd "${S}"
-	sed -i "/LDFLAGS += -static -s/d" Makefile
-}
-
-src_compile() {
-	ARCH=i386
-	use amd64 && ARCH=x86_64
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} || die
-	cd "${S}"-utils
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README || die
-	docinto design
-	dodoc design/*.txt || die
-	cd "${S}"-utils
-	emake DESTDIR="${D}" install || die
-	docinto
-	newdoc README README-utils || die
-}
diff --git a/sys-fs/aufs2/aufs2-0_p20090916.ebuild b/sys-fs/aufs2/aufs2-0_p20090916.ebuild
index 0d991bb25bd3..8805975d97a5 100644
--- a/sys-fs/aufs2/aufs2-0_p20090916.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20090916.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916.ebuild,v 1.2 2009/09/20 20:37:55 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916.ebuild,v 1.3 2009/10/09 18:08:02 tommy Exp $
 
 EAPI="2"
 
@@ -66,7 +66,7 @@ src_prepare() {
 
 	cd "${WORKDIR}"/${PN}-util
 	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	epatch "${FILESDIR}"/${P}-makefile.patch.bz2
+	epatch "${FILESDIR}"/{${P}-makefile.patch.bz2,utils-2.6.31.patch}
 }
 
 src_compile() {
diff --git a/sys-fs/aufs2/files/utils-2.6.31.patch b/sys-fs/aufs2/files/utils-2.6.31.patch
new file mode 100644
index 000000000000..23d435b6687e
--- /dev/null
+++ b/sys-fs/aufs2/files/utils-2.6.31.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index cca9c4f..a304043 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,14 @@ ifndef KDIR
+ KDIR = /lib/modules/$(shell uname -r)/build
+ endif
+ 
++ifndef ARCH
++ARCH := $(shell uname -m)
++endif
++ARCH := $(shell echo ${ARCH} | sed -e 's/_64$$//')
++
+ CFLAGS += -I${KDIR}/include
++d=${KDIR}/arch/${ARCH}/include
++CFLAGS += $(shell test -d ${d} && echo -I${d})
+ CFLAGS += -O -Wall
+ 
+ Cmd = umount.aufs auchk aubrsync