4 files changed, 3 insertions, 62 deletions
diff --git a/libre-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
index d04643491..ceee17e13 100644
--- a/libre-testing/ath9k-htc-firmware-git/PKGBUILD
+++ b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ath9k-htc-firmware-git
diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
index d60144bde..b153ad518 100644
--- a/libre-testing/icecat/PKGBUILD
+++ b/libre-testing/icecat/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 
diff --git a/libre-testing/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD
deleted file mode 100644
index 23ab691aa..000000000
--- a/libre-testing/linux-libre-firmware/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-# Contributor: Márcio Silva <coadde@lavabit.com>
-
-pkgname=linux-libre-firmware
-pkgver=3.11
-pkgrel=1
-pkgdesc='Free firmware files for Linux-libre'
-arch=('any')
-url=('http://linux-libre.fsfla.org/')
-license=('GPL2')
-depends=('ath9k-htc-firmware')
-provides=('linux-firmware'
-          'kernel26-firmware=2.6.34.99')
-conflicts=('linux-firmware'
-           'linux-firmware-git'
-           'kernel26-firmware'
-           'ar9170-fw'
-           'iwlwifi-1000-ucode'
-           'iwlwifi-3945-ucode'
-           'iwlwifi-4965-ucode'
-           'iwlwifi-5000-ucode'
-           'iwlwifi-5150-ucode'
-           'iwlwifi-6000-ucode'
-           'rt2870usb-fw'
-           'rt2x00-rt61-fw'
-           'rt2x00-rt71w-fw')
-replaces=('linux-firmware'
-          'kernel26-firmware'
-          'ar9170-fw'
-          'iwlwifi-1000-ucode'
-          'iwlwifi-3945-ucode'
-          'iwlwifi-4965-ucode'
-          'iwlwifi-5000-ucode'
-          'iwlwifi-5150-ucode'
-          'iwlwifi-6000-ucode'
-          'rt2870usb-fw'
-          'rt2x00-rt61-fw'
-          'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
-
-package() {
-
-  # create firmware folder to put the free firmware files there
-  install -d -m755 $pkgdir/usr/lib/firmware
-
-  cd $srcdir/linux-$pkgver
-
-  # compile free firmware files  
-  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
-
-  # create licenses folder to put the licenses files there
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
-  # move WHENCE file to linux-firmware license folder
-  cd $srcdir/linux-$pkgver
-  install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
-
-}
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 8b9e59932..bd7d396db 100644
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
@@ -4,7 +4,7 @@
 # then please put 'unknown'.
 
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 source PKGBUILD
 unset build package md5sums source check
 _repo=testing