4 files changed, 56 insertions, 59 deletions
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
deleted file mode 100644
index e70fa1cb3..000000000
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 139089 2015-09-02 08:47:24Z spupykin $
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=icecat-adblock-plus
-pkgver=2.6.10
-pkgrel=1
-pkgdesc="Extension for icecat which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-groups=('icecat-addons')
-depends=("icecat")
-makedepends=('unzip')
-noextract=("adblockplus-$pkgver.xpi")
-source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi")
-md5sums=('df5f71f73ace992fc3504a6c46849b59')
-
-package() {
-  cd $srcdir
-  unzip adblockplus-$pkgver.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/icecat-ublock-origin/PKGBUILD b/libre/icecat-ublock-origin/PKGBUILD
new file mode 100644
index 000000000..d757acf37
--- /dev/null
+++ b/libre/icecat-ublock-origin/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=icecat-ublock-origin
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="Extension fork of the Adblock Plus for IceCat which block ads and banners, but without 'acceptable ads' feature"
+arch=('any')
+url="https://github.com/gorhill/uBlock"
+license=('GPL3')
+groups=('icecat-addons')
+depends=("icecat")
+makedepends=('unzip')
+provides=('icecat-adblock-plus')
+conflicts=('icecat-adblock-plus')
+replaces=('icecat-adblock-plus')
+source=("https://github.com/gorhill/uBlock/releases/download/$pkgver/uBlock0.firefox.xpi")
+md5sums=('9f907a1d2e845cd34acfb5a669c013ac')
+
+package() {
+  # extension
+  _dest="$pkgdir/usr/lib/icecat/browser/extensions/uBlock0@raymondhill.net"
+  find . -type d -exec install -d {} $_dest/{} \;
+  find . -type f -exec install -Dm644 {} $_dest/{} \;
+
+  # license
+  install -Dm644 LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
deleted file mode 100644
index f54dffb7d..000000000
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 139089 2015-09-02 08:47:24Z spupykin $
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=iceweasel-adblock-plus
-pkgver=2.6.10
-pkgrel=1
-pkgdesc="Extension for iceweasel which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-groups=('iceweasel-addons')
-depends=("iceweasel")
-makedepends=('unzip')
-replaces=('firefox-adblock-plus')
-noextract=("adblockplus-$pkgver.xpi")
-source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi")
-md5sums=('df5f71f73ace992fc3504a6c46849b59')
-
-package() {
-  cd $srcdir
-  unzip adblockplus-$pkgver.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/iceweasel-ublock-origin/PKGBUILD b/libre/iceweasel-ublock-origin/PKGBUILD
new file mode 100644
index 000000000..16d69bc39
--- /dev/null
+++ b/libre/iceweasel-ublock-origin/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=iceweasel-ublock-origin
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="Extension fork of the Adblock Plus for Iceweasel which block ads and banners, but without 'acceptable ads' feature"
+arch=('any')
+url="https://github.com/gorhill/uBlock"
+license=('GPL3')
+groups=('iceweasel-addons')
+depends=("iceweasel")
+makedepends=('unzip')
+provides=('iceweasel-adblock-plus')
+conflicts=('iceweasel-adblock-plus')
+replaces=('firefox-adblock-plus' 'iceweasel-adblock-plus')
+source=("https://github.com/gorhill/uBlock/releases/download/$pkgver/uBlock0.firefox.xpi")
+md5sums=('9f907a1d2e845cd34acfb5a669c013ac')
+
+package() {
+  # extension
+  _dest="$pkgdir/usr/lib/iceweasel/browser/extensions/uBlock0@raymondhill.net"
+  find . -type d -exec install -d {} $_dest/{} \;
+  find . -type f -exec install -Dm644 {} $_dest/{} \;
+
+  # license
+  install -Dm644 LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}