sys-fs/aufs-util: Bump to latest, drop old; version schema is now following upstreams branches

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

9 files changed, 16 insertions, 262 deletions

diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index b7e545863890..8c87d2df8ad3 100644
--- a/sys-fs/aufs-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-fs/aufs-util
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.16 2013/08/07 07:01:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.17 2013/08/21 07:49:15 jlec Exp $
+
+*aufs-util-3.9_p20130821 (21 Aug 2013)
+*aufs-util-3.2_p20130821 (21 Aug 2013)
+
+  21 Aug 2013; Justin Lecher <jlec@gentoo.org> +aufs-util-3.2_p20130821.ebuild,
+  -aufs-util-3.6.ebuild, -aufs-util-3.7.ebuild, -aufs-util-3.7-r1.ebuild,
+  -aufs-util-3.7.6.ebuild, -aufs-util-3.8_p20130318.ebuild,
+  -aufs-util-3.8_p20130422.ebuild, +aufs-util-3.9_p20130821.ebuild,
+  -aufs-util-3.10_p20130722.ebuild, -aufs-util-3.10_p20130807.ebuild:
+  Bump to latest, drop old; version schema is now following upstreams branches
 
 *aufs-util-3.10_p20130807 (07 Aug 2013)
 
diff --git a/sys-fs/aufs-util/aufs-util-3.10_p20130807.ebuild b/sys-fs/aufs-util/aufs-util-3.2_p20130821.ebuild
index a623da2f840c..da60b21d1fc8 100644
--- a/sys-fs/aufs-util/aufs-util-3.10_p20130807.ebuild
+++ b/sys-fs/aufs-util/aufs-util-3.2_p20130821.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.10_p20130807.ebuild,v 1.1 2013/08/07 07:01:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.2_p20130821.ebuild,v 1.1 2013/08/21 07:49:15 jlec Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ RDEPEND="
 	!sys-fs/aufs2
 	!<sys-fs/aufs3-3_p20130318"
 DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
+	<sys-fs/aufs-headers-3.9"
 
 src_prepare() {
 	sed \
diff --git a/sys-fs/aufs-util/aufs-util-3.6.ebuild b/sys-fs/aufs-util/aufs-util-3.6.ebuild
deleted file mode 100644
index b7c396915bd9..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.6.ebuild,v 1.6 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.6/ \
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \
-# -o aufs-util-3.6.tar && xz -ve9 aufs-util-3.6.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!sys-fs/aufs3
-	sys-kernel/aufs-sources"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	[[ -e "${KERNEL_DIR}"/include/linux/aufs_type.h ]] || \
-		die "Please select aufs-sources before building ${PN}"
-	append-cppflags -I"${KERNEL_DIR}/include"
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.7-r1.ebuild b/sys-fs/aufs-util/aufs-util-3.7-r1.ebuild
deleted file mode 100644
index 1d36849d1611..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.7-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.7-r1.ebuild,v 1.3 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-AUFS_VERSION=3.7.3
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="
-	${AUFS_URI}
-	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.7/ \
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \
-# -o aufs-util-3.7.tar && xz -ve9 aufs-util-3.7.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	append-cppflags -I"${WORKDIR}/include"
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed -i "s:__user::g" "${WORKDIR}"/include/uapi/linux/aufs_type.h || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.7.6.ebuild b/sys-fs/aufs-util/aufs-util-3.7.6.ebuild
deleted file mode 100644
index 7291b5a18fd0..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.7.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.7.6.ebuild,v 1.2 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-AUFS_VERSION=3.7.6
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="
-	${AUFS_URI}
-	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.7/ \
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \
-# -o aufs-util-3.7.tar && xz -ve9 aufs-util-3.7.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	append-cppflags -I"${WORKDIR}/include"
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed -i "s:__user::g" "${WORKDIR}"/include/uapi/linux/aufs_type.h || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.7.ebuild b/sys-fs/aufs-util/aufs-util-3.7.ebuild
deleted file mode 100644
index 53aac0ca67cb..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.7.ebuild,v 1.2 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.7/ \
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \
-# -o aufs-util-3.7.tar && xz -ve9 aufs-util-3.7.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!sys-fs/aufs3
-	sys-kernel/aufs-sources"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	[[ -e "${KERNEL_DIR}"/include/uapi/linux/aufs_type.h ]] || \
-		die "Please select aufs-sources before building ${PN}"
-	append-cppflags -I"${KERNEL_DIR}/include"
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild b/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild
deleted file mode 100644
index e86e9a9744bd..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild,v 1.3 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.8_p20130318/
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0
-# -o aufs-util-3.8_p20130318.tar && xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.8_p20130422.ebuild b/sys-fs/aufs-util/aufs-util-3.8_p20130422.ebuild
deleted file mode 100644
index cf42b0f98fd4..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.8_p20130422.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.8_p20130422.ebuild,v 1.2 2013/05/27 11:20:55 jlec Exp $
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.8_p20130422 /
-# --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.2
-# -o aufs-util-3.8_p20130422.tar && xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-	sed \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.10_p20130722.ebuild b/sys-fs/aufs-util/aufs-util-3.9_p20130821.ebuild
index 9797d4de2164..2658617ab839 100644
--- a/sys-fs/aufs-util/aufs-util-3.10_p20130722.ebuild
+++ b/sys-fs/aufs-util/aufs-util-3.9_p20130821.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.10_p20130722.ebuild,v 1.1 2013/07/22 06:42:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.9_p20130821.ebuild,v 1.1 2013/08/21 07:49:15 jlec Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit flag-o-matic linux-info multilib toolchain-funcs
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.10 -o ${P}.tar
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.2 -o ${P}.tar
 # xz -ve9 *.tar
 
 SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND="
 	!sys-fs/aufs2
 	!<sys-fs/aufs3-3_p20130318"
 DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
+	>sys-fs/aufs-headers-3.9"
 
 src_prepare() {
 	sed \