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

Package-Manager: portage-2.2.7_p18/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 76 insertions, 10 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/Manifest b/sys-fs/btrfs-progs/Manifest
index 68244151c454..a0e9fd9eea3c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -10,18 +10,20 @@ DIST btrfs-progs-0.19.tar.bz2 118119 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff
 DIST btrfs-progs-0.20-rc1.tar.gz 246563 SHA256 73383b6de89dbd1e93b45ecd8db99b3b813893d23875490e1a1132a868ce94c0 SHA512 954c3dee745e60e7f041e9858bfaf2724375ee363cbb98d35fdc4b10b0092a3ec388a8af1fb59f693be076d6caff2f1211cb03e0e22e4e5708438ad520c4fba2 WHIRLPOOL c10975d79823539dec9d76854f1b1854b75a3e589e828cb45d253cbb53f1da83d09ed4813ca15d29c8685e5159c2b6746ea7a99ae34ea0f18adf030e91820049
 DIST btrfs-progs-0.20_rc1_p358.tar.gz 326938 SHA256 42dabee7c5cdcc353a0aa5d3244a920949557c90bcd5dd94f98df95c5a0ccd8a SHA512 9fe3c18975f4f80449b0296d9d19af6f919c56565dfd7c33e7fa142635a5b46bc9759ee116dc2a09c3392637e461bbfd5434e60bece0e6b707167c30331eb82c WHIRLPOOL 53b7161d185b2340c291a8057b3f9610c84af7efacee1aad34cd92674802b87f3e272054fd305f35e517c9036b5c1f0765a1a151a32945ef46c81098075efb60
 DIST btrfs-progs-0.20_rc1_p56.tar.gz 252929 SHA256 dd7746524465f47cdb740a5e46ebf2d1da4ed4631ddba5d4d550547828726d50 SHA512 bb47f2f5d30222fc6dd8b558de4d56c5f39d2833519af5fda595dbc67907133853dafb240baf65f6e0d344d7a80c0571e16db888b884e27ca1a75333b3556890 WHIRLPOOL ad5d59ad3ebc07489dadeaf769fdd6955812eb913ebee5b40419bf7607590048be34906b3b416539807223be06f0587d14d28278716d9c54ddbfe09427c6089c
+DIST btrfs-progs-v3.12.tar.xz 261220 SHA256 097e63561c91c1fbfdf99e7a60ed55b51fa0f057b3875c08413e362c93938cdf SHA512 655e8d9ecf297281d07312bd19a6ab942f354a370147e0ca46a22e5bcd7485ed0d415247ba21162617a23b7f9def202cab3bb5dc23ccfa96496043b48dfda785 WHIRLPOOL b8e50c90c2a5f5bf9f5db7a1d7ea841b767fbb4ffdea52d913f7365965f6c58c612388f5b95a8a190826f9bcc6af783e09d4867a4b153040462b3ed353d56050
 EBUILD btrfs-progs-0.19-r3.ebuild 2733 SHA256 77ae329be086d9d70848c9f63ecb46dc6f820ebacba9e3bf094c092094a0ff8b SHA512 97d92488a923e1efc938f8bed4ece3f6893192fd16976dcb24bf28a778e319dfd4442c8660e9599d73a97ca4e269a416364422a1d7c80868938a4e23728152a8 WHIRLPOOL e1d4f67116c48aafea82c96bd5fb895dac531f6aa62ca225b8e14df10feffda0a7e5c6ef5563992bf20d14e7ccf7e1df035ab8561849e4d9a48b9579a14e7e5b
 EBUILD btrfs-progs-0.19.11.ebuild 1687 SHA256 93e3661de2904fbc30d6a553b9bf580670b31976daa00b972844b473a1f9ef73 SHA512 1812c567a8382ea1d0ef42866303afc44fbbb685e98a78f584bd7c3f73d9310ebf4891d22f24efbc0cee0729e8595da2481e244f6651dd843303d47dc46d494c WHIRLPOOL a406c5d018a2412f20fbf5bc53218fbe211d35a2777533047872dac2372e7d811308890d04e22dbabb23a9ceff3233d1f0512622ec9205d9225c4b8cc7ba3d8b
 EBUILD btrfs-progs-0.20_rc1.ebuild 1572 SHA256 72aac33b871a604d5f668d2fabcc4e546535410e678d273c8f1ae1864c588bd0 SHA512 b24cb1f56c64fd6bd670ab513be418f8fb59e0d66b9ca74a1f952451a955ac2c83bcb625c12b892eab2b1ea517edd01a24f78c5fa95ea73f9118c052e050f0a8 WHIRLPOOL 2662118584242bc0a39587951946752447fe8f535fd33aa581bd894450a110e7b700009cf6e13360ec1611798845f722a7ab3d75126c274a4e87ecf6c9b94707
 EBUILD btrfs-progs-0.20_rc1_p358.ebuild 1079 SHA256 d81f3a95ee67b4466f8e5a342484862a0c22a1d5e99fa95a0577368b5fc79e60 SHA512 94e1171073faf3a041413a38696d1c21344a59e3af7d453d56a70a919f3bdc60a625fd5a78532121ad4a03efc0d6bd9f43df300c6dbc918660c72bda3ae26dde WHIRLPOOL 71a9f7500192b9640d5a58b6bda1c21a729a5c10b605c55c2f602845cd0e1a86fd3ba8cffc79f65ff29b2ea970f1cca8247455ede92ea9d654a71b52af80ef0d
 EBUILD btrfs-progs-0.20_rc1_p56.ebuild 1039 SHA256 494a3ed6440764f689beceaf5dee28fb071aec2a5f00e104a766aef427a40d8c SHA512 b4f9cda9e4e5cbedfeec3001d95c6356b964de7c3c530ab860104aa855093a59a497a5c69d2056eeb4e75f66b97c02de3f2cadd43205d9b4040a388dfa908282 WHIRLPOOL 157d1b2be6d8b8840117a028570a2e58c66f0ebab56ba465c1edb3109cde4b48ab5a07b9ca4f739b9cf732e26ef76db088e989f62ebafaa54c8e0e5e7aa5e867
-EBUILD btrfs-progs-9999.ebuild 1071 SHA256 959baccae83bc26d75df5a70368f1af5168eee1237f7e7a29e8da370b339e9a2 SHA512 944054157b61c7cd129ac8138548ac46df5480ee9184cc9c8798e406da7e00baf3eaf1a9f0a2616071706c41649f4948c48204bbcdae9925ebab8030d2efb6ec WHIRLPOOL 48d466541f4c0ce81e021185c8576dc62af6221f8ce86a5d1064f58807b9dd01ba6669b8653f554b1a5409206f9cb194b066b0458935efcafc4276e2a41fdcab
-MISC ChangeLog 10031 SHA256 a4db0cedd1b94315d9d051ec7a9fa7e48fcf71885a0bcf84d4db5157ed123251 SHA512 8cce3812e785fb94090b8473996eed4d5c492c90097ca2e774e13d68e726436e2b2a6f97a707da1065d42363a3a0ac09754a5896b677b8478c2488738f16f5d4 WHIRLPOOL b2c07f2707fcf56c5f4cba12e3fda9bb90d2f6314494b69be2189d3c5980fac680bffeba35b0da017cafe8e008da5499bddbb1e587ec12b3b147d0a7ab780b73
+EBUILD btrfs-progs-3.12.ebuild 1206 SHA256 d4838d0debd45eb0cd02668f33a370e2c91f4b7d81fbfe38b8cb6a9a8adfe69c SHA512 dacffd454b290ff1f68c6e36053cbd506802edeedfe7e6fff42f01dac69a97e27cf67d8bc41512b83b30beeb89d7eebd27f446628582128dfc64b819afac513d WHIRLPOOL 5c2bc20f4b0e282bc8806b1e88286f7022809040939b242aa477fa43e10eec3bd988414d13a82cb4bc868e82221739a871b73c1aaa5127872010240ff72a18e4
+EBUILD btrfs-progs-9999.ebuild 1207 SHA256 c0d345fd64269357736a40650a5ba6c5ed527afa22c86b4551e553595eb55851 SHA512 23c9b724f15986f03bf31c01bf9899cd2184b0540cad08c3af7cdb96a109812616e1cf8d5013312f591f94d6a8c79987c08514b18813afb14755c3b71f14a032 WHIRLPOOL 86bd22b9605100c01a36c07e8bddd91f7e5855672701c2006348d43bf66c65ef12eb7e4499f5102c0b87421f070c8cb0abb9f1a6df81826c93289207f31e2228
+MISC ChangeLog 10229 SHA256 63cff7433f7fe80acdee0ce08960da33a8a6693b9bc37c9c15dcc96d8a4bc6a0 SHA512 67ba991ecb3096c737bea99a55de8fb9036c1d3abaf09ef792f48372d60c254c34b56c29296494acc5222cdafda3037f3e6fd3994241d97696cc57b712ae6b84 WHIRLPOOL 971fbb4449d7413185c92e40e8f1bb586e436e683ed1e1c4ed9ae423c3a606616650549eb25d56eb41e7957d7315c19996e0586229ec671a0970cf6b87548045
 MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlHwjCAACgkQC77qH+pIQ6QxFwD+JC0uh5bP7lcVsjGJSKmyZu7J
-wBrtFpBj3CiRnkl8j7QA/2yHrrcGEqHo3u8el+lg+ps/W+noZ5djZcY2XkhYLDvX
-=kJZA
+iEYEAREIAAYFAlKU1AEACgkQcaHudmEf86oiLACfcqwpWlX6EVSx8qhJHHk1j8QY
+ErIAn2P8MhRBxq4CQA3Kx4dpFFTZ9rDC
+=xQFL
 -----END PGP SIGNATURE-----
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}" \