Merge remote-tracking branch 'origin/master' into devel-merge-kde4+plasma5+kde5

8 files changed, 52 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 816252407c..c265e3a3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 	* kde5-net/kaccounts-integration: added
 	* kde5-net/kaccounts-providers: add
 
+2015-06-07 Ismael Luceno <ismael@sourcemage.org>
+	* devel/cgit: new spell, A fast web frontend for git repositories
+	  written in C
+
 2015-06-03  Treeve Jelbert <treeve@sourcemage.org>
 	* KDE5_FUNCTIONS: tweak kde5_build
 
diff --git a/devel/cgit/BUILD b/devel/cgit/BUILD
new file mode 100755
index 0000000000..8f58e6df93
--- /dev/null
+++ b/devel/cgit/BUILD
@@ -0,0 +1 @@
+make
diff --git a/devel/cgit/DETAILS b/devel/cgit/DETAILS
new file mode 100755
index 0000000000..0fb284a7ac
--- /dev/null
+++ b/devel/cgit/DETAILS
@@ -0,0 +1,35 @@
+           SPELL=cgit
+         VERSION=0.11.2
+          SOURCE="$SPELL-$VERSION.tar.xz"
+   SOURCE_URL[0]="http://git.zx2c4.com/$SPELL/snapshot/$SOURCE"
+     SOURCE_HASH=sha512:a29bce6e02c61bb2683ce96f867c3050c03dc9e45b5154507e92a30f9e436f61517eeff0c5b9023727e54a9212bf9bf6692a33e791e7883976a5349ae58c0c72
+         GIT_VER=2.3.2
+         SOURCE2="git-$GIT_VER.tar.gz"
+  SOURCE2_URL[0]="http://www.kernel.org/pub/software/scm/git/$SOURCE2"
+    SOURCE2_HASH=sha512:ac56a8b2351e85c7c02b206ca17bf4c96569ad13bbe92dace2f8ed05f146c3e352248d52d15f3bfd33b705a816dcdd60909f1fd3e38e437130ba18e0c34925df
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE="http://git.zx2c4.com/cgit/about/"
+      LICENSE[0]="GPL"
+         ENTERED=20150606
+        KEYWORDS=""
+           SHORT="A fast web frontend for git repositories written in C"
+cat << EOF
+cgit is a web interface (cgi) for Git repositories, written in C.  It is
+non-forking, uses an internal cache to speed things up, and features virtual
+URLs (unlike gitweb).
+
+Features:
+* basic repository browsing (logs, diffs, trees...).
+* caching of generated HTML.
+* cloneable URLs (implements dumb HTTP transport).
+* commit feeds (atom format).
+* discovery of Git repositories.
+* on-the-fly archives for tags and commits.
+* plugin support for e.g. syntax highlighting.
+* side-by-side diffs.
+* simple time/author statistics.
+* simple virtual hosting support (macro expansion).
+* understands GitWeb project-lists.
+* understands gitweb.owner in Git config files.
+* has extensive filtering framework using scripts or a built-in lua interpreter.
+EOF
diff --git a/devel/cgit/HISTORY b/devel/cgit/HISTORY
new file mode 100644
index 0000000000..ef8e8b9338
--- /dev/null
+++ b/devel/cgit/HISTORY
@@ -0,0 +1,2 @@
+2015-06-06 Ismael Luceno <ismael@sourcemage.org>
+	* BUILD, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/devel/cgit/INSTALL b/devel/cgit/INSTALL
new file mode 100755
index 0000000000..04bdeaaf4b
--- /dev/null
+++ b/devel/cgit/INSTALL
@@ -0,0 +1 @@
+make prefix="$INSTALL_ROOT/usr" install
diff --git a/devel/cgit/PRE_BUILD b/devel/cgit/PRE_BUILD
new file mode 100755
index 0000000000..3230fd5a84
--- /dev/null
+++ b/devel/cgit/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+unpack_file 2 &&
+rmdir "$SOURCE_DIRECTORY/git" &&
+mv "git-$GIT_VER" "$SOURCE_DIRECTORY/git"
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index ff8995532a..a2735ac0b2 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cmake
-         VERSION=3.2.2
-     SOURCE_HASH=sha512:b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b
+         VERSION=3.2.3
+     SOURCE_HASH=sha512:1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c
               VX=v`echo $VERSION|cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index f16ee023b8..e6f479e793 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2015-06-07 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.2.3
+
 2015-04-17 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 3.2.2