slyfox      14/03/10 19:34:28

  Modified:             btrfs-progs-9999.ebuild ChangeLog
  Added:                btrfs-progs-3.12-r2.ebuild
  Log:
  Fix recursive defrag failures on non-files (bug #503514 by Antoine Lemoine).
  
  (Portage version: 2.2.8_p62/cvs/Linux x86_64, signed Manifest commit with key 
611FF3AA)

Revision  Changes    Path
1.32                 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.32&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.32&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?r1=1.31&r2=1.32

Index: btrfs-progs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- btrfs-progs-9999.ebuild     30 Nov 2013 20:55:15 -0000      1.31
+++ btrfs-progs-9999.ebuild     10 Mar 2014 19:34:28 -0000      1.32
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.31 
2013/11/30 20:55:15 slyfox Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.32 
2014/03/10 19:34:28 slyfox Exp $
 
 EAPI=5
 
@@ -36,6 +36,7 @@
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.12-fix-send-subvol-492776.patch
+       epatch "${FILESDIR}"/${PN}-3.12-defrag-sockets.patch
        epatch_user
 }
 



1.75                 sys-fs/btrfs-progs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.75&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.75&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog   5 Jan 2014 10:46:27 -0000       1.74
+++ ChangeLog   10 Mar 2014 19:34:28 -0000      1.75
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.74 
2014/01/05 10:46:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.75 
2014/03/10 19:34:28 slyfox Exp $
+
+*btrfs-progs-3.12-r2 (10 Mar 2014)
+
+  10 Mar 2014; Sergei Trofimovich <sly...@gentoo.org>
+  +btrfs-progs-3.12-r2.ebuild, +files/btrfs-progs-3.12-defrag-sockets.patch,
+  btrfs-progs-9999.ebuild:
+  Fix recursive defrag failures on non-files (bug #503514 by Antoine Lemoine).
 
   05 Jan 2014; Agostino Sarubbo <a...@gentoo.org> btrfs-progs-3.12-r1.ebuild:
   Stable for x86, wrt bug #494114



1.1                  sys-fs/btrfs-progs/btrfs-progs-3.12-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.12-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.12-r2.ebuild?rev=1.1&content-type=text/plain

Index: btrfs-progs-3.12-r2.ebuild
===================================================================
# Copyright 1999-2014 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-r2.ebuild,v 1.1 
2014/03/10 19:34:28 slyfox Exp $

EAPI=5

inherit eutils 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_prepare() {
        epatch "${FILESDIR}"/${P}-fix-send-subvol-492776.patch
        epatch "${FILESDIR}"/${P}-defrag-sockets.patch
        epatch_user
}

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
}




Reply via email to