Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 z-http/opera/CONFIGURE                               |   11 +--
 z-http/opera/DEPENDS                                 |   45 +++++++++++---
 z-http/opera/DETAILS                                 |   23 ++++++-
 z-http/opera/HISTORY                                 |    6 +
 z-http/opera/INSTALL                                 |   18 +++--
 z-http/opera/POST_REMOVE                             |    3 
 z-http/opera/PREPARE                                 |    6 +
 z-http/opera/PRE_BUILD                               |   14 +++-
 z-http/opera/opera-stable_39.0.2256.48_amd64.rpm.sig |binary
 z-http/opera/opera-stable_39.0.2256.48_i386.rpm.sig  |binary
 z-http/vivaldi/DEPENDS                               |   58 
++++++++++---------
 z-http/vivaldi/HISTORY                               |    3 
 12 files changed, 129 insertions(+), 58 deletions(-)

New commits:
commit 69cff67597c15eaba4a411741e166b5b7813e72c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    vivaldi: corrected deps

commit b7a0ad2a2894a3f8a799b8d778886d215d693ea8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    opera: => 39.0.2256.48

diff --git a/z-http/opera/CONFIGURE b/z-http/opera/CONFIGURE
index 775b990..e96f6f2 100755
--- a/z-http/opera/CONFIGURE
+++ b/z-http/opera/CONFIGURE
@@ -2,8 +2,9 @@
 #
 source $GRIMOIRE/REJECTED_MSG &&
 
-config_query_list OPERA_TOOLKIT \
-  "What graphics toolkit do you wish to use?" \
-  "none" \
-  "gtk+2" \
-  "kde4"
+if [[ $OPERA_BRANCH == "legacy" ]]; then
+  config_query_list OPERA_TOOLKIT "What graphics toolkit do you wish to 
use?" \
+                                  "none" \
+                                  "gtk+2" \
+                                  "kde4"
+fi
diff --git a/z-http/opera/DEPENDS b/z-http/opera/DEPENDS
index 1c82751..2528c7a 100755
--- a/z-http/opera/DEPENDS
+++ b/z-http/opera/DEPENDS
@@ -1,19 +1,46 @@
+depends -sub CXX gcc &&
+
 # Main opera binary dependencies
 depends libx11 &&
 depends libxext &&
-depends libsm &&
-depends libice &&
-depends libxft &&
 depends freetype2 &&
-depends zlib &&
 depends fontconfig &&
 depends libxrender &&
 
-# Additional plugin wrapper dependencies
-depends libxt &&
+if [[ $OPERA_BRANCH == "stable" ]]; then
+  depends rpm2targz &&
+
+  depends curl &&
+  depends nspr &&
+  depends nss &&
+  depends expat &&
+  depends libxi &&
+  depends libxtst &&
+  depends libxscrnsaver &&
+  depends libxcomposite &&
+  depends libxrandr &&
+  depends libxfixes &&
+  depends libxdamage &&
+  depends libxcursor &&
+  depends gconf2 &&
+  depends alsa-lib &&
+  depends dbus &&
+  depends libnotify &&
+  depends cups
+else
+  depends libsm &&
+  depends libice &&
+  depends libxft &&
+  depends zlib &&
+
+  # Additional plugin wrapper dependencies
+  depends libxt &&
+
+  optional_depends  JAVA  ""  ""  "for Java Runtime Environment"
+fi &&
 
 # Additional graphical toolkit dependencies
-if [[ $OPERA_TOOLKIT == "gtk+2" ]]; then
+if [[ $OPERA_TOOLKIT == "gtk+2" ]] || [[ $OPERA_BRANCH == "stable" ]]; then
   depends gtk+2 &&
   depends atk &&
   depends pango &&
@@ -22,6 +49,4 @@ if [[ $OPERA_TOOLKIT == "gtk+2" ]]; then
 elif [[ $OPERA_TOOLKIT == "kde4" ]]; then
   depends kdelibs4 &&
   depends qt4
-fi &&
-
-optional_depends  JAVA  ""  ""  "for Java Runtime Environment"
+fi
diff --git a/z-http/opera/DETAILS b/z-http/opera/DETAILS
index 7bc15e6..daff86e 100755
--- a/z-http/opera/DETAILS
+++ b/z-http/opera/DETAILS
@@ -1,17 +1,32 @@
              SPELL=opera
+if [[ $OPERA_BRANCH == "stable" ]]; then
+           VERSION=39.0.2256.48
+else
            VERSION=12.16
              BUILD=1860
     SECURITY_PATCH=4
-    if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+fi
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+  if [[ $OPERA_BRANCH == "stable" ]]; then
+          PLATFORM=amd64
+  else
           PLATFORM=x86_64
-    else
+  fi
+else
           PLATFORM=i386
-    fi
+fi
+if [[ $OPERA_BRANCH == "stable" ]]; then
+            SOURCE=${SPELL}-stable_${VERSION}_${PLATFORM}.rpm
+     
SOURCE_URL[0]=http://get.geo.opera.com/pub/${SPELL}/desktop/${VERSION}/linux/${SOURCE}
+  SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+       GATHER_DOCS=off
+else
             SOURCE=${SPELL}-${VERSION}-${BUILD}.${PLATFORM}.linux.tar.bz2
-  
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${PLATFORM}.linux
      
SOURCE_URL[0]=ftp://ftp.tiscali.nl/pub/mirror/opera/linux/${VERSION/./}/$SOURCE
      SOURCE_URL[1]=ftp://ftp.scarlet.be/pub/opera/linux/${VERSION/./}/$SOURCE
      SOURCE_URL[2]=ftp://ftp.opera.com/pub/opera/linux/${VERSION/./}/$SOURCE
+  
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${PLATFORM}.linux"
+fi
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENCE[0]=UNKNOWN
         WEB_SITE=http://www.opera.com/
diff --git a/z-http/opera/HISTORY b/z-http/opera/HISTORY
index b533fee..f63542f 100644
--- a/z-http/opera/HISTORY
+++ b/z-http/opera/HISTORY
@@ -1,3 +1,9 @@
+2016-08-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 39.0.2256.48; quoting paths
+       * PREPARE, CONFIGURE, INSTALL, PRE_BUILD: added stable branch
+       * DEPENDS: added missing dependencies
+       * POST_REMOVE: dropped, not needed
+
 2014-05-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 12.16; SECURITY_PATCH++
        * INSTALL: moved install script modification to PRE_BUILD
diff --git a/z-http/opera/INSTALL b/z-http/opera/INSTALL
index 2b9d27c..ac5640b 100755
--- a/z-http/opera/INSTALL
+++ b/z-http/opera/INSTALL
@@ -1,8 +1,14 @@
-./install --system --unattended &&
+if [[ $OPERA_BRANCH == "stable" ]]; then
+  cp -av usr/lib64/opera "${INSTALL_ROOT}/usr/lib" &&
+  cp -av usr/share "${INSTALL_ROOT}/usr/share" &&
+  ln -vsf "${TRACK_ROOT}/usr/lib/opera/opera" "/usr/bin/opera"
+else
+  ./install --system --unattended &&
 
-if [[ $OPERA_TOOLKIT != "gtk+2" ]]; then
-  rm -f $INSTALL_ROOT/usr/lib/opera/liboperagtk.so
-fi &&
-if [[ $OPERA_TOOLKIT != "kde4" ]]; then
-  rm -f $INSTALL_ROOT/usr/lib/opera/liboperakde4.so
+  if [[ $OPERA_TOOLKIT != "gtk+2" ]]; then
+    rm -f $INSTALL_ROOT/usr/lib/opera/liboperagtk.so
+  fi &&
+  if [[ $OPERA_TOOLKIT != "kde4" ]]; then
+    rm -f $INSTALL_ROOT/usr/lib/opera/liboperakde4.so
+  fi
 fi
diff --git a/z-http/opera/POST_REMOVE b/z-http/opera/POST_REMOVE
deleted file mode 100755
index 0c18782..0000000
--- a/z-http/opera/POST_REMOVE
+++ /dev/null
@@ -1,3 +0,0 @@
-rm  -f  /usr/share/icons/hicolor/16x16/apps/opera.png  &&
-rm  -f  /usr/share/icons/hicolor/32x32/apps/opera.png  &&
-rm  -f  /usr/share/icons/hicolor/48x48/apps/opera.png
diff --git a/z-http/opera/PREPARE b/z-http/opera/PREPARE
index 94640d6..893e8b6 100755
--- a/z-http/opera/PREPARE
+++ b/z-http/opera/PREPARE
@@ -4,4 +4,8 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} != "x86_64"
    && ${SMGL_COMPAT_ARCHS[1]} != "ia32" ]]; then
   message "${PROBLEM_COLOR}Opera is not available for platform 
${SMGL_COMPAT_ARCHS[1]}${DEFAUL_COLOR}"
   false
-fi
+fi &&
+
+config_query_list OPERA_BRANCH "What branch do you wish to use?" \
+                               "stable" \
+                               "legacy"
diff --git a/z-http/opera/PRE_BUILD b/z-http/opera/PRE_BUILD
index a171d81..a81381c 100755
--- a/z-http/opera/PRE_BUILD
+++ b/z-http/opera/PRE_BUILD
@@ -1,4 +1,12 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+if [[ $OPERA_BRANCH == "stable" ]]; then
+  mkdir "${SOURCE_DIRECTORY}" &&
+  cd "${SOURCE_DIRECTORY}" &&
+  verify_file &&
+  rpm2tar -O "${SOURCE_CACHE}/${SOURCE}" > "${SPELL}-${VERSION}.tar" &&
+  tar xvf "${SPELL}-${VERSION}.tar"
+else
+  default_pre_build &&
+  cd $SOURCE_DIRECTORY &&
 
-sedit "s,/usr/local,$INSTALL_ROOT/usr,;s:finalize_desktop[^(]*$:\::" install
+  sedit "s,/usr/local,$INSTALL_ROOT/usr,;s:finalize_desktop[^(]*$:\::" 
install
+fi
diff --git a/z-http/opera/opera-stable_39.0.2256.48_amd64.rpm.sig 
b/z-http/opera/opera-stable_39.0.2256.48_amd64.rpm.sig
new file mode 100644
index 0000000..84c8047
Binary files /dev/null and 
b/z-http/opera/opera-stable_39.0.2256.48_amd64.rpm.sig differ
diff --git a/z-http/opera/opera-stable_39.0.2256.48_i386.rpm.sig 
b/z-http/opera/opera-stable_39.0.2256.48_i386.rpm.sig
new file mode 100644
index 0000000..6cbfbf2
Binary files /dev/null and 
b/z-http/opera/opera-stable_39.0.2256.48_i386.rpm.sig differ
diff --git a/z-http/vivaldi/DEPENDS b/z-http/vivaldi/DEPENDS
index 69bde35..08d84f8 100755
--- a/z-http/vivaldi/DEPENDS
+++ b/z-http/vivaldi/DEPENDS
@@ -1,36 +1,42 @@
 # extract tool
 depends rpm2targz &&
 
+# essential
+runtime_depends -sub CXX gcc &&
+
 # crypto stack
-depends nspr &&
-depends nss &&
+runtime_depends nspr &&
+runtime_depends nss &&
 
 # X11
-depends libx11 &&
-depends libxt &&
-depends libxext &&
-depends libxscrnsaver &&
-depends libxi &&
-depends libxtst &&
-depends libxcomposite &&
-depends libxrender &&
-depends libxrandr &&
-depends libxfixes &&
-depends libxdamage &&
-depends libxcursor &&
+runtime_depends libx11 &&
+runtime_depends libxt &&
+runtime_depends libxext &&
+runtime_depends libxscrnsaver &&
+runtime_depends libxi &&
+runtime_depends libxtst &&
+runtime_depends libxcomposite &&
+runtime_depends libxrender &&
+runtime_depends libxrandr &&
+runtime_depends libxfixes &&
+runtime_depends libxdamage &&
+runtime_depends libxcursor &&
 
 # GTK+
-depends expat &&
-depends dbus &&
-depends glib2 &&
-depends freetype2 &&
-depends fontconfig &&
-depends libxrender &&
-depends atk &&
-depends pango &&
-depends cairo &&
-depends gtk+2 &&
-depends gconf2 &&
+runtime_depends expat &&
+runtime_depends dbus &&
+runtime_depends glib2 &&
+runtime_depends freetype2 &&
+runtime_depends fontconfig &&
+runtime_depends libxrender &&
+runtime_depends atk &&
+runtime_depends pango &&
+runtime_depends cairo &&
+runtime_depends gtk+2 &&
+runtime_depends gconf2 &&
+
+# audio
+runtime_depends alsa-lib &&
 
 # printing
-depends cups
+runtime_depends cups
diff --git a/z-http/vivaldi/HISTORY b/z-http/vivaldi/HISTORY
index 2cc303a..cdecea7 100644
--- a/z-http/vivaldi/HISTORY
+++ b/z-http/vivaldi/HISTORY
@@ -1,3 +1,6 @@
+2016-08-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: switched to runtime_depends, added missing alsa-lib and gcc
+
 2016-08-08 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFIGURE, FINAL, PREPARE,
          PROVIDES, UNATTEND_SAFE: created spell, version 1.2.490.43-1 
(stable),