Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 disk/btrfs-progs/BUILD     |    6 +++++-
 disk/btrfs-progs/DEPENDS   |   19 +++++++++++++++----
 disk/btrfs-progs/DETAILS   |   23 +++++++++++++++--------
 disk/btrfs-progs/HISTORY   |   10 ++++++++++
 disk/btrfs-progs/INSTALL   |    6 +++++-
 disk/btrfs-progs/PREPARE   |    2 +-
 disk/btrfs-progs/PRE_BUILD |    6 ++++++
 7 files changed, 57 insertions(+), 15 deletions(-)

New commits:
commit 629339bdb357c243182fb580b436c1909b0df063
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    btrfs-progs: => 3.18.2

diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
index 8f58e6d..a9b8577 100755
--- a/disk/btrfs-progs/BUILD
+++ b/disk/btrfs-progs/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL xmlto; then
+  make BUILD_VERBOSE=1
+else
+  make BUILD_VERBOSE=1 DISABLE_DOCUMENTATION=1
+fi
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
index 575c5ac..21c38f4 100755
--- a/disk/btrfs-progs/DEPENDS
+++ b/disk/btrfs-progs/DEPENDS
@@ -1,4 +1,15 @@
-depends docbook-xsl &&
-depends xmlto &&
-depends acl &&
-depends e2fsprogs
+depends zlib &&
+depends util-linux &&
+depends lzo &&
+
+optional_depends acl "" "" "for btrfs-convert utility" &&
+
+if is_depends_enabled $SPELL acl; then
+  depends e2fsprogs
+fi &&
+
+optional_depends xmlto "" "" "to build documentation" &&
+
+if is_depends_enabled $SPELL xmlto; then
+  depends asciidoc
+fi
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 4d15fdb..3f20989 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,16 +1,23 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=btrfs-progs
-   
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
-if [ "$BTRFS_PROGS_BRANCH" = scm ]; then
+if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
          VERSION=$(get_scm_version)
-else
-         VERSION=3.14.2
-   SOURCE_URL[0]="$SOURCE_URL[0]::v$VERSION"
-fi
-          SOURCE=$SPELL-scm.tar.bz2
+          SOURCE=${SPELL}-${VERSION}.tar.bz2
+   
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/${SPELL}.git:${SPELL}-${VERSION}
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
+else
+         VERSION=3.18.2
+          SOURCE=${SPELL}-${VERSION}.tar.bz2
+         SOURCE2=${SOURCE}.sig
+   SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
+   SOURCE_URL[1]=http://download.sourcemage.org/distro/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL}.sig
+  SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+      SOURCE_GPG=gurus.gpg:$SOURCE2:WORKS_FOR_ME
+  SOURCE2_IGNORE=signature
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://btrfs.wiki.kernel.org/
          ENTERED=20090205
       LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 26d1bf9..ce57ef8 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,13 @@
+2015-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.18.2, use our own tarball checked out
+         from 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+         (tag v3.18.2), signed by me; quoting paths
+       * DEPENDS: rewritten proper dependency tree
+       * PREPARE: use release by default
+       * PRE_BUILD: added, to handle btrfs-convert
+       * BUILD, INSTALL: handle docless installation; /bin -> /sbin;
+         verbosity++
+
 2015-01-22 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: Depends on xmlto & docbook-xsl for manpages
 
diff --git a/disk/btrfs-progs/INSTALL b/disk/btrfs-progs/INSTALL
index baa07f4..3593c7d 100755
--- a/disk/btrfs-progs/INSTALL
+++ b/disk/btrfs-progs/INSTALL
@@ -1 +1,5 @@
-make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/bin install
+if is_depends_enabled $SPELL xmlto; then
+  make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/sbin install
+else
+  make DISABLE_DOCUMENTATION=1 DESTDIR="$INSTALL_ROOT" prefix=/usr 
bindir=/sbin install
+fi
diff --git a/disk/btrfs-progs/PREPARE b/disk/btrfs-progs/PREPARE
index 22bb1c5..1abc8d1 100755
--- a/disk/btrfs-progs/PREPARE
+++ b/disk/btrfs-progs/PREPARE
@@ -1,2 +1,2 @@
 . ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch scm release
+prepare_select_branch release scm
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
new file mode 100755
index 0000000..df25ba6
--- /dev/null
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if ! is_depends_enabled $SPELL acl; then
+  sedit "s:btrfs-convert::g" Makefile
+fi