[SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (c039a8a11810790c627ad1b017b9f8276b5317f6)

Remko van der Vossen scm at sourcemage.org
Tue Jun 17 14:22:52 EDT 2008


GIT changes to master z-rejected grimoire by Remko van der Vossen <wich at radio0.stack.nl>:

 dev/null                                                          |binary
 z-http/opera/DEPENDS                                              |   17 -
 z-http/opera/DETAILS                                              |  111 ++++------
 z-http/opera/HISTORY                                              |    5 
 z-http/opera/PREPARE                                              |   16 +
 z-http/opera/opera-9.27-20080331.1-static-qt.i386-en.tar.bz2.sig  |    0 
 z-http/opera/opera-9.27-20080331.6-shared-qt.i386-en.tar.bz2.sig  |    0 
 z-http/opera/opera-9.50.gcc4-qt4.i386.tar.bz2.sig                 |binary
 z-http/opera/opera-9.50.gcc4-shared-qt3.i386.tar.bz2.sig          |binary
 z-http/opera/opera-9.50.gcc4-shared-qt3.x86_64.tar.bz2.sig        |binary
 z-http/opera/opera-9.50.gcc4-static-qt3.i386.tar.bz2.sig          |binary
 z-http/opera/opera-9.50b2-20080422.1-static-qt.i386-en.tar.gz.sig |    0 
 z-http/opera/opera-9.50b2-20080422.6-shared-qt.i386-en.tar.gz.sig |    0 
 13 files changed, 75 insertions(+), 74 deletions(-)

New commits:
commit b621b97903fb65566b3a3dd62e795e844f31f319
Author: Remko van der Vossen <wich at radio0.stack.nl>
Commit: Remko van der Vossen <wich at radio0.stack.nl>

    opera: version 9.50

diff --git a/z-http/opera/DEPENDS b/z-http/opera/DEPENDS
index f8afbf5..abd3b06 100755
--- a/z-http/opera/DEPENDS
+++ b/z-http/opera/DEPENDS
@@ -1,14 +1,9 @@
-if [ "${OPERA_RELEASE}" = "8, shared" ]; then
-  depends  qt-x11  &&
-  depends  zlib
-fi &&
 if [ "${OPERA_RELEASE}" = "9, shared" ]; then
-  depends  qt-x11  &&
-  depends  zlib
-fi  &&
-if [ "${OPERA_RELEASE}" = "9.5 preview, shared" ]; then
-  depends  qt-x11  &&
-  depends  zlib
-fi  &&
+  depends qt-x11  &&
+  depends zlib
+elif [ "${OPERA_RELEASE}" = "9, qt4" ]; then
+  depends qt4 &&
+  depends zlib
+fi
 
 optional_depends  JAVA  ""  ""  "for Java Runtime Environment"
diff --git a/z-http/opera/DETAILS b/z-http/opera/DETAILS
index af05a5f..76ca606 100755
--- a/z-http/opera/DETAILS
+++ b/z-http/opera/DETAILS
@@ -1,67 +1,54 @@
            SPELL=opera
-        VERSION4=qt.i386-en
-if [ "${OPERA_RELEASE}" = "9.5 preview, static" ]; then
-         VERSION=9.50b2
-         VERPATH=950b2
-        VERSION2=20080422.1
-        VERSION3=static
-        VERSION5=final
-        VERSION6=1933
-     COMPRESSION=gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:4}-${VERSION2}-${VERSION3}-${VERSION4:0:7}-${VERSION6}
-elif [ "${OPERA_RELEASE}" = "9.5 preview, shared" ]; then
-         VERSION=9.50b2
-         VERPATH=950b2
-        VERSION2=20080422.6
-        VERSION3=shared
-        VERSION5=final
-        VERSION6=1933
-     COMPRESSION=gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:4}-${VERSION2}-${VERSION3}-${VERSION4:0:7}-${VERSION6}
-elif [ "${OPERA_RELEASE}" = "9, static" ]; then
-         VERSION=9.27
-         VERPATH=927
-        VERSION2=20080331.1
-        VERSION3=static
-        VERSION5=final
-     COMPRESSION=bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${VERSION2}-${VERSION3}-${VERSION4}-709
-elif [ "${OPERA_RELEASE}" = "8, static" ]; then
-         VERSION=8.54
-         VERPATH=854
-        VERSION2=20060330.1
-        VERSION3=static
-        VERSION5=final
-     COMPRESSION=bz2
-     SOURCE_HASH=sha512:972d9a6fb811a0932a2dce3e749a7889ee829875f9579bd30b051c3f5c5fb571e0cfad18cc3b7cd33db523d3d630b2ee51610c6c37cf3ad6864c40bfd6d1f084
-     SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${VERSION2}-${VERSION3}-${VERSION4}
-elif [ "${OPERA_RELEASE}" = "8, shared" ]; then
-         VERSION=8.54
-         VERPATH=854
-        VERSION2=20060330.6
-        VERSION3=shared
-        VERSION5=final
-     COMPRESSION=bz2
-     SOURCE_HASH=sha512:ba18749f40832fb86b907c524bec6df0cea352a2f389827975808538863c87647227292660bfd2709634ab0badface7853c80c4847ec2b329d738a16e468b29e
-     SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${VERSION2}-${VERSION3}-${VERSION4}
+if [ "${OPERA_RELEASE}" = "9, static" ]; then
+           VERSION=9.50
+            LINKED=static
+           RELEASE=final
+          LANGUAGE=en
+          COMPILER=gcc4
+                QT=qt3
+          PLATFORM=i386
+       COMPRESSION=bz2
+             BUILD=2042
+            SOURCE=${SPELL}-${VERSION}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}.tar.${COMPRESSION}
+  SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}
+         DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${LINKED}/${SOURCE}
+elif [ "${OPERA_RELEASE}" = "9 qt4, static" ]; then
+           VERSION=9.50
+           RELEASE=final
+          LANGUAGE=en
+          COMPILER=gcc4
+                QT=qt4
+          PLATFORM=i386
+       COMPRESSION=bz2
+             BUILD=2042
+            SOURCE=${SPELL}-${VERSION}.${COMPILER}-${QT}.${PLATFORM}.tar.${COMPRESSION}
+  SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${QT}.${PLATFORM}
+         DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${SOURCE}
 else
-         VERSION=9.27
-         VERPATH=927
-        VERSION2=20080331.6
-        VERSION3=shared
-        VERSION5=final
-     COMPRESSION=bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${VERSION2}-${VERSION3}-${VERSION4}-709
+           VERSION=9.50
+            LINKED=shared
+           RELEASE=final
+          LANGUAGE=en
+          COMPILER=gcc4
+                QT=qt3
+  if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+          PLATFORM=x86_64
+  else
+          PLATFORM=i386
+  fi
+       COMPRESSION=bz2
+             BUILD=2042
+            SOURCE=${SPELL}-${VERSION}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}.tar.${COMPRESSION}
+  SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}
+  if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+         DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${SOURCE}
+  else
+         DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${LINKED}/${SOURCE}
+  fi
 fi
-          SOURCE=${SPELL}-${VERSION}-${VERSION2}-${VERSION3}-${VERSION4}.tar.${COMPRESSION}
-#
-# Currently only v9 is signed, v8 uses sha512
-#
-if [[ ${OPERA_RELEASE:0:1} == 9 ]]; then
+     SOURCE_URL[0]=ftp://ftp.tiscali.nl/pub/mirror/opera/linux/${DIST_PATH}
+     SOURCE_URL[1]=ftp://ftp.scarlet.be/pub/opera/linux/${DIST_PATH}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
-   SOURCE_URL[0]=ftp://ftp.tiscali.nl/pub/mirror/opera/linux/${VERPATH}/${VERSION5}/en/i386/${VERSION3}/${SOURCE}
-   SOURCE_URL[1]=ftp://ftp.scarlet.be/pub/opera/linux/${VERPATH}/${VERSION5}/en/i386/${VERSION3}/${SOURCE}  
       LICENCE[0]=UNKNOWN
         WEB_SITE=http://www.opera.com/
          ENTERED=20020530
@@ -69,8 +56,8 @@ fi
            SHORT="Opera is a small quick qt based browser"
 cat << EOF
 Opera is a fast full featured web browser. It supports plugins and is 
-very customizable. It now uses the qt3 widget set. 
+very customizable. It now uses the qt4 widget set. 
 
 The shared version is now included here because the current grimoire 
-uses qt3. 
+uses qt4. 
 EOF
diff --git a/z-http/opera/HISTORY b/z-http/opera/HISTORY
index 1f7a5bf..521d289 100644
--- a/z-http/opera/HISTORY
+++ b/z-http/opera/HISTORY
@@ -1,3 +1,8 @@
+2008-06-17 Remko van der Vossen <wich at sourcemage.org>
+	* PREPARE, DETAILS, DEPENDS: version 9.50
+	* PREPARE, DETAILS, DEPENDS: Removed version 8, not available anymore
+	* PREPARE, DETAILS: x86_64 version of opera
+
 2008-05-30 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS: preview version 9.50b2
 
diff --git a/z-http/opera/PREPARE b/z-http/opera/PREPARE
index 85a1b5f..6a98408 100755
--- a/z-http/opera/PREPARE
+++ b/z-http/opera/PREPARE
@@ -1 +1,15 @@
-config_query_list OPERA_RELEASE "Which release would you like to cast?" "9, shared" "9, static" "8, shared" "8, static" "9.5 preview, shared" "9.5 preview, static"
+persistent_load
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+  persistent_add OPERA_RELEASE
+  OPERA_RELEASE="9, shared" 
+elif [[ ${SMGL_COMPAT_ARCHS[1]} == "ia32" ]]; then
+  if [[ ${OPERA_RELEASE:0:1} == "8" ]] ||
+     [[ ${OPERA_RELEASE} == "9.5 preview, static" ]] ||
+     [[ ${OPERA_RELEASE} == "9.5 preview, shared" ]]; then
+    persistent_remove OPERA_RELEASE
+  fi
+  config_query_list OPERA_RELEASE "Which release would you like to cast?" "9, shared" "9, static" "9 qt4, static"
+else
+  message "${PROBLEM_COLOR}Opera is not available for platform ${SMGL_COMPAT_ARCHS[1]}${DEFAUL_COLOR}"
+  false
+fi
diff --git a/z-http/opera/opera-9.27-20080331.1-static-qt.i386-en.tar.bz2.sig b/z-http/opera/opera-9.27-20080331.1-static-qt.i386-en.tar.bz2.sig
deleted file mode 100644
index 35c9938..0000000
Binary files a/z-http/opera/opera-9.27-20080331.1-static-qt.i386-en.tar.bz2.sig and /dev/null differ
diff --git a/z-http/opera/opera-9.27-20080331.6-shared-qt.i386-en.tar.bz2.sig b/z-http/opera/opera-9.27-20080331.6-shared-qt.i386-en.tar.bz2.sig
deleted file mode 100644
index da19b12..0000000
Binary files a/z-http/opera/opera-9.27-20080331.6-shared-qt.i386-en.tar.bz2.sig and /dev/null differ
diff --git a/z-http/opera/opera-9.50.gcc4-qt4.i386.tar.bz2.sig b/z-http/opera/opera-9.50.gcc4-qt4.i386.tar.bz2.sig
new file mode 100644
index 0000000..24e0df9
Binary files /dev/null and b/z-http/opera/opera-9.50.gcc4-qt4.i386.tar.bz2.sig differ
diff --git a/z-http/opera/opera-9.50.gcc4-shared-qt3.i386.tar.bz2.sig b/z-http/opera/opera-9.50.gcc4-shared-qt3.i386.tar.bz2.sig
new file mode 100644
index 0000000..d401ee9
Binary files /dev/null and b/z-http/opera/opera-9.50.gcc4-shared-qt3.i386.tar.bz2.sig differ
diff --git a/z-http/opera/opera-9.50.gcc4-shared-qt3.x86_64.tar.bz2.sig b/z-http/opera/opera-9.50.gcc4-shared-qt3.x86_64.tar.bz2.sig
new file mode 100644
index 0000000..29a61b7
Binary files /dev/null and b/z-http/opera/opera-9.50.gcc4-shared-qt3.x86_64.tar.bz2.sig differ
diff --git a/z-http/opera/opera-9.50.gcc4-static-qt3.i386.tar.bz2.sig b/z-http/opera/opera-9.50.gcc4-static-qt3.i386.tar.bz2.sig
new file mode 100644
index 0000000..6d791e1
Binary files /dev/null and b/z-http/opera/opera-9.50.gcc4-static-qt3.i386.tar.bz2.sig differ
diff --git a/z-http/opera/opera-9.50b2-20080422.1-static-qt.i386-en.tar.gz.sig b/z-http/opera/opera-9.50b2-20080422.1-static-qt.i386-en.tar.gz.sig
deleted file mode 100644
index 303ee29..0000000
Binary files a/z-http/opera/opera-9.50b2-20080422.1-static-qt.i386-en.tar.gz.sig and /dev/null differ
diff --git a/z-http/opera/opera-9.50b2-20080422.6-shared-qt.i386-en.tar.gz.sig b/z-http/opera/opera-9.50b2-20080422.6-shared-qt.i386-en.tar.gz.sig
deleted file mode 100644
index f29b3dc..0000000
Binary files a/z-http/opera/opera-9.50b2-20080422.6-shared-qt.i386-en.tar.gz.sig and /dev/null differ



More information about the SM-Commit mailing list