Fix bug 291865, drop old version

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

4 files changed, 14 insertions, 101 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index d53d8f23dd74..9e8f353a693f 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2009/11/26 18:01:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.12 2009/11/27 14:14:40 tommy Exp $
+
+  27 Nov 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -aufs2-0_p20090916.ebuild, aufs2-0_p20090916-r1.ebuild:
+  Fix bug 291865, drop old version
 
 *aufs2-0_p20090916-r1 (26 Nov 2009)
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index a3cf1cac6fb7..b25ae559c247 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -14,16 +14,15 @@ AUX aufs2-standalone-31.patch 5826 RMD160 e7405edce064d3a163fccd390845442926b9c4
 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_p20090916-r1.ebuild 2985 RMD160 34256bc27e6e45b76a36f025d86e4fa6d594ec9f SHA1 42fd61c3373bdbf8d00637df10067229822fb50a SHA256 4a7de773cbe76a396a908725fa4dea7fe4e464063b0054a18de9739743187c2d
-EBUILD aufs2-0_p20090916.ebuild 2839 RMD160 a7034452cf0b8acc621ff598b275c0ab3bd8dd82 SHA1 3e82990cb2c6689ef8421320307fbeef7efe0caa SHA256 9d368ce57d1084b4405e795bcf56c912b7c54f6c3e7286bc5458e9afe7ef2b63
-MISC ChangeLog 2645 RMD160 e8398ac158ea87a51c31fbd82e2837f58f2d698b SHA1 a6a14b679b4bc1dcac8f267985e33614d17c0c13 SHA256 57f86632e11dcbb122202090f521dee085bd312b69ff05dcc5a56114f3a34f9d
+EBUILD aufs2-0_p20090916-r1.ebuild 2958 RMD160 68da42877796919e684b32106dd3a5c35b3ea09f SHA1 09c41c34e1f5d18b29b4f89275342b69765ac09e SHA256 b3ce3776fa79794844642112a6dbc16fafe41d1f160c83e8736faf9ed2a80344
+MISC ChangeLog 2798 RMD160 992851045d5b7fc8733bcb905c1c3cea51b90ec7 SHA1 1657669e10991d18d797cce7607004680ebe1e9b SHA256 ccfe2270fb4e65e38ae272c639d6ac5b5a32231baefe7592a318ac0febd7a1d8
 MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iJwEAQECAAYFAksOwpkACgkQG7kqcTWJkGdL5AP+KqdXP/rR7tMtKb/bTBIXF9Fu
-ai4lyoX3gd9Sy5WZf86ABWWUhYIdIp+DeUOYxLs5uUy66/0TQIBFZvU4j7Ll61zy
-neAiWpCMI5Vzscn8fqIu0OIFLvBKubWe8tBbx13Zaci9PGEG3DJqLizPLFLP1FxF
-yVMkySldj8jM2tBABsY=
-=uOmm
+iJwEAQECAAYFAksP3uMACgkQG7kqcTWJkGel4QP+KAizkNXTJA6Np5f97IMb4GAA
+ZmjeGG63EXHGI2VjKEXuvjC9vlz8HGiVhxO4uyUdnMtzlpCJlc6yAJpfOylP2JvD
+sgGpb5yb4zhsk8WrIPlhDaiFR0k9aSuz5JyWkhRXixzxxACoWThdIDwE03GNfY7N
+N1o1yDKeF2W409zojF0=
+=1pMx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild b/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild
index ae735374702a..e544bf2bb8b4 100644
--- a/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20090916-r1.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-r1.ebuild,v 1.1 2009/11/26 18:01:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild,v 1.2 2009/11/27 14:14:40 tommy Exp $
 
 EAPI="2"
 
@@ -70,10 +70,9 @@ src_prepare() {
 }
 
 src_compile() {
-	local myargs="" ARCH=i386
+	local myargs="" ARCH=x86
 	use nfs && myargs="CONFIG_EXPORTFS=y CONFIG_AUFS_EXPORT=y "
 	use nfs && use amd64 && myargs+="CONFIG_AUFS_INO_T_64=y"
-	use amd64 && ARCH=x86_64
 	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m ${myargs} KDIR=${KV_DIR} || die
 	cd "${WORKDIR}"/${PN}-util
 	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die
diff --git a/sys-fs/aufs2/aufs2-0_p20090916.ebuild b/sys-fs/aufs2/aufs2-0_p20090916.ebuild
deleted file mode 100644
index 8805975d97a5..000000000000
--- a/sys-fs/aufs2/aufs2-0_p20090916.ebuild
+++ /dev/null
@@ -1,89 +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_p20090916.ebuild,v 1.3 2009/10/09 18:08:02 tommy Exp $
-
-EAPI="2"
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug inotify kernel-patch ramfs"
-
-DEPEND="dev-util/git"
-RDEPEND="!sys-fs/aufs"
-
-S=${WORKDIR}/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	get_version
-	kernel_is lt 2 6 27 && die "kernel too old"
-	kernel_is gt 2 6 31 && die "kernel too new"
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/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}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null
-			epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch
-			elog "You need to compile your kernel with the applied patch"
-			elog "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}/aufs2-base-${KV_PATCH}.patch and"
-			eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	local branch=origin/aufs2-${KV_PATCH}
-	if [[ $KV_PATCH == 31 ]] ; then
-		branch=origin/aufs2
-	fi
-	git checkout -q $branch || die
-	if ! use debug; then
-		sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die
-	fi
-	if use inotify; then
-		sed -i  "s:HINOTIFY =:HINOTIFY = y:g" config.mk || die
-	fi
-	if use ramfs; then
-		sed -i  "s:RAMFS =:RAMFS = y:g" config.mk || die
-	fi
-
-	cd "${WORKDIR}"/${PN}-util
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	epatch "${FILESDIR}"/{${P}-makefile.patch.bz2,utils-2.6.31.patch}
-}
-
-src_compile() {
-	local ARCH=i386
-	use amd64 && ARCH=x86_64
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} || die
-	cd "${WORKDIR}"/${PN}-util
-	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 "${WORKDIR}"/${PN}-util
-	emake DESTDIR="${D}" install || die
-	docinto
-	newdoc README README-utils || die
-}