remove uneeded [libre] replacements and unused PKGBUILDs

Signed-off-by: David P <megver83@parabola.nu>

63 files changed, 0 insertions, 5844 deletions

diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD
deleted file mode 100644
index 3f8ded46f..000000000
--- a/libre/abuse/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor (Arch): Lukas Fleischer <lfleischer@archlinux.org>
-# Contributor (Arch): jlvsimoes <jlvsimoes@oninet.pt>
-# Contributor (Arch): kevin <kevin@archlinux.org>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=abuse
-_pkgname=$pkgname-libre
-pkgver=0.8
-pkgrel=10
-pkgrel+=.parabola1
-pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-url='http://abuse.zoy.org/'
-license=('GPL' 'custom')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-depends=('desktop-file-utils' 'gcc-libs' 'glu' 'libgl' 'sdl_mixer')
-makedepends=('gendesk' 'glu' 'mesa-libgl')
-mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$pkgname-$pkgver.tar.gz")
-source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
-        "$pkgname.sh"
-        "default.${pkgname}rc"
-        'default.gamma.lsp'
-        'libre.patch')
-mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488')
-sha256sums=('8f77e8020bf17b10d8a5269d7d4d9bc3592f961ce352672ce183e1f41efc956b'
-            '8dcf3b6b6ac419e5ffabc847166917d70ce43af3092c4d651f473947fff0cc7d'
-            '6ea2fa9e65c10bbcab4432f40d0c7284cb3970835c40c5c00ced14b39ce1b00f'
-            '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6'
-            '7566a3affb01c64ff4f859bcd549661220847e9c62327e71e1d585c0048f90ea')
-
-mksource() {
-  cd "$pkgname-$pkgver"
-
-  # Remove the nonfree claudio addon
-  rm -rvf ./data/addon/claudio
-}
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -p1 -i "$srcdir/libre.patch"
-
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --with-assetdir="/usr/share/$pkgname/orig" \
-    --with-x \
-    --enable-debug # Fix for FS#52915
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Desktop shortcut and icon
-  install -Dm644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  # Default configuration
-  mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$srcdir/default.${pkgname}rc" \
-    "$pkgdir/usr/share/$pkgname/default.${pkgname}rc"
-  install -Dm644 "$srcdir/default.gamma.lsp" \
-    "$pkgdir/usr/share/$pkgname/default.gamma.lsp"
-
-  # License (for the original source code)
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/abuse/abuse.sh b/libre/abuse/abuse.sh
deleted file mode 100644
index 5ffdf9078..000000000
--- a/libre/abuse/abuse.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Copy over sane configuration files, unless they already exists
-if [ ! -d $HOME/.abuse ]; then
-  mkdir -p $HOME/.abuse
-fi
-if [ ! -f $HOME/.abuse/abuserc ]; then
-  cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc
-fi
-if [ ! -f $HOME/.abuse/gamma.lsp ]; then
-  cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp
-fi
-
-# Run abuse
-exec /usr/bin/abuse.elf "$@"
diff --git a/libre/abuse/default.abuserc b/libre/abuse/default.abuserc
deleted file mode 100644
index ff116819f..000000000
--- a/libre/abuse/default.abuserc
+++ /dev/null
@@ -1,37 +0,0 @@
-; Abuse-SDL Configuration file
-
-; Startup fullscreen
-fullscreen=0
-
-; Use DoubleBuffering
-doublebuf=1
-
-; Use OpenGL
-gl=1
-
-; Location of the datafiles
-datadir=/usr/share/abuse/orig
-
-; Use mono audio only
-mono=0
-
-; Grab the mouse to the window
-grabmouse=0
-
-; Set the scale factor
-scale=2
-
-; Use anti-aliasing (with gl=1 only)
-antialias=0
-
-; Disable the SDL parachute in the case of a crash
-nosdlparachute=0
-
-; Key mappings
-left=a
-right=d
-up=w
-down=s
-fire=Space
-weapprev=q
-weapnext=e
diff --git a/libre/abuse/default.gamma.lsp b/libre/abuse/default.gamma.lsp
deleted file mode 100644
index 9a77afa27..000000000
--- a/libre/abuse/default.gamma.lsp
+++ /dev/null
@@ -1 +0,0 @@
-(setq darkest_gray 20)
diff --git a/libre/abuse/libre.patch b/libre/abuse/libre.patch
deleted file mode 100644
index 1e3814bb1..000000000
--- a/libre/abuse/libre.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-diff --git a/data/Makefile.am b/data/Makefile.am
-index cad0b9ff4..abbb8941f 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -35,7 +35,6 @@ lisp += \
-     \
-     addon/bong/bong.lsp \
-     \
--    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
-     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
-     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
-     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
-@@ -113,21 +112,6 @@ art += \
-     \
-     addon/bong/bong.spe \
-     \
--    addon/claudio/antship.spe addon/claudio/bigexp.spe \
--    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
--    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
--    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
--    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
--    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
--    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
--    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
--    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
--    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
--    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
--    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
--    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
--    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
--    \
-     addon/example/example.spe \
-     \
-     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
-@@ -214,7 +198,6 @@ demos = \
- doc = \
-     addon/aliens/aliens.txt \
-     addon/aliens/readme.txt \
--    addon/claudio/palettes.txt \
-     addon/leon/leon.txt \
-     addon/newart/tiledoc.txt \
-     addon/pong/pong.txt \
-@@ -267,11 +250,6 @@ sound += \
-     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
-     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
-     \
--    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
--    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
--    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
--    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
--    \
-     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
-     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
-     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
-diff --git a/data/Makefile.in b/data/Makefile.in
-index b27371448..77b140231 100644
---- a/data/Makefile.in
-+++ b/data/Makefile.in
-@@ -184,7 +184,6 @@ lisp = abuse.lsp edit.lsp hardness.lsp music/playhmp.lsp lisp/ant.lsp \
- 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
- 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
- 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
--	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
- 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
- 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
- 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
-@@ -245,23 +244,6 @@ art = art/ant.spe art/ball.spe art/blowups.spe art/bold.spe \
- 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
- 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
- 	addon/aliens/fortiles.spe addon/bong/bong.spe \
--	addon/claudio/antship.spe addon/claudio/bigexp.spe \
--	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
--	addon/claudio/droid.spe addon/claudio/extiles.spe \
--	addon/claudio/fire.spe addon/claudio/lamp.spe \
--	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
--	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
--	addon/claudio/pal2.spe addon/claudio/pal5.spe \
--	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
--	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
--	addon/claudio/pal90.spe addon/claudio/rob2.spe \
--	addon/claudio/skull.spe addon/claudio/spaced.spe \
--	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
--	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
--	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
--	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
--	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
--	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
- 	addon/example/example.spe addon/leon/gray.spe \
- 	addon/leon/level00.spe addon/leon/level01.spe \
- 	addon/leon/level02.spe addon/leon/lmisc.spe \
-@@ -333,7 +315,6 @@ demos = \
- doc = \
-     addon/aliens/aliens.txt \
-     addon/aliens/readme.txt \
--    addon/claudio/palettes.txt \
-     addon/leon/leon.txt \
-     addon/newart/tiledoc.txt \
-     addon/pong/pong.txt \
-@@ -414,17 +395,6 @@ extra = \
- @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
- @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
- @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
-diff --git a/data/abuse.lsp b/data/abuse.lsp
-index cc09aa930..6b15f8dd2 100644
---- a/data/abuse.lsp
-+++ b/data/abuse.lsp
-@@ -42,7 +42,6 @@
- (load "addon/twist/f2chars.lsp")
- (load "addon/twist/f2ai.lsp")
- (load "addon/aliens/astartup.lsp")
--(load "addon/claudio/claudio.lsp")
- (load "addon/twist/lisp/dray.lsp")
- (load "addon/twist/lisp/mario.lsp")
- (load "addon/leon/4frabs.lsp")
-@@ -50,13 +49,11 @@
- 
- (setq bad_guy_list
-   (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
--        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
--        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
-+        GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
-         ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
- (setq object_destroyable_list
-   (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
--        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
--        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
-+        GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
-         ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
- 
- (gc)              ;; garbage collection perm space
-diff --git a/data/addon/deathmat/deathmat.lsp b/data/addon/deathmat/deathmat.lsp
-index 3d5a78e77..5452ddad7 100644
---- a/data/addon/deathmat/deathmat.lsp
-+++ b/data/addon/deathmat/deathmat.lsp
-@@ -28,7 +28,6 @@
- (load "lisp/switch.lsp")
- 
- ;; Artwork from fRaBs
--(load "addon/claudio/claudio.lsp")
- (load "addon/aliens/astartup.lsp")
- (load "addon/newart/newart.lsp")
- (load "addon/leon/4frabsdm.lsp")
-diff --git a/data/addon/newart/tiledoc.txt b/data/addon/newart/tiledoc.txt
-index 5dbebea33..3f864353c 100644
---- a/data/addon/newart/tiledoc.txt
-+++ b/data/addon/newart/tiledoc.txt
-@@ -21,8 +21,6 @@ NEW FOREGROUND TILES
- /addon/newart/frabs_2.spe   1250-1285
- /addon/newart/final.spe     1300-1336
- /addon/aliens/fortiles.spe  2000-2077
--/addon/claudio/pal81f.spe   2200-2217
--/addon/claudio/pal82f.spe   2250-2283
- 
- REGULAR ABUSE BACKGROUND TILES
- 
-@@ -38,11 +36,7 @@ REGULAR ABUSE BACKGROUND TILES
- NEW BACKGROUND TILES
- 
- /addon/aliens/bactiles.spe  340-374
--/addon/claudio/pal2.spe     380-387
--/addon/claudio/pal5.spe     430-444
- /addon/newart/space.spe     450-468
--/addon/claudio/pal90.spe    475-494
--/addon/claudio/pal21.spe    500-529
- /addon/newart/blcave.spe    560-574
- /addon/newart/frbsblue.spe  580-611
- 
-@@ -72,39 +66,16 @@ FOREGROUND DESCRIPTIONS
- ;; Green cave foreground tiles used in
- ;; the Aliens Abuse addon, by Michael Moss
- 
--/addon/claudio/pal81f.spe    2200
--/addon/claudio/pal82f.spe    2250
--;; Out of all the addon tiles for Abuse,
--;; Claudio Bolzoni's grey space ones just 
--;; stand out as the best. These were 
--;; numbered from 8100 in older versions of
--;; fRaBs.
--
- BACKGROUND DESCRIPTIONS
- 
- /addon/aliens/bactiles.spe  340-374
- ;; Aliens Abuse background tiles. Have
- ;; you ever played Doom? :)
- 
--/addon/claudio/pal2.spe     380-387
--;; Metal sewer tiles also from Doom.
--
--/addon/claudio/pal5.spe     430-444
--;; Limestone cave tiles! Very cool.
--;; Also by Claudio.
--
- /addon/newart/space.spe     450-468
- ;; Space tiles with planets. Thanks
- ;; Cypress!
- 
--/addon/claudio/pal90.spe    475-494
--;; Starry tiles. These were
--;; numbered from 9000 in previous
--;; versions of fRaBs. By Claudio.
--
--/addon/claudio/pal21.spe    500-529
--;; Starry tiles by Claudio Bolzoni.
--
- /addon/newart/blcave.spe    560-574
- ;; Blue caves. By Cypress.
- 
-diff --git a/data/addon/twist/lisp/dray.lsp b/data/addon/twist/lisp/dray.lsp
-index eba873f45..84c4e27e7 100644
---- a/data/addon/twist/lisp/dray.lsp
-+++ b/data/addon/twist/lisp/dray.lsp
-@@ -9,7 +9,7 @@
- ;; make sure you add all the objects that the deathray's light beam will have effect on.
- ;; the objects are simply the bad_guy_list... BUT, remove DARNEL from the list.
- 
--(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))
-+(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))
- 
- 
- ;; this will allow the player to pick up both ammo and weapons.
diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
deleted file mode 100644
index f9aca7693..000000000
--- a/libre/antlr2/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): George Giorgidze <giorgidze (at) gmail.com>
-# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Luke Shumaker <lukeshu@parabola.nu>
-
-pkgbase=antlr2
-pkgname=('antlr2' antlr2-{java,python2,cxx})
-pkgver=2.7.7
-pkgrel=9
-pkgrel+=.par1
-pkgdesc="Language recognition tool providing a framework to build grammatical parsers"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-url="http://www.antlr2.org/"
-license=('custom:Public Domain')
-makedepends=('java-environment' 'python2' 'bash' 'jh')
-options=('staticlibs')
-source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
-        "https://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
-        'runantlr2.sh'
-        'gcc4.4.patch')
-sha256sums=('853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9'
-            '100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7'
-            '04c5b1e4d1fef6fe31852ecba2c18313dfa9d9971ee317274ea964b6f658c255'
-            'b37444f9867544b8c7ad498b0bface51de0b34af8ef88eb7e2b298f102a10b1b')
-
-prepare() {
-  cd "${srcdir}/antlr-${pkgver}"
-  patch -Np1 -i "${srcdir}"/gcc4.4.patch
-}
-
-build() {
-  cd "${srcdir}/antlr-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --disable-examples \
-    --disable-csharp
-  make
-}
-
-_install_license() {
-  install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_antlr2() {
-  depends=('bash' 'antlr2-java')
-
-  install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
-  _install_license
-}
-
-package_antlr2-java() {
-  pkgdesc+=" (Java version)"
-  depends=('java-runtime')
-
-  provides=("java-antlr2=$pkgver")
-  conflicts=("java-antlr2")
-  replaces=("java-antlr2")
-
-  DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-    "$srcdir"/antlr-${pkgver}.pom \
-    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-    antlr2.jar
-
-  ln -s "/usr/share/java/antlr2.jar" \
-    "${pkgdir}/usr/share/java/antlr2-${pkgver}.jar"
-  _install_license
-}
-
-package_antlr2-python2() {
-  pkgdesc+=" (Python version)"
-  depends=('python2')
-
-  provides=("python2-antlr2=$pkgver")
-  conflicts=("python2-antlr2")
-  replaces=("python2-antlr2")
-
-  cd "$srcdir"/antlr-${pkgver}/lib/python
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  _install_license
-}
-
-package_antlr2-cxx() {
-  pkgdesc+=" (C++ version)"
-
-  cd "$srcdir"/antlr-${pkgver}/lib/cpp
-  make prefix="${pkgdir}/usr" install
-
-  _install_license
-}
diff --git a/libre/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch
deleted file mode 100644
index 15e25fb00..000000000
--- a/libre/antlr2/gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
---- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp
-+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
-@@ -10,6 +10,8 @@
- 
- #include <antlr/config.hpp>
- 
-+#include <cstdio>
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
diff --git a/libre/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
deleted file mode 100644
index d274e56a9..000000000
--- a/libre/antlr2/runantlr2.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export CLASSPATH="/usr/share/java/antlr2.jar${CLASSPATH:+:$CLASSPATH}"
-java antlr.Tool "$@"
diff --git a/libre/bfgminer/PKGBUILD b/libre/bfgminer/PKGBUILD
deleted file mode 100644
index 6aad415a6..000000000
--- a/libre/bfgminer/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer (Arch): Christian Rebischke <chris.rebischke@archlinux.org>
-# Contributor (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-
-# parabola changes and rationale:
-#  - replaced opencl-nvidia recommendation with opencl-mesa
-
-pkgname=bfgminer
-pkgver=5.5.0
-pkgrel=3
-pkgrel+=.parabola1
-pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining"
-pkgdesc+=", with opencl-mesa recommendation"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors')
-makedepends=('uthash' 'yasm')
-optdepends=('opencl-mesa: OpenCL implementation for AMD/ATI GPUs')
-url='https://bitcointalk.org/?topic=877081'
-license=('GPL3')
-source=("https://luke.dashjr.org/programs/bitcoin/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.txz"
-        'remove-dangerous-rpath.patch')
-sha512sums=('d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb'
-            '087aa60d818ff37cb7a4edce7a34331a492b5e379a8e034d7a2e02b106bb6ea52b4ce6a1077f602987a2c30213bc185063990796a828ae95f60cff03c7a0bc3f')
-
-prepare() {
-  cd "${pkgname}"-"${pkgver}"
-
-  patch -p1 -i "${srcdir}"/remove-dangerous-rpath.patch
-}
-
-build() {
-  cd "${pkgname}"-"${pkgver}"
-
-  ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --enable-cpumining \
-    --enable-bfsb \
-    --enable-metabank \
-    --enable-scrypt \
-    --enable-opencl \
-    --with-udevrulesdir=/usr/lib/udev/rules.d
-  # --enable-knc (FS#33640)
-  make
-}
-
-package() {
-  cd "${pkgname}"-"${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/bfgminer/remove-dangerous-rpath.patch b/libre/bfgminer/remove-dangerous-rpath.patch
deleted file mode 100644
index 897aca505..000000000
--- a/libre/bfgminer/remove-dangerous-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur bfgminer-4.8.0-orig/configure bfgminer-4.8.0/configure
---- bfgminer-4.8.0-orig/configure	2014-10-04 20:54:28.717071865 -0400
-+++ bfgminer-4.8.0/configure	2014-10-04 20:55:50.140274445 -0400
-@@ -14111,7 +14111,7 @@
- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
- 	libbase58_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libbase58'
--	libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,\$$ORIGIN/libbase58/.libs'"$origin_LDFLAGS"'  -lbase58'
-+	libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"'  -lbase58'
- 	libbase58_SUBDIRS=libbase58
- 	libbase58_EXTRADEPS=libbase58_directory
- 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES
-@@ -14380,7 +14380,7 @@
- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
- 	libblkmaker_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libblkmaker'
--	libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"'  -lblkmaker_jansson-0.1 -lblkmaker-0.1'
-+	libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"'  -lblkmaker_jansson-0.1 -lblkmaker-0.1'
- 	libblkmaker_SUBDIRS=libblkmaker
- 	libblkmaker_EXTRADEPS=libblkmaker_directory
- 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES
diff --git a/libre/digikam/PKGBUILD b/libre/digikam/PKGBUILD
deleted file mode 100644
index 6acfb5c60..000000000
--- a/libre/digikam/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
-
-pkgbase=digikam
-pkgname=(kipi-plugins)
-_pkgver=5.9.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=1
-pkgrel+=.parabola1
-pkgdesc="An advanced digital photo management application"
-arch=(x86_64)
-arch+=(i686 armv7h)
-license=(GPL)
-url="http://www.digikam.org/"
-makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common
-             kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu)
-source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz")
-source+=("libre.patch")
-sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b'
-            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89')
-
-prepare() {
-  mkdir -p build
-
-# fix freedom issues
-  cd $pkgbase-$_pkgver
-  patch -Np1 -i "$srcdir"/libre.patch
-}
-
-build() {
-  cd build
-
-  cmake ../$pkgbase-${_pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DENABLE_KFILEMETADATASUPPORT=ON \
-    -DENABLE_MEDIAPLAYER=ON \
-    -DENABLE_AKONADICONTACTSUPPORT=ON \
-    -DENABLE_MYSQLSUPPORT=ON \
-    -DENABLE_OPENCV3=ON \
-    -DENABLE_APPSTYLES=ON
-  make
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  pkgdesc+=", without nonfree suggestions"
-  depends=(kio libkipi)
-  optdepends=('libmediawiki: MediaWiki Export plugin'
-              'libkvkontakte: VKontakte.ru Exporter plugin')
-
-  cd build/extra
-  make DESTDIR="$pkgdir" install
-  cd $srcdir/build/po
-  make DESTDIR="$pkgdir" install
-
-# Provided by digikam
-  rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
-}
diff --git a/libre/digikam/libre.patch b/libre/digikam/libre.patch
deleted file mode 100644
index 8c677e210..000000000
--- a/libre/digikam/libre.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
-index 0f58cc4..b497299 100644
---- a/extra/kipi-plugins/sendimages/emailsettings.h
-+++ b/extra/kipi-plugins/sendimages/emailsettings.h
-@@ -64,10 +64,9 @@ public:
-         CLAWSMAIL,
-         EVOLUTION,
-         KMAIL,
--        NETSCAPE,
-         SYLPHEED,
-         SYLPHEEDCLAWS,
--        THUNDERBIRD
-+        ICEDOVE
-     };
- 
-     enum ImageSize
-diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
-index 1be65d6..68094de 100644
---- a/extra/kipi-plugins/sendimages/sendimages.cpp
-+++ b/extra/kipi-plugins/sendimages/sendimages.cpp
-@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()
-                 // More info about command lines options with Mozilla & co:
-                 // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
- 
--                case EmailSettings::NETSCAPE:
--                case EmailSettings::THUNDERBIRD:
-+                case EmailSettings::ICEDOVE:
-                 {
-                     QString prog;
- 
--                    if (d->settings.emailProgram == EmailSettings::NETSCAPE)
-+                    if (d->settings.emailProgram == EmailSettings::ICEDOVE)
-                     {
--                        prog = QLatin1String("netscape");
--                    }
--                    else
--                    {
--                        prog = QLatin1String("thunderbird");
-+                        prog = QLatin1String("icedove");
-                     }
- 
-                     QStringList args;
-diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
-index b8416a4..f160310 100644
---- a/extra/kipi-plugins/sendimages/settingswidget.cpp
-+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
-@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
-     d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL,     QLatin1String("Claws Mail"));
-     d->mailAgentName->insertItem(EmailSettings::EVOLUTION,     QLatin1String("Evolution"));
-     d->mailAgentName->insertItem(EmailSettings::KMAIL,         QLatin1String("KMail"));
--    d->mailAgentName->insertItem(EmailSettings::NETSCAPE,      QLatin1String("Netscape"));
-     d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      QLatin1String("Sylpheed"));
-     d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
--    d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   QLatin1String("Thunderbird"));
-+    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,   QLatin1String("Icedove"));
- #endif
-     d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
-     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
diff --git a/libre/faenza-icon-theme/PKGBUILD b/libre/faenza-icon-theme/PKGBUILD
deleted file mode 100644
index 9038ebb2b..000000000
--- a/libre/faenza-icon-theme/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# Maintainer (Arch): Daniel Micay <danielmicay@gmail.com>
-# Contributor (Arch): Elia Notarangelo <elia.notarangelo AT gmail DOT com>
-# Contributor (Arch): Frikilinux <frikilinux at frikilinux.com.ar>
-# Contributor (Arch): graysky <graysky AT archlinux DOT us>
-# Contributor (Arch): Samsagax <samsagax AT gmail DOT com>
-# Contributor (Arch): simongmzlj <simongmzlj AT gmail DOT com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=faenza-icon-theme
-pkgver=1.3.1
-pkgrel=5
-pkgrel+=.par1
-pkgdesc='Icon theme designed for Equinox GTK theme'
-pkgdesc+=', without nonfree distros and application icons (Parabola rebranded)'
-url='http://gnome-look.org/content/show.php/Faenza?content=128143'
-license=('GPL3')
-arch=('any')
-replaces=(${pkgname}-libre)
-conflicts=(${pkgname}-libre)
-makedepends=('librsvg')
-options=(!strip)
-source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz"
-        'distributor-logo-parabola.svg'
-        'start-here-parabola-symbolic.svg')
-sha512sums=('0c017ddbaa2dba485341d3bb1e321fafad026aafc893fa2519ddfd3fe0475fc8d011c99ce3de581c9b1c6aa7d250312673dda7c10bb12783db2d45816646ddc9'
-            'a6efee8dc521c3975033185eb8a7bf5d89e9a5a157f0f22e2cdee32d631bcaf0930e3a55dbfaf7e7ae2b5249d28895bd06c8957eb6139544b807e8494e601a41'
-            '8bcc02e44606af66908b8c377965f1df36341e7991544c7c89375dfa19d05abb8055280a8ec8038e889ba18aa3dd9ab8e5292c9c7c83fec8fac46bebedc3415e')
-
-prepare() {
- cd "$srcdir/$pkgname-1.3"
- rm -rv debian
-
- # remove nonfree distros and application logos
- for nonfree in archlinux debian fedora frugalware gentoo linux-mint mandriva opensuse redhat slackware ubuntu flash rpmdrake novell skype; do
-  find -name *$nonfree* -delete
- done
-
-  # add the Parabola GNU/Linux-libre logos to the source code
-  cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable
-  cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable/start-here-parabola.svg
-  cp -a "$srcdir/start-here-parabola-symbolic.svg" Faenza/places/scalable
-
-  for size in 22 24 32 48 64 96; do
-   rsvg-convert -w $size -h $size -o Faenza/places/$size/distributor-logo-parabola.png "$srcdir/distributor-logo-parabola.svg"
-   rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola.png "$srcdir/distributor-logo-parabola.svg"
-   rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola-symbolic.png "$srcdir/start-here-parabola-symbolic.svg"
-
-   ln -sf Faenza/places/$size/distributor-logo-parabola.png Faenza/places/$size/parabola-logo.png
-   ln -sf Faenza/places/scalable/distributor-logo-parabola.svg parabola-logo.svg
-   ln -sf Faenza/places/scalable/start-here-parabola.svg Faenza-Dark/places/scalable/start-here-parabola.svg
-   ln -sf Faenza/places/scalable/start-here-parabola-symbolic.svg  Faenza-Dark/places/scalable/start-here-parabola-symbolic.svg
-  done
-}
-
-package() {
-  cd $pkgname-1.3
-  mkdir -p "$pkgdir/usr/share/icons" "$pkgdir/usr/lib" "$pkgdir/usr/share"
-
-  cp -rf Faenza{,-Dark,-Darkest,-Darker,-Ambiance,-Radiance} "$pkgdir/usr/share/icons/"
-  cp -rf rhythmbox "$pkgdir/usr/lib/"
-  cp -rf emesene "$pkgdir/usr/share/"
-
-  # set the Parabola GNU/Linux-libre Distributor and start menu logo
-  for theme in Faenza{,-Dark}; do
-    for size in 22 24 32 48 64 96; do
-      cd "$pkgdir/usr/share/icons/$theme/places/$size/"
-      # no distributor-logo for Faenza-Dark
-      [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.png
-      ln -sf start-here{-parabola,}.png
-    done
-    cd "$pkgdir/usr/share/icons/$theme/places/scalable/"
-    # no distributor-logo for Faenza-Dark
-    [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.svg
-    ln -sf start-here{-parabola,}.svg
-    ln -sf start-here{-parabola-symbolic,-symbolic}.svg
-  done
-
-  for theme in Faenza{,-Dark}; do
-    cd "$pkgdir/usr/share/icons/$theme/apps/scalable/"
-    ln -sf gnome-session-reboot.svg system-reboot.svg
-    for size in 16 22 24 32 48 64 96; do
-      cd "$pkgdir/usr/share/icons/$theme/apps/$size/"
-      ln -sf gnome-session-reboot.png system-reboot.png
-    done
-  done
-}
diff --git a/libre/faenza-icon-theme/distributor-logo-parabola.svg b/libre/faenza-icon-theme/distributor-logo-parabola.svg
deleted file mode 100644
index dec339e9c..000000000
--- a/libre/faenza-icon-theme/distributor-logo-parabola.svg
+++ /dev/null
@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="96"
-   height="96"
-   id="svg2408"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="distributor-logo-parabola.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="752"
-     id="namedview3048"
-     showgrid="false"
-     inkscape:zoom="4.916429"
-     inkscape:cx="46.064774"
-     inkscape:cy="49.491663"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2408"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <defs
-     id="defs2410">
-    <linearGradient
-       id="linearGradient3919">
-      <stop
-         id="stop3921"
-         style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3923"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3903">
-      <stop
-         id="stop3905"
-         style="stop-color:#3b3f5f;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3907"
-         style="stop-color:#abaecb;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3737">
-      <stop
-         id="stop3739"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3741"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3174">
-      <feGaussianBlur
-         id="feGaussianBlur3176"
-         stdDeviation="1.71" />
-    </filter>
-    <linearGradient
-       x1="36.357143"
-       y1="6"
-       x2="36.357143"
-       y2="63.893143"
-       id="linearGradient3188"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.192"
-       y="-0.192"
-       width="1.3839999"
-       height="1.3839999"
-       color-interpolation-filters="sRGB"
-       id="filter3794">
-      <feGaussianBlur
-         id="feGaussianBlur3796"
-         stdDeviation="5.28" />
-    </filter>
-    <linearGradient
-       x1="48"
-       y1="20.220806"
-       x2="48"
-       y2="138.66119"
-       id="linearGradient3613"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="48"
-       cy="90.171875"
-       r="42"
-       fx="48"
-       fy="90.171875"
-       id="radialGradient3619"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" />
-    <clipPath
-       id="clipPath3613">
-      <rect
-         width="84"
-         height="84"
-         rx="6"
-         ry="6"
-         x="6"
-         y="6"
-         id="rect3615"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </clipPath>
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)">
-      <stop
-         id="stop3750-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-5"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3780"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3772"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3725"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3721"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-97)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3026"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="541.33502"
-       y1="104.50665"
-       x2="606.91248"
-       y2="303.14029"
-       id="linearGradient3060-4"
-       xlink:href="#path1082_2_-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.13677913,0,0,0.13677146,122.19582,8.5219823)" />
-    <linearGradient
-       x1="112.49854"
-       y1="6.1372099"
-       x2="112.49853"
-       y2="129.3468"
-       id="path1082_2_-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(287,-83)">
-      <stop
-         id="stop193-9"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop195-6"
-         style="stop-color:#ffffff;stop-opacity:0.60465115"
-         offset="1" />
-      <midPointStop
-         id="midPointStop197-7"
-         style="stop-color:#FFFFFF"
-         offset="0" />
-      <midPointStop
-         id="midPointStop199-4"
-         style="stop-color:#FFFFFF"
-         offset="0.5" />
-      <midPointStop
-         id="midPointStop201-8"
-         style="stop-color:#000000"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="48"
-       y1="90"
-       x2="48"
-       y2="5.9464455"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3903"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="48"
-       cy="71.995491"
-       r="32.993801"
-       fx="48"
-       fy="71.995491"
-       id="radialGradient3925"
-       xlink:href="#linearGradient3919"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0001879,0,-0.00901697)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3737"
-       id="radialGradient3051"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)"
-       cx="48"
-       cy="90.171875"
-       fx="48"
-       fy="90.171875"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3737"
-       id="linearGradient3054"
-       gradientUnits="userSpaceOnUse"
-       x1="36.357143"
-       y1="6"
-       x2="36.357143"
-       y2="63.893143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3903"
-       id="linearGradient3057"
-       gradientUnits="userSpaceOnUse"
-       x1="48"
-       y1="90"
-       x2="48"
-       y2="5.9464455" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#path1082_2_-8"
-       id="linearGradient3060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.13677913,0,0,0.13677146,122.19582,8.5219823)"
-       x1="541.33502"
-       y1="104.50665"
-       x2="606.91248"
-       y2="303.14029" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient3064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0001879,0,-0.00901697)"
-       cx="48"
-       cy="71.995491"
-       fx="48"
-       fy="71.995491"
-       r="32.993801" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#ButtonShadow-0"
-       id="linearGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-97)"
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#ButtonShadow-0"
-       id="linearGradient3075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#ButtonShadow-0"
-       id="linearGradient3078"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#ButtonShadow-0"
-       id="linearGradient3081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#ButtonShadow-0"
-       id="linearGradient3084"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient4038"
-       cx="64.249374"
-       cy="33.144417"
-       fx="64.249374"
-       fy="33.144417"
-       r="38.221073"
-       gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient4042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"
-       cx="64.249374"
-       cy="33.144417"
-       fx="64.249374"
-       fy="33.144417"
-       r="38.221073" />
-    <filter
-       inkscape:collect="always"
-       id="filter4052">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32474815"
-         id="feGaussianBlur4054" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4066">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.97424445"
-         id="feGaussianBlur4068" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient4093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"
-       cx="64.249374"
-       cy="33.144417"
-       fx="64.249374"
-       fy="33.144417"
-       r="38.221073" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient4105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"
-       cx="64.249374"
-       cy="33.144417"
-       fx="64.249374"
-       fy="33.144417"
-       r="38.221073" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="radialGradient4107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"
-       cx="64.249374"
-       cy="33.144417"
-       fx="64.249374"
-       fy="33.144417"
-       r="38.221073" />
-  </defs>
-  <metadata
-     id="metadata2413">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer2">
-    <rect
-       width="86"
-       height="85"
-       rx="6"
-       ry="6"
-       x="5"
-       y="7"
-       id="rect3745"
-       style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" />
-  </g>
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.07999998;fill:url(#linearGradient3084);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3786"
-     d="M 12,95.03125 C 6.4889097,95.03125 1.96875,90.51109 1.96875,85 l 0,-71 C 1.96875,8.4889098 6.4889098,3.96875 12,3.96875 l 72,0 c 5.51109,0 10.03125,4.5201597 10.03125,10.03125 l 0,71 c 0,5.51109 -4.52016,10.03125 -10.03125,10.03125 l -72,0 z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.1;fill:url(#linearGradient3081);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3778"
-     d="M 12,94.03125 C 7.028367,94.03125 2.96875,89.971633 2.96875,85 l 0,-71 C 2.96875,9.0283671 7.0283671,4.96875 12,4.96875 l 72,0 c 4.971633,0 9.03125,4.059617 9.03125,9.03125 l 0,71 c 0,4.971633 -4.059617,9.03125 -9.03125,9.03125 l -72,0 z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:url(#linearGradient3078);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3770"
-     d="M 12,93 C 7.5908667,93 4,89.409133 4,85 L 4,14 C 4,9.5908667 7.5908667,6 12,6 l 72,0 c 4.409133,0 8,3.5908667 8,8 l 0,71 c 0,4.409133 -3.590867,8 -8,8 l -72,0 z" />
-  <rect
-     style="opacity:0.3;fill:url(#linearGradient3075);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect3723"
-     transform="scale(1,-1)"
-     y="-92"
-     x="5"
-     ry="7"
-     rx="7"
-     height="85"
-     width="86" />
-  <rect
-     style="opacity:0.45;fill:url(#linearGradient3072);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect3716"
-     transform="scale(1,-1)"
-     y="-91"
-     x="6"
-     ry="6"
-     rx="6"
-     height="84"
-     width="84" />
-  <rect
-     style="fill:url(#linearGradient3057);fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect2419"
-     y="6"
-     x="6"
-     ry="6"
-     rx="6"
-     height="84"
-     width="84" />
-  <path
-     style="opacity:0.4;fill:url(#linearGradient3054);fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3728"
-     inkscape:connector-curvature="0"
-     d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,2 0,68 0,2 c 0,0.334721 0.04135,0.6507 0.09375,0.96875 0.0487,0.295596 0.09704,0.596915 0.1875,0.875 0.00988,0.03038 0.020892,0.0636 0.03125,0.09375 0.098865,0.287771 0.2348802,0.547452 0.375,0.8125 0.1445918,0.273507 0.3156161,0.535615 0.5,0.78125 0.1843839,0.245635 0.3737765,0.473472 0.59375,0.6875 0.439947,0.428056 0.94291,0.814526 1.5,1.09375 0.278545,0.139612 0.5734731,0.246947 0.875,0.34375 -0.2562018,-0.100222 -0.4867109,-0.236272 -0.71875,-0.375 -0.00741,-0.0044 -0.023866,0.0045 -0.03125,0 -0.031933,-0.0193 -0.062293,-0.04251 -0.09375,-0.0625 -0.120395,-0.0767 -0.2310226,-0.163513 -0.34375,-0.25 -0.1061728,-0.0808 -0.2132809,-0.161112 -0.3125,-0.25 C 8.4783201,88.557317 8.3087904,88.373362 8.15625,88.1875 8.0486711,88.057245 7.9378561,87.922215 7.84375,87.78125 7.818661,87.74287 7.805304,87.69538 7.78125,87.65625 7.716487,87.553218 7.6510225,87.451733 7.59375,87.34375 7.4927417,87.149044 7.3880752,86.928049 7.3125,86.71875 7.30454,86.69694 7.288911,86.6782 7.28125,86.65625 7.2494249,86.5643 7.2454455,86.469419 7.21875,86.375 7.1884177,86.268382 7.1483606,86.171969 7.125,86.0625 7.0521214,85.720988 7,85.364295 7,85 L 7,83 7,15 7,13 C 7,10.218152 9.2181517,8 12,8 l 2,0 68,0 2,0 c 2.781848,0 5,2.218152 5,5 l 0,2 0,68 0,2 c 0,0.364295 -0.05212,0.720988 -0.125,1.0625 -0.04415,0.206893 -0.08838,0.397658 -0.15625,0.59375 -0.0077,0.02195 -0.0233,0.04069 -0.03125,0.0625 -0.06274,0.173739 -0.138383,0.367449 -0.21875,0.53125 -0.04158,0.0828 -0.07904,0.169954 -0.125,0.25 -0.0546,0.09721 -0.126774,0.18835 -0.1875,0.28125 -0.09411,0.140965 -0.204921,0.275995 -0.3125,0.40625 -0.143174,0.17445 -0.303141,0.346998 -0.46875,0.5 -0.01117,0.0102 -0.01998,0.02115 -0.03125,0.03125 -0.138386,0.125556 -0.285091,0.234436 -0.4375,0.34375 -0.102571,0.07315 -0.204318,0.153364 -0.3125,0.21875 -0.0074,0.0045 -0.02384,-0.0044 -0.03125,0 -0.232039,0.138728 -0.462548,0.274778 -0.71875,0.375 0.301527,-0.0968 0.596455,-0.204138 0.875,-0.34375 0.55709,-0.279224 1.060053,-0.665694 1.5,-1.09375 0.219973,-0.214028 0.409366,-0.441865 0.59375,-0.6875 0.184384,-0.245635 0.355408,-0.507743 0.5,-0.78125 0.14012,-0.265048 0.276135,-0.524729 0.375,-0.8125 0.01041,-0.03078 0.02133,-0.06274 0.03125,-0.09375 0.09046,-0.278085 0.1388,-0.579404 0.1875,-0.875 C 89.95865,84.6507 90,84.334721 90,84 l 0,-2 0,-68 0,-2 C 90,8.676 87.324,6 84,6 L 12,6 z" />
-  <path
-     style="opacity:0.2;fill:url(#radialGradient3051);fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path3615"
-     inkscape:connector-curvature="0"
-     d="M 12,90 C 8.676,90 6,87.324 6,84 L 6,82 6,14 6,12 c 0,-0.334721 0.04135,-0.6507 0.09375,-0.96875 0.0487,-0.295596 0.09704,-0.596915 0.1875,-0.875 C 6.29113,10.12587 6.302142,10.09265 6.3125,10.0625 6.411365,9.774729 6.5473802,9.515048 6.6875,9.25 6.8320918,8.976493 7.0031161,8.714385 7.1875,8.46875 7.3718839,8.223115 7.5612765,7.995278 7.78125,7.78125 8.221197,7.353194 8.72416,6.966724 9.28125,6.6875 9.559795,6.547888 9.8547231,6.440553 10.15625,6.34375 9.9000482,6.443972 9.6695391,6.580022 9.4375,6.71875 c -0.00741,0.0044 -0.023866,-0.0045 -0.03125,0 -0.031933,0.0193 -0.062293,0.04251 -0.09375,0.0625 -0.120395,0.0767 -0.2310226,0.163513 -0.34375,0.25 -0.1061728,0.0808 -0.2132809,0.161112 -0.3125,0.25 C 8.4783201,7.442683 8.3087904,7.626638 8.15625,7.8125 8.0486711,7.942755 7.9378561,8.077785 7.84375,8.21875 7.818661,8.25713 7.805304,8.30462 7.78125,8.34375 7.716487,8.446782 7.6510225,8.548267 7.59375,8.65625 7.4927417,8.850956 7.3880752,9.071951 7.3125,9.28125 7.30454,9.30306 7.288911,9.3218 7.28125,9.34375 7.2494249,9.4357 7.2454455,9.530581 7.21875,9.625 7.1884177,9.731618 7.1483606,9.828031 7.125,9.9375 7.0521214,10.279012 7,10.635705 7,11 l 0,2 0,68 0,2 c 0,2.781848 2.2181517,5 5,5 l 2,0 68,0 2,0 c 2.781848,0 5,-2.218152 5,-5 l 0,-2 0,-68 0,-2 C 89,10.635705 88.94788,10.279012 88.875,9.9375 88.83085,9.730607 88.78662,9.539842 88.71875,9.34375 88.71105,9.3218 88.69545,9.30306 88.6875,9.28125 88.62476,9.107511 88.549117,8.913801 88.46875,8.75 88.42717,8.6672 88.38971,8.580046 88.34375,8.5 88.28915,8.40279 88.216976,8.31165 88.15625,8.21875 88.06214,8.077785 87.951329,7.942755 87.84375,7.8125 87.700576,7.63805 87.540609,7.465502 87.375,7.3125 87.36383,7.3023 87.35502,7.29135 87.34375,7.28125 87.205364,7.155694 87.058659,7.046814 86.90625,6.9375 86.803679,6.86435 86.701932,6.784136 86.59375,6.71875 c -0.0074,-0.0045 -0.02384,0.0044 -0.03125,0 -0.232039,-0.138728 -0.462548,-0.274778 -0.71875,-0.375 0.301527,0.0968 0.596455,0.204138 0.875,0.34375 0.55709,0.279224 1.060053,0.665694 1.5,1.09375 0.219973,0.214028 0.409366,0.441865 0.59375,0.6875 0.184384,0.245635 0.355408,0.507743 0.5,0.78125 0.14012,0.265048 0.276135,0.524729 0.375,0.8125 0.01041,0.03078 0.02133,0.06274 0.03125,0.09375 0.09046,0.278085 0.1388,0.579404 0.1875,0.875 C 89.95865,11.3493 90,11.665279 90,12 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z" />
-  <rect
-     style="opacity:0.1;fill:url(#linearGradient3613);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794)"
-     id="rect3171"
-     clip-path="url(#clipPath3613)"
-     y="15"
-     x="15"
-     ry="12"
-     rx="12"
-     height="66"
-     width="66" />
-  <g
-     id="g4095"
-     transform="translate(-1.3624913e-7,-0.815655)">
-    <path
-       style="fill:url(#radialGradient4105);fill-opacity:1;stroke:none"
-       d="m 68.98139,18.058681 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.158951 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.058681 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,21.366156 z M 41.968916,26.055362 C 26.67139,32.431928 12.991689,40.220919 12.991689,40.220919 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-       id="path4040"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4087"
-       d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-       style="opacity:0.1;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:6;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="opacity:0.3;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-       id="path4085"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4083"
-       d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-       style="opacity:0.4;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="opacity:0.4;fill:#1a1a1a;fill-opacity:1;stroke:none"
-       d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-       id="path4081"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(0.3720417,-0.36217118)"
-       id="g4089">
-      <path
-         style="fill:url(#radialGradient4107);fill-opacity:1;stroke:none"
-         d="m 68.98139,18.058681 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.158951 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.058681 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,21.366156 z M 41.968916,26.055362 C 26.67139,32.431928 12.991689,40.220919 12.991689,40.220919 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
-         id="path3488"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 68.96875,18.0625 c -1.805638,0.174842 -3.719049,0.47767 -5.71875,0.90625 l -4.53125,4.71875 c 1.380487,0.163601 2.805429,0.370309 4.25,0.625 l 6,-6.25 z m 8.9375,0.75 -7.03125,7.3125 c 4.628934,1.323647 8.615381,2.971692 11.625,4.71875 1.173125,-5.310086 0.416327,-9.545417 -3.46875,-11.5625 -0.3559,-0.184781 -0.732035,-0.322877 -1.125,-0.46875 z m -23.375,2.5625 c -1.808246,0.583119 -3.633684,1.22712 -5.46875,1.90625 1.164404,-0.05954 2.393939,-0.06327 3.6875,-0.03125 l 1.78125,-1.875 z"
-         id="path4075" />
-    </g>
-  </g>
-</svg>
diff --git a/libre/faenza-icon-theme/start-here-parabola-symbolic.svg b/libre/faenza-icon-theme/start-here-parabola-symbolic.svg
deleted file mode 100644
index a70ad3b3c..000000000
--- a/libre/faenza-icon-theme/start-here-parabola-symbolic.svg
+++ /dev/null
@@ -1,738 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   version="1.0"
-   sodipodi:docname="start-here-parabola-symbolic.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   style="display:inline">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3722">
-      <stop
-         id="stop3724"
-         offset="0"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-      <stop
-         id="stop3726"
-         offset="1"
-         style="stop-color:#f0f0f0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3295">
-      <stop
-         style="stop-color:#559829;stop-opacity:1;"
-         offset="0"
-         id="stop3297" />
-      <stop
-         style="stop-color:#86c837;stop-opacity:1;"
-         offset="1"
-         id="stop3299" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3287">
-      <stop
-         style="stop-color:#cd0000;stop-opacity:1;"
-         offset="0"
-         id="stop3289" />
-      <stop
-         style="stop-color:#e55300;stop-opacity:1;"
-         offset="1"
-         id="stop3291" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3279">
-      <stop
-         style="stop-color:#f08e00;stop-opacity:1;"
-         offset="0"
-         id="stop3281" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3283" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3271">
-      <stop
-         style="stop-color:#395d93;stop-opacity:1;"
-         offset="0"
-         id="stop3273" />
-      <stop
-         style="stop-color:#6e92c7;stop-opacity:1;"
-         offset="1"
-         id="stop3275" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3327">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3330" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3333" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3327"
-       id="linearGradient3335"
-       x1="11.375"
-       y1="22"
-       x2="11.375"
-       y2="-9.817296"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 11 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="22 : 11 : 1"
-       inkscape:persp3d-origin="11 : 7.3333333 : 1"
-       id="perspective102" />
-    <linearGradient
-       id="linearGradient4081">
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="0"
-         id="stop4083" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1;"
-         offset="1"
-         id="stop4085" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4057">
-      <stop
-         style="stop-color:#816647;stop-opacity:1;"
-         offset="0"
-         id="stop4059" />
-      <stop
-         style="stop-color:#a6845d;stop-opacity:1;"
-         offset="1"
-         id="stop4061" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3929">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3931" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3933" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3929"
-       id="linearGradient4051"
-       x1="9.494998"
-       y1="15.516565"
-       x2="9.494998"
-       y2="-4.1786065"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4057"
-       id="linearGradient4063"
-       x1="9.17138"
-       y1="21.000002"
-       x2="9.17138"
-       y2="0.97239029"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4089"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4103"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4105"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4107"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4109"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4111"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4113"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4115"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4117"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4119"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4121"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4123"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4125"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4127"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4129"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4132"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4141"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4148"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4158"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4180"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4182"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4184"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient4186"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2483"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2489"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2495"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2498"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2501"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2506"
-       gradientUnits="userSpaceOnUse"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4081"
-       id="linearGradient2510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"
-       x1="6.101758"
-       y1="154.58195"
-       x2="6.101758"
-       y2="36.995476" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4974">
-      <path
-         id="path4976"
-         d="M 16.625,2 C 15.93281,2.046173 15.13978,2.350316 14.5,2.875 13.716105,3.517873 13.079371,5.1522168 13.25,6.0625 13.337976,6.531842 13.692147,7.1029241 14.03125,7.28125 14.662734,7.613335 15.813682,7.0624791 16.875,5.9375 18.021489,4.722239 18.547995,3.383178 18.15625,2.625 17.915497,2.159052 17.31719,1.953827 16.625,2 z M 10.96875,2.71875 C 10.005789,2.719616 9.496306,3.3967078 9.5,4.6875 c 0.00253,0.88392 0.31322,1.6791318 0.71875,1.875 0.301512,0.145631 0.309051,0.1320361 0.6875,0 C 11.533114,6.343793 12.122053,4.8839409 12,3.90625 11.900109,3.106091 11.556193,2.7182209 10.96875,2.71875 z m -3.8125,1.3125 C 6.976067,4.0573035 6.795347,4.173262 6.625,4.34375 6.281636,4.687396 6.277056,4.8747068 6.28125,5.53125 6.286196,6.305553 6.475145,6.7277249 7,7.28125 7.392601,7.695296 7.675716,7.7200481 8.03125,7.34375 8.416388,6.936117 8.535971,6.296057 8.40625,5.59375 8.208416,4.5226825 7.696799,3.9530895 7.15625,4.03125 z M 4.46875,6.375 C 4.281799,6.4054104 4.1133,6.5115553 3.9375,6.6875 3.476154,7.14923 3.798831,8.4188978 4.53125,9.0625 5.405425,9.830669 6.111327,9.1273309 5.8125,7.78125 5.599846,6.8233425 5.029603,6.2837687 4.46875,6.375 z M 12.5,8.0625 C 11.88094,8.0518483 11.187196,8.1034691 10.46875,8.25 8.61799,8.627471 7.13709,9.3254488 6.1875,10.28125 5.640611,10.831715 5.327697,11.341306 5.0625,12.125 c -0.641919,1.896963 0.546896,4.595678 2.8125,6.4375 0.844088,0.686203 1.359152,0.993313 2.21875,1.28125 0.445736,0.149308 0.799163,0.183992 1.625,0.15625 0.946716,-0.03181 1.139252,-0.07408 1.75,-0.375 0.895036,-0.440989 1.909553,-1.461035 2.34375,-2.34375 0.264885,-0.5385 0.307321,-0.768628 0.28125,-1.21875 -0.04452,-0.768578 -0.342658,-0.977756 -1.3125,-0.96875 -1.38452,0.01285 -1.965756,0.333932 -2.25,1.3125 -0.21469,0.739118 -0.452038,1 -0.9375,1 -0.769368,0 -1.5625,-0.611791 -1.5625,-1.25 0,-0.443994 0.715313,-1.10577 2.5,-2.3125 2.514116,-1.69994 3.378489,-2.734111 3.25,-3.875 C 15.64852,8.7901993 14.35718,8.0944552 12.5,8.0625 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4995">
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="M 30,0 30,22 52,22 52,0 30,0 z M 46.625,2 C 47.31719,1.953827 47.915497,2.159052 48.15625,2.625 48.547995,3.383178 48.021489,4.722239 46.875,5.9375 45.813682,7.0624791 44.662734,7.613335 44.03125,7.28125 43.692147,7.1029241 43.337976,6.531842 43.25,6.0625 43.079371,5.1522168 43.716105,3.517873 44.5,2.875 45.13978,2.350316 45.93281,2.046173 46.625,2 z m -5.65625,0.71875 c 0.587443,-5.291e-4 0.931359,0.387341 1.03125,1.1875 0.122053,0.9776909 -0.466886,2.437543 -1.09375,2.65625 -0.378449,0.1320361 -0.385988,0.145631 -0.6875,0 C 39.81322,6.3666318 39.502528,5.57142 39.5,4.6875 39.496306,3.3967078 40.005789,2.719616 40.96875,2.71875 z m -3.8125,1.3125 c 0.540549,-0.078161 1.052166,0.4914325 1.25,1.5625 0.129721,0.702307 0.01014,1.342367 -0.375,1.75 C 37.675716,7.7200481 37.392601,7.695296 37,7.28125 36.475145,6.7277249 36.286196,6.305553 36.28125,5.53125 36.277056,4.8747068 36.281636,4.687396 36.625,4.34375 36.795347,4.173262 36.976067,4.0573035 37.15625,4.03125 z M 34.46875,6.375 C 35.029603,6.2837687 35.599846,6.8233425 35.8125,7.78125 36.111327,9.1273309 35.405425,9.830669 34.53125,9.0625 33.798831,8.4188978 33.476154,7.14923 33.9375,6.6875 34.1133,6.5115553 34.281799,6.4054104 34.46875,6.375 z M 42.5,8.0625 c 1.85718,0.031955 3.14852,0.7276993 3.28125,1.90625 0.128489,1.140889 -0.735884,2.17506 -3.25,3.875 -1.784687,1.20673 -2.5,1.868506 -2.5,2.3125 0,0.638209 0.793132,1.25 1.5625,1.25 0.485462,0 0.72281,-0.260882 0.9375,-1 0.284244,-0.978568 0.86548,-1.299646 2.25,-1.3125 0.969842,-0.009 1.267977,0.200172 1.3125,0.96875 0.02607,0.450122 -0.01637,0.68025 -0.28125,1.21875 -0.434197,0.882715 -1.448714,1.902761 -2.34375,2.34375 -0.610748,0.300916 -0.803284,0.343192 -1.75,0.375 -0.825837,0.02774 -1.179264,-0.0069 -1.625,-0.15625 C 39.234152,19.555813 38.719088,19.248703 37.875,18.5625 35.609396,16.720678 34.420581,14.021963 35.0625,12.125 35.327697,11.341306 35.640611,10.831715 36.1875,10.28125 37.13709,9.3254488 38.61799,8.627471 40.46875,8.25 41.187196,8.1034691 41.88094,8.0518483 42.5,8.0625 z"
-         id="path4997"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <inkscape:perspective
-       id="perspective4374"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="StandardGradient-1"
-       gradientTransform="matrix(0.9984539,0,0,0.9984539,-0.0459776,0.05767558)"
-       x1="10.710332"
-       y1="1.9963325"
-       x2="10.710332"
-       y2="18.974037"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.86274511;"
-         offset="0"
-         id="stop3277-4" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.47058824;"
-         offset="1"
-         id="stop3279-3" />
-    </linearGradient>
-    <linearGradient
-       id="SpecificGradient-5"
-       x1="10.761708"
-       y1="3.9999998"
-       x2="10.761708"
-       y2="18.011395"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#a50000;stop-opacity:1;"
-         offset="0"
-         id="stop3292-8" />
-      <stop
-         style="stop-color:#e73800;stop-opacity:1;"
-         offset="1"
-         id="stop3294-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient3738"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient3741"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595"
-       gradientTransform="translate(-30,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient3747"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595"
-       gradientTransform="translate(0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient3751"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3758">
-      <path
-         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
-         d="m -30,0 0,22 22,0 0,-22 -22,0 z m 16.625,2 c 0.69219,-0.046173 1.290497,0.159052 1.53125,0.625 0.391745,0.758178 -0.134761,2.097239 -1.28125,3.3125 -1.061318,1.124979 -2.212266,1.675835 -2.84375,1.34375 C -16.307853,7.102924 -16.66202,6.531842 -16.75,6.0625 -16.920629,5.152217 -16.283895,3.517873 -15.5,2.875 -14.86022,2.350316 -14.06719,2.046173 -13.375,2 z m -5.65625,0.71875 c 0.587443,-5.29e-4 0.93136,0.387341 1.03125,1.1875 0.122053,0.977691 -0.466886,2.437543 -1.09375,2.65625 -0.378449,0.132036 -0.385988,0.145631 -0.6875,0 -0.40553,-0.195868 -0.71625,-0.99108 -0.71875,-1.875 -0.0037,-1.290792 0.505789,-1.967884 1.46875,-1.96875 z m -3.8125,1.3125 c 0.540549,-0.078161 1.052166,0.4914325 1.25,1.5625 0.129721,0.702307 0.01014,1.342367 -0.375,1.75 -0.355534,0.376298 -0.638649,0.351546 -1.03125,-0.0625 -0.524855,-0.553525 -0.71385,-0.975697 -0.71875,-1.75 -0.0042,-0.656543 3.86e-4,-0.843854 0.34375,-1.1875 0.170347,-0.170488 0.351067,-0.286447 0.53125,-0.3125 z m -2.6875,2.34375 c 0.560853,-0.091231 1.131096,0.4483425 1.34375,1.40625 0.298827,1.346081 -0.407075,2.049419 -1.28125,1.28125 -0.732419,-0.643602 -1.055096,-1.91327 -0.59375,-2.375 0.1758,-0.1759448 0.344299,-0.282089 0.53125,-0.3125 z M -17.5,8.0625 c 1.85718,0.031955 3.14852,0.7276993 3.28125,1.90625 0.128489,1.140889 -0.735884,2.17506 -3.25,3.875 -1.784687,1.20673 -2.5,1.868506 -2.5,2.3125 0,0.638209 0.793132,1.25 1.5625,1.25 0.485462,0 0.72281,-0.260882 0.9375,-1 0.284244,-0.978569 0.86548,-1.29965 2.25,-1.3125 0.969842,-0.009 1.26798,0.200172 1.3125,0.96875 0.02607,0.450123 -0.01637,0.68025 -0.28125,1.21875 -0.434197,0.882715 -1.448714,1.902761 -2.34375,2.34375 -0.610748,0.30092 -0.803284,0.34319 -1.75,0.375 -0.825837,0.02774 -1.179264,-0.0069 -1.625,-0.15625 -0.859598,-0.287937 -1.374662,-0.595047 -2.21875,-1.28125 -2.265604,-1.841822 -3.454419,-4.540537 -2.8125,-6.4375 0.265198,-0.783694 0.578111,-1.293285 1.125,-1.84375 0.94959,-0.9558013 2.43049,-1.653779 4.28125,-2.03125 0.718447,-0.146531 1.41219,-0.198152 2.03125,-0.1875 z"
-         id="path3760"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient6801"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient6806"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1"
-       id="linearGradient6810"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="8"
-       x2="12"
-       y2="20.041595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#StandardGradient-1-1"
-       id="linearGradient3745"
-       x1="13"
-       y1="2"
-       x2="13"
-       y2="18.031219"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1252108,0,0,1.1249999,-2.5078172,-0.2808096)" />
-    <linearGradient
-       id="StandardGradient-1-1"
-       gradientTransform="matrix(0.9984539,0,0,0.9984539,-0.0459776,0.05767558)"
-       x1="10.710332"
-       y1="1.9963325"
-       x2="10.710332"
-       y2="18.974037"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.86274511;"
-         offset="0"
-         id="stop3277-4-7" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.47058824;"
-         offset="1"
-         id="stop3279-3-5" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#f05656"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.640001"
-     inkscape:cx="2.1794604"
-     inkscape:cy="0.60330206"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:showpageshadow="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1596"
-     inkscape:window-height="1161"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0">
-    <sodipodi:guide
-       orientation="1,0"
-       position="0,112"
-       id="guide2383" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="26.278146,128"
-       id="guide2385" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="128,54.082119"
-       id="guide2387" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="78.156291,0"
-       id="guide2389" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="60.863576,64.084768"
-       id="guide2391" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3672"
-       visible="true"
-       enabled="true"
-       empspacing="8"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Dark background"
-     sodipodi:insensitive="true"
-     style="display:none"
-     transform="translate(0,-6)">
-    <rect
-       y="0"
-       x="0"
-       height="22"
-       width="22"
-       id="rect4898"
-       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Pale darkground"
-     sodipodi:insensitive="true"
-     style="display:none"
-     transform="translate(0,-6)">
-    <rect
-       style="fill:#efebe7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4126"
-       width="22"
-       height="22"
-       x="0"
-       y="0" />
-  </g>
-  <g
-     inkscape:label="Button"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline"
-     transform="translate(0,-6)">
-    <path
-       style="fill:#d40000;fill-opacity:1;stroke:none"
-       d="m -13.375,32 c -0.69219,0.04617 -1.48522,0.350316 -2.125,0.875 -0.783895,0.642873 -1.420629,2.277217 -1.25,3.1875 0.08798,0.469342 0.442147,1.040424 0.78125,1.21875 0.631484,0.332085 1.782432,-0.218771 2.84375,-1.34375 1.146489,-1.215261 1.672995,-2.554322 1.28125,-3.3125 C -12.084503,32.159052 -12.68281,31.953827 -13.375,32 z m -5.65625,0.71875 c -0.962961,8.66e-4 -1.472444,0.677958 -1.46875,1.96875 0.0025,0.88392 0.31322,1.679132 0.71875,1.875 0.301512,0.145631 0.309051,0.132036 0.6875,0 0.626864,-0.218707 1.215803,-1.678559 1.09375,-2.65625 -0.09989,-0.800159 -0.443807,-1.188029 -1.03125,-1.1875 z m -3.8125,1.3125 c -0.180183,0.02605 -0.360903,0.142012 -0.53125,0.3125 -0.343364,0.343646 -0.347944,0.530957 -0.34375,1.1875 0.0049,0.774303 0.193895,1.196475 0.71875,1.75 0.392601,0.414046 0.675716,0.438798 1.03125,0.0625 0.385138,-0.407633 0.504721,-1.047693 0.375,-1.75 -0.197834,-1.071067 -0.709451,-1.64066 -1.25,-1.5625 z m -2.6875,2.34375 c -0.186951,0.03041 -0.35545,0.136555 -0.53125,0.3125 -0.461346,0.46173 -0.138669,1.731398 0.59375,2.375 0.874175,0.768169 1.580077,0.06483 1.28125,-1.28125 -0.212654,-0.957908 -0.782897,-1.497481 -1.34375,-1.40625 z M -17.5,38.0625 c -0.61906,-0.01065 -1.312804,0.04097 -2.03125,0.1875 -1.85076,0.377471 -3.33166,1.075449 -4.28125,2.03125 -0.546889,0.550465 -0.859803,1.060056 -1.125,1.84375 -0.641919,1.896963 0.546896,4.595678 2.8125,6.4375 0.844088,0.686203 1.359152,0.993313 2.21875,1.28125 0.445736,0.149308 0.799163,0.183992 1.625,0.15625 0.946716,-0.03181 1.139252,-0.07408 1.75,-0.375 0.895036,-0.440989 1.909553,-1.461035 2.34375,-2.34375 0.264885,-0.5385 0.307321,-0.768628 0.28125,-1.21875 -0.04452,-0.768578 -0.342658,-0.977756 -1.3125,-0.96875 -1.38452,0.01285 -1.965756,0.333932 -2.25,1.3125 -0.21469,0.739118 -0.452038,1 -0.9375,1 -0.769368,0 -1.5625,-0.611791 -1.5625,-1.25 0,-0.443994 0.715313,-1.10577 2.5,-2.3125 2.514116,-1.69994 3.378489,-2.734111 3.25,-3.875 -0.13273,-1.178551 -1.42407,-1.874295 -3.28125,-1.90625 z"
-       id="path4951"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 12.794607,7.2463486 c -0.412619,0.039429 -0.850706,0.1118949 -1.307673,0.2085403 L 8.5918944,10.425987 c 0.3318369,0.03992 0.6355226,0.105825 0.9126725,0.198728 L 12.794607,7.2463486 z m 2.038798,0.1668323 -4.006442,4.1094871 C 11.953734,12.982879 11.556824,15.916073 9.1856228,20.75 10.939952,18.83497 18.596402,9.318268 15.093469,7.5235868 15.01214,7.4819169 14.923205,7.4460756 14.833405,7.4131809 z M 9.494754,7.9921903 C 8.9405327,8.1685562 8.3764085,8.3684955 7.8141582,8.5810114 L 5.898033,10.546205 c 0.4395322,-0.07126 0.8562847,-0.119159 1.2487937,-0.144752 L 9.494754,7.9921903 z M 6.6217935,9.049616 C 3.1260463,10.487544 0,12.243977 0,12.243977 1.8570277,11.54804 3.5341689,11.027779 4.9976258,10.715491 L 6.6217935,9.049616 z"
-       id="path3488"
-       style="fill:#bebebe;stroke:none;fill-opacity:1" />
-  </g>
-</svg>
diff --git a/libre/java-bcel/PKGBUILD b/libre/java-bcel/PKGBUILD
deleted file mode 100644
index bb2875008..000000000
--- a/libre/java-bcel/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-_libname=bcel
-pkgname=java-${_libname}
-pkgver=6.0
-pkgrel=1.parabola1
-pkgdesc="Java library to analyze, create, and manipulate (binary) Java class files"
-arch=('any')
-url='https://commons.apache.org/proper/commons-bcel/'
-license=('APACHE')
-depends=('java-runtime')
-makedepends=('java-environment' 'jh')
-source=("http://archive.apache.org/dist/jakarta/${_libname}/source/${_libname}-$pkgver-src.tar.gz")
-sha256sums=('b963b9f0614f17de40da1de265e44476b80a8cc8a36c07a3acfe48f603306958')
-
-prepare() {
-  cd "$srcdir/${_libname}-$pkgver-src"
-  mkdir -p build/classes
-}
-
-build() {
-  cd "$srcdir/${_libname}-$pkgver-src"
-  javac -d build/classes -encoding UTF-8 \
-    $(find src/main/java -name \*.java)
-  javadoc -sourcepath src/main/java -d build/javadoc \
-    -encoding UTF-8 -subpackages org
-
-  jar -cvf "${_libname}.jar" -C build/classes .
-}
-
-package() {
-  cd "$srcdir/${_libname}-$pkgver-src"
-
-  # Install license file
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-
-  # Install documentation
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname"
-
-  # Install Maven artifacts
-  export DESTDIR=$pkgdir
-  jh mvn-install "org.apache.${_libname}" ${_libname} $pkgver \
-    pom.xml "${_libname}.jar" "${_libname}.jar"
-
-  ln -s "/usr/share/java/${_libname}.jar" \
-    "$pkgdir/usr/share/java/${_libname}-$pkgver.jar"
-}
diff --git a/libre/java-commons-net1/PKGBUILD b/libre/java-commons-net1/PKGBUILD
deleted file mode 100644
index b17eb9665..000000000
--- a/libre/java-commons-net1/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_libname=commons-net
-pkgname=java-${_libname}1
-pkgver=1.4.1
-pkgrel=3.parabola1
-pkgdesc="Apache library that implements the client side of many basic Internet protocols"
-arch=('any')
-url="http://commons.apache.org/net/"
-license=('APACHE')
-depends=('java-runtime-headless')
-makedepends=('apache-ant' 'jakarta-oro' 'jh')
-source=("https://archive.apache.org/dist/commons/net/source/${_libname}-${pkgver}-src.tar.gz")
-sha512sums=('6ac697536eff947cd0aa828c887e9cc4046c49a593c760bbc59db7e04cf0d7456e84d22504cfa2f6915315dc061e3499382f05bd7740bf79a532a4d9d42c0da8')
-
-build() {
-  cd "${srcdir}/${_libname}-${pkgver}"
-  ant dist -Dnoget=true -lib "/usr/share/java/jakarta-oro.jar"
-}
-
-package() {
-  cd "${srcdir}/${_libname}-${pkgver}"
-
-  # Install license file
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-
-  # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "dist/docs/api" "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "src/java/examples" "${pkgdir}/usr/share/doc/${pkgname}/examples"
-
-  # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install ${_libname} ${_libname} ${pkgver} \
-    "${srcdir}/${_libname}-${pkgver}/project.xml" \
-    "${srcdir}/${_libname}-${pkgver}/target/${_libname}-${pkgver}.jar" \
-    "${_libname}.jar"
-  ln -s "/usr/share/java/${_libname}.jar" \
-    "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar"
-}
diff --git a/libre/jedit/PKGBUILD b/libre/jedit/PKGBUILD
deleted file mode 100644
index 017187ddb..000000000
--- a/libre/jedit/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=jedit
-pkgver=5.4.0
-pkgrel=5.parabola1
-pkgdesc='Editor for programmers'
-arch=('any')
-url='http://jedit.org/'
-license=('GPL')
-depends=('java-runtime>=8')
-makedepends=('java-environment=8' 'apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell' 'docbook-xsl-saxon'
-             'gendesk' 'java-hamcrest' 'jsr305' 'junit' 'xerces2-java')
-optdepends=('noto-fonts: usable font')
-options=('!emptydirs')
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/jedit${pkgver}source.tar.bz2"
-        'jedit.sh' 'jeditbg.sh' 'jedit.props' 'jedit-fix_build.patch')
-sha256sums=('b42dec6c81936b8974308f03c8f356487586cec782d79659b8ae67953c8edf71'
-            '91d9b4b0c4855c9624ceea8c6b40c90b53fb15a020b6d954f4bb6b4b934e0348'
-            '5cf267b6ee1f908ee7e9a830dc98f03a3a4a53db2822fce6a2cb5ed02d444c69'
-            'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347'
-            '1d747fb3d4b0d4af3d3e752d92858067e02e8160d4d22cf820bd9f45c0fff90b')
-
-prepare() {
-  gendesk -f -n \
-    --pkgname "$pkgname" \
-    --pkgdesc "$pkgdesc" \
-    --exec 'jeditbg %U' \
-    --name jEdit \
-    --genericname Editor
-
-  cd jEdit
-  mkdir -p lib/{ant-contrib,compile,docbook,ivy,default-plugins,scripting,test}
-  ln -sf /usr/share/java/ant-contrib.jar lib/ant-contrib/ant-contrib.jar
-  ln -sf /usr/share/java/apache-ivy/ivy.jar lib/ivy/ivy.jar
-  ln -sf /usr/share/java/bsh.jar lib/ant-contrib/bsh.jar
-  ln -sf /usr/share/java/docbook-xsl-saxon.jar lib/docbook/docbook-xsl-saxon.jar
-  ln -sf /usr/share/java/saxon.jar lib/docbook/saxon.jar
-  ln -sf /usr/share/java/xercesImpl.jar lib/docbook/xercesImpl.jar
-  ln -sf /usr/share/java/hamcrest-core.jar lib/test/hamcrest-core.jar
-  ln -sf /usr/share/java/hamcrest-library.jar lib/test/hamcrest-library.jar
-  ln -sf /usr/share/java/jsr305.jar lib/compile/jsr305.jar
-  ln -sf /usr/share/java/junit.jar lib/test/junit.jar
-  patch -Np1 -i "${srcdir}/jedit-fix_build.patch"
-}
-
-build() {
-  cd jEdit
-  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-  ant build docs-html \
-    -Divy.done=true
-}
-
-package() {
-  cd jEdit
-
-  # Install documentation
-  install -d "$pkgdir/usr/share/java/$pkgname"
-  cp -r build/doc "$pkgdir/usr/share/java/$pkgname"
-
-  # Install jars
-  install -D -m644 build/$pkgname.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
-
-  # Install keymaps
-  cp -r build/keymaps "${pkgdir}/usr/share/java/${pkgname}"
-
-  # Install macros
-  cp -r build/macros "${pkgdir}/usr/share/java/${pkgname}"
-
-  # Install modes
-  cp -r build/modes "${pkgdir}/usr/share/java/${pkgname}"
-
-  # Install properties
-  cp -r build/properties "${pkgdir}/usr/share/java/${pkgname}"
-
-  # Install startup
-  cp -r build/startup "${pkgdir}/usr/share/java/${pkgname}"
-
-  # Man pages
-  install -Dm644 package-files/linux/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
-
-  install -d "$pkgdir/usr/bin"
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  install -Dm755 "$srcdir/${pkgname}bg.sh" "$pkgdir/usr/bin/${pkgname}bg"
-  install -Dm644 "$srcdir/$pkgname.props" "$pkgdir/usr/share/$pkgname/default.props"
-  install -Dm644 doc/$pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-}
diff --git a/libre/jedit/jedit-fix_build.patch b/libre/jedit/jedit-fix_build.patch
deleted file mode 100644
index 15d2da728..000000000
--- a/libre/jedit/jedit-fix_build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- jEdit.orig/build.xml	2015-10-20 12:56:08.000000000 -0500
-+++ jEdit/build.xml	2016-07-02 10:14:37.488512109 -0500
-@@ -119,7 +119,7 @@
- 
- 	<target name="retrieve"
- 		description="retrieve the dependencies"
--		depends="init,init-ivy"
-+		depends="init"
- 		unless="ivy.done">
- 		<ivy:retrieve sync="true"/>
- 		<ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
-@@ -629,8 +629,6 @@
- 
- 	<target name="unpack-docbook-xsl"
- 		depends="init,retrieve">
--		<unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"
--		       dest="${build.dir}/docbook-xsl/"/>
- 	</target>
- 
- 	<presetdef name="dependset.build">
-@@ -660,9 +657,9 @@
- 			<factory name="com.icl.saxon.TransformerFactoryImpl"/>
- 			<xmlcatalog>
- 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
--					location="${build.dir}/docbook-xsl/docbook/html/chunk.xsl"/>
-+					location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/html/chunk.xsl"/>
- 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
--					location="${build.dir}/docbook-xsl/docbook/fo/docbook.xsl"/>
-+					location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/docbook.xsl"/>
- 			</xmlcatalog>
- 			<sysproperty key="javax.xml.parsers.DocumentBuilderFactory"
- 				     value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
diff --git a/libre/jedit/jedit.props b/libre/jedit/jedit.props
deleted file mode 100644
index a712b9686..000000000
--- a/libre/jedit/jedit.props
+++ /dev/null
@@ -1,63 +0,0 @@
-# --- Arch Linux defaults for jEdit ---
-#
-# Just remove this file (~/.jedit/properties) to use the original jEdit defaults.
-#
-# startup
-firstTime=false
-tip.show=false
-# buffers
-buffer.tabSize=4
-buffer.indentSize=4
-buffer.encoding=UTF-8
-buffer.maxLineLen=99
-# look and feel, fonts and colors
-icon-theme=tango
-lookAndFeel=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
-view.fontsize=14
-view.font=Noto Mono
-view.selectionFg=false
-view.antiAlias=standard
-view.caretColor=\#333333
-view.lineHighlightColor=\#deebfb
-view.thickCaret=false
-view.selectionFgColor=\#000000
-view.extendedState=0
-view.wrapGuideColor=\#dedede
-view.structureHighlightColor=\#3d9bc4
-view.selectionColor=\#cccccc
-view.status.show-caret-virtual=true
-view.status.foreground=\#000000
-view.status.show-caret-linenumber=true
-view.status.show-caret-bufferlength=true
-view.status.background=\#ffffff
-view.status.show-caret-dot=true
-view.status.memory.background=\#66699a
-view.status.show-caret-offset=true
-view.style.invalid=color\:\#ff1e00 bgColor\:\#ffffcc
-view.style.digit=color\:\#330066
-view.style.literal4=color\:\#0182bc
-view.style.literal3=color\:\#0700cc
-view.style.literal2=color\:\#760000
-view.style.literal1=color\:\#90001c
-view.style.comment4=color\:\#a2a2a2
-view.style.label=color\:\#009500
-view.style.comment3=color\:\#868686
-view.style.comment2=color\:\#383838
-view.style.comment1=color\:\#434343
-view.style.keyword4=color\:\#00a228
-view.style.keyword3=color\:\#0b2700
-view.style.keyword2=color\:\#000066
-view.style.keyword1=color\:\#0033cc
-view.style.function=color\:\#006600
-view.style.operator=color\:\#000000
-view.gutter.fontsize=14
-view.gutter.font=Courier 10 Pitch
-view.gutter.highlightColor=\#660000
-view.gutter.selectionAreaBgColor=\#f0f0f0
-view.gutter.highlightInterval=10
-view.gutter.focusBorderColor=\#ececec
-view.gutter.highlightCurrentLine=false
-view.gutter.bgColor=\#f0f0f0
-view.gutter.currentLineColor=\#006699
-view.gutter.fgColor=\#3c3c3c
-view.gutter.selectionAreaWidth=12
diff --git a/libre/jedit/jedit.sh b/libre/jedit/jedit.sh
deleted file mode 100644
index df16cfa6a..000000000
--- a/libre/jedit/jedit.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Runs jEdit - Programmer's Text Editor
-
-# If both $HOME/.jedit and $HOME/.jedit/properties doesn't exist,
-# copy in a default property file.
-if [ ! -e $HOME/.jedit ]; then
-  if [ ! -e $HOME/.jedit/properties ]; then
-    mkdir -p "$HOME/.jedit"
-    cp "/usr/share/jedit/default.prop"s "$HOME/.jedit/properties"
-  fi
-fi
-
-# Set the initial and maximum JVM heap size
-JAVA_HEAP_MAX_SIZE=192
-
-# Start jEdit
-exec java -Xmx${JAVA_HEAP_MAX_SIZE}M -Dawt.useSystemAAFontSettings=lcd -jar "/usr/share/java/jedit/jedit.jar" "$@"
diff --git a/libre/jedit/jeditbg.sh b/libre/jedit/jeditbg.sh
deleted file mode 100644
index f4d08ed27..000000000
--- a/libre/jedit/jeditbg.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# Runs jEdit in background-mode, ready to reuse the running instance
-jedit -background -reuseview "$@"
diff --git a/libre/libquicktime/PKGBUILD b/libre/libquicktime/PKGBUILD
deleted file mode 100644
index b5501886c..000000000
--- a/libre/libquicktime/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Maintainer (Arch): David Runge <dvzrv@archlinux.org>
-# Contributor (Arch): Federico Cinelli <cinelli@aur.archlinux.org>
-# Contributor (Arch): Mateusz Herych   <heniekk@gmail.com>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Jorge Lopez <jorginho@lavabit.com>
-
-pkgname=libquicktime
-pkgver=1.2.4
-pkgrel=22
-pkgrel+=.parabola1
-pkgdesc="A library for reading and writing quicktime files"
-pkgdesc+=", without nonfree faac support"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-license=('LGPL2.1')
-url="http://libquicktime.sourceforge.net/"
-depends=('glib2' 'glibc' 'zlib')
-makedepends=('alsa-lib' 'faad2' 'ffmpeg' 'gtk2' 'lame' 'libdv'
-'libglvnd' 'libjpeg-turbo' 'libvorbis' 'libx11' 'libxaw' 'libxext' 'libxt'
-'libxv' 'schroedinger' 'sndio' 'x264')
-optdepends=('alsa-lib: for lqtplay'
-            'ffmpeg: for lqt_ffmpeg plugin'
-            'gtk2: for libquicktime_config'
-            'lame: for lqt_lame plugin'
-            'libdv: for lqt_dv plugin'
-            'libglvnd: for lqtplay'
-            'libjpeg-turbo: for lqt_mjpeg plugin'
-            'libpng: for lqt_png plugin'
-            'libvorbis: for lqt_lame and lqt_vorbis plugin'
-            'libx11: for lqtplay'
-            'libxaw: for lqtplay'
-            'libxext: for lqtplay'
-            'libxt: for lqtplay'
-            'libxv: for lqtplay'
-            'schroedinger: for lqt_schroedinger plugin'
-            'sndio: for lqtplay'
-            'x264: for lqt_x264 plugin')
-provides=('libquicktime.so')
-source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "${pkgname}-1.2.4-CVE-2016-2399.patch"
-        "${pkgname}-1.2.4-CVE-2017-9122_et_al.patch"
-        "${pkgname}-1.2.4-faad2.patch"
-        "${pkgname}-1.2.4-ffmpeg2.patch"
-        "${pkgname}-1.2.4-ffmpeg29.patch"
-        "${pkgname}-1.2.4-ffmpeg4.patch"
-        "${pkgname}-1.2.4-ffmpeg-codecs.patch"
-        "${pkgname}-1.2.4-libavutil.patch")
-sha512sums=('6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd'
-            '759fee13bc96db036063efcd8288c0e467ce811b597cf6c0ceed1c8927593963174f4f3324512db0e773e936a4b9fe5c8d8fc9e0f00b2ce59110661175986f9c'
-            '93639d3fe12eefddd1b457be702ec0a4a64a73c44fce6b3134e50bb9a4e7e5f25d256d3ace6ec5e774f2db4c0d68725f3e35e901f7d932a4be9cba566eab528e'
-            '3e751330ebbc4026363efd45b21c60c313ea169a57a5cdfa46125e126aab34c2dea3629ce92e7b0b5f14693db4f11723177fd28611e2e979cc8fcd506077509e'
-            '32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d'
-            '2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e'
-            '1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8'
-            '20c535444de1f3e9a68c35ee4eb409f150e6340fd43dda4544791454f42c031b24c08f651e0351f5a22dcb59459ac372aa70d82a1d20482b2d997589e19087fd'
-            '691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e')
- 
-replaces=("${pkgname}-libre" "${pkgname}-parabola")
-conflicts=("${pkgname}-libre" "${pkgname}-parabola")
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  # boatload of CVEs: http://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=libquicktime
-  patch -Np1 -i "../${pkgname}-1.2.4-CVE-2016-2399.patch"
-  patch -Np1 -i "../${pkgname}-1.2.4-CVE-2017-9122_et_al.patch"
-  # checks for faad2 are broken in configure.ac
-  patch -Np1 -i "../${pkgname}-1.2.4-faad2.patch"
-  # ffmpeg compatibility is very ancient
-  patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg2.patch"
-  patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg29.patch"
-  patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg4.patch"
-  patch -Np1 -i "../${pkgname}-1.2.4-libavutil.patch"
-  patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg-codecs.patch"
-  autoreconf -vfi
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --enable-gpl \
-    --with-ffmpeg \
-    --with-libdv \
-    --with-x264 \
-    --without-doxygen \
-    --without-faac
-  make
-}
-
-package() {
-  depends+=('libfaad.so')
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -vDm 644 {AUTHORS,ChangeLog,README,TODO} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
diff --git a/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch b/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch
deleted file mode 100644
index a1737c0dc..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399
-
-diff --git a/src/util.c b/src/util.c
-index d8dc3c3..9422fc5 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file)
- 
- void quicktime_read_pascal(quicktime_t *file, char *data)
- {
--	char len = quicktime_read_char(file);
--	quicktime_read_data(file, (uint8_t*)data, len);
--	data[(int)len] = 0;
-+	int len = quicktime_read_char(file);
-+	if ((len > 0) && (len < 256)) {
-+          /* data[] is expected to be 256 bytes long */
-+          quicktime_read_data(file, (uint8_t*)data, len);
-+          data[len] = 0;
-+        } else {
-+          data[0] = 0;
-+        }
- }
- 
- void quicktime_write_pascal(quicktime_t *file, char *data)
diff --git a/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch b/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
deleted file mode 100644
index 06fb7b337..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From: Burkhard Plaum <plaum@ipf.uni-stuttgart.de>
-Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706
-
-Hi,
-
-I committed some (mostly trivial) updates to CVS. The following CVE's
-are fixed and/or no longer reproducible:
-
-CVE-2017-9122
-CVE-2017-9123
-CVE-2017-9124
-CVE-2017-9125
-CVE-2017-9126
-CVE-2017-9127
-CVE-2017-9128
-
-I was a bit surprised that one simple sanity check fixes a whole bunch of files.
-
-So it could be, that the problems are still there, but better hidden since the
-critical code isn't executed anymore with the sample files I got.
-
-If someone encounters more crashes, feel free to report them.
-
-Burkhard
-
---- a/include/lqt_funcprotos.h
-+++ b/include/lqt_funcprotos.h
-@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t
- int quicktime_write_char32(quicktime_t *file, char *string);
- float quicktime_read_fixed16(quicktime_t *file);
- int quicktime_write_fixed16(quicktime_t *file, float number);
--unsigned long quicktime_read_uint32(quicktime_t *file);
--long quicktime_read_int32(quicktime_t *file);
--long quicktime_read_int32_le(quicktime_t *file);
-+uint32_t quicktime_read_uint32(quicktime_t *file);
-+int32_t quicktime_read_int32(quicktime_t *file);
-+int32_t quicktime_read_int32_le(quicktime_t *file);
- int64_t quicktime_read_int64(quicktime_t *file);
- int64_t quicktime_read_int64_le(quicktime_t *file);
- long quicktime_read_int24(quicktime_t *file);
---- a/src/atom.c
-+++ b/src/atom.c
-@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime
- 			atom->size = read_size64(header);
- 			atom->end = atom->start + atom->size;
- 		}
-+/* Avoid broken files */
-+        if(atom->end > file->total_length)
-+          result = 1;
- 	}
- 
- 
---- a/src/lqt_quicktime.c
-+++ b/src/lqt_quicktime.c
-@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil
-                 quicktime_set_position(file, start_position);
-                 free(temp);
- 
--                quicktime_read_moov(file, &file->moov, &leaf_atom);
--                got_header = 1;
-+                if(!quicktime_read_moov(file, &file->moov, &leaf_atom))
-+                  got_header = 1;
-                 }
-               else
-                 quicktime_atom_skip(file, &leaf_atom);
---- a/src/moov.c
-+++ b/src/moov.c
-@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil
- 		if(quicktime_atom_is(&leaf_atom, "trak"))
- 		{
- 			quicktime_trak_t *trak = quicktime_add_trak(file);
--			quicktime_read_trak(file, trak, &leaf_atom);
-+			if(quicktime_read_trak(file, trak, &leaf_atom))
-+                          return 1;
- 		}
- 		else
- 		if(quicktime_atom_is(&leaf_atom, "udta"))
---- a/src/trak.c
-+++ b/src/trak.c
-@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil
-     else quicktime_atom_skip(file, &leaf_atom);
-     } while(quicktime_position(file) < trak_atom->end);
- 
-+  /* Do some sanity checks to prevent later crashes */
-+  if(trak->mdia.minf.is_video || trak->mdia.minf.is_video)
-+    {
-+    if(!trak->mdia.minf.stbl.stsc.table ||
-+       !trak->mdia.minf.stbl.stco.table)
-+      return 1;
-+    }
-+
- #if 1 
-   if(trak->mdia.minf.is_video &&
-      quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac"))
---- a/src/util.c
-+++ b/src/util.c
-@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t
- 	return quicktime_write_data(file, data, 2);
- }
- 
--unsigned long quicktime_read_uint32(quicktime_t *file)
-+uint32_t quicktime_read_uint32(quicktime_t *file)
- {
--	unsigned long result;
--	unsigned long a, b, c, d;
-+	uint32_t result;
-+	uint32_t a, b, c, d;
- 	uint8_t data[4];
- 
- 	quicktime_read_data(file, data, 4);
-@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic
- 	return result;
- }
- 
--long quicktime_read_int32(quicktime_t *file)
-+int32_t quicktime_read_int32(quicktime_t *file)
- {
--	unsigned long result;
--	unsigned long a, b, c, d;
-+	uint32_t result;
-+	uint32_t a, b, c, d;
- 	uint8_t data[4];
- 
- 	quicktime_read_data(file, data, 4);
-@@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *f
- 	d = data[3];
- 
- 	result = (a << 24) | (b << 16) | (c << 8) | d;
--	return (long)result;
-+	return (int32_t)result;
- }
- 
--long quicktime_read_int32_le(quicktime_t *file)
-+int32_t quicktime_read_int32_le(quicktime_t *file)
- {
--	unsigned long result;
--	unsigned long a, b, c, d;
-+	uint32_t result;
-+	uint32_t a, b, c, d;
- 	uint8_t data[4];
- 
- 	quicktime_read_data(file, data, 4);
-@@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t
- 	d = data[3];
- 
- 	result = (d << 24) | (c << 16) | (b << 8) | a;
--	return (long)result;
-+	return (int32_t)result;
- }
- 
- int64_t quicktime_read_int64(quicktime_t *file)
diff --git a/libre/libquicktime/libquicktime-1.2.4-faad2.patch b/libre/libquicktime/libquicktime-1.2.4-faad2.patch
deleted file mode 100644
index 563f46426..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-faad2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2012-03-29 21:44:28.000000000 +0200
-+++ b/configure.ac	2020-02-09 18:27:31.599127781 +0100
-@@ -728,82 +728,9 @@
- 
- if test "x$with_faad2" != "xno"; then
- 
--OLD_CFLAGS=$CFLAGS
--OLD_LIBS=$LIBS
--
- CFLAGS="$CFLAGS"
- LIBS="$LIBS -lfaad -lm"
- 
--AC_MSG_CHECKING(for neaacdec.h usability for faad2)
--
--
--AC_TRY_RUN([
--    #include <neaacdec.h>
--    #include <stdio.h>
--    main()
--    {
--    int faad_major;
--    int faad_minor;
--    faacDecHandle dec;
--
--    if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
--      return -1;
--    dec = faacDecOpen();
--    if(!dec)
--      return -1;
--    return 0;
--    }
--  ],
--  [
--    # program could be run
--    have_faad2="true"
--    AC_MSG_RESULT(yes)
--    FAAD2_CFLAGS=$CFLAGS
--    FAAD2_LIBS=$LIBS
--    AC_DEFINE(HAVE_NEAACDEC_H)
--  ],
--    # program could not be run
--    AC_MSG_RESULT(no)
--)
--
--if test "x$have_faad2" != "xtrue"; then
--
--AC_MSG_CHECKING(for faad.h usability for faad2)
--
--AC_TRY_RUN([
--    #include <faad.h>
--    #include <stdio.h>
--    main()
--    {
--    int faad_major;
--    int faad_minor;
--    faacDecHandle dec;
--
--    if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
--      return -1;
--    dec = faacDecOpen();
--    if(!dec)
--      return -1;
--    return 0;
--    }
--  ],
--  [
--    # program could be run
--    have_faad2="true"
--    AC_MSG_RESULT(yes)
--    FAAD2_CFLAGS=$CFLAGS
--    FAAD2_LIBS=$LIBS
--    
--
--  ],
--    # program could not be run
--    AC_MSG_RESULT(no)
--)
--
--fi
--
--CFLAGS=$OLD_CFLAGS
--LIBS=$OLD_LIBS
- 
- fi
- 
diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch
deleted file mode 100644
index 8de9a288c..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch
+++ /dev/null
@@ -1,651 +0,0 @@
-diff -ruN a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c
---- a/plugins/ffmpeg/audio.c	2012-03-29 21:44:28.000000000 +0200
-+++ b/plugins/ffmpeg/audio.c	2020-02-09 19:08:03.716063846 +0100
-@@ -626,7 +626,7 @@
-     {
-     /* If the codec is mp3, make sure to decode the very last frame */
- 
--    if((codec->avctx->codec_id == CODEC_ID_MP3) &&
-+    if((codec->avctx->codec_id == AV_CODEC_ID_MP3) &&
-        (codec->bytes_in_chunk_buffer >= 4))
-       {
-       if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0))
-@@ -695,7 +695,7 @@
-     
-     /* Some really broken mp3 files have the header bytes split across 2 chunks */
- 
--    if(codec->avctx->codec_id == CODEC_ID_MP3)
-+    if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
-       {
-       if(codec->bytes_in_chunk_buffer < 4)
-         {
-@@ -806,7 +806,7 @@
-     
-     if(bytes_decoded < 0)
-       {
--      if(codec->avctx->codec_id == CODEC_ID_MP3)
-+      if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
-         {
-         /* For mp3, bytes_decoded < 0 means, that the frame should be muted */
-         memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end -
-@@ -866,8 +866,8 @@
-   quicktime_audio_map_t *track_map = &file->atracks[track];
-   quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv;
- 
--  if((codec->decoder->id == CODEC_ID_MP2) ||
--     (codec->decoder->id == CODEC_ID_MP3))
-+  if((codec->decoder->id == AV_CODEC_ID_MP2) ||
-+     (codec->decoder->id == AV_CODEC_ID_MP3))
-     {
-     mpa_header h;
-     uint32_t header;
-@@ -909,7 +909,7 @@
-     else
-       track_map->ci.bitrate = h.bitrate;
-     }
--  else if(codec->decoder->id == CODEC_ID_AC3)
-+  else if(codec->decoder->id == AV_CODEC_ID_AC3)
-     {
-     a52_header h;
-     uint8_t * ptr;
-@@ -986,7 +986,7 @@
- #endif
-     /* Some codecs need extra stuff */
- 
--    if(codec->decoder->id == CODEC_ID_ALAC)
-+    if(codec->decoder->id == AV_CODEC_ID_ALAC)
-       {
-       header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len);
-       if(header)
-@@ -995,7 +995,7 @@
-         codec->avctx->extradata_size = header_len;
-         }
-       }
--    if(codec->decoder->id == CODEC_ID_QDM2)
-+    if(codec->decoder->id == AV_CODEC_ID_QDM2)
-       {
-       header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len);
-       if(header)
-@@ -1495,9 +1495,9 @@
-     codec_base->decode_audio = lqt_ffmpeg_decode_audio;
-   codec_base->set_parameter = set_parameter;
- 
--  if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2))
-+  if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2))
-     codec_base->read_packet = read_packet_mpa;
--  else if(decoder->id == CODEC_ID_AC3)
-+  else if(decoder->id == AV_CODEC_ID_AC3)
-     {
-     codec_base->write_packet = write_packet_ac3;
-     codec_base->read_packet = read_packet_ac3;
-diff -ruN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c
---- a/plugins/ffmpeg/lqt_ffmpeg.c	2012-02-15 20:48:30.000000000 +0100
-+++ b/plugins/ffmpeg/lqt_ffmpeg.c	2020-02-09 19:07:17.929831925 +0100
-@@ -386,7 +386,7 @@
- struct CODECIDMAP codecidmap_v[] =
-   {
-     {
--      .id = CODEC_ID_MPEG1VIDEO,
-+      .id = AV_CODEC_ID_MPEG1VIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -397,7 +397,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE }
-     },
-     {
--      .id = CODEC_ID_MPEG4,
-+      .id = AV_CODEC_ID_MPEG4,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -415,7 +415,7 @@
-       .compression_id = LQT_COMPRESSION_MPEG4_ASP,
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V1,
-+      .id = AV_CODEC_ID_MSMPEG4V1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -426,7 +426,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V2,
-+      .id = AV_CODEC_ID_MSMPEG4V2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -437,7 +437,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V3,
-+      .id = AV_CODEC_ID_MSMPEG4V3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -453,7 +453,7 @@
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V3,
-+      .id = AV_CODEC_ID_MSMPEG4V3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -468,7 +468,7 @@
-     },
- #if 0
-     {
--      .id = CODEC_ID_WMV1,
-+      .id = AV_CODEC_ID_WMV1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -481,7 +481,7 @@
-     },
- #endif
-     {
--      .id = CODEC_ID_H263,
-+      .id = AV_CODEC_ID_H263,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -493,7 +493,7 @@
-       .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP,
-     },
-     {
--      .id = CODEC_ID_H263,
-+      .id = AV_CODEC_ID_H263,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -508,7 +508,7 @@
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_H264,
-+      .id = AV_CODEC_ID_H264,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -519,7 +519,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_H263P,
-+      .id = AV_CODEC_ID_H263P,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -533,7 +533,7 @@
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_H263I,
-+      .id = AV_CODEC_ID_H263I,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -544,7 +544,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SVQ1,
-+      .id = AV_CODEC_ID_SVQ1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -555,7 +555,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SVQ3,
-+      .id = AV_CODEC_ID_SVQ3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -566,7 +566,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MJPEG,
-+      .id = AV_CODEC_ID_MJPEG,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -580,7 +580,7 @@
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_MJPEGB,
-+      .id = AV_CODEC_ID_MJPEGB,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -594,7 +594,7 @@
-     },
- #if LIBAVCODEC_BUILD >= 3346688
-     {
--      .id = CODEC_ID_TARGA,
-+      .id = AV_CODEC_ID_TARGA,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -606,7 +606,7 @@
- #endif
- #if LIBAVCODEC_BUILD >= 3347456
-     {
--      .id = CODEC_ID_TIFF,
-+      .id = AV_CODEC_ID_TIFF,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -617,7 +617,7 @@
-     },
- #endif
-     {
--      .id = CODEC_ID_8BPS,
-+      .id = AV_CODEC_ID_8BPS,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -627,7 +627,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_INDEO3,
-+      .id = AV_CODEC_ID_INDEO3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -638,7 +638,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_RPZA,
-+      .id = AV_CODEC_ID_RPZA,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -648,7 +648,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SMC,
-+      .id = AV_CODEC_ID_SMC,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -658,7 +658,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_CINEPAK,
-+      .id = AV_CODEC_ID_CINEPAK,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -669,7 +669,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_CYUV,
-+      .id = AV_CODEC_ID_CYUV,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -680,7 +680,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_QTRLE,
-+      .id = AV_CODEC_ID_QTRLE,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -693,7 +693,7 @@
-       .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE },
-     },
-     {
--      .id = CODEC_ID_MSRLE,
-+      .id = AV_CODEC_ID_MSRLE,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -703,7 +703,7 @@
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -719,7 +719,7 @@
-       .image_sizes = image_sizes_dv,
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -735,7 +735,7 @@
-       .image_sizes = image_sizes_dv,
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -751,7 +751,7 @@
-     },
-     /* DVCPRO HD (decoding only for now) */
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -772,7 +772,7 @@
-       // .do_encode = 1
-     },
-     {
--      .id = CODEC_ID_FFVHUFF,
-+      .id = AV_CODEC_ID_FFVHUFF,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -785,7 +785,7 @@
-       .do_encode = 1
-     },
-     {
--      .id = CODEC_ID_FFV1,
-+      .id = AV_CODEC_ID_FFV1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -801,7 +801,7 @@
-     },
- #if LIBAVCODEC_BUILD >= 3352576
-     {
--      .id = CODEC_ID_DNXHD,
-+      .id = AV_CODEC_ID_DNXHD,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -817,7 +817,7 @@
-     },
- #endif
-     {
--      .id = CODEC_ID_MPEG2VIDEO,
-+      .id = AV_CODEC_ID_MPEG2VIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -839,7 +839,7 @@
- struct CODECIDMAP codecidmap_a[] =
-   {
-     {
--      .id = CODEC_ID_MP3,
-+      .id = AV_CODEC_ID_MP3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -851,7 +851,7 @@
-       .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MP2,
-+      .id = AV_CODEC_ID_MP2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -866,7 +866,7 @@
-       .compression_id = LQT_COMPRESSION_MP2,
-     },
-     {
--      .id = CODEC_ID_AC3,
-+      .id = AV_CODEC_ID_AC3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -881,7 +881,7 @@
-       .compression_id = LQT_COMPRESSION_AC3,
-     },
-     {
--      .id = CODEC_ID_QDM2,
-+      .id = AV_CODEC_ID_QDM2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -896,7 +896,7 @@
- #if 1
-     /* Doesn't work as long as audio chunks are not split into VBR "Samples" */
-     {
--      .id = CODEC_ID_ALAC,
-+      .id = AV_CODEC_ID_ALAC,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -909,7 +909,7 @@
- #if 1
-     /* Sounds ugly */
-     {
--      .id = CODEC_ID_ADPCM_MS,
-+      .id = AV_CODEC_ID_ADPCM_MS,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -922,7 +922,7 @@
- #if 1
-     /* Sounds ugly */
-     {
--      .id = CODEC_ID_ADPCM_IMA_WAV,
-+      .id = AV_CODEC_ID_ADPCM_IMA_WAV,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-diff -ruN a/plugins/ffmpeg/video.c b/plugins/ffmpeg/video.c
---- a/plugins/ffmpeg/video.c	2012-02-25 20:46:56.000000000 +0100
-+++ b/plugins/ffmpeg/video.c	2020-02-09 19:07:44.399580606 +0100
-@@ -400,7 +400,7 @@
-   codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
- 
-   /* First we try codec-specific colormodel matching. */
--  if(codec->decoder->id == CODEC_ID_DNXHD)
-+  if(codec->decoder->id == AV_CODEC_ID_DNXHD)
-     {
-     /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
-        we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
-@@ -438,7 +438,7 @@
-   quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv;
-   codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel);
- 
--  if (codec->encoder->id == CODEC_ID_DNXHD)
-+  if (codec->encoder->id == AV_CODEC_ID_DNXHD)
-     {
-     /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
-        and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
-@@ -728,13 +728,13 @@
- 
-     /* Set extradata: It's done differently for each codec */
- 
--    if(codec->decoder->id == CODEC_ID_SVQ3)
-+    if(codec->decoder->id == AV_CODEC_ID_SVQ3)
-       {
-       extradata       = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4;
-       extradata_size  = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4;
-       
-       }
--    else if(codec->decoder->id == CODEC_ID_H264)
-+    else if(codec->decoder->id == AV_CODEC_ID_H264)
-       {
-       user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len);
- 
-@@ -753,7 +753,7 @@
-         }
-       
-       }
--    else if(codec->decoder->id == CODEC_ID_MPEG4)
-+    else if(codec->decoder->id == AV_CODEC_ID_MPEG4)
-       {
-       if(trak->mdia.minf.stbl.stsd.table[0].has_esds)
-         {
-@@ -947,15 +947,15 @@
-           }
- #endif
-       }
--    if(codec->decoder->id == CODEC_ID_DVVIDEO)
-+    if(codec->decoder->id == AV_CODEC_ID_DVVIDEO)
-       {
-       if(vtrack->stream_cmodel == BC_YUV420P)
-         vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;
-       vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST;
-       vtrack->ci.id = LQT_COMPRESSION_DV;
-       }
--    else if((codec->decoder->id == CODEC_ID_MPEG4) ||
--            (codec->decoder->id == CODEC_ID_H264))
-+    else if((codec->decoder->id == AV_CODEC_ID_MPEG4) ||
-+            (codec->decoder->id == AV_CODEC_ID_H264))
-       {
-       if(vtrack->stream_cmodel == BC_YUV420P)
-         vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
-@@ -1299,13 +1299,13 @@
-     {
-     if(vtrack->stream_cmodel == BC_YUV420P)
-       {
--      if(codec->encoder->id == CODEC_ID_MPEG4)
-+      if(codec->encoder->id == AV_CODEC_ID_MPEG4)
-         {
-         vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
-         /* enable interlaced encoding */
-         vtrack->interlace_mode = LQT_INTERLACE_NONE;
-         }
--      else if(codec->encoder->id == CODEC_ID_DVVIDEO)
-+      else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)
-         {
-         vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;
-         }
-@@ -1340,7 +1340,7 @@
-     codec->avctx->sample_aspect_ratio.num = pixel_width;
-     codec->avctx->sample_aspect_ratio.den = pixel_height;
-     /* Use global headers for mp4v */
--    if(codec->encoder->id == CODEC_ID_MPEG4)
-+    if(codec->encoder->id == AV_CODEC_ID_MPEG4)
-       {
-       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
-         {
-@@ -1364,12 +1364,12 @@
-         }
- #endif
-       }
--    else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) &&
-+    else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) &&
-             !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4))
-       {
-       strncpy(trak->strl->strh.fccHandler, "div3", 4);
-       }
--    else if((codec->encoder->id == CODEC_ID_H263) &&
-+    else if((codec->encoder->id == AV_CODEC_ID_H263) &&
-             (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP)))
-       {
-       uint8_t d263_data[] =
-@@ -1383,7 +1383,7 @@
-       strncpy(trak->mdia.minf.stbl.stsd.table[0].format,
-               "s263", 4);
-       }
--    else if(codec->encoder->id == CODEC_ID_FFVHUFF)
-+    else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)
-       {
-       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
-         {
-@@ -1391,7 +1391,7 @@
-         codec->write_global_header = 1;
-         }
-       }
--    else if(codec->encoder->id == CODEC_ID_QTRLE)
-+    else if(codec->encoder->id == AV_CODEC_ID_QTRLE)
-       {
-       if(vtrack->stream_cmodel == BC_RGBA8888)
-         {
-@@ -1402,11 +1402,11 @@
-         vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
-         }
-       }
--    else if(codec->encoder->id == CODEC_ID_DVVIDEO)
-+    else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)
-       {
-       set_dv_fourcc(width, height, vtrack->stream_cmodel, trak);
-       }
--    else if(codec->encoder->id == CODEC_ID_DNXHD)
-+    else if(codec->encoder->id == AV_CODEC_ID_DNXHD)
-       {
-       if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
-         {
-@@ -1558,12 +1558,12 @@
-   
- #endif
-   
--  if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD)
-+  if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD)
-     setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded);
-   
-   if(bytes_encoded)
-     {
--    if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0))
-+    if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0))
-       {
-       /* Some codecs don't bother generating presentation timestamps.
-          FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */
-@@ -1590,13 +1590,13 @@
- 
-   if(codec->write_global_header && !codec->global_header_written)
-     {
--    if(codec->encoder->id == CODEC_ID_FFVHUFF)
-+    if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)
-       {
-       quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms,
-                                     "glbl",
-                                     codec->avctx->extradata, codec->avctx->extradata_size );
-       }
--    else if(codec->encoder->id == CODEC_ID_MPEG4)
-+    else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
-       {
-       int advanced = 0;
-       if(codec->avctx->max_b_frames ||
-@@ -1903,18 +1903,18 @@
-     codec_base->encode_video = lqt_ffmpeg_encode_video;
-     codec_base->set_pass = set_pass_ffmpeg;
- 
--    if(encoder->id == CODEC_ID_MPEG4)
-+    if(encoder->id == AV_CODEC_ID_MPEG4)
-       {
-       codec_base->writes_compressed = writes_compressed_mpeg4;
-       codec_base->init_compressed   = init_compressed_mpeg4;
-       codec_base->write_packet = write_packet_mpeg4;
-       }
--    else if(encoder->id == CODEC_ID_MPEG2VIDEO)
-+    else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO)
-       {
-       codec_base->writes_compressed = writes_compressed_imx;
-       codec_base->init_compressed   = init_compressed_imx;
-       }
--    else if(encoder->id == CODEC_ID_DVVIDEO)
-+    else if(encoder->id == AV_CODEC_ID_DVVIDEO)
-       {
-       codec_base->init_compressed = init_compressed_dv;
-       }
-@@ -1922,7 +1922,7 @@
-     }
-   if(decoder)
-     {
--    if(decoder->id == CODEC_ID_H264)
-+    if(decoder->id == AV_CODEC_ID_H264)
-       codec_base->read_packet = read_packet_h264;
-     codec_base->decode_video = lqt_ffmpeg_decode_video;
-     }
diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch
deleted file mode 100644
index 7add44220..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Extracted from upstream CVS.
-https://bugs.gentoo.org/show_bug.cgi?id=476498
-
-Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
-@@ -45,6 +45,11 @@
- #define ENCODE_AUDIO 1
- #endif
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+/* from libavcodec/avcodec.h dated Dec 23 2012 */
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
- 
- /* MPEG Audio header parsing code */
-Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/params.c
-@@ -101,6 +101,17 @@ typedef struct
-     }                                           \
-   }
- 
-+#define PARAM_DICT_INT(name, dict_name)             \
-+  {                                                 \
-+  if(!strcasecmp(name, key))                        \
-+    {                                               \
-+    char buf[128];                                  \
-+    snprintf(buf, sizeof(buf), "%d", *(int*)value); \
-+    av_dict_set(options, dict_name, buf, 0);        \
-+    found = 1;                                      \
-+    }                                               \
-+  }
-+
- #define PARAM_DICT_FLAG(name, dict_name)        \
-   {                                             \
-   if(!strcasecmp(name, key))                    \
-@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT("ff_max_b_frames",max_b_frames);
-   PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
-   PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
-+
-+#if LIBAVCODEC_VERSION_MAJOR >= 55
-+  PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");
-+  PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");
-+#else
-   PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
-   PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
-+#endif
-+
-   PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
-   PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
-   PARAM_INT("ff_rc_min_rate",rc_min_rate);
-@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_QP2LAMBDA("ff_lmax", lmax);
-   PARAM_INT("ff_noise_reduction",noise_reduction);
-   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
-+
-+#if LIBAVCODEC_VERSION_MAJOR >= 55
-+  PARAM_DICT_INT("ff_inter_threshold","inter_threshold");
-+  PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");
-+#else
-   PARAM_INT("ff_inter_threshold",inter_threshold);
-   PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
-+#endif
-+
-   PARAM_INT("ff_thread_count",thread_count);
-   PARAM_INT("ff_me_threshold",me_threshold);
-   PARAM_INT("ff_mb_threshold",mb_threshold);
-@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
-   PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
-   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
-+
-+#if LIBAVCODEC_VERSION_MAJOR >= 55
-+  PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");
-+  PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
-+  PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
-+#else
-   PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
-   PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
-+  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
-+#endif
- 
- #if LIBAVCODEC_VERSION_MAJOR >= 54
-   PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");
-@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
-   PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
-   PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
--  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
-   PARAM_ENUM("ff_coder_type",coder_type,coder_type);
-   
-   }
diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch
deleted file mode 100644
index 96a323aa8..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/video.c
-@@ -37,10 +37,10 @@
- #endif
- 
- 
--#ifdef  PIX_FMT_YUV422P10
--#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10
-+#ifdef  AV_PIX_FMT_YUV422P10
-+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10
- #else
--#define PIX_FMT_YUV422P10_OR_DUMMY -1234
-+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234
- #endif
- 
- #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0)
-@@ -90,9 +90,9 @@ typedef struct
-   int imx_bitrate;
-   int imx_strip_vbi;
- 
--  /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while
--     we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */
--  enum PixelFormat reinterpret_pix_fmt;
-+  /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while
-+     we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */
-+  enum AVPixelFormat reinterpret_pix_fmt;
-   
-   int is_imx;
-   int y_offset;
-@@ -137,42 +137,42 @@ typedef struct
- 
- static const struct
-   {
--  enum PixelFormat ffmpeg_id;
-+  enum AVPixelFormat ffmpeg_id;
-   int              lqt_id;
-   int              exact;
-   }
- colormodels[] =
-   {
--    { PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
-+    { AV_PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--    { PIX_FMT_YUV422,    BC_YUV422,    1 },
-+    { AV_PIX_FMT_YUV422,    BC_YUV422,    1 },
- #else
--    { PIX_FMT_YUYV422,   BC_YUV422,    1 },
-+    { AV_PIX_FMT_YUYV422,   BC_YUV422,    1 },
- #endif
--    { PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
--    { PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
--    { PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
--    { PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
--    { PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
--    { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
--#ifdef PIX_FMT_YUV422P10
--    { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
--#endif
--    { PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
--    { PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
--    { PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
--    { PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
-+    { AV_PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
-+    { AV_PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
-+    { AV_PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
-+    { AV_PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
-+    { AV_PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
-+    { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
-+#ifdef AV_PIX_FMT_YUV422P10
-+    { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
-+#endif
-+    { AV_PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
-+    { AV_PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
-+    { AV_PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
-+    { AV_PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--    { PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
-+    { AV_PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
- #else
--    { PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
-+    { AV_PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
- #endif
--    { PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
--    { PIX_FMT_GRAY8,     BC_RGB888,    0 },
--    { PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
--    { PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
--    { PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
--    { PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
-+    { AV_PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
-+    { AV_PIX_FMT_GRAY8,     BC_RGB888,    0 },
-+    { AV_PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
-+    { AV_PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
-+    { AV_PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
-+    { AV_PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
-   };
- 
- static const struct
-@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV
-   if (!codec->pix_fmts)
-     return 0;
- 
--  for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i)
-+  for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i)
-     {
--    if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY)
-+    if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY)
-       return 1;
-     }
- 
-   return 0;
-   }
- 
--static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
-+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
-   {
-   int i;
- 
-@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f
-     if(colormodels[i].lqt_id == id)
-       return colormodels[i].ffmpeg_id;
-     }
--  return PIX_FMT_NB;
-+  return AV_PIX_FMT_NB;
-   }
- 
--static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact)
-+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact)
-   {
-   int i;
- 
-@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co
-   /* First we try codec-specific colormodel matching. */
-   if(codec->decoder->id == AV_CODEC_ID_DNXHD)
-     {
--    /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
--       we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
--    if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY)
-+    /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which
-+       we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */
-+    if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY)
-       {
--      int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY);
-+      int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY);
-       *exact = 1;
-       if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
-         {
-         vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P;
--        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P;
--        // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except
-+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P;
-+        // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except
-         // there is no such colormodel in FFMpeg. Fortunately, it's not a problem
-         // in this case, as reinterpret_pix_fmt is only used when *exact == 0.
-         }
-       else
-         {
-         vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P;
--        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P;
-+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P;
-         }
-       return;
-       }
-@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co
- 
-   if (codec->encoder->id == AV_CODEC_ID_DNXHD)
-     {
--    /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
--       and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
-+    /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10
-+       and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10
-        (in fact, the latter doesn't even exist) */
--    codec->avctx->pix_fmt = PIX_FMT_YUV422P;
-+    codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
-     if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10)
-       {
-       if (lqt_tenbit_dnxhd_supported(codec->encoder))
--        codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY;
-+        codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY;
-       }
-     }
-   }
-@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co
- /* From avcodec.h: */
- 
- /*
-- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
-+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
-  * color is put together as:
-  *  (A << 24) | (R << 16) | (G << 8) | B
-  * This is stored as BGRA on little endian CPU architectures and ARGB on
-@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t
-  */
- 
- static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec,
--                                 AVFrame * in_frame, enum PixelFormat in_format,
-+                                 AVFrame * in_frame, enum AVPixelFormat in_format,
-                                  unsigned char ** out_frame, int out_format,
-                                  int width, int height, int row_span, int row_span_uv)
-   {
-@@ -547,9 +547,9 @@ static void convert_image_decode(quickti
-    *  RGBA format like in ffmpeg??
-    */
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--  if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
-+  if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
- #else
--    if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
-+    if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
- #endif
-       {
-       convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset);
-@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick
-     if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0)
-       return -1;
- #endif
--    codec->frame = avcodec_alloc_frame();
-+    codec->frame = av_frame_alloc();
-     vtrack->stream_cmodel = LQT_COLORMODEL_NONE;
-     codec->initialized = 1;
-     }
-@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick
- #ifdef HAVE_LIBSWSCALE
- 
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--      if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&
-+      if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) &&
-            (vtrack->stream_cmodel == BC_RGBA8888)))
- #else
--        if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) &&
-+        if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) &&
-              (vtrack->stream_cmodel == BC_RGBA8888)))
- #endif
-           {
-@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick
-         
-   if(!codec->initialized)
-     {
--    codec->frame = avcodec_alloc_frame();
-+    codec->frame = av_frame_alloc();
- 
-     /* time_base is 1/framerate for constant framerate */
-           
-@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick
-       if(vtrack->stream_cmodel == BC_RGBA8888)
-         {
-         /* Libquicktime doesn't natively support a color model equivalent
--           to PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
-+           to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
-            So, we use BC_RGBA8888 and do ad hoc conversion below. */
--        codec->avctx->pix_fmt = PIX_FMT_ARGB;
-+        codec->avctx->pix_fmt = AV_PIX_FMT_ARGB;
-         vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
-         }
-       }
-@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick
-     }
-   //        codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc);
- 
--  if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB)
-+  if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
-     {
-     if(!codec->tmp_rows)
-       {
-@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick
-                         vtrack->stream_cmodel,
-                         0, 0, 0, codec->y_offset);
-       }
--    else if(codec->avctx->pix_fmt == PIX_FMT_ARGB)
-+    else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
-       {
-       convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span,
-                            codec->tmp_rows[0], codec->tmp_row_span,
-Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
-@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick
-     pkt.data = codec->chunk_buffer;
-     pkt.size = codec->chunk_buffer_alloc;
- 
--    avcodec_get_frame_defaults(&f);
-+    av_frame_unref(&f);
-     f.nb_samples = codec->avctx->frame_size;
-     
-     avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt,
diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
deleted file mode 100644
index eb196ea16..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
-@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
- 
- #if DECODE_AUDIO3 || DECODE_AUDIO4
-     codec->pkt.data = codec->chunk_buffer;
--    codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
-+    codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
- 
- #if DECODE_AUDIO4
-     frame_bytes = avcodec_decode_audio4(codec->avctx, &f,
-@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
-                                          (codec->sample_buffer_end - codec->sample_buffer_start)],
-                   &bytes_decoded,
-                   codec->chunk_buffer,
--                  packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+                  packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
-     if(frame_bytes < 0)
-       {
-       lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
-@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
-         return 0;
-         }
- 
--      if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)
-+      if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)
-         {
--        codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;
-+        codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;
-         codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);
-         }
-       memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
--             mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
-+             mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
-       num_samples = mph.samples_per_frame;
-       codec->bytes_in_chunk_buffer = mph.frame_bytes;
-       }
-@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
-     {
- 
-         
--    /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size
-+    /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size
-        because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */
-     
-     /* Some really broken mp3 files have the header bytes split across 2 chunks */
-@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
- 
- #if DECODE_AUDIO3 || DECODE_AUDIO4
-     codec->pkt.data = &codec->chunk_buffer[bytes_used];
--    codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
-+    codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;
- 
- #if DECODE_AUDIO4
-     
-@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
-                                                   (codec->sample_buffer_end - codec->sample_buffer_start)],
-                             &bytes_decoded,
-                             &codec->chunk_buffer[bytes_used],
--                            codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
-+                            codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
- #endif
-     if(frame_bytes < 0)
-       {
-@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
-         }
-       }
-     
--    /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
-+    /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
-     
-     if(codec->bytes_in_chunk_buffer < 0)
-       codec->bytes_in_chunk_buffer = 0;
-Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/params.c
-@@ -124,16 +124,6 @@ typedef struct
-   }
- 
- 
--enum_t me_method[] =
--  {
--    { "Zero",  ME_ZERO },
--    { "Phods", ME_PHODS },
--    { "Log",   ME_LOG },
--    { "X1",    ME_X1 },
--    { "Epzs",  ME_EPZS },
--    { "Full",  ME_FULL }
--  };
--
- enum_t prediction_method[] =
-   {
-     { "Left",   FF_PRED_LEFT },
-@@ -163,15 +153,6 @@ enum_t mb_decision[] =
-     { "Rate distoration",     FF_MB_DECISION_RD }
-   };
- 
--enum_t coder_type[] =
--  {
--    { "VLC",                  FF_CODER_TYPE_VLC },
--    { "Arithmetic",           FF_CODER_TYPE_AC },
--    { "Raw",                  FF_CODER_TYPE_RAW },
--    { "RLE",                  FF_CODER_TYPE_RLE },
--    { "Deflate",              FF_CODER_TYPE_DEFLATE },
--  };
--
- #define PARAM_ENUM(name, var, arr) \
-   if(!strcasecmp(key, name)) \
-     { \
-@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);
-   PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);
-   PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);
--  PARAM_ENUM("ff_me_method",me_method,me_method);
-+  PARAM_DICT_INT("ff_me_method","motion-est");
-   PARAM_INT("ff_gop_size",gop_size);
-   PARAM_FLOAT("ff_qcompress",qcompress);
-   PARAM_FLOAT("ff_qblur",qblur);
-@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT("ff_rc_min_rate",rc_min_rate);
-   PARAM_INT("ff_rc_max_rate",rc_max_rate);
-   PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);
--  PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);
-   PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);
-   PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);
--  PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);
-+  PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");
-   PARAM_FLOAT("ff_lumi_masking",lumi_masking);
-   PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);
-   PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);
-@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT("ff_me_range",me_range);
-   PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);
-   PARAM_INT("ff_scenechange_threshold",scenechange_threshold);
--  PARAM_QP2LAMBDA("ff_lmin", lmin);
--  PARAM_QP2LAMBDA("ff_lmax", lmax);
-+  PARAM_DICT_INT("ff_lmin", "lmin");
-+  PARAM_DICT_INT("ff_lmax", "lmax");
-   PARAM_INT("ff_noise_reduction",noise_reduction);
-   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
- 
-@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
- #endif
- 
-   PARAM_INT("ff_thread_count",thread_count);
--  PARAM_INT("ff_me_threshold",me_threshold);
--  PARAM_INT("ff_mb_threshold",mb_threshold);
-   PARAM_INT("ff_nsse_weight",nsse_weight);
--  PARAM_FLOAT("ff_border_masking",border_masking);
-+  PARAM_DICT_INT("ff_border_masking","border_mask");
-   PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);
-   PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);
-   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
-   PARAM_INT("ff_bidir_refine",bidir_refine);
-   PARAM_INT("ff_brd_scale",brd_scale);
--  PARAM_INT("ff_scenechange_factor",scenechange_factor);
--  PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
--  PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
--  PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
--  PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
--  PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
-+  PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);
-+  PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);
-+  PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);
-+  PARAM_DICT_FLAG("ff_flag_gmc","gmc");
-+  PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");
-   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
--  PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
--  PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
--  PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
-+  PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);
-+  PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");
-   //  PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);
- #else
-   PARAM_INT("ff_trellis",trellis);
- #endif
--  PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
--  PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
-+  PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);
-+  PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);
-   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
- 
- #if LIBAVCODEC_VERSION_MAJOR >= 55
-@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
-   PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
- #else
--  PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
--  PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
--  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
-+  PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);
-+  PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);
-+  PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);
- #endif
- 
- #if LIBAVCODEC_VERSION_MAJOR >= 54
-@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_DICT_FLAG("ff_flag_obmc","obmc");
-   PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");
- #else
--  PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);
--  PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);
--  PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);
-+  PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);
-+  PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);
-+  PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);
- #endif
- 
--  PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
--  PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
--  PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
--  PARAM_ENUM("ff_coder_type",coder_type,coder_type);
-+  PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);
-+  PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);
-+  PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);
-+  PARAM_DICT_INT("ff_coder_type","coder");
-   
-   }
-Index: libquicktime-1.2.4/plugins/ffmpeg/params.h
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
-+++ libquicktime-1.2.4/plugins/ffmpeg/params.h
-@@ -149,7 +149,7 @@ the reference. Unused for constant quant
-     .type =        LQT_PARAMETER_INT, \
-     .val_default = { .val_int = 0 }, \
-     .val_min =     { .val_int = 0 }, \
--    .val_max =     { .val_int = FF_MAX_B_FRAMES }, \
-+    .val_max =     { .val_int = 16 }, \
-     .help_string = TRS("Maximum number of B-frames between non B-frames") \
-   }
- 
-Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
-+++ libquicktime-1.2.4/plugins/ffmpeg/video.c
-@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick
-     if(extradata)
-       {
-       codec->extradata =
--        calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-       memcpy(codec->extradata, extradata, extradata_size);
-       codec->avctx->extradata_size = extradata_size;
-       codec->avctx->extradata = codec->extradata;
-@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t
-   codec->avctx->qmin = 1;
-   codec->avctx->qmax = 3;
-   codec->avctx->rtp_payload_size = 1; // ??
--  codec->avctx->rc_buffer_aggressivity = 0.25;
--  codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
-+  av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);
-+  codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY;
- 
- #if (LIBAVCODEC_VERSION_MAJOR < 54)
-   codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT;
-@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick
-     //          codec->avctx->time_base.den = 1;
-     //          codec->avctx->time_base.num = lqt_video_time_scale(file, track);
- 
--    if(codec->avctx->flags & CODEC_FLAG_QSCALE)
-+    if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
-       codec->avctx->global_quality = codec->qscale;
-                               
-     codec->avctx->width = width;
-@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick
-       {
-       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
-         {
--        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-         codec->write_global_header = 1;
-         }
-             
-@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick
-         {
-         lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");
-         codec->avctx->flags |=
--          (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN);
-+          (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN);
-         }
- #endif
-       }
-@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick
-       {
-       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
-         {
--        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-         codec->write_global_header = 1;
-         }
-       }
-@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick
-       {
-       if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
-         {
--        codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT;
-+        codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
-         }
-       }
-     else if(codec->is_imx)
-@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick
-       if(codec->pass == 1)
-         {
-         codec->stats_file = fopen(codec->stats_filename, "w");
--        codec->avctx->flags |= CODEC_FLAG_PASS1;
-+        codec->avctx->flags |= AV_CODEC_FLAG_PASS1;
-         }
-       else if(codec->pass == codec->total_passes)
-         {
-@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick
-         fclose(codec->stats_file);
-         codec->stats_file = (FILE*)0;
-               
--        codec->avctx->flags |= CODEC_FLAG_PASS2;
-+        codec->avctx->flags |= AV_CODEC_FLAG_PASS2;
-         }
-       }
-     /* Open codec */
-@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick
-     }
-   
-   codec->frame->pts = vtrack->timestamp;
--  if(codec->avctx->flags & CODEC_FLAG_QSCALE)
-+  if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
-     codec->frame->quality = codec->qscale;
- #ifdef DO_INTERLACE
-   if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
-@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick
-     else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
-       {
-       int advanced = 0;
--      if(codec->avctx->max_b_frames ||
--         (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
-+      if(codec->avctx->max_b_frames)
-         advanced = 1;
- 
-       setup_header_mpeg4(file, track, codec->avctx->extradata,
diff --git a/libre/libquicktime/libquicktime-1.2.4-libavutil.patch b/libre/libquicktime/libquicktime-1.2.4-libavutil.patch
deleted file mode 100644
index 99a4d39e5..000000000
--- a/libre/libquicktime/libquicktime-1.2.4-libavutil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h
-===================================================================
---- libquicktime-1.2.4.orig/plugins/ffmpeg/ffmpeg.h
-+++ libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h
-@@ -27,6 +27,7 @@
- 
- #include <quicktime/qtprivate.h>
- #include AVCODEC_HEADER
-+#include <libavutil/mem.h>
- 
- void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec,
-                                        quicktime_video_map_t *vtrack,
diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD
deleted file mode 100644
index d360d184e..000000000
--- a/libre/mcomix/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer (Arch): schuay <jakob.gruber@gmail.com>
-# Contributor (Arch): Ray Powell <ray_al@xphoniexx.net>
-# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: bill-auger <bill-auger@programmer.net>
-
-pkgname=mcomix
-pkgver=1.3.0.dev0
-pkgrel=3
-pkgrel+=.parabola1
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
-pkgdesc+=", without non-free RAR support"
-arch=('any')
-url="https://github.com/multiSnow/mcomix3"
-license=('GPL')
-depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pillow')
-makedepends=('git')
-optdepends=('mupdf-tools: for pdf comics'
-            'p7zip: for 7zip compressed comics')
-_commit=a95f08140fc8850890f283bc06e3e2615477d736  # HEAD as of 20200528.
-source=("git+https://github.com/multiSnow/mcomix3.git#commit=$_commit"
-        'libre.patch')
-sha256sums=('SKIP'
-            '8566f979b4d56866074f22a44ee31f6904dac6ef802fa88413cedd82ee752721')
-
-prepare() {
-  cd mcomix3
-
-  # Remove nonfree unRAR support
-  rm -v mcomix/mcomix/archive/rar{,_external}.py
-  patch -Np1 -i ${srcdir}/libre.patch
-}
-
-package() {
-  cd mcomix3
-
-  python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/share
-
-  install -dm755 "$pkgdir"/usr/bin
-  ln -s /usr/share/mcomix/mcomixstarter.py "$pkgdir"/usr/bin/mcomix
-  ln -s /usr/share/mcomix/comicthumb.py "$pkgdir"/usr/bin/comicthumb
-
-  install -Dm644 mime/mcomix.desktop "$pkgdir"/usr/share/applications/mcomix.desktop
-  install -Dm644 mime/mcomix.appdata.xml "$pkgdir"/usr/share/metainfo/mcomix.appdata.xml
-  install -Dm644 mime/comicthumb.thumbnailer "$pkgdir"/usr/share/thumbnailers/comicthumb.thumbnailer
-
-  for size in 16x16 22x22 24x24 32x32 48x48
-  do
-    install -dm755 "$pkgdir"/usr/share/icons/hicolor/$size/apps/
-    install -Dm644 mcomix/mcomix/images/$size/mcomix.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/mcomix.png
-    install -Dm644 mime/icons/$size/application-x-cb7.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cb7.png
-    install -Dm644 mime/icons/$size/application-x-cbt.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbt.png
-  done
-
-  install -Dm644 man/mcomix.1 "$pkgdir"/usr/share/man/man1/mcomix.1
-  install -Dm644 man/comicthumb.1 "$pkgdir"/usr/share/man/man1/comicthumb.1
-}
diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch
deleted file mode 100644
index 20b0c3ca1..000000000
--- a/libre/mcomix/libre.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff --git a/man/comicthumb.1 b/man/comicthumb.1
-index 4af1791..6546014 100644
---- a/man/comicthumb.1
-+++ b/man/comicthumb.1
-@@ -1,7 +1,7 @@
- .TH comicthumb 1
- 
- .SH NAME
--\fBcomicthumb\fP - Thumbnailer for cbz, cbr and cbt archives.
-+\fBcomicthumb\fP - Thumbnailer for cbz and cbt archives.
- 
- .SH SYNOPSIS
- .nf
-diff --git a/man/mcomix.1 b/man/mcomix.1
-index 5361e86..37b0698 100644
---- a/man/mcomix.1
-+++ b/man/mcomix.1
-@@ -12,7 +12,7 @@
- .B MComix
- is a user-friendly, customizable image viewer. It is specifically designed to
- handle comic books (both Western comics and manga) and supports a variety of
--container formats (including CBR, CBZ, CB7, CBT, LHA and PDF).
-+container formats (including CBZ, CB7, CBT, LHA and PDF).
- 
- .SH OPTIONS
- .TP
-diff --git a/mcomix/comicthumb.py b/mcomix/comicthumb.py
-index 3606091..150a1f5 100755
---- a/mcomix/comicthumb.py
-+++ b/mcomix/comicthumb.py
-@@ -34,7 +34,7 @@ def main():
-     parser=argparse.ArgumentParser(
-         prog='comicthumb',
-         description='Thumbnailer for comic book archives',
--        epilog='Supported formats: ZIP, RAR and tar (.cbz, .cbr, .cbt)',
-+        epilog='Supported formats: ZIP and tar (.cbz, .cbt)',
-     )
-     parser.add_argument('infile',default=None,metavar='INFILE',
-                         help='input archive')
-diff --git a/mcomix/mcomix/about_dialog.py b/mcomix/mcomix/about_dialog.py
-index ba64a40..0160ed9 100644
---- a/mcomix/mcomix/about_dialog.py
-+++ b/mcomix/mcomix/about_dialog.py
-@@ -28,7 +28,7 @@ class _AboutDialog(Gtk.AboutDialog):
-         comment = \
-             _('%s is an image viewer specifically designed to handle comic books.') % \
-             constants.APPNAME + ' ' + \
--            _('It reads ZIP, RAR and tar archives, as well as plain image files.')
-+            _('It reads ZIP and tar archives, as well as plain image files.')
-         self.set_comments(comment)
- 
-         license = \
-diff --git a/mcomix/mcomix/archive_tools.py b/mcomix/mcomix/archive_tools.py
-index c121f59..1f48aa8 100644
---- a/mcomix/mcomix/archive_tools.py
-+++ b/mcomix/mcomix/archive_tools.py
-@@ -15,8 +15,6 @@ from mcomix.archive import (
-     archivemount,
-     lha_external,
-     pdf_external,
--    rar,
--    rar_external,
-     sevenzip_external,
-     squashfs,
-     tar,
-@@ -47,16 +45,6 @@ _HANDLERS = {
-     constants.XZ: (
-         tar.TarArchive,
-     ),
--    constants.RAR: (
--        rar.RarArchive,
--        rar_external.RarArchive,
--        # Last resort: some versions of 7z support RAR.
--        sevenzip_external.SevenZipArchive,
--    ),
--    constants.RAR5: (
--        rar.RarArchive,
--        rar_external.RarArchive,
--    ),
-     constants.LHA: (
-         # Prefer 7z over lha executable for Unicode support.
-         sevenzip_external.SevenZipArchive,
-@@ -90,9 +78,6 @@ def _is_available(archive_type):
- def szip_available():
-     return _is_available(constants.SEVENZIP)
- 
--def rar_available():
--    return _is_available(constants.RAR)
--
- def lha_available():
-     return _is_available(constants.LHA)
- 
-@@ -109,7 +94,6 @@ def init_supported_formats():
-     for name, formats, is_available in (
-         ('ZIP', constants.ZIP_FORMATS , True            ),
-         ('Tar', constants.TAR_FORMATS , True            ),
--        ('RAR', constants.RAR_FORMATS , rar_available() ),
-         ('7z' , constants.SZIP_FORMATS, szip_available()),
-         ('LHA', constants.LHA_FORMATS , lha_available() ),
-         ('PDF', constants.PDF_FORMATS , pdf_available() ),
-@@ -168,11 +152,6 @@ def archive_mime_type(path):
-                 else:
-                     return constants.TAR
- 
--            if magic.startswith(b'Rar!\x1a\x07'):
--                if sevenzip_external.is_7z_support_rar():
--                    return constants.RAR
--                else:
--                    return constants.RAR5
- 
-             if magic[0:6] == b'7z\xbc\xaf\x27\x1c':
-                 return constants.SEVENZIP
-diff --git a/mcomix/mcomix/constants.py b/mcomix/mcomix/constants.py
-index 414f65c..e068218 100644
---- a/mcomix/mcomix/constants.py
-+++ b/mcomix/mcomix/constants.py
-@@ -49,7 +49,7 @@ ANIMATION_NORMAL = 1 # loop as animation setting
- ANIMATION_ONCE = 1<<1 # loop only once
- ANIMATION_INF = 1<<2 # loop infinity
- 
--ZIP, RAR, RAR5, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(12)
-+ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(10)
- NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4)
- LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3)
- AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \
-@@ -84,13 +84,6 @@ ZIP_FORMATS = (
-     ('.cbz', 'application/vnd.comicbook+zip'),
- )
- 
--RAR_FORMATS = (
--    # https://www.iana.org/assignments/media-types/application/vnd.rar
--    ('.rar', 'application/vnd.rar'),
--    # https://www.iana.org/assignments/media-types/application/vnd.comicbook-rar
--    ('.cbr', 'application/vnd.comicbook-rar'),
--)
--
- TAR_FORMATS = (
-     # not registed in IANA
-     ('.tar', 'application/x-tar'),
-@@ -143,7 +136,7 @@ SQUASHFS_FORMATS = (
-     ('.sqsh', 'application/vnd.squashfs'),
- )
- 
--ARCHIVE_FORMATS = ZIP_FORMATS + RAR_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS
-+ARCHIVE_FORMATS = ZIP_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS
- ARCHIVE_FORMATS += SZIP_FORMATS + LHA_FORMATS + PDF_FORMATS
- 
- # vim: expandtab:sw=4:ts=4
-diff --git a/mcomix/mcomix/messages/mcomix.pot b/mcomix/mcomix/messages/mcomix.pot
-index e622347..02528c3 100644
---- a/mcomix/mcomix/messages/mcomix.pot
-+++ b/mcomix/mcomix/messages/mcomix.pot
-@@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books."
- msgstr ""
- 
- #: mcomix/mcomix/about_dialog.py:30
--msgid "It reads ZIP, RAR and tar archives, as well as plain image files."
-+msgid "It reads ZIP and tar archives, as well as plain image files."
- msgstr ""
- 
- #: mcomix/mcomix/about_dialog.py:34
-@@ -1523,10 +1523,6 @@ msgstr ""
- msgid "ZIP archive"
- msgstr ""
- 
--#: mcomix/mcomix/strings.py:10
--msgid "RAR archive"
--msgstr ""
--
- #: mcomix/mcomix/strings.py:11
- msgid "Tar archive"
- msgstr ""
-diff --git a/mcomix/mcomix/strings.py b/mcomix/mcomix/strings.py
-index 0eb2ea7..c534f5f 100644
---- a/mcomix/mcomix/strings.py
-+++ b/mcomix/mcomix/strings.py
-@@ -3,11 +3,10 @@
-     This file should only be imported after gettext has been correctly initialized
-     and installed in the global namespace. '''
- 
--from mcomix.constants import ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL
-+from mcomix.constants import ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL
- 
- ARCHIVE_DESCRIPTIONS = {
-     ZIP         : _('ZIP archive'),
--    RAR         : _('RAR archive'),
-     TAR         : _('Tar archive'),
-     GZIP        : _('Gzip compressed tar archive'),
-     BZIP2       : _('Bzip2 compressed tar archive'),
-diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas
-index d8ab034..3bf2711 100644
---- a/mime/comicbook.schemas
-+++ b/mime/comicbook.schemas
-@@ -1,27 +1,5 @@
- <gconfschemafile>
-     <schemalist>
--        <schema>
--            <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable</key>
--            <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable</applyto>
--            <owner>comicthumb</owner>
--            <type>bool</type>
--            <default>true</default>
--            <locale name="C">
--                <short></short>
--                <long></long>
--            </locale>
--        </schema>
--        <schema>
--            <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command</key>
--            <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command</applyto>
--            <owner>comicthumb</owner>
--            <type>string</type>
--            <default>comicthumb %i %o %s</default>
--            <locale name="C">
--                <short></short>
--                <long></long>
--            </locale>
--        </schema>
-         <schema>
-             <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable</key>
-             <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable</applyto>
-diff --git a/mime/comicthumb.thumbnailer b/mime/comicthumb.thumbnailer
-index e357fe0..88cc59f 100644
---- a/mime/comicthumb.thumbnailer
-+++ b/mime/comicthumb.thumbnailer
-@@ -1,4 +1,4 @@
- [Thumbnailer Entry]
- TryExec=comicthumb
- Exec=comicthumb %i %o %s
--MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf
-+MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf
-diff --git a/mime/mcomix.appdata.xml b/mime/mcomix.appdata.xml
-index 514f95d..b07b474 100644
---- a/mime/mcomix.appdata.xml
-+++ b/mime/mcomix.appdata.xml
-@@ -10,7 +10,7 @@
-   <p>
- 	  MComix is a user-friendly, customizable image viewer. It is specifically
- 	  designed to handle comic books (both Western comics and manga) and supports
--	  a variety of container formats (including CBR, CBZ, CB7, CBT, LHA and PDF).
-+	  a variety of container formats (including CBZ, CB7, CBT, LHA and PDF).
-   </p>
-   <p>
- 	  MComix is a fork of the Comix project, and aims to add bug fixes and
-diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop
-index 0bb8315..1d46cdf 100644
---- a/mime/mcomix.desktop
-+++ b/mime/mcomix.desktop
-@@ -19,4 +19,4 @@ Terminal=false
- Type=Application
- StartupNotify=true
- Categories=Graphics;Viewer;
--MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;
-+MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
deleted file mode 100644
index 0836f6405..000000000
--- a/libre/mkisolinux/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=mkisolinux
-pkgver=2013.05
-pkgrel=2.parabola1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils')
-replaces=('mkbootcd' "${pkgname}-parabola")
-conflicts=(${pkgname}-parabola)
-backup=(etc/mkisolinux.conf)
-source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')
-
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux"
-  install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf"
-  install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"
-  install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"
-}
-md5sums=('0ddb91a127ba040ce1434776d387825e'
-         'd19183e162aff04f7f4c7b9e46be1315'
-         'a474f11ab00ecbc12dafb548bb9ac025'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg
deleted file mode 100644
index 2725404e0..000000000
--- a/libre/mkisolinux/boot.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-ISOLINUX BOOT
-created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-
-Press ENTER or type 'parabola' to boot the CD.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux
deleted file mode 100755
index 048d925aa..000000000
--- a/libre/mkisolinux/mkisolinux
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkisolinux.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-TARNAME=""
-export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX)
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "  -g=IMAGE         Generate a ISO image as IMAGE"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkisolinux.conf"
-    echo "  -B               Burn the ISO image after creation"
-    echo "  -b               Blanking media first"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-B|--B) BURN="1" ;;
-		-b|--b) BLANK="1" ;;
-		-t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then 
-	echo "ERROR: No image name specified, please use the -g option"
-	exit 1
-fi
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-	exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-export RUNPROGRAM="${APPNAME}"
-export BOOTDIRNAME="boot/syslinux"
-
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
-export USEKERNEL=${VERSION}
-
-# begin script
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/
-# prepare syslinux
-install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-for i in /usr/lib/syslinux/*.c32; do
-    install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
-done
-install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
-# create syslinux.cfg
-echo ":: Creating syslinux.cfg ..."
-if [ "${ISOLINUXCFG}" = "" ]; then
-	[ -e  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "prompt ${PROMPT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "timeout ${TIMEOUT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "display boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "default parabola"  >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "label parabola" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "kernel /boot/vmlinuz" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-fi
-[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
-
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
-	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-# create image
-echo ":: Creating ISO image ..."
-	[ -e ${GENIMG} ] && rm ${GENIMG}
-	[ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre"
-	mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \
-		-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \
-        && echo ":: ISO Image succesfull created at ${GENIMG}"
-	# burning/blanking image
-	if [ "$BLANK" = "1" ]; then
-		echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-	if [ "$BURN" = "1" ]; then
-		echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG}  > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
deleted file mode 100644
index e8b1e0df0..000000000
--- a/libre/mkisolinux/mkisolinux.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mkisolinux
-
-# DEFAULT kernel boot options like root=/dev/sda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkisolinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg"
-
-# syslinux.cfg file to use
-SYSLINUXCFG=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later
-ISONAME=""
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE=""
diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mkisolinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
deleted file mode 100644
index efcd0a5c3..000000000
--- a/libre/mkpxelinux/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=mkpxelinux
-pkgver=2013.10
-pkgrel=2.parabola1
-pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'tftp-hpa' 'syslinux')
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
-backup=(etc/mkpxelinux.conf)
-optdepends=('dhcp: for dhcp server usage')
-source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux"
-  install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf"
-  install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg"
-  install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg"
-}
-md5sums=('7225e73bfe717f97bd7ab52f5ab157f6'
-         '44c6b9fa8ae668a432f26adb9e70bd3f'
-         '158dece3af889740b0f0ee397f9058ed'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkpxelinux/boot.msg b/libre/mkpxelinux/boot.msg
deleted file mode 100644
index 6c1fcd476..000000000
--- a/libre/mkpxelinux/boot.msg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-PXELINUX BOOT
-created with 'mkpxelinux' written by Tobias Powalowski <tpowa@archlinux.org>
-
-Press ENTER or type 'parabola' to boot image.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux
deleted file mode 100755
index 35e946f82..000000000
--- a/libre/mkpxelinux/mkpxelinux
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkpxelinux.conf"
-
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo""
-    echo "  -d=INSTALLDIR    Your INSTALLDIR overwrites config default"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkpxelinux.conf"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage && exit 1
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-d=*|--d=*) CUSTOMINSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-    exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR}
-
-if [ "${INSTALLDIR}" = "" ]; then 
-	echo "ERROR: No INSTALLDIR name specified, please use the -d option"
-	 exit 1
-fi
-
-if ! [ $UID -eq 0 ]; then 
-	echo "ERROR: only works when run as root!"
-	exit 1
-fi
-
-! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1 
-export TEMPDIR=${NFSROOTDIR}
-export INSTALLDIR=${INSTALLDIR}
-export RUNPROGRAM="${APPNAME}"
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-# create default
-echo ":: Creating pxelinux default config file ..."
-mkdir -p ${INSTALLDIR}/pxelinux.cfg
-if [ "${PXELINUX_DEFAULT}" = "" ]; then
-	[ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default
-	echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "default parabola"  >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${PXELINUX_DEFAULT} >  ${INSTALLDIR}/pxelinux.cfg/default
-fi
-[ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz
-echo ":: Installing message files to ${INSTALLDIR} ..."
-	install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg
-	[ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-echo ":: Installing PXELINUX to ${INSTALLDIR} ..."
-	install -m644 /usr/lib/syslinux/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed."
diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf
deleted file mode 100644
index 55aba8247..000000000
--- a/libre/mkpxelinux/mkpxelinux.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mkpxelinux
-
-# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg"
-
-#pxelinux default config file to use
-PXELINUX_DEFAULT=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# Installdir of tftp, default location
-INSTALLDIR="/var/tftpboot"
-
-# Nfsrootdir, for hooks that might need it
-NFSROOTDIR=""
diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mkpxelinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
deleted file mode 100644
index fddc18ae5..000000000
--- a/libre/mksyslinux/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=mksyslinux
-pkgver=2013.06
-pkgrel=2.parabola1
-pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
-depends=('mkinitcpio' 'syslinux' 'pciutils')
-backup=(etc/mksyslinux.conf)
-source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux"
-  install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf"
-  install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg"
-  install -D -m644 options.msg  "$pkgdir/usr/share/mksyslinux/options.msg"
-}
-md5sums=('e9836ac2bbb436ca3a13bfbe9cc5c19a'
-         '0a9fd93356b5d98ab386f28bc849b808'
-         'c702b0b41ae7f58e9b08b53f3b6b0961'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg
deleted file mode 100644
index 2cfe24d42..000000000
--- a/libre/mksyslinux/boot.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-SYSLINUX BOOT
-created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-
-Press ENTER or type 'parabola' to boot image.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux
deleted file mode 100755
index 96ad45133..000000000
--- a/libre/mksyslinux/mksyslinux
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mksyslinux.conf"
-export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX)
-TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX)
-BOOTDIRNAME=boot/syslinux
-
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "WRITING TO DEVICE:"
-    echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!"
-    echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!"
-    echo ""
-    echo "CREATING AN IMAGE FILE:"
-    echo "- For creating an image file use the -i=IMAGEFILE switch"
-    echo "- use 'dd if=<yourimage> of=<yourdevice>' to write to your device afterwards."
-    echo ""
-    echo "PARAMETERS:"
-    echo "  -d=DEVICE        Your DEVICE first partition from /dev/xxx tree to install"
-    echo "  -i=IMAGENAME     Your IMAGENAME"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mksyslinux.conf"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage && exit 1
-
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-    exit 1
-fi
-
-if [ "${IMAGENAME}" = "" ]; then
-	if [ "${DEVICE}" = "" ]; then 
-		echo "ERROR: No DEVICE name specified, please use the -d option"
-	 	exit 1
-	fi
-fi
-
-if ! [ $UID -eq 0 ]; then 
-	echo "ERROR: only works when run as root!"
-	exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')"
-
-export RUNPROGRAM="${APPNAME}"
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}
-echo ":: Mounting ${DEVICE} ..."
-if ! [ "${IMAGENAME}" = "" ]; then
-	modprobe loop
-else
-	mount ${DEVICE} ${TEMPDIR} || exit 1
-fi
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-# prepare syslinux bootloader
-install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-for i in /usr/lib/syslinux/*.c32; do
-    install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
-done
-install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
-
-# create syslinux.cfg
-echo ":: Creating syslinux.cfg ..."
-if [ "${SYSLINUXCFG}" = "" ]; then
-	[ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "default parabola"  >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-fi
-[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
-	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-if ! [ "${IMAGENAME}" = "" ]; then
-	# ext2 overhead's upper bound is 6%
-	# empirically tested up to 1GB
-	rootsize=$(du -bs ${TEMPDIR}|cut -f1)
-	IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors
-	# create the filesystem image file
-	dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}"
-	# create a filesystem on the image
-	mkfs.vfat "${IMAGENAME}"
-	mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1
-	cp -r "${TEMPDIR}"/* "$TMPDIR"
-	umount ${TMPDIR}
-else
-	echo ":: Unmounting ${DEVICE} ..."
-	umount ${TEMPDIR} || exit 1
-fi
-if ! [ "${IMAGENAME}" = "" ]; then
-	echo ":: Installing SYSLINUX on ${IMAGENAME} ..."
-	syslinux ${IMAGENAME} && echo "Installation completed."
-else
-	echo ":: Installing MBR on ${MBRDEVICE} ..."
-	cat ${MBR} > ${MBRDEVICE}
-	echo ":: Installing SYSLINUX on ${DEVICE} ..."
-	syslinux -t offset ${DEVICE} && echo "Installation completed."
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
-! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR}
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
deleted file mode 100644
index a7d032295..000000000
--- a/libre/mksyslinux/mksyslinux.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mksyslinux
-
-# DEFAULT kernel boot options like root=/dev/sda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"
-
-# syslinux.cfg file to use
-SYSLINUXCFG=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# default MBR
-MBR="/usr/lib/syslinux/mbr.bin"
diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mksyslinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/shntool/PKGBUILD b/libre/shntool/PKGBUILD
deleted file mode 100644
index cc88117d5..000000000
--- a/libre/shntool/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer (Arch): schuay <jakob.gruber@gmail.com>
-# Contributor (Arch): Michal Hybner <dta081@gmail.com>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=shntool
-pkgver=3.0.10
-pkgrel=5
-pkgrel+=.parabola1
-pkgdesc="A multi-purpose WAVE data processing and reporting utility"
-pkgdesc+=", without nonfree mac recommendation"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-url="http://shnutils.freeshell.org/shntool/"
-license=('GPL')
-options=(!emptydirs)
-depends=('glibc')
-optdepends=('flac: support for flac format'
-            'wavpack: support for wv format')
-source=("http://shnutils.freeshell.org/shntool/dist/src/${pkgname}-${pkgver}.tar.gz"
-        'shntool-3.0.10-large-size.diff'
-        'shntool-3.0.10-large-times.diff')
-
-# Patches taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684600
-
-prepare() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 < "${srcdir}/shntool-3.0.10-large-size.diff"
-  patch -Np1 < "${srcdir}/shntool-3.0.10-large-times.diff"
-}
-
-build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-	make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('5d41f8f42c3c15e3145a7a43539c3eae'
-         '4265935ef1d684a4b49041278ffda7de'
-         '6f0d61ddbf8cbee5c0b51a99e987ddda')
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/shntool/shntool-3.0.10-large-size.diff b/libre/shntool/shntool-3.0.10-large-size.diff
deleted file mode 100644
index 539c7fb70..000000000
--- a/libre/shntool/shntool-3.0.10-large-size.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aur shntool-3.0.10-clean/src/core_fileio.c shntool-3.0.10-size/src/core_fileio.c
---- shntool-3.0.10-clean/src/core_fileio.c	2009-03-11 17:18:01.000000000 +0000
-+++ shntool-3.0.10-size/src/core_fileio.c	2012-08-11 17:20:14.000000000 +0100
-@@ -110,10 +110,16 @@
-   buf[4] = 0;
- 
-   if (be_val)
--    *be_val = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-+    *be_val = (((unsigned long)buf[0]) << 24)
-+              | (((unsigned long)buf[1]) << 16)
-+              | (((unsigned long)buf[2]) << 8)
-+              | ((unsigned long)buf[3]);
- 
-   if (le_val)
--    *le_val = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-+    *le_val = (((unsigned long)buf[3]) << 24)
-+              | (((unsigned long)buf[2]) << 16)
-+              | (((unsigned long)buf[1]) << 8)
-+              | ((unsigned long)buf[0]);
- 
-   if (tag_val)
-     tagcpy(tag_val,buf);
diff --git a/libre/shntool/shntool-3.0.10-large-times.diff b/libre/shntool/shntool-3.0.10-large-times.diff
deleted file mode 100644
index be4716e6b..000000000
--- a/libre/shntool/shntool-3.0.10-large-times.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -aur shntool-3.0.10-clean/src/core_mode.c shntool-3.0.10/src/core_mode.c
---- shntool-3.0.10-clean/src/core_mode.c	2009-03-30 06:55:33.000000000 +0100
-+++ shntool-3.0.10/src/core_mode.c	2012-08-11 16:37:58.000000000 +0100
-@@ -310,8 +310,8 @@
-   if (sec >= 60)
-     st_error("invalid value for seconds: [%d]",sec);
- 
--  bytes = (wlong)(min * info->rate * 60) +
--          (wlong)(sec * info->rate);
-+  bytes = (((wlong)min) * info->rate * 60) +
-+          (((wlong)sec) * info->rate);
- 
-   return bytes;
- }
-@@ -358,9 +358,9 @@
-   if (frames >= 75)
-     st_error("invalid value for frames: [%d]",frames);
- 
--  bytes = (wlong)(min * CD_RATE * 60) +
--          (wlong)(sec * CD_RATE) +
--          (wlong)(frames * CD_BLOCK_SIZE);
-+  bytes = (((wlong)min) * CD_RATE * 60) +
-+          (((wlong)sec) * CD_RATE) +
-+          (((wlong)frames) * CD_BLOCK_SIZE);
- 
-   return bytes;
- }
-@@ -403,8 +403,8 @@
- 
-   nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5);
- 
--  bytes = (wlong)(min * info->rate * 60) +
--          (wlong)(sec * info->rate);
-+  bytes = (((wlong)min) * info->rate * 60) +
-+          (((wlong)sec) * info->rate);
- 
-   if (PROB_NOT_CD(info)) {
-     bytes += nearest_byte;
-
diff --git a/libre/wings3d/PKGBUILD b/libre/wings3d/PKGBUILD
deleted file mode 100644
index 6797bce4f..000000000
--- a/libre/wings3d/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>
-# Contributor (Arch): kappa <kappacurve@gmail.com>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=wings3d
-pkgver=2.2.5
-pkgrel=1
-pkgrel+=.parabola1
-pkgdesc='3D modeler using the winged edge data structure'
-pkgdesc+=', without nonfree kerkythea render support'
-arch=(x86_64)
-arch+=(i686 armv7h)
-# https is not available
-url='http://www.wings3d.com/'
-license=(GPL)
-depends=(erlang erlang-cl erlang-sdl)
-makedepends=(gendesk)
-optdepends=('povray: render scenes with POV-Ray')
-conflicts=("${pkgname}-libre")
-replaces=("${pkgname}-libre")
-source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
-        "$pkgname.sh")
-sha256sums=('95ecf84a8f49bc00b983643e7ccd807f64a3b8b88253037a8ccefbe7a3bedff8'
-            '8e5e8f31d47ea55a0e9d311b7cc0eaac4e6050ac40506d3548b6ebae5d3618be')
-_p=${pkgname%3d}-$pkgver
-
-prepare() {
-  gendesk -f -n \
-    --name Wings3D \
-    --pkgname $pkgname \
-    --pkgdesc "$pkgdesc" \
-    --genericname '3D Modeler' \
-    --categories 'Graphics;3DGraphics'
-}
-
-build() {
-  export ERL_LIBS="$srcdir"
-  make -C "${pkgname%3d}-$pkgver" unix
-}
-
-package() {
-  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 -t "$pkgdir/usr/share/applications" $pkgname.desktop
-  cd "${pkgname%3d}-$pkgver/icons"
-  install -Dm644 wings_icon_48x48.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  cd ../build
-  install -d "$pkgdir/usr/lib/$pkgname"
-  cp -r "wings-$pkgver-linux/lib/wings-$pkgver"/* "$pkgdir/usr/lib/$pkgname/"
-  msg 'remove nonfree kerkythea render support plugin'
-  rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_kerky.beam
-}
-
-# getver: -u=2 github.com/dgud/wings/releases
-# vim: ts=2 sw=2 et:
diff --git a/libre/wings3d/wings3d.png b/libre/wings3d/wings3d.png
deleted file mode 100644
index 1fe6579dc..000000000
--- a/libre/wings3d/wings3d.png
+++ /dev/null
diff --git a/libre/wings3d/wings3d.sh b/libre/wings3d/wings3d.sh
deleted file mode 100644
index 13130db98..000000000
--- a/libre/wings3d/wings3d.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec /usr/bin/erl -noinput -smp \
-  -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \
-  -run wings_start start_halt ${1+"$@"}
diff --git a/libre/xalan-java/PKGBUILD b/libre/xalan-java/PKGBUILD
deleted file mode 100644
index 1723688a8..000000000
--- a/libre/xalan-java/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_libname=xalan
-pkgname=${_libname}-java
-pkgver=2.7.2
-pkgrel=1.parabola1
-pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types"
-arch=('any')
-license=('APACHE')
-url="http://xalan.apache.org/xalan-j/index.html"
-depends=('java-runtime' 'xerces2-java')
-makedepends=('apache-ant' 'jakarta-regexp' 'java-bcel' 'java-cup' 'jlex' 'jh' 'xerces2-java')
-source=("http://archive.apache.org/dist/${_libname}/${_libname}-j/source/${_libname}-j_${pkgver//./_}-src.tar.gz"
-        "http://repo.maven.apache.org/maven2/${_libname}/${_libname}/${pkgver}/${_libname}-${pkgver}.pom"
-        "http://repo.maven.apache.org/maven2/${_libname}/serializer/${pkgver}/serializer-${pkgver}.pom")
-md5sums=('74e6ab12dda778a4b26da67438880736'
-         '32d9a54317a2495ec8c7f4d9d89dd656'
-         '89a3a32915a378a87a113b917dd1144b')
-
-prepare() {
-  cd "${srcdir}/${_libname}-j_${pkgver//./_}"
-  rm -rv lib/*.jar
-  rm -rv tools/*.jar
-  sed -i 's/-static //g' build.xml
-
-  ln -sf /usr/share/java/java_cup.jar tools/java_cup.jar
-  ln -sf /usr/share/java/JLex.jar tools/JLex.jar
-  ln -sf /usr/share/java/bcel.jar lib/BCEL.jar
-  ln -sf /usr/share/java/regexp.jar lib/regexp.jar
-  ln -sf /usr/share/java/java_cup.jar lib/runtime.jar
-#  ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
-}
-
-build() {
-  cd "${srcdir}/${_libname}-j_${pkgver//./_}"
-
-  ant clean xsltc.clean jar xsltc.unbundledjar javadocs docs \
-    -Dendorsed.dir=/usr/share/java/
-}
-
-package() {
-  cd "${srcdir}/${_libname}-j_${pkgver//./_}"
-
-  # Install license file
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-
-  # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/docs" "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "samples" "${pkgdir}/usr/share/doc/${pkgname}/examples"
-
-  # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install ${_libname} ${_libname} ${pkgver} \
-    "${srcdir}/${_libname}-${pkgver}.pom" \
-    "build/${_libname}.jar" \
-    "${_libname}.jar"
-  jh mvn-install ${_libname} serializer ${pkgver} \
-    "${srcdir}/serializer-${pkgver}.pom" \
-    "build/serializer.jar" \
-    "serializer.jar"
-
-  ln -s "/usr/share/java/${_libname}.jar" \
-    "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar"
-  ln -s "/usr/share/java/serializer.jar" \
-    "${pkgdir}/usr/share/java/serializer-${pkgver}.jar"
-
-  install -m644 "build/xsltc.jar" "${pkgdir}/usr/share/java/"
-}
diff --git a/libre/xerces2-java/PKGBUILD b/libre/xerces2-java/PKGBUILD
deleted file mode 100644
index aaf2811a7..000000000
--- a/libre/xerces2-java/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_libname=xerces2
-pkgname=${_libname}-java
-pkgver=2.11.0
-pkgrel=3.parabola1
-pkgdesc="High performance fully compliant Java XML parser"
-arch=('any')
-url="http://xml.apache.org/xerces2-j"
-license=('APACHE')
-depends=('java-runtime' 'java-resolver' 'java-xml-commons-external')
-makedepends=('apache-ant' 'java-resolver' 'java-xml-commons-external' 'jh')
-provides=("java-xerces2=${pkgver}")
-conflicts=('java-xerces2')
-replaces=('java-xerces2')
-source=("http://archive.apache.org/dist/xerces/j/Xerces-J-src.${pkgver}.tar.gz"
-        "http://repo.maven.apache.org/maven2/xerces/xercesImpl/${pkgver}/xercesImpl-${pkgver}.pom"
-        "xerces2-java-taskdef.patch"
-        "xerces2-java-dont_unzip.patch"
-        "xerces2-java-HTMLObjectElementImpl.patch")
-md5sums=('d01fc11eacbe43b45681cb85ac112ebf'
-         '64288948e6420e49679348b0ce1963f8'
-         '600788add1665864495e2bd0ab015613'
-         '3bd20b2ea82f14d77031bf0e49c03516'
-         'e1c26eeaedd33dc0a7af493a07a17211')
-
-prepare() {
-  cd "${srcdir}/xerces-${pkgver//./_}"
-  mkdir -p tools
-  patch -Np1 -i ../xerces2-java-taskdef.patch
-  patch -Np1 -i ../xerces2-java-dont_unzip.patch
-  patch -Np1 -i ../xerces2-java-HTMLObjectElementImpl.patch
-}
-
-build() {
-  cd "${srcdir}/xerces-${pkgver//./_}"
-  ln -sf /usr/share/java/resolver.jar tools/resolver.jar
-  ln -sf /usr/share/java/xml-apis.jar tools/xml-apis.jar
-
-  ant clean jar sampjar javadocs
-}
-
-package() {
-  cd "${srcdir}/xerces-${pkgver//./_}"
-
-  # Install license file
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-
-  # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/docs/javadocs" "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/samples" "${pkgdir}/usr/share/doc/${pkgname}/examples"
-
-  # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install xerces xercesImpl ${pkgver} \
-    "${srcdir}/xercesImpl-${pkgver}.pom" \
-    "build/xercesImpl.jar" \
-    "xercesImpl.jar"
-
-  ln -s "/usr/share/java/xercesImpl.jar" \
-    "${pkgdir}/usr/share/java/xercesImpl-${pkgver}.jar"
-}
diff --git a/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch b/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch
deleted file mode 100644
index b18badc5d..000000000
--- a/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLElementImpl.java	2010-11-26 15:42:05.000000000 -0500
-+++ xerces-2_11_0/src/org/apache/html/dom/HTMLElementImpl.java	2015-12-02 09:54:52.042144620 -0500
-@@ -20,6 +20,7 @@
- 

- import org.apache.xerces.dom.ElementImpl;

- import org.w3c.dom.Attr;

-+import org.w3c.dom.Document;

- import org.w3c.dom.Node;

- import org.w3c.dom.NodeList;

- import org.w3c.dom.html.HTMLElement;

-@@ -254,4 +255,7 @@
-         return null;

-     }

- 

-+    public Document getContentDocument() { 

-+        throw new UnsupportedOperationException(); 

-+    }

- }

diff --git a/libre/xerces2-java/xerces2-java-dont_unzip.patch b/libre/xerces2-java/xerces2-java-dont_unzip.patch
deleted file mode 100644
index 8d068a259..000000000
--- a/libre/xerces2-java/xerces2-java-dont_unzip.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- xerces-2_11_0.orig/build.xml	2010-11-26 15:42:11.000000000 -0500
-+++ xerces-2_11_0/build.xml	2015-12-03 02:10:02.884516544 -0500
-@@ -246,30 +246,6 @@
-       tofile="${build.src}/org/apache/xerces/impl/msg/XPointerMessages_en.properties"/>

-     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"

-       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>

--

--    <!-- now deal with API's:  -->

--    <unzip src="${src.apis.zip}" dest="${build.src}">

--        <patternset

--            includes="org/xml/sax/** 

--                javax/xml/**

--                javax/xml/datatype/**

--                javax/xml/namespace/**

--                javax/xml/parsers/**

--                javax/xml/stream/**

--                javax/xml/transform/**

--                javax/xml/validation/**

--                javax/xml/xpath/**

--                org/w3c/dom/*

--                org/w3c/dom/bootstrap/**

--                org/w3c/dom/events/**

--                org/w3c/dom/html/**

--                org/w3c/dom/ls/**

--                org/w3c/dom/ranges/**

--                org/w3c/dom/traversal/**

--                org/w3c/dom/views/**

--                org/w3c/dom/xpath/**"

--        />

--    </unzip>

-     

-     <!-- substitute tokens as needed -->

-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

-@@ -1231,31 +1207,6 @@
-     <!-- HACK: Remove reference to XML11Configurable from SAX parser -->

-     <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"

-              token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>

-- 

--    <!-- now deal with API's:  -->

--    <unzip src="${src.apis.zip}" dest="${build.src}">

--        <patternset

--            includes="org/xml/sax/** 

--                javax/xml/**

--                javax/xml/datatype/**

--                javax/xml/namespace/**

--                javax/xml/parsers/**

--                javax/xml/stream/**

--                javax/xml/transform/**

--                javax/xml/validation/**

--                javax/xml/xpath/**

--                org/w3c/dom/*

--                org/w3c/dom/bootstrap/**

--                org/w3c/dom/events/**

--                org/w3c/dom/html/**

--                org/w3c/dom/ls/**

--                org/w3c/dom/ranges/**

--                org/w3c/dom/traversal/**

--                org/w3c/dom/views/**

--                org/w3c/dom/xpath/**"

--        />

--    </unzip>

--

- 

-     <!-- substitute tokens as needed -->

-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

diff --git a/libre/xerces2-java/xerces2-java-taskdef.patch b/libre/xerces2-java/xerces2-java-taskdef.patch
deleted file mode 100644
index 06ba7fe95..000000000
--- a/libre/xerces2-java/xerces2-java-taskdef.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- xerces-2_11_0.orig/build.xml	2010-11-26 15:42:11.000000000 -0500
-+++ xerces-2_11_0/build.xml	2015-09-07 21:19:33.401435351 -0500
-@@ -39,7 +39,7 @@
-   <property name="tools.dir" value="./tools"/>

- 

-   <!-- enable compilation under JDK 1.4 and above -->

--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">

-+  <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac">

-     <classpath>

-       <pathelement location="${tools.dir}/bin/xjavac.jar"/>

-     </classpath>

-@@ -291,7 +291,7 @@
-            source="${javac.source}"

-            target="${javac.target}"

-            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"

--           debug="${debug}"

-+           debug="${debug}" nowarn="true"

-            debuglevel="${debuglevel}"

-            deprecation="${deprecation}"

-            optimize="${optimize}"

-@@ -359,7 +359,7 @@
-            source="${javac.source}"

-            target="${javac.target}"

-            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"

--           debug="${debug}"

-+           debug="${debug}" nowarn="true"

-            debuglevel="${debuglevel}"

-            includeAntRuntime="false"

-            includeJavaRuntime="true"/>

-@@ -379,7 +379,7 @@
-            source="${javac.source}"

-            target="${javac.target}"

-            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"

--           debug="${debug}"

-+           debug="${debug}" nowarn="true"

-            debuglevel="${debuglevel}"

-            includeAntRuntime="false"

-            includeJavaRuntime="true"/>

diff --git a/nonprism/digikam/0001-optionally-enable-OpenGL.patch b/nonprism/digikam/0001-optionally-enable-OpenGL.patch
deleted file mode 100644
index f87e8e4a8..000000000
--- a/nonprism/digikam/0001-optionally-enable-OpenGL.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9b37ca152cbae4b86ce2b93f7b1af58f092d1ccf Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Tue, 5 Jul 2016 18:47:56 -0600
-Subject: [PATCH] optionally enable OpenGL
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89e0682..b60d0b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,6 +105,7 @@ option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer suppor
- option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                         OFF)
- option(ENABLE_MEDIAPLAYER           "Build digiKam with Media Player support (default=OFF)"                              OFF)
- option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                       ON)
-+option(ENABLE_OPENGL                "Build digiKam with OpenGL support (default=ON)"                                   ON)
- option(ENABLE_APPSTYLES             "Build digiKam with support for changing the widget application style (default=OFF)" OFF)
- 
- # Mysql support options (experimental):
-@@ -293,7 +294,7 @@ else()
- endif()
- 
- # decide if Presentation tool can be built with OpenGL
--if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND)
-+if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL)
-     set(HAVE_OPENGL TRUE)
- elseif()
-     set(HAVE_OPENGL FALSE)
--- 
-2.10.2
-
diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD
deleted file mode 100644
index da82a61b1..000000000
--- a/nonprism/digikam/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Andreas Grapentin <andreas@grapentin.org>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
-
-# parabola changes and rationale:
-#  - remove libkvkontakte support for kipi-plugins
-
-pkgbase=digikam
-pkgname=(kipi-plugins)
-_pkgver=5.9.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=1
-pkgrel+=.nonprism1
-pkgdesc="An advanced digital photo management application"
-arch=(x86_64)
-arch+=(i686 armv7h)
-license=(GPL)
-url="http://www.digikam.org/"
-makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common
-             kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu)
-source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz")
-source+=("libre.patch" "nonprism.patch")
-sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b'
-            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89'
-            'e3d8ec4fd041a5545b7efef167d3b2ae6efc1f510832dabc7430ddfeb6b3c4ac')
-
-prepare() {
-  mkdir -p build
-
-# fix freedom issues
-  cd $pkgbase-$_pkgver
-  patch -Np1 -i "$srcdir"/libre.patch
-  patch -Np1 -i "$srcdir"/nonprism.patch
-}
-
-build() {
-  cd build
-
-  cmake ../$pkgbase-${_pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DENABLE_KFILEMETADATASUPPORT=ON \
-    -DENABLE_MEDIAPLAYER=ON \
-    -DENABLE_AKONADICONTACTSUPPORT=ON \
-    -DENABLE_MYSQLSUPPORT=ON \
-    -DENABLE_OPENCV3=ON \
-    -DENABLE_APPSTYLES=ON \
-    -DENABLE_LEGACY=ON \
-    -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF
-  make
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  pkgdesc+=", without nonfree suggestions and support for unsafe and dangerous for privacy protocols"
-  depends=(kio libkipi)
-  optdepends=('libmediawiki: MediaWiki Export plugin')
-
-  cd build/extra
-  make DESTDIR="$pkgdir" install
-  cd $srcdir/build/po
-  make DESTDIR="$pkgdir" install
-
-# Provided by digikam
-  rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
-}
diff --git a/nonprism/digikam/libre.patch b/nonprism/digikam/libre.patch
deleted file mode 100644
index 8c677e210..000000000
--- a/nonprism/digikam/libre.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
-index 0f58cc4..b497299 100644
---- a/extra/kipi-plugins/sendimages/emailsettings.h
-+++ b/extra/kipi-plugins/sendimages/emailsettings.h
-@@ -64,10 +64,9 @@ public:
-         CLAWSMAIL,
-         EVOLUTION,
-         KMAIL,
--        NETSCAPE,
-         SYLPHEED,
-         SYLPHEEDCLAWS,
--        THUNDERBIRD
-+        ICEDOVE
-     };
- 
-     enum ImageSize
-diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
-index 1be65d6..68094de 100644
---- a/extra/kipi-plugins/sendimages/sendimages.cpp
-+++ b/extra/kipi-plugins/sendimages/sendimages.cpp
-@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()
-                 // More info about command lines options with Mozilla & co:
-                 // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
- 
--                case EmailSettings::NETSCAPE:
--                case EmailSettings::THUNDERBIRD:
-+                case EmailSettings::ICEDOVE:
-                 {
-                     QString prog;
- 
--                    if (d->settings.emailProgram == EmailSettings::NETSCAPE)
-+                    if (d->settings.emailProgram == EmailSettings::ICEDOVE)
-                     {
--                        prog = QLatin1String("netscape");
--                    }
--                    else
--                    {
--                        prog = QLatin1String("thunderbird");
-+                        prog = QLatin1String("icedove");
-                     }
- 
-                     QStringList args;
-diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
-index b8416a4..f160310 100644
---- a/extra/kipi-plugins/sendimages/settingswidget.cpp
-+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
-@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
-     d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL,     QLatin1String("Claws Mail"));
-     d->mailAgentName->insertItem(EmailSettings::EVOLUTION,     QLatin1String("Evolution"));
-     d->mailAgentName->insertItem(EmailSettings::KMAIL,         QLatin1String("KMail"));
--    d->mailAgentName->insertItem(EmailSettings::NETSCAPE,      QLatin1String("Netscape"));
-     d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      QLatin1String("Sylpheed"));
-     d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
--    d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   QLatin1String("Thunderbird"));
-+    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,   QLatin1String("Icedove"));
- #endif
-     d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
-     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch
deleted file mode 100644
index 779196f09..000000000
--- a/nonprism/digikam/nonprism.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-diff --git a/doc/TODO b/doc/TODO
-index a0ac4f4c6..23bf7450f 100644
---- a/doc/TODO
-+++ b/doc/TODO
-@@ -78,16 +78,10 @@ menu-mainwindow.docbook                    *               *                  Gi
- tool-acquireimages.docbook
- tool-advrename.docbook                                                                             Need to be created
- tool-calendar.docbook                                                                              Need to be created
--tool-dropbox.docbook                                                                               Need to be created
- tool-expoblending.docbook                                                                          Need to be created
--tool-facebook.docbook                                                                              Need to be created
- tool-findduplicates.docbook                                                                        Need to be created
- tool-flashexport.docbook                                                                           Need to be created
--tool-flickrexport.docbook
- tool-geolocationeditor.docbook                                                                     Need to be created
--tool-googleexport.docbook                                                                          Need to be created
--tool-imageshack.docbook                                                                            Need to be created
--tool-imgur.docbook                                                                                 Need to be created
- tool-kmlexport.docbook                                                                             Need to be created
- tool-maintenance.docbook                                                                           Need to be created
- tool-mediawiki.docbook                                                                             Need to be created
-@@ -97,12 +91,8 @@ tool-panorama.docbook
- tool-piwigoexport.docbook                                                                          Need to be created
- tool-presentation.docbook
- tool-printwizard.docbook
--tool-rajce.docbook                                                                                 Need to be created
- tool-remotestorage.docbook                                                                         Need to be created
- tool-sendimages.docbook
--tool-smug.docbook                                                                                  Need to be created
--tool-vkontakte.docbook                                                                             Need to be created
--tool-yandexfotki.docbook                                                                           Need to be created
- using-bqm.docbook
- using-camera.docbook                       DONE            DONE               Gilles
- using-camera-intro.docbook
-diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook
-index 080275044..0fe7027c9 100644
---- a/doc/digikam/index.docbook
-+++ b/doc/digikam/index.docbook
-@@ -172,21 +172,11 @@
-     <!-- plugins -->
-     <!ENTITY doc-tool-printwizard                 SYSTEM "tool-printwizard.docbook">
-     <!ENTITY doc-tool-sendimages                  SYSTEM "tool-sendimages.docbook">
--    <!ENTITY doc-tool-flickrexport                SYSTEM "tool-flickrexport.docbook">
-     <!ENTITY doc-tool-piwigoexport                SYSTEM "tool-piwigoexport.docbook">
-     <!ENTITY doc-tool-kmlexport                   SYSTEM "tool-kmlexport.docbook">
--    <!ENTITY doc-tool-googleexport                SYSTEM "tool-googleexport.docbook">
-     <!ENTITY doc-tool-flashexport                 SYSTEM "tool-flashexport.docbook">
--    <!ENTITY doc-tool-dropbox                     SYSTEM "tool-dropbox.docbook">
--    <!ENTITY doc-tool-facebook                    SYSTEM "tool-facebook.docbook">
--    <!ENTITY doc-tool-imageshack                  SYSTEM "tool-imageshack.docbook">
--    <!ENTITY doc-tool-imgur                       SYSTEM "tool-imgur.docbook">
-     <!ENTITY doc-tool-mediawiki                   SYSTEM "tool-mediawiki.docbook">
--    <!ENTITY doc-tool-rajce                       SYSTEM "tool-rajce.docbook">
-     <!ENTITY doc-tool-remotestorage               SYSTEM "tool-remotestorage.docbook">
--    <!ENTITY doc-tool-smug                        SYSTEM "tool-smug.docbook">
--    <!ENTITY doc-tool-vkontakte                   SYSTEM "tool-vkontakte.docbook">
--    <!ENTITY doc-tool-yandexfotki                 SYSTEM "tool-yandexfotki.docbook">
- 
-     <!-- Menus Chapter -->
- 
-@@ -311,21 +301,11 @@
-     <!-- plugins -->
-     &doc-tool-printwizard;
-     &doc-tool-sendimages;
--    &doc-tool-flickrexport;
-     &doc-tool-piwigoexport;
-     &doc-tool-kmlexport;
--    &doc-tool-googleexport;
-     &doc-tool-flashexport;
--    &doc-tool-dropbox;
--    &doc-tool-facebook;
--    &doc-tool-imageshack;
--    &doc-tool-imgur;
-     &doc-tool-mediawiki;
--    &doc-tool-rajce;
-     &doc-tool-remotestorage;
--    &doc-tool-smug;
--    &doc-tool-vkontakte;
--    &doc-tool-yandexfotki;
- 
- <!-- ******** MENUS ******************************************************** -->
- 
-diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook
-index 5c8e8e2b2..acdef13a2 100644
---- a/doc/digikam/menu-mainwindow.docbook
-+++ b/doc/digikam/menu-mainwindow.docbook
-@@ -943,22 +943,6 @@
- 
-         <varlistentry>
-             <term><menuchoice>
--                <guimenu>Export</guimenu><guimenuitem>KML Export...</guimenuitem>
--            </menuchoice></term>
--            <listitem>
--                <para><action>
--                    Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth.
--                </action></para>
--                <para>
--                    See the dedicated 
--                    <link linkend="tool-flickrexport">KML Export Tool</link> 
--                    for more information.
--                </para>
--            </listitem>
--        </varlistentry>
--
--        <varlistentry>
--            <term><menuchoice>
-                 <guimenu>Tools</guimenu><guimenuitem>Export to Piwigo</guimenuitem>
-             </menuchoice></term>
-             <listitem>
-@@ -973,21 +957,6 @@
-             </listitem>
-         </varlistentry>
- 
--        <varlistentry>
--            <term><menuchoice>
--                <guimenu>Export</guimenu><guimenuitem>Export to Flickr...</guimenuitem>
--            </menuchoice></term>
--            <listitem>
--                <para><action>
--                    Tool to upload or update images to <ulink url="http://www.flickr.com/">Flickr</ulink> server.
--                </action></para>
--                <para>
--                    See the dedicated 
--                    <link linkend="tool-flickrexport">Flickr Export Tool</link> 
--                    for more information.
--                </para>
--            </listitem>
--        </varlistentry>
- <!-- not ported to Qt5
-         <varlistentry>
-             <term><menuchoice>
-@@ -1005,37 +974,6 @@
-             </listitem>
-         </varlistentry>
- -->
--        <varlistentry>
--            <term><menuchoice>
--                <guimenu>Export</guimenu><guimenuitem>Export to Google Photos...</guimenuitem>
--            </menuchoice></term>
--            <listitem>
--                <para><action>
--                    Tool upload or update images to <ulink url="https://photos.google.com/">Google Photos galleries</ulink>.
--                </action></para>
--                <para>
--                    See the dedicated 
--                    <link linkend="tool-googleexport">Google Services Tool</link>
--                    for more information.
--                </para>
--            </listitem>
--        </varlistentry>
--
--        <varlistentry>
--            <term><menuchoice>
--                <guimenu>Export</guimenu><guimenuitem>Export to Google Drive...</guimenuitem>
--            </menuchoice></term>
--            <listitem>
--                <para><action>
--                    Tool upload images to <ulink url="https://www.google.com/drive/">Google Drive</ulink>.
--                </action></para>
--                <para>
--                    See the dedicated 
--                    <link linkend="tool-googleexport">Google Services Tool</link>
--                    for more information.
--                </para>
--            </listitem>
--        </varlistentry>
- <!-- not ported to Qt5
-         <varlistentry>
-             <term><menuchoice>
-diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
-index 63579cae7..9b8171ca3 100644
---- a/extra/kipi-plugins/CMakeLists.txt
-+++ b/extra/kipi-plugins/CMakeLists.txt
-@@ -145,7 +145,6 @@ if(KF5Kipi_FOUND)
-     # -- Optional dependencies detection required by some plugins -------------------------------------
- 
-     DETECT_LIBMEDIAWIKI(5.0.0)                                                 # For Mediawiki.
--    DETECT_LIBKVKONTAKTE(4.70.0)                                               # For VKontakte.
- 
-     # ==================================================================================================
-     # Log messages
-@@ -166,7 +165,6 @@ if(KF5Kipi_FOUND)
-     PRINT_OPTIONAL_LIBRARY_STATUS("libkio"          "https://projects.kde.org/projects/frameworks/kio"                "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkio support."          KF5KIO_FOUND)
-     PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive"     "https://projects.kde.org/projects/frameworks/karchive"           "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkarchive support."     KF5Archive_FOUND)
-     PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki"    "https://projects.kde.org/projects/extragear/libs/libmediawiki"   "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libmediawiki support."    KF5MediaWiki_FOUND)
--    PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte"   "https://projects.kde.org/projects/extragear/libs/libkvkontakte"  "(version >= 4.70.0)"                  "Kipi-plugins will be compiled without libkvkontakte support."   KF5Vkontakte_FOUND)
- 
-     # Optional plugins results ----------------------------------------------------------------------------
- 
-@@ -183,7 +181,6 @@ if(KF5Kipi_FOUND)
-     endif()
- 
-     PRINT_COMPONENT_COMPILE_STATUS("Legacy plugins"     ENABLE_LEGACY)
--    PRINT_COMPONENT_COMPILE_STATUS("VKontakte"          KF5Vkontakte_FOUND)
-     PRINT_COMPONENT_COMPILE_STATUS("Mediawiki"          KF5MediaWiki_FOUND)
-     PRINT_COMPONENT_COMPILE_STATUS("FlashExport"        KF5Archive_FOUND)
- 
-@@ -243,16 +240,7 @@ if(KF5Kipi_FOUND)
-         add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- 
-         add_subdirectory(common)
--        add_subdirectory(flickr)
--        add_subdirectory(dropbox)
--        add_subdirectory(facebook)
--        add_subdirectory(imgur)
-         add_subdirectory(piwigo)
--        add_subdirectory(rajce)
--        add_subdirectory(smug)
--        add_subdirectory(imageshack)
--        add_subdirectory(yandexfotki)
--        add_subdirectory(googleservices)
- 
-         if(ENABLE_LEGACY)
-             add_subdirectory(printimages)
-@@ -266,10 +254,6 @@ if(KF5Kipi_FOUND)
- 
-         endif()
- 
--        if(KF5Vkontakte_FOUND)
--            add_subdirectory(vkontakte)
--        endif()
--
-         if(KF5MediaWiki_FOUND)
-             add_subdirectory(mediawiki)
-         endif()