Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=366e9f5e77a4b18589433b130f43f78ebcf9d7a5
commit 366e9f5e77a4b18589433b130f43f78ebcf9d7a5 Author: crazy <[email protected]> Date: Tue Nov 8 18:45:31 2016 +0100 schemas - kill 32bit diff --git a/source/include/aspell.sh b/source/include/aspell.sh index c8bdfbc..9171f31 100644 --- a/source/include/aspell.sh +++ b/source/include/aspell.sh @@ -51,7 +51,7 @@ pkgname=aspell$_F_aspell_ver-$_F_aspell_lang url="http://aspell.net/"; depends=('aspell>=0.60') groups=('locale-extra') -archs=('i686' 'x86_64') +archs=('x86_64') up2date="lynx -dump ftp://ftp.gnu.org/pub/gnu/aspell/dict/$_F_aspell_lang/|grep aspell$_F_aspell_ver-$_F_aspell_lang.*bz2$|sed -n 's/.*aspell$_F_aspell_ver-$_F_aspell_lang-\(.*\).t.*/\1/;s/-/r/;$ p'" source=(ftp://ftp.gnu.org/gnu/aspell/dict/$_F_aspell_lang/$pkgname-${pkgver/r/-}.tar.bz2) signatures=($source.sig) diff --git a/source/include/berlios.sh b/source/include/berlios.sh index 3621228..22c5892 100644 --- a/source/include/berlios.sh +++ b/source/include/berlios.sh @@ -24,7 +24,7 @@ # depends=('mpd' 'pygtk') # options=('scriptlet') # groups=('xapps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('e771538c1fc4f6299efc4699acffd8af7d529417') # -------------------------------------------------- # diff --git a/source/include/cgit-freedesktop.sh b/source/include/cgit-freedesktop.sh index 9252205..f48c458 100644 --- a/source/include/cgit-freedesktop.sh +++ b/source/include/cgit-freedesktop.sh @@ -24,7 +24,7 @@ # depends=('scim>=1.4.4' 'uim') # options=('scriptlet') # groups=('xapps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('9023c205cb1623e749bd5ca7baf721c55f36f279') # -------------------------------------------------- ### diff --git a/source/include/cgit.sh b/source/include/cgit.sh index 76b6880..aa9cd2b 100644 --- a/source/include/cgit.sh +++ b/source/include/cgit.sh @@ -25,7 +25,7 @@ Finclude provider # depends=('scim>=1.4.4' 'uim') # options=('scriptlet') # groups=('xapps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('9023c205cb1623e749bd5ca7baf721c55f36f279') # -------------------------------------------------- ### diff --git a/source/include/clutter.sh b/source/include/clutter.sh index 44bdcdc..a18eb18 100644 --- a/source/include/clutter.sh +++ b/source/include/clutter.sh @@ -78,7 +78,7 @@ fi source=(http://source.clutter-project.org/sources/$_F_clutter_name/`_F_clutter_getver`/$_F_clutter_name-$pkgver.tar.bz2) url="http://www.clutter-project.org/"; groups=('xlib-extra') -archs=('i686' 'x86_64') +archs=('x86_64') ### # == APPENDED VARIABLES diff --git a/source/include/firefox-extension.sh b/source/include/firefox-extension.sh index 88aee19..ee13ec9 100644 --- a/source/include/firefox-extension.sh +++ b/source/include/firefox-extension.sh @@ -52,7 +52,7 @@ pkgname=firefox-$_F_firefox_ext rodepends=('firefox>=4.0') groups=('xapps-extra' 'firefox-extensions') -archs=('i686' 'x86_64') +archs=('x86_64') if [ -n "$_F_firefox_num" ]; then url="https://addons.mozilla.org/en-US/firefox/addon/$_F_firefox_num/"; up2date="curl -s -k -L '$url' | sed -n 's|.*Version \(\S*\)<.*|\1|p'" diff --git a/source/include/fonts.sh b/source/include/fonts.sh index 4e233ec..e0a9c2f 100644 --- a/source/include/fonts.sh +++ b/source/include/fonts.sh @@ -23,7 +23,7 @@ # _F_fonts_subdir="TTF" # Finclude sourceforge fonts # groups=('xlib-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('81e711b5f00816c57e205c9e60f69237c709679d') # -------------------------------------------------- # diff --git a/source/include/gem.sh b/source/include/gem.sh index 009549b..5d37c09 100644 --- a/source/include/gem.sh +++ b/source/include/gem.sh @@ -19,7 +19,7 @@ # url="http://rubyforge.org/projects/aws/"; # depends=('activerecord>=1.15.2' 'actionpack>=1.13.2') # groups=('devel-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # Finclude gem # sha1sums=('2712601395ec0a059263b730b10db9f93cd5a1f1') # -------------------------------------------------- diff --git a/source/include/github.sh b/source/include/github.sh index e1b8a9a..3c993ee 100644 --- a/source/include/github.sh +++ b/source/include/github.sh @@ -19,7 +19,7 @@ # url="http://www.keplerproject.org/luafilesystem/"; # depends=('lua') # groups=('lib-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('1ee2ca3b5dbc3cf7c21c7168a0873b2983b7e241') # _F_github_author=keplerproject # Finclude github diff --git a/source/include/gnome-look.sh b/source/include/gnome-look.sh index 93307f7..bd15f64 100644 --- a/source/include/gnome-look.sh +++ b/source/include/gnome-look.sh @@ -18,7 +18,7 @@ # pkgdesc="The Somatic icons have been used with permission from David Lanham" # depends=('icon-naming-utils' 'libpng') # groups=('xlib-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # _F_archive_name="ICON-Somatic" # _F_gnome_look_id="64638" # Finclude gnome-look diff --git a/source/include/gnome-scriptlet.sh b/source/include/gnome-scriptlet.sh index 52a4ecc..3ab8adc 100644 --- a/source/include/gnome-scriptlet.sh +++ b/source/include/gnome-scriptlet.sh @@ -20,7 +20,7 @@ # depends=('libnotify>=0.4.3' 'libwnck' 'libsexy' 'gconf' 'dbus-glib>=0.71') # makedepends=('gnome-doc-utils' 'intltool') # groups=('gnome') -# archs=('i686' 'x86_64') +# archs=('x86_64') # source=($url/files/releases/source/$pkgname/$pkgname-$pkgver.tar.bz2) # up2date="lynx -dump http://www.galago-project.org/files/releases/source/$pkgname | Flasttar" # options=('scriptlet') diff --git a/source/include/gnome.sh b/source/include/gnome.sh index 4092bdf..d3c305e 100644 --- a/source/include/gnome.sh +++ b/source/include/gnome.sh @@ -19,7 +19,7 @@ # url="http://www.gnome.org/"; # depends=('glibmm>=2.13.1' 'gtk+2' 'cairomm>=1.2.2') # groups=('gnome') -# archs=('i686' 'x86_64') +# archs=('x86_64') # Finclude gnome # sha1sums=('e40c337bc2afd2de4a6527bf333e9c8788c38668') # Fconfopts+=" --disable-examples --disable-demos" diff --git a/source/include/googlecode.sh b/source/include/googlecode.sh index 7e65d75..45f7a65 100644 --- a/source/include/googlecode.sh +++ b/source/include/googlecode.sh @@ -19,7 +19,7 @@ # depends=('cdparanoia' 'ruby-gettext' 'ruby-gtk2' 'cd-discid' 'flac' \ # 'ogmtools' 'lame' 'vorbisgain' 'mp3gain' 'normalize' ) # groups=('xapps-extra') -# archs=('i686') +# archs=('x86_64') # _F_googlecode_ext=".tar.bz2" # Finclude googlecode # options=('scriptlet') diff --git a/source/include/haskell.sh b/source/include/haskell.sh index 94b3070..8e85004 100644 --- a/source/include/haskell.sh +++ b/source/include/haskell.sh @@ -16,7 +16,7 @@ # pkgver=1.4.2 # pkgrel=1 # pkgdesc="A Haskell binding to the X11 graphics library." -# archs=('i686' 'x86_64') +# archs=('x86_64') # url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"; # makedepends=('ghc') # groups=('xlib-extra') diff --git a/source/include/kde.sh b/source/include/kde.sh index 26bd4fc..cc525b6 100644 --- a/source/include/kde.sh +++ b/source/include/kde.sh @@ -19,7 +19,7 @@ Finclude cmake kde-version # pkgrel=1 # pkgdesc="Games for KDE." # groups=('kde') -# archs=('i686' 'x86_64') +# archs=('x86_64') # depends=('kdebase') # Finclude kde # sha1sums=('1848b81f890180b130000dd6004009d4acc98f48') diff --git a/source/include/kernel-module.sh b/source/include/kernel-module.sh index e12b79a..12589d5 100644 --- a/source/include/kernel-module.sh +++ b/source/include/kernel-module.sh @@ -21,7 +21,7 @@ Finclude kernel-version # Finclude kernel-module # depends=(${depends[@]} 'python') # groups=('apps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # install=$pkgname.install # _F_sourceforge_ext=".tar.bz2" # Finclude sourceforge diff --git a/source/include/kf5.sh b/source/include/kf5.sh index 87e7edc..6ce1814 100644 --- a/source/include/kf5.sh +++ b/source/include/kf5.sh @@ -19,7 +19,7 @@ Finclude cmake kf5-version # pkgrel=1 # pkgdesc="Games for KDE." # groups=('kde') -# archs=('i686' 'x86_64') +# archs=('x86_64') # depends=('kdebase') # Finclude kde # sha1sums=('1848b81f890180b130000dd6004009d4acc98f48') @@ -39,13 +39,6 @@ Finclude cmake kf5-version ### -## OK f*** this -if [[ "$CARCH" == "i686" ]]; then - unset MAKEFLAGS - export MAKEFLAGS="-j1" - _F_make_opts="-j1" -fi - if [ -z "$_F_kde_ver" ]; then _F_kde_ver="$_F_kdever_ver" if [ "$_F_kde_project" = "frameworks" ]; then diff --git a/source/include/launchpad.sh b/source/include/launchpad.sh index 9c2f538..39de089 100644 --- a/source/include/launchpad.sh +++ b/source/include/launchpad.sh @@ -19,7 +19,7 @@ # depends=('pygtk' 'dbus-python' 'postler' 'python-distutils-extra' 'vobject' 'pyenchant' 'storm') # makedepends=('intltool') # groups=('xapps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # _F_launchpad_dirname="dexter-rolodex" # _F_launchpad_sep="_" # _F_launchpad_branch="0.x" diff --git a/source/include/mono.sh b/source/include/mono.sh index b79396a..3be0a6b 100644 --- a/source/include/mono.sh +++ b/source/include/mono.sh @@ -19,7 +19,7 @@ # url="http://www.galago-project.org"; # depends=('libgalago' 'gtk2-sharp>=2.10.0' 'perl-xml-libxml' 'dbus-mono') # groups=('gnome') -# archs=('i686' 'x86_64') +# archs=('x86_64') # source=($url/files/releases/source/$pkgname/$pkgname-$pkgver.tar.bz2 \ # galago-sharp-0.5.0-fix-nunit-name.patch) # Finclude mono diff --git a/source/include/mozilla-i18n.sh b/source/include/mozilla-i18n.sh index becfadb..232c7cb 100644 --- a/source/include/mozilla-i18n.sh +++ b/source/include/mozilla-i18n.sh @@ -46,7 +46,7 @@ Finclude i18n ### : ${pkgname="$_F_mozilla_i18n_name-i18n"} \ ${pkgdesc="Language support for ${_F_mozilla_i18n_name^}"} -archs=('i686' 'x86_64') +archs=('x86_64') groups=('locale-extra') options=("${options[@]}" 'noversrc') up2date=$pkgver diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh index 6e11620..2ba45db 100644 --- a/source/include/nvidia.sh +++ b/source/include/nvidia.sh @@ -15,10 +15,9 @@ # pkgname=nvidia # pkgver=173.14.12 # pkgrel=3 -# archs=('i686' 'x86_64') +# archs=('x86_64') # Finclude nvidia # case "$_F_nvidia_arch" in -#Â x86) sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');; # x86_64) sha1sums=('78d3034314df7f9c95526707d7fcf4543f5993ed');; # esac # -------------------------------------------------- @@ -34,15 +33,10 @@ ### # General variables if [ -z "$_F_nvidia_arch" ]; then - if echo "$CARCH" | grep -q 'i.86'; then - _F_nvidia_arch=x86 - elif [ "$CARCH" == "x86_64" ]; then - _F_nvidia_arch=x86_64 - fi + _F_nvidia_arch=x86_64 fi if [ -z "$_F_nvidia_pkgnum" ]; then case "$_F_nvidia_arch" in - x86) _F_nvidia_pkgnum=1;; x86_64) _F_nvidia_pkgnum=2;; esac fi diff --git a/source/include/openjava.sh b/source/include/openjava.sh index d3559a2..cb2b6ec 100644 --- a/source/include/openjava.sh +++ b/source/include/openjava.sh @@ -18,7 +18,7 @@ # pkgdesc="100% Pure Java Regular Expression package" # url="http://jakarta.apache.org/regexp"; # groups=('devel-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # up2date="lynx -dump http://www.apache.org/dist/jakarta/regexp/source/ |Flasttar" # source=(http://www.apache.org/dist/jakarta/regexp/source/jakarta-regexp-$pkgver.tar.gz) # signatures=($source.asc) diff --git a/source/include/pear.sh b/source/include/pear.sh index 1635496..b57810c 100644 --- a/source/include/pear.sh +++ b/source/include/pear.sh @@ -40,7 +40,7 @@ pkgname=php-pear-`echo $_F_pear_name|tr [A-Z] [a-z]` [ -z "$pkgrel" ] && pkgrel=1 url="http://pear.php.net/package/$_F_pear_name"; groups=('devel-extra') -archs=('i686' 'x86_64') # it's safe to add x86_64 by default +archs=('x86_64') up2date="lynx -dump http://pear.php.net/package/$_F_pear_name|grep stable.*released|sed 's/.*\]\([^ ]*\) (.*/\1/'" source=(http://pear.php.net/get/$_F_pear_name-$pkgver.tgz) install=src/pear.install diff --git a/source/include/pecl.sh b/source/include/pecl.sh index 445deff..8f91a37 100644 --- a/source/include/pecl.sh +++ b/source/include/pecl.sh @@ -17,7 +17,7 @@ # pkgdesc="Terminal screen handling and optimization package for PHP." # depends=('php>=5.2.0' 'ncurses') # Finclude pecl -# archs=('i686' 'x86_64') +# archs=('x86_64') # pkgrel=2 # sha1sums=('bd57c58806d72baa23c20f4d078c0196f7c2c309') # -------------------------------------------------- @@ -36,7 +36,7 @@ pkgname=php-pecl-$_F_pecl_name url="http://pecl.php.net/package/$_F_pecl_name"; groups=('devel-extra') -archs=('i686') +archs=('x86_64') _F_archive_name=$_F_pecl_name up2date="Flasttar $url" source=(http://pecl.php.net/get/$_F_pecl_name-$pkgver.tgz) diff --git a/source/include/perl.sh b/source/include/perl.sh index f1751ff..f9f29fc 100644 --- a/source/include/perl.sh +++ b/source/include/perl.sh @@ -19,7 +19,7 @@ # depends=('perl-pod-escapes') # Finclude perl # pkgrel=1 -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('45646ac806b91b37caadf0b08ce71d3f6ef2a60c') # -------------------------------------------------- # @@ -66,7 +66,7 @@ pkgname="perl-`echo $_F_perl_name|tr [A-Z] [a-z]`" [ -z "$pkgrel" ] && pkgrel=1 depends+=('perl>=5.24.0-6') [ -z "$groups" ] && groups=('devel-extra') -[ -z "$archs" ] && archs=('i686' 'x86_64') +[ -z "$archs" ] && archs=('x86_64') ### # == PROVIDED FUNCTIONS diff --git a/source/include/phonon-backend.sh b/source/include/phonon-backend.sh index cf9a322..e2ab1ed 100644 --- a/source/include/phonon-backend.sh +++ b/source/include/phonon-backend.sh @@ -15,7 +15,7 @@ # pkgname=phonon-backend-xine # pkgrel=1 # pkgdesc="Phonon xine backend." -# archs=('i686' 'x86_64') +# archs=('x86_64') # # Finclude phonon-backend # depends=("${depends[@]}" 'xine-lib') diff --git a/source/include/pypi.sh b/source/include/pypi.sh index f7b99cf..351ca9d 100644 --- a/source/include/pypi.sh +++ b/source/include/pypi.sh @@ -19,7 +19,7 @@ # pkgdesc="A library to assist the building of PyGTK applications." # rodepends=('pygtk') # groups=('xlib-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # Finclude pypi # sha1sums=('24af2eb1d5631a4565a4a867a2f6bb5820926001') # -------------------------------------------------- diff --git a/source/include/qt5.sh b/source/include/qt5.sh index 0610e33..62fb673 100644 --- a/source/include/qt5.sh +++ b/source/include/qt5.sh @@ -24,7 +24,7 @@ url="http://www.qt.io"; if [ -z "$groups" ]; then groups=('xlib') fi -archs=('i686' 'x86_64') +archs=('x86_64') options+=('nodocs') source=(http://download.qt.io/archive/qt/${pkgver%.*}/${pkgver}/submodules/${qtpkgfilename}.tar.xz) _F_archive_name=qt-everywhere-opensource-src diff --git a/source/include/sawfish-script.sh b/source/include/sawfish-script.sh index 7c1b1a4..b7a657c 100644 --- a/source/include/sawfish-script.sh +++ b/source/include/sawfish-script.sh @@ -42,7 +42,7 @@ # * pkgname ### groups=('xlib-extra' 'sawfish-scripts') -archs=('i686' 'x86_64') +archs=('x86_64') pkgname="sawfish-$_F_sawfish_name" ### diff --git a/source/include/scm.sh b/source/include/scm.sh index 1e451c4..342d747 100644 --- a/source/include/scm.sh +++ b/source/include/scm.sh @@ -21,7 +21,7 @@ # depends=('glibc') # replaces=('debianutils') # groups=('base' 'chroot-core') -# archs=('i686' 'x86_64') +# archs=('x86_64') # options=('nobuild') # _F_scm_type="cvs" # _F_scm_url=":pserver:[email protected]:/cvs" diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh index f6b501e..bffb6ff 100644 --- a/source/include/sourceforge.sh +++ b/source/include/sourceforge.sh @@ -23,7 +23,7 @@ # depends=('scim>=1.4.4' 'uim') # options=('scriptlet') # groups=('xapps-extra') -# archs=('i686' 'x86_64') +# archs=('x86_64') # sha1sums=('9023c205cb1623e749bd5ca7baf721c55f36f279') # -------------------------------------------------- # diff --git a/source/include/texinfo.sh b/source/include/texinfo.sh index 41a8c09..82ee33a 100644 --- a/source/include/texinfo.sh +++ b/source/include/texinfo.sh @@ -20,7 +20,7 @@ # depends=() # This time it's _really_ empty ;-) # makedepends=('pth') # it must be compiled with pth for gpg-agent # groups=('lib') -# archs=('i686' 'x86_64') +# archs=('x86_64') # up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libassuan.*tar |sed -n -e 's/.*n-\(.*\)\.t.*/\1/;s/-/_/;1 p'" # source=(http://gd.tuwien.ac.at/privacy/gnupg/libassuan/libassuan-$pkgver.tar.bz2) # Finclude texinfo diff --git a/source/include/vim-spell.sh b/source/include/vim-spell.sh index b3493ce..d22ec57 100644 --- a/source/include/vim-spell.sh +++ b/source/include/vim-spell.sh @@ -46,7 +46,7 @@ url="http://ftp.vim.org/pub/vim/unstable/runtime/spell/"; depends=() rodepends=('vim>=7.0') groups=('locale-extra') -archs=('i686' 'x86_64') +archs=('x86_64') up2date="date --date \$(lynx -dump http://ftp.vim.org/pub/vim/unstable/runtime/spell/|grep '$_F_vim_lang\..*\.spl '|sed 's/.* \([^- ]*-[^- ]*-[^- ]*\) .*/\1/;q') +%Y%m%d" source=(http://ftp.vim.org/pub/vim/unstable/runtime/spell/README_$_F_vim_lang.txt) for i in ${_F_vim_encodings[@]} diff --git a/source/include/xpi.sh b/source/include/xpi.sh index 7eccca4..6289654 100644 --- a/source/include/xpi.sh +++ b/source/include/xpi.sh @@ -34,7 +34,7 @@ : ${_F_xpi_ext='.xpi'} \ ${pkgname="$_F_xpi_product-$_F_xpi_pkgname"} groups=("${groups[@]}" "$_F_xpi_product-extensions") -archs=('i686' 'x86_64') +archs=('x86_64') if [ -n "$_F_xpi_num" ]; then : ${url="https://addons.mozilla.org/en-US/$_F_xpi_product/addon/$_F_xpi_pkgname/"} \
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
