2 files changed, 27 insertions, 41 deletions
diff --git a/libre/icecat-theme-adwaita/PKGBUILD b/libre/icecat-theme-adwaita/PKGBUILD
deleted file mode 100644
index 512ef3679..000000000
--- a/libre/icecat-theme-adwaita/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer (Arch): Muflone http://www.muflone.com/contacts/english/
-# Contributor (Arch): Diego Principe <cdprincipe@at@gmail@dot@com>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Daniel Milewski <niitotantei@riseup.net>
-
-pkgname=icecat-theme-adwaita
-pkgver=38.1
-pkgrel=1.1
-pkgdesc="Adwaita theme for IceCat (Matches the default GNOME Shell theme)"
-url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/"
-arch=('any')
-license=('MPL')
-depends=("icecat")
-makedepends=('unzip')
-source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi")
-sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e')
-noextract=("gnome-firefox-theme-${pkgver}.xpi")
-
-prepare() {
-  unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}"
-  # Fix for wrong version number
-  # https://github.com/gnome-integration-team/firefox-gnome/issues/337
-  cd "${pkgname}-${pkgver}"
-  sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf"
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  # Find extension UUID
-  _emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' install.rdf)
-  # Prepare destination folder
-  _dstdir="${pkgdir}/usr/lib/icecat/browser/extensions/${_emid}"
-  install -d "${_dstdir}"
-  # Copy files
-  cp -R * "${_dstdir}"
-  # Restore standard permissions
-  find "${pkgdir}" -type d -print0 | xargs --null chmod 0755
-  find "${pkgdir}" -type f -print0 | xargs --null chmod 0644
-}
-
diff --git a/libre/icecat-theme-gnome/PKGBUILD b/libre/icecat-theme-gnome/PKGBUILD
new file mode 100644
index 000000000..4e4e8ca00
--- /dev/null
+++ b/libre/icecat-theme-gnome/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 171810 2016-04-25 17:30:31Z muflone $
+# Maintainer (Arch): Muflone http://www.muflone.com/contacts/english/
+# Contributor (Arch): Diego Principe <cdprincipe@at@gmail@dot@com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Daniel Milewski <niitotantei@riseup.net>
+# Contributor: Isaac David <isacdaavid () isacdaavid!info>
+
+pkgname=icecat-theme-gnome
+_pkgname=firefox-gnome
+pkgver=38.1
+pkgrel=1
+pkgdesc='GNOME 3 theme for IceCat (Previously known as "Adwaita")'
+url="https://addons.mozilla.org/en-us/firefox/addon/adwaita/"
+arch=('any')
+license=('MPL')
+depends=("icecat")
+conflicts=('icecat-theme-adwaita')
+optdepends=('icecat-theme-gnome-tweak: GNOME theme customization')
+source=("https://addons.mozilla.org/firefox/downloads/file/410922/gnome_3-${pkgver}-fx-linux.xpi")
+sha256sums=('d230a3cc20739696281d7bb5aa5bb395afce782d53a97ab5270278602e4cb274')
+
+package() {
+  install -m 755 -d "${pkgdir}/usr/lib/icecat/browser/extensions"
+  _emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' install.rdf)
+  install -m 644 "gnome_3-${pkgver}-fx-linux.xpi" "${pkgdir}/usr/lib/icecat/browser/extensions/${_emid}.xpi"
+}