fix some relations to blacklisted packages

see https://lists.parabola.nu/pipermail/dev/2017-October/005936.html

4 files changed, 48 insertions, 33 deletions

diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index a4508a77a..8cb89783f 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -3,6 +3,10 @@
 # Contributor (Arch): Andrew Wright <andreww@photism.org>
 # Contributor (Arch): Paul Mattal <paul@archlinux.org>
 
+# FIXME: this seems to also be a replacement and provider of
+#        apache-ant-doc. a split package should be made for it, or it
+#        should be explicitly conflicted at the very least.
+
 pkgname=apache-ant
 pkgver=1.9.7
 pkgdesc='A java-based build tool'
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 94eb2ccdb..4f51a040f 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -38,7 +38,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech')
 
-replaces=("$pkgname-libre" "$_oldname")
+replaces=("$pkgname-libre" "$_oldname" 'firefox')
 conflicts=("$pkgname-libre" "$_oldname")
 
 options=(!emptydirs !makeflags !strip debug)
diff --git a/libre/paraboley-git/PKGBUILD b/libre/paraboley-git/PKGBUILD
new file mode 100644
index 000000000..5c29c2333
--- /dev/null
+++ b/libre/paraboley-git/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer (AUR) : tuftedocelot@fastmail.fm
+# Maintainer (AUR) : frank604 <frankshin82 at gmail>
+# Maintainer (AUR) : youngunix <zagazaw2004 'at' gmail 'dot' com>
+# Maintainer (AUR) : Jeremy L <jl AT adminempire DOT com>
+# Maintainer (Arch) : Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor (Arch) : Laurie Clark-Michalek <bluepeppers@archlinux.us>
+# Contributor (Arch) : graysky <graysky AT archlinux DOR us>
+# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+
+_pkgname=paraboley
+# FIXME: couldn't we skip the -git to simplify provides=() ?
+#        we should probably use the one in [community] over AUR
+pkgname=${_pkgname}-git
+pkgver=6
+pkgrel=1.1
+pkgdesc="Python script to display system infomation alongside the Parabola GNU/Linux-libre logo."
+arch=('any')
+url="https://projects.parabola.nu/paraboley.git"
+license=('GPL')
+depends=('python')
+makedepends=('git' 'python-distribute')
+optdepends=(
+'python-mpd-git: python libary for mpd interaction',
+'python-logbook-git: for logging'
+'imagemagick: for default screenshot command'
+)
+conflicts=('archey3')
+provides=('archey3' 'paraboley')
+replaces=('archey3')
+source=("git://projects.parabola.nu/paraboley.git")
+md5sums=('SKIP')
+
+pkgver() {
+	cd ${_pkgname}
+    git rev-list --count HEAD
+}
+
+package() {
+	cd "$_pkgname"
+	python setup.py install --root=${pkgdir}
+	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/paraboley/COPYING
+}
diff --git a/pcr/paraboley-git/PKGBUILD b/pcr/paraboley-git/PKGBUILD
deleted file mode 100644
index 268175879..000000000
--- a/pcr/paraboley-git/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>
-
-_pkgname=paraboley
-pkgname=${_pkgname}-git
-pkgver=6
-pkgrel=1
-pkgdesc="Python script to display system infomation alongside the Parabola GNU / Linux-libre logo."
-arch=('any')
-url="https://projects.parabola.nu/paraboley.git"
-license=('GPL')
-depends=('python')
-makedepends=('git' 'python-distribute')
-optdepends=(
-'python-mpd-git: python libary for mpd interaction',
-'python-logbook-git: for logging'
-'imagemagick: for default screenshot command'
-)
-conflicts=()
-provides=('paraboley')
-source=("git://projects.parabola.nu/paraboley.git")
-md5sums=('SKIP')
-
-pkgver() {
-	cd ${_pkgname}
-    git rev-list --count HEAD
-}
-
-package() {
-	cd "$_pkgname"
-	python setup.py install --root=${pkgdir}
-	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/paraboley/COPYING
-}