Version bump, added new subslot as a libbtrfs's SONAME.

(Portage version: 2.2.7_p18/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

3 files changed, 68 insertions, 4 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 00053c4ce9fb..ba4fce23cccd 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.66 2013/07/25 02:23:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.67 2013/11/26 17:06:49 slyfox Exp $
+
+*btrfs-progs-3.12 (26 Nov 2013)
+
+  26 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org> +btrfs-progs-3.12.ebuild,
+  btrfs-progs-9999.ebuild:
+  Version bump, added new subslot as a libbtrfs's SONAME.
 
   25 Jul 2013; Mike Gilbert <floppym@gentoo.org>
   btrfs-progs-0.20_rc1_p358.ebuild, btrfs-progs-9999.ebuild:
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.12.ebuild
new file mode 100644
index 000000000000..b3f9cfcefb10
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.12.ebuild,v 1.1 2013/11/26 17:06:49 slyfox Exp $
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	inherit git-2
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE=""
+
+DEPEND="
+	dev-libs/lzo
+	sys-libs/zlib
+	sys-apps/acl
+	sys-fs/e2fsprogs
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		BUILD_VERBOSE=1
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		bindir=/sbin \
+		libdir=/usr/$(get_libdir) \
+		mandir=/usr/share/man
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index c853c0bb458e..61c1a1ad6700 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.28 2013/07/25 02:23:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.29 2013/11/26 17:06:49 slyfox Exp $
 
 EAPI=5
 
 inherit multilib toolchain-funcs
 
+libbtrfs_soname=0
+
 if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
 else
 	inherit git-2
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
@@ -19,7 +23,7 @@ DESCRIPTION="Btrfs filesystem utilities"
 HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${libbtrfs_soname}"
 IUSE=""
 
 DEPEND="
@@ -32,6 +36,7 @@ RDEPEND="${DEPEND}"
 
 src_compile() {
 	emake \
+		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \