Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/gawk/PKGBUILD
	libre/linux-libre/PKGBUILD
	staging/icu/PKGBUILD
	testing/cairo/PKGBUILD

8 files changed, 52 insertions, 52 deletions

diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD
index c83ef667b..bd5f8da17 100644
--- a/libre/foomatic/PKGBUILD
+++ b/libre/foomatic/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
+# $Id: PKGBUILD 155771 2012-04-06 10:09:10Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
  
 pkgbase="foomatic"
 pkgname=('foomatic-db' 'foomatic-filters-libre' 'foomatic-db-engine')
-arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20110707
-_relver=4.0.7
-pkgver=${_relver}_${_snapdate}
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
+_snapdate=20120406
+_filtersver=4.0.15
+_enginever=4.0.8
+pkgver=${_filtersver}_${_snapdate}
 pkgrel=1
 epoch=1
-makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-db-engine-${_relver}.tar.gz
-        http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
-        http://repo.parabolagnulinux.org/other/$pkgbase-filters-libre-${_relver}.tar.gz)
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+#_url=http://www.openprinting.org/download/foomatic/ # switch after build
+_url=ftp://ftp.archlinux.org/other/foomatic/
+source=(https://repo.parabolagnulinux.org/other/${pkgbase}-filters-libre-${_filtersver}.tar.gz
+        ${_url}/$pkgbase-db-engine-${_enginever}.tar.gz
+        ${_url}/$pkgbase-db-4.0-${_snapdate}.tar.gz)
 url="http://www.linuxprinting.org/foomatic.html"
 options=('!emptydirs')
-md5sums=('fcfa8eb9ce5494b81b58ae983fc2aeb5'
-         '88d467d9099188b170185564bd33d7b7'
-         'ffda5eb8ab36564e5b28190e6c5406b2')
 
 mksource() {
-    if [ ! -d ${pkgbase}-filters-libre-${_relver}/ ]; then
-        wget -O - http://www.linuxprinting.org/download/foomatic/$pkgbase-filters-${_relver}.tar.gz | \
+    if [ ! -d ${pkgbase}-filters-libre-${_filtersver}/ ]; then
+        wget -O - http://www.openprinting.org/download/foomatic/foomatic-filters-${_filtersver}.tar.gz | \
         bsdtar xzf -
 
-        mv ${pkgbase}-filters{,-libre}-${_relver}/
+        mv ${pkgbase}-filters{,-libre}-${_filtersver}/
     fi
 
-    rm -rfv ${pkgbase}-filters-libre-${_relver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
-    bsdtar cvzf ${pkgbase}-filters-libre-${_relver}.tar.gz ${pkgbase}-filters-libre-${_relver}/
-}
-
-build() {
- /bin/true
+    rm -rfv ${pkgbase}-filters-libre-${_filtersver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
+    bsdtar cvzf ${pkgbase}-filters-libre-${_filtersver}.tar.gz ${pkgbase}-filters-libre-${_filtersver}/
 }
 
 package_foomatic-db() {
@@ -64,8 +60,7 @@ package_foomatic-filters-libre() {
  optdepends=('perl:      for the "beh" Backend End Handler used by cups'
             'net-snmp:  certain (mostly HP) printers need it to work')
 
-#   cd ${srcdir}/${pkgname}-${pkgver}
-   cd ${srcdir}/foomatic-filters-libre-${_relver}
+   cd ${srcdir}/foomatic-filters-${_filtersver}
    ./configure --prefix=/usr --sysconfdir=/etc
    make
    make DESTDIR=${pkgdir} install
@@ -78,8 +73,7 @@ package_foomatic-db-engine() {
  license=('GPL')
  depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
 
-#   cd ${srcdir}/${pkgname}-${pkgver}
-   cd ${srcdir}/foomatic-db-engine-${_relver}
+   cd ${srcdir}/foomatic-db-engine-${_enginever}
     ./configure --prefix=/usr
    make
    eval `perl -V:archname`
@@ -92,3 +86,4 @@ package_foomatic-db-engine() {
    chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
 }
 
+
diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
index 73b1767da..f39ceed05 100644
--- a/libre/linux-libre/.directory
+++ b/libre/linux-libre/.directory
@@ -1,2 +1,5 @@
 [Dolphin]
-Timestamp=2012,3,19,13,36,16
+Timestamp=2012,4,8,18,21,16
+
+[Settings]
+HiddenFilesShown=true
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
new file mode 100644
index 000000000..173a6c3cd
--- /dev/null
+++ b/libre/linux-libre/ChangeLog
@@ -0,0 +1,9 @@
+2012-04-08  André Silva  <andre.paulista@adinet.com.uy>
+
+	* linux-libre 3.3.1-1.1
+	* Disable CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+
+2012-03-03  André Silva  <andre.paulista@adinet.com.uy>
+
+	* linux-libre-2.3.9-2
+	* Enable CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 48b393ac2..c75323c8f 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -15,7 +15,7 @@ _basekernel=3.3
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -34,7 +34,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'i915-fix-ghost-tv-output.patch'
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-
+md5sums=('5487da14ca81715a469c7594d39722fa'
+         '58799da6f62daf1e54a256d02792b91f'
+         '559487f3e438ad95f1c80aa11abf2ed0'
+         'f3749180b53d042091a483300ef04f8d'
+         'a8a3843046926eb7ab81312cd438c5c5'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '263725f20c0b9eb9c353040792d644e5'
+         'bb7fd1aa23016c8057046b84fd4eb528'
+         'acdce5260b0fb711cb9a0fbce984f0ef')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 38312a3d2..718c4f3b6 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -2351,17 +2351,8 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
 
 #
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index f36dc8cf5..454a61b84 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -2237,17 +2237,8 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
 
 #
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index b733c1dc0..6f0d7a347 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.3.1-1-LIBRE
+KERNEL_VERSION=3.3.1-1.1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 49ae04510..50988f587 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
   * Etc.
 
   Please report back to the Parabola Project on the usual channels:
-  * http://bugs.parabolagnulinux.org
+  * https://bugs.parabolagnulinux.org
   * irc://freenode.net/#parabola
   * mailto:dev@list.parabolagnulinux.org
 EOM