Merge remote-tracking branch 'origin/master' into devel-xorg-modular

11 files changed, 40 insertions, 3 deletions

diff --git a/devel/gitg/DETAILS b/devel/gitg/DETAILS
index 3096c15d55..85ba748eac 100755
--- a/devel/gitg/DETAILS
+++ b/devel/gitg/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gitg
-         VERSION=0.2.5
+         VERSION=0.2.7
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+     SOURCE_HASH=sha512:8d07e3410691a9ea4772e8db546d3da87f4517ac35111156c6cba3b9317e02fc7dd63a79c05aa0700ce59d2739d0c680d33825e3a8c8c7c242db7ac8ae6962c4
       LICENSE[0]=GPL
         WEB_SITE=http://git.gnome.org/browse/gitg/
          ENTERED=20110902
diff --git a/devel/gitg/HISTORY b/devel/gitg/HISTORY
index b99ec880fd..6f3bd6d9f9 100644
--- a/devel/gitg/HISTORY
+++ b/devel/gitg/HISTORY
@@ -1,2 +1,5 @@
+2013-06-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.2.7
+
 2011-09-02 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS, DEPENDS: spell created, version 0.2.5
diff --git a/devel/gitg/gitg-0.2.5.tar.bz2.sig b/devel/gitg/gitg-0.2.5.tar.bz2.sig
deleted file mode 100644
index 71c1f326fe..0000000000
--- a/devel/gitg/gitg-0.2.5.tar.bz2.sig
+++ /dev/null
diff --git a/devel/qgrit/BUILD b/devel/qgrit/BUILD
new file mode 100755
index 0000000000..eec3de4651
--- /dev/null
+++ b/devel/qgrit/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/devel/qgrit/DEPENDS b/devel/qgrit/DEPENDS
new file mode 100755
index 0000000000..18aca0a8cf
--- /dev/null
+++ b/devel/qgrit/DEPENDS
@@ -0,0 +1,2 @@
+depends git &&
+depends qt4 
diff --git a/devel/qgrit/DETAILS b/devel/qgrit/DETAILS
new file mode 100755
index 0000000000..c21727dfdf
--- /dev/null
+++ b/devel/qgrit/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=qgrit
+    if [[ ${QGRIT_AUTOUPDATE} == "y" ]]
+    then
+         VERSION=$(date +%Y%m%d)
+    else
+         VERSION=scm
+    fi
+          SOURCE="${SPELL}-scm.tar.bz2"
+   SOURCE_URL[0]=git_http://github.com/${SPELL}/${SPELL}.git:$SPELL
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+        WEB_SITE="https://github.com/qgrit/qgrit"
+      LICENSE[0]=BSD
+         ENTERED=20130615
+           SHORT="git GUI for interactive git rebase"
+cat << EOF
+This helper allows you to graphically reorder commits during "git rebase -i"
+It avoids the potential problem when editing text files.  Typos during edit,
+lines lost by cutting and forgetting to paste.  And other shortcomings
+depending on the editor used.
+EOF
diff --git a/devel/qgrit/HISTORY b/devel/qgrit/HISTORY
new file mode 100644
index 0000000000..4e2f9359c8
--- /dev/null
+++ b/devel/qgrit/HISTORY
@@ -0,0 +1,3 @@
+2013-06-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS, PREPARE, INSTALL: spell created
+
diff --git a/devel/qgrit/INSTALL b/devel/qgrit/INSTALL
new file mode 100755
index 0000000000..e3df906e1f
--- /dev/null
+++ b/devel/qgrit/INSTALL
@@ -0,0 +1 @@
+install -m755 $SOURCE_DIRECTORY/qgrit $INSTALL_ROOT/usr/bin/
diff --git a/devel/qgrit/PREPARE b/devel/qgrit/PREPARE
new file mode 100755
index 0000000000..a68f274f72
--- /dev/null
+++ b/devel/qgrit/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm
diff --git a/devel/xdg-utils/DEPENDS b/devel/xdg-utils/DEPENDS
new file mode 100755
index 0000000000..52faa767e7
--- /dev/null
+++ b/devel/xdg-utils/DEPENDS
@@ -0,0 +1 @@
+runtime_depends  xprop
diff --git a/devel/xdg-utils/HISTORY b/devel/xdg-utils/HISTORY
index e2d9c59bd0..edfb8e1411 100644
--- a/devel/xdg-utils/HISTORY
+++ b/devel/xdg-utils/HISTORY
@@ -1,3 +1,6 @@
+2013-06-14 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Runtime depends on xprop
+
 2010-05-19 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* INSTALL: Create /usr/share/desktop-directories (Bug #15546)