From 19341054e1e71a5b332076a4ba31addb04efaff0 Mon Sep 17 00:00:00 2001
From: Izzy <izzy@qumran.org>
Date: Sat, 10 Aug 2019 16:05:49 +0000
Subject: [PATCH] Converting metadata to YAML

---
 metadata/An.stop.txt                          |  26 ---
 metadata/An.stop.yml                          |  28 +++
 metadata/a2dp.Vol.txt                         | 134 -------------
 metadata/a2dp.Vol.yml                         | 188 ++++++++++++++++++
 metadata/aarddict.android.txt                 |  91 ---------
 metadata/aarddict.android.yml                 | 105 ++++++++++
 metadata/acr.browser.barebones.txt            |  70 -------
 metadata/acr.browser.barebones.yml            |  85 ++++++++
 metadata/acr.browser.lightning.txt            | 120 -----------
 metadata/acr.browser.lightning.yml            | 159 +++++++++++++++
 metadata/android.androidVNC.txt               |  27 ---
 metadata/android.androidVNC.yml               |  28 +++
 metadata/android.game.prboom.txt              |  30 ---
 metadata/android.game.prboom.yml              |  31 +++
 metadata/android.tether.txt                   |  36 ----
 metadata/android.tether.yml                   |  38 ++++
 .../app.android.com.materialfilemanager.txt   |  32 ---
 17 files changed, 662 insertions(+), 566 deletions(-)
 delete mode 100644 metadata/An.stop.txt
 create mode 100644 metadata/An.stop.yml
 delete mode 100644 metadata/a2dp.Vol.txt
 create mode 100644 metadata/a2dp.Vol.yml
 delete mode 100644 metadata/aarddict.android.txt
 create mode 100644 metadata/aarddict.android.yml
 delete mode 100644 metadata/acr.browser.barebones.txt
 create mode 100644 metadata/acr.browser.barebones.yml
 delete mode 100644 metadata/acr.browser.lightning.txt
 create mode 100644 metadata/acr.browser.lightning.yml
 delete mode 100644 metadata/android.androidVNC.txt
 create mode 100644 metadata/android.androidVNC.yml
 delete mode 100644 metadata/android.game.prboom.txt
 create mode 100644 metadata/android.game.prboom.yml
 delete mode 100644 metadata/android.tether.txt
 create mode 100644 metadata/android.tether.yml
 delete mode 100644 metadata/app.android.com.materialfilemanager.txt

diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt
deleted file mode 100644
index 8807cac997..0000000000
--- a/metadata/An.stop.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Categories:Time
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/jdmonin/anstop
-Issue Tracker:https://github.com/jdmonin/anstop/issues
-
-Auto Name:Anstop
-Summary:A simple stopwatch
-Description:
-A simple stopwatch, that also supports lap timing and a countdown timer. The
-countdown timer doesn't make an alarm so an eye will have to be kept on it.
-.
-
-Repo Type:git
-Repo:https://github.com/jdmonin/anstop
-
-Build:1.4,9
-    commit=v1.4
-
-Build:1.5,10
-    commit=v1.5
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.5
-Current Version Code:10
diff --git a/metadata/An.stop.yml b/metadata/An.stop.yml
new file mode 100644
index 0000000000..95fbd19640
--- /dev/null
+++ b/metadata/An.stop.yml
@@ -0,0 +1,28 @@
+Categories:
+  - Time
+License: GPL-2.0-only
+SourceCode: https://github.com/jdmonin/anstop
+IssueTracker: https://github.com/jdmonin/anstop/issues
+
+AutoName: Anstop
+Summary: A simple stopwatch
+Description: |-
+    A simple stopwatch, that also supports lap timing and a countdown timer. The
+    countdown timer doesn't make an alarm so an eye will have to be kept on it.
+
+RepoType: git
+Repo: https://github.com/jdmonin/anstop
+
+Builds:
+  - versionName: '1.4'
+    versionCode: 9
+    commit: v1.4
+
+  - versionName: '1.5'
+    versionCode: 10
+    commit: v1.5
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '1.5'
+CurrentVersionCode: 10
diff --git a/metadata/a2dp.Vol.txt b/metadata/a2dp.Vol.txt
deleted file mode 100644
index 1e349165e7..0000000000
--- a/metadata/a2dp.Vol.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:http://jimroal.com/slist.htm
-Source Code:https://github.com/jroal/a2dpvolume
-Issue Tracker:https://github.com/jroal/a2dpvolume/issues
-
-Auto Name:A2DP Volume
-Summary:Manage Bluetooth functions
-Description:
-Automatically adjusts the media volume on connect and resets it on disconnect.
-This is done so that stereo streaming audio can work properly. Intended
-primarily for car Bluetooth systems. It can read out text messages using Text To
-Speech (TTS) services while you are connected. Each paired Bluetooth device or
-virtual device (home dock, car dock, power connection, or headset plug) can be
-configured to your liking. There is a
-[https://github.com/jroal/a2dpvolume/wiki/Manual manual] on the website.
-
-A secondary feature is the ability to capture location information so you can
-find where you left your car. The location can also be automatically captured
-when exiting Car Mode on your Android device and read by any app that
-understands GPS data.
-.
-
-Repo Type:git
-Repo:https://github.com/jroal/a2dpvolume
-
-Build:2.8.11,93
-    commit=2250750e7b1720412dcd9901f2c7cfa98a139cd3
-
-Build:2.8.14,96
-    commit=355c68bbc7709586aad7b5c3fe59d2638c273cff
-
-Build:2.8.17,99
-    commit=5a7160c26f75489fb76ea2047ec44f1e98410fbf
-
-Build:2.9.1,101
-    disable=remove because beta
-    commit=e867ed4068a88dabc0e867d270ca7dc732330693
-
-Build:2.9.4,104
-    commit=9217cbbecc7306c21155853ca3fe6b1123124d15
-
-Build:2.9.7,107
-    commit=fa9a8cdb0125d2cc6fe7980ad0e2d02bf15f0157
-
-Build:2.10.1,111
-    commit=2b2d45970158d076cb51911bd74bc2c8d64fa802
-
-Build:2.11.1,114
-    commit=93a00fe2bbcc627766a41ecec312fc83245b5a27
-
-Build:2.11.7,120
-    commit=02416d7f94b69befd8d42e9741f1017f46f061c2
-    extlibs=android/android-support-v4.jar
-
-Build:2.11.8,121
-    commit=634d460a8679a4503f12c7054afadc5208a11dde
-    extlibs=android/android-support-v4.jar
-
-Build:2.11.10,123
-    commit=9d6d23dc6495eeccfbbe97681148af12572fddd8
-    extlibs=android/android-support-v4.jar
-
-Build:2.11.11,124
-    commit=f984727b4b2ea06ece137fd40a829e5b04b66c2f
-    extlibs=android/android-support-v4.jar
-
-Build:2.11.12,125
-    commit=b9c15ece8d446830429c8ce118c673c73c755862
-    extlibs=android/android-support-v4.jar
-
-Build:2.11.13,126
-    commit=ad4167b1048365e437c8ace14a5c842ebd6a72df
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-
-Build:2.12.4,130
-    disable=old failing build
-    commit=faace8e5b53c5ca2f13a2c972971a4c4ce655f83
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
-
-Build:2.12.5,131
-    commit=9c31879ec4fa5c1062d19e5d9e6ec485bea6500f
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
-
-Build:2.12.7,133
-    commit=7747d7fe945e925befa5af403b99a34a446b49e8
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
-
-Build:2.12.8,134
-    commit=80f5f24ad100c23b4acd6d37870864d4edb7d70e
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
-
-Build:2.12.9,135
-    commit=a08e21f28e1f63f05158b03ca18751c497cbf71a
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
-
-Build:2.12.9.1,136
-    disable=non-free, see https://github.com/jroal/a2dpvolume/issues/242
-    commit=8307a4e0a234898cf8e55810e3a29949352d22b1
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle && \
-        sed -i -e '/<!-- ATTENTION:/,+4d' -e 's@</application>@</service></application>@g' src/main/AndroidManifest.xml
-
-Build:2.12.9.2,137
-    commit=aed734d5ff231b7d6462a6fe0f8ac40c45593bd9
-    subdir=app
-    patch=gradle.patch
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle && \
-        echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.13.0.3
-Current Version Code:168
diff --git a/metadata/a2dp.Vol.yml b/metadata/a2dp.Vol.yml
new file mode 100644
index 0000000000..f520f7b77c
--- /dev/null
+++ b/metadata/a2dp.Vol.yml
@@ -0,0 +1,188 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: http://jimroal.com/slist.htm
+SourceCode: https://github.com/jroal/a2dpvolume
+IssueTracker: https://github.com/jroal/a2dpvolume/issues
+
+AutoName: A2DP Volume
+Summary: Manage Bluetooth functions
+Description: |-
+    Automatically adjusts the media volume on connect and resets it on disconnect.
+    This is done so that stereo streaming audio can work properly. Intended
+    primarily for car Bluetooth systems. It can read out text messages using Text To
+    Speech (TTS) services while you are connected. Each paired Bluetooth device or
+    virtual device (home dock, car dock, power connection, or headset plug) can be
+    configured to your liking. There is a
+    [https://github.com/jroal/a2dpvolume/wiki/Manual manual] on the website.
+
+    A secondary feature is the ability to capture location information so you can
+    find where you left your car. The location can also be automatically captured
+    when exiting Car Mode on your Android device and read by any app that
+    understands GPS data.
+
+RepoType: git
+Repo: https://github.com/jroal/a2dpvolume
+
+Builds:
+  - versionName: 2.8.11
+    versionCode: 93
+    commit: 2250750e7b1720412dcd9901f2c7cfa98a139cd3
+
+  - versionName: 2.8.14
+    versionCode: 96
+    commit: 355c68bbc7709586aad7b5c3fe59d2638c273cff
+
+  - versionName: 2.8.17
+    versionCode: 99
+    commit: 5a7160c26f75489fb76ea2047ec44f1e98410fbf
+
+  - versionName: 2.9.1
+    versionCode: 101
+    disable: remove because beta
+    commit: e867ed4068a88dabc0e867d270ca7dc732330693
+
+  - versionName: 2.9.4
+    versionCode: 104
+    commit: 9217cbbecc7306c21155853ca3fe6b1123124d15
+
+  - versionName: 2.9.7
+    versionCode: 107
+    commit: fa9a8cdb0125d2cc6fe7980ad0e2d02bf15f0157
+
+  - versionName: 2.10.1
+    versionCode: 111
+    commit: 2b2d45970158d076cb51911bd74bc2c8d64fa802
+
+  - versionName: 2.11.1
+    versionCode: 114
+    commit: 93a00fe2bbcc627766a41ecec312fc83245b5a27
+
+  - versionName: 2.11.7
+    versionCode: 120
+    commit: 02416d7f94b69befd8d42e9741f1017f46f061c2
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: 2.11.8
+    versionCode: 121
+    commit: 634d460a8679a4503f12c7054afadc5208a11dde
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: 2.11.10
+    versionCode: 123
+    commit: 9d6d23dc6495eeccfbbe97681148af12572fddd8
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: 2.11.11
+    versionCode: 124
+    commit: f984727b4b2ea06ece137fd40a829e5b04b66c2f
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: 2.11.12
+    versionCode: 125
+    commit: b9c15ece8d446830429c8ce118c673c73c755862
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: 2.11.13
+    versionCode: 126
+    commit: ad4167b1048365e437c8ace14a5c842ebd6a72df
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+
+  - versionName: 2.12.4
+    versionCode: 130
+    disable: old failing build
+    commit: faace8e5b53c5ca2f13a2c972971a4c4ce655f83
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g'
+        -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+  - versionName: 2.12.5
+    versionCode: 131
+    commit: 9c31879ec4fa5c1062d19e5d9e6ec485bea6500f
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g'
+        -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+  - versionName: 2.12.7
+    versionCode: 133
+    commit: 7747d7fe945e925befa5af403b99a34a446b49e8
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g'
+        -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+  - versionName: 2.12.8
+    versionCode: 134
+    commit: 80f5f24ad100c23b4acd6d37870864d4edb7d70e
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g'
+        -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+  - versionName: 2.12.9
+    versionCode: 135
+    commit: a08e21f28e1f63f05158b03ca18751c497cbf71a
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g'
+        -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+  - versionName: 2.12.9.1
+    versionCode: 136
+    disable: non-free, see https://github.com/jroal/a2dpvolume/issues/242
+    commit: 8307a4e0a234898cf8e55810e3a29949352d22b1
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g'
+        -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle
+      - sed -i -e '/<!-- ATTENTION:/,+4d' -e 's@</application>@</service></application>@g'
+        src/main/AndroidManifest.xml
+
+  - versionName: 2.12.9.2
+    versionCode: 137
+    commit: aed734d5ff231b7d6462a6fe0f8ac40c45593bd9
+    subdir: app
+    patch:
+      - gradle.patch
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g'
+        -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 2.13.0.3
+CurrentVersionCode: 168
diff --git a/metadata/aarddict.android.txt b/metadata/aarddict.android.txt
deleted file mode 100644
index 270d3c25d9..0000000000
--- a/metadata/aarddict.android.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:http://aarddict.org
-Source Code:https://github.com/aarddict/android
-Issue Tracker:https://github.com/aarddict/android/issues
-Donate:http://aarddict.org/android
-FlattrID:80944
-
-Auto Name:Aard
-Summary:Offline dictionary
-Description:
-'''Note:''' This app is no longer maintained.
-
-* looks up words fast even with huge dictionaries like English Wikipedia
-* looks up words in multiple dictionaries in multiple languages without switching
-* works great as an offline Wikipedia reader
-* uses same the efficient, highly compressed dictionary data storage format as the desktop version
-* it can integrate with both [[org.geometerplus.zlibrary.ui.android]] and [[org.coolreader]]
-
-Ready-made dictionaries can be found on the website, or you can roll your own
-with the tools on the website.
-.
-
-Repo Type:git
-Repo:https://github.com/aarddict/android.git
-
-Build:1.3.1,10
-    commit=1.3.1
-    prebuild=mv lib libs
-
-Build:1.4.0,12
-    commit=7df930161256324e31b2c720281629f58446b6d6
-    prebuild=mv lib libs
-
-Build:1.4.1,13
-    commit=b81c9c8c52de5f65b550e3c608a610962582e5cd
-    prebuild=mv lib libs
-
-Build:1.6.1,16
-    commit=1.6.1
-    target=android-17
-
-Build:1.6.2,17
-    commit=1.6.2
-    target=android-17
-
-Build:1.6.3,18
-    commit=1.6.3
-    target=android-17
-
-Build:1.6.4,19
-    commit=1.6.4
-    target=android-17
-
-Build:1.6.5,20
-    commit=1.6.5
-    target=android-17
-
-Build:1.6.6,21
-    commit=1.6.6
-    target=android-17
-
-Build:1.6.7,22
-    commit=1.6.7
-    target=android-17
-
-Build:1.6.8,23
-    commit=1.6.8
-    target=android-17
-
-Build:1.6.9,24
-    commit=1.6.9
-    target=android-17
-
-Build:1.6.10,25
-    commit=1.6.10
-    target=android-17
-
-Build:1.6.11,26
-    commit=1.6.11
-    target=android-17
-
-Maintainer Notes:
-Github site points to https://github.com/itkach/aard2-android (itkach.aard2) as successor.
-We cannot point to this app as all its builds are disabled (as of 2018-10-16).
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.6.11
-Current Version Code:26
diff --git a/metadata/aarddict.android.yml b/metadata/aarddict.android.yml
new file mode 100644
index 0000000000..7f09bb6dfe
--- /dev/null
+++ b/metadata/aarddict.android.yml
@@ -0,0 +1,105 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+WebSite: http://aarddict.org
+SourceCode: https://github.com/aarddict/android
+IssueTracker: https://github.com/aarddict/android/issues
+Donate: http://aarddict.org/android
+FlattrID: '80944'
+
+AutoName: Aard
+Summary: Offline dictionary
+Description: |-
+    '''Note:''' This app is no longer maintained.
+
+    * looks up words fast even with huge dictionaries like English Wikipedia
+    * looks up words in multiple dictionaries in multiple languages without switching
+    * works great as an offline Wikipedia reader
+    * uses same the efficient, highly compressed dictionary data storage format as the desktop version
+    * it can integrate with both [[org.geometerplus.zlibrary.ui.android]] and [[org.coolreader]]
+
+    Ready-made dictionaries can be found on the website, or you can roll your own
+    with the tools on the website.
+
+RepoType: git
+Repo: https://github.com/aarddict/android.git
+
+Builds:
+  - versionName: 1.3.1
+    versionCode: 10
+    commit: 1.3.1
+    prebuild: mv lib libs
+
+  - versionName: 1.4.0
+    versionCode: 12
+    commit: 7df930161256324e31b2c720281629f58446b6d6
+    prebuild: mv lib libs
+
+  - versionName: 1.4.1
+    versionCode: 13
+    commit: b81c9c8c52de5f65b550e3c608a610962582e5cd
+    prebuild: mv lib libs
+
+  - versionName: 1.6.1
+    versionCode: 16
+    commit: 1.6.1
+    target: android-17
+
+  - versionName: 1.6.2
+    versionCode: 17
+    commit: 1.6.2
+    target: android-17
+
+  - versionName: 1.6.3
+    versionCode: 18
+    commit: 1.6.3
+    target: android-17
+
+  - versionName: 1.6.4
+    versionCode: 19
+    commit: 1.6.4
+    target: android-17
+
+  - versionName: 1.6.5
+    versionCode: 20
+    commit: 1.6.5
+    target: android-17
+
+  - versionName: 1.6.6
+    versionCode: 21
+    commit: 1.6.6
+    target: android-17
+
+  - versionName: 1.6.7
+    versionCode: 22
+    commit: 1.6.7
+    target: android-17
+
+  - versionName: 1.6.8
+    versionCode: 23
+    commit: 1.6.8
+    target: android-17
+
+  - versionName: 1.6.9
+    versionCode: 24
+    commit: 1.6.9
+    target: android-17
+
+  - versionName: 1.6.10
+    versionCode: 25
+    commit: 1.6.10
+    target: android-17
+
+  - versionName: 1.6.11
+    versionCode: 26
+    commit: 1.6.11
+    target: android-17
+
+MaintainerNotes: |-
+    Github site points to https://github.com/itkach/aard2-android (itkach.aard2) as successor.
+    We cannot point to this app as all its builds are disabled (as of 2018-10-16).
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.6.11
+CurrentVersionCode: 26
diff --git a/metadata/acr.browser.barebones.txt b/metadata/acr.browser.barebones.txt
deleted file mode 100644
index 71cee23953..0000000000
--- a/metadata/acr.browser.barebones.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Categories:Internet
-License:Apache-2.0
-Web Site:http://acrdevelopment.org
-Source Code:https://github.com/anthonycr/Lightning-Browser
-Issue Tracker:https://github.com/anthonycr/Lightning-Browser/issues
-
-Name:Lightning (old)
-Auto Name:Lightning
-Summary:Lightweight browser
-Description:
-* Fast Start Times
-* Small Footprint
-* Smooth Scrolling
-* Long-press a tab to delete it
-* Long-press the back button to exit the browser
-
-There is a proprietary software version of this app found elsewhere which uses
-drawers instead of tabs for its UI.
-
-Upstream changed id, new versions will be found at [[acr.browser.lightning]].
-.
-
-Repo Type:git
-Repo:https://github.com/anthonycr/Lightning-Browser.git
-
-Build:2.2.0,22
-    commit=7a228d2a8c1
-    prebuild=sed -i 's/int MAX_TABS=5, MAX_BOOKMARKS=5/int MAX_TABS=15, MAX_BOOKMARKS=50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.3.4,27
-    commit=2afff6d2876
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.3.7,30
-    commit=bba148f92e1
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.3.12,36
-    commit=d99e82b6cbbe8
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.4,37
-    commit=deed4b7f3c487102
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.4.3,42
-    commit=103b4e40e113beaf
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-    target=android-17
-
-Build:2.5.1.4,60
-    commit=a383f8e77871
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
-    target=android-18
-
-Build:3.0.5b,67
-    commit=10a18373d3d74b
-    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
-    target=android-18
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:3.0.5b
-Current Version Code:67
diff --git a/metadata/acr.browser.barebones.yml b/metadata/acr.browser.barebones.yml
new file mode 100644
index 0000000000..b02150b32e
--- /dev/null
+++ b/metadata/acr.browser.barebones.yml
@@ -0,0 +1,85 @@
+Categories:
+  - Internet
+License: Apache-2.0
+WebSite: http://acrdevelopment.org
+SourceCode: https://github.com/anthonycr/Lightning-Browser
+IssueTracker: https://github.com/anthonycr/Lightning-Browser/issues
+
+Name: Lightning (old)
+AutoName: Lightning
+Summary: Lightweight browser
+Description: |-
+    * Fast Start Times
+    * Small Footprint
+    * Smooth Scrolling
+    * Long-press a tab to delete it
+    * Long-press the back button to exit the browser
+
+    There is a proprietary software version of this app found elsewhere which uses
+    drawers instead of tabs for its UI.
+
+    Upstream changed id, new versions will be found at [[acr.browser.lightning]].
+
+RepoType: git
+Repo: https://github.com/anthonycr/Lightning-Browser.git
+
+Builds:
+  - versionName: 2.2.0
+    versionCode: 22
+    commit: 7a228d2a8c1
+    prebuild: sed -i 's/int MAX_TABS=5, MAX_BOOKMARKS=5/int MAX_TABS=15, MAX_BOOKMARKS=50/g'
+        src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: 2.3.4
+    versionCode: 27
+    commit: 2afff6d2876
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS
+        = 50/g' src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: 2.3.7
+    versionCode: 30
+    commit: bba148f92e1
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS
+        = 50/g' src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: 2.3.12
+    versionCode: 36
+    commit: d99e82b6cbbe8
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS
+        = 50/g' src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: '2.4'
+    versionCode: 37
+    commit: deed4b7f3c487102
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS
+        = 50/g' src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: 2.4.3
+    versionCode: 42
+    commit: 103b4e40e113beaf
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS
+        = 50/g' src/acr/browser/barebones/Barebones.java
+    target: android-17
+
+  - versionName: 2.5.1.4
+    versionCode: 60
+    commit: a383f8e77871
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
+    target: android-18
+
+  - versionName: 3.0.5b
+    versionCode: 67
+    commit: 10a18373d3d74b
+    prebuild: sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
+    target: android-18
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 3.0.5b
+CurrentVersionCode: 67
diff --git a/metadata/acr.browser.lightning.txt b/metadata/acr.browser.lightning.txt
deleted file mode 100644
index 1a386831e7..0000000000
--- a/metadata/acr.browser.lightning.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-Categories:Internet
-License:MPL-2.0
-Web Site:http://acrdevelopment.org
-Source Code:https://github.com/anthonycr/Lightning-Browser
-Issue Tracker:https://github.com/anthonycr/Lightning-Browser/issues
-Changelog:https://github.com/anthonycr/Lightning-Browser/releases
-
-Auto Name:Lightning
-Summary:Lightweight web browser
-Description:
-Lightweight web browser with following features:
-
-* Fast Start Times
-* Small Footprint
-* Smooth Scrolling
-* Long-press a tab to delete it
-* Long-press the back button to exit the browser
-* Ad blocker
-
-The old, archived version was known as acr.browser.barebones.
-.
-
-Repo Type:git
-Repo:https://github.com/anthonycr/Lightning-Browser.git
-
-Build:3.1.1a,66
-    commit=3647f0b4241b81135dfdaa965e79993d41ff15a1
-    srclibs=1:NetCipher@1.1
-    prebuild=cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
-    target=android-19
-
-Build:3.2.0.1a,67
-    commit=v3.2a-beta
-    srclibs=1:NetCipher@1.1
-    forcevercode=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
-    target=android-19
-
-Build:4.0.2a,68
-    commit=v4.0.2a
-    srclibs=1:NetCipher@1.1
-    forceversion=yes
-    forcevercode=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
-    target=android-19
-
-Build:4.0.10a,78
-    commit=2f3655045cf686ad4ea2914d77b29fdd3fbcecb4
-    subdir=app
-    submodules=yes
-    gradle=yes
-    rm=app/libs/*.jar
-    prebuild=sed -i -e 's/1.2.3/1.1.3/g' ../build.gradle && \
-        sed -i -e '/compile files/d' -e 's/minifyEnabled true/minifyEnabled false/g' -e '/palette-v7/icompile "com.android.support:support-v4:22.1.1"\ncompile "org.jsoup:jsoup:1.8.1"\n' build.gradle && \
-        sed -i -e '/fileTree/acompile "com.madgag.spongycastle:core:1.51.0.0"' ../external/netcipher/libnetcipher/build.gradle && \
-        rm -fR ../external/netcipher/libnetcipher/libs/spongycastle*.jar
-
-Build:4.0.10a,79
-    disable=wait for upstream
-    commit=9677135c2859851bf86417e3e878cdce9d1174ee
-    subdir=app
-    submodules=yes
-    gradle=yes
-    rm=app/libs/*.jar
-    prebuild=sed -i -e 's/1.2.3/1.1.3/g' ../build.gradle && \
-        sed -i -e '/compile files/d' -e 's/minifyEnabled true/minifyEnabled false/g' -e '/palette-v7/icompile "com.android.support:support-v4:22.1.1"\n' build.gradle && \
-        sed -i -e '/fileTree/acompile "com.madgag.spongycastle:core:1.51.0.0"' ../external/netcipher/libnetcipher/build.gradle && \
-        rm -fR ../external/netcipher/libnetcipher/libs/spongycastle*.jar
-
-Build:4.2.3a,84
-    commit=v4.2.3
-    subdir=app
-    submodules=yes
-    gradle=lightningPlus
-    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
-
-Build:4.3.3,88
-    commit=v4.3.3
-    subdir=app
-    submodules=yes
-    gradle=lightningPlus
-    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
-
-Build:4.4.0,89
-    commit=v4.4.0
-    subdir=app
-    submodules=yes
-    gradle=lightningPlus
-    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
-
-Build:4.4.1,90
-    commit=v4.4.1
-    subdir=app
-    submodules=yes
-    gradle=lightningPlus
-    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
-
-Build:4.4.2,91
-    commit=e4a46b66b188d120faf2fdf3bcaf76bfffd5f5f7
-    subdir=app
-    submodules=yes
-    gradle=lightningPlus
-    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
-
-Build:4.5.0,95
-    commit=v4.5.0
-    subdir=app
-    gradle=lightningPlus
-
-Build:4.5.1,96
-    commit=v4.5.1
-    subdir=app
-    gradle=lightningPlus
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:4.4.1
-Current Version Code:90
diff --git a/metadata/acr.browser.lightning.yml b/metadata/acr.browser.lightning.yml
new file mode 100644
index 0000000000..f7ec2a38bc
--- /dev/null
+++ b/metadata/acr.browser.lightning.yml
@@ -0,0 +1,159 @@
+Categories:
+  - Internet
+License: MPL-2.0
+WebSite: http://acrdevelopment.org
+SourceCode: https://github.com/anthonycr/Lightning-Browser
+IssueTracker: https://github.com/anthonycr/Lightning-Browser/issues
+Changelog: https://github.com/anthonycr/Lightning-Browser/releases
+
+AutoName: Lightning
+Summary: Lightweight web browser
+Description: |-
+    Lightweight web browser with following features:
+
+    * Fast Start Times
+    * Small Footprint
+    * Smooth Scrolling
+    * Long-press a tab to delete it
+    * Long-press the back button to exit the browser
+    * Ad blocker
+
+    The old, archived version was known as acr.browser.barebones.
+
+RepoType: git
+Repo: https://github.com/anthonycr/Lightning-Browser.git
+
+Builds:
+  - versionName: 3.1.1a
+    versionCode: 66
+    commit: 3647f0b4241b81135dfdaa965e79993d41ff15a1
+    srclibs:
+      - 1:NetCipher@1.1
+    prebuild: cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
+    target: android-19
+
+  - versionName: 3.2.0.1a
+    versionCode: 67
+    commit: v3.2a-beta
+    srclibs:
+      - 1:NetCipher@1.1
+    forcevercode: true
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild: cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
+    target: android-19
+
+  - versionName: 4.0.2a
+    versionCode: 68
+    commit: v4.0.2a
+    srclibs:
+      - 1:NetCipher@1.1
+    forceversion: true
+    forcevercode: true
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild: cp libs/android-support-v4.jar $$NetCipher$$/libs/android-support-v4.jar
+    target: android-19
+
+  - versionName: 4.0.10a
+    versionCode: 78
+    commit: 2f3655045cf686ad4ea2914d77b29fdd3fbcecb4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+    prebuild:
+      - sed -i -e 's/1.2.3/1.1.3/g' ../build.gradle
+      - sed -i -e '/compile files/d' -e 's/minifyEnabled true/minifyEnabled false/g'
+        -e '/palette-v7/icompile "com.android.support:support-v4:22.1.1"\ncompile
+        "org.jsoup:jsoup:1.8.1"\n' build.gradle
+      - sed -i -e '/fileTree/acompile "com.madgag.spongycastle:core:1.51.0.0"' ../external/netcipher/libnetcipher/build.gradle
+      - rm -fR ../external/netcipher/libnetcipher/libs/spongycastle*.jar
+
+  - versionName: 4.0.10a
+    versionCode: 79
+    disable: wait for upstream
+    commit: 9677135c2859851bf86417e3e878cdce9d1174ee
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+    prebuild:
+      - sed -i -e 's/1.2.3/1.1.3/g' ../build.gradle
+      - sed -i -e '/compile files/d' -e 's/minifyEnabled true/minifyEnabled false/g'
+        -e '/palette-v7/icompile "com.android.support:support-v4:22.1.1"\n' build.gradle
+      - sed -i -e '/fileTree/acompile "com.madgag.spongycastle:core:1.51.0.0"' ../external/netcipher/libnetcipher/build.gradle
+      - rm -fR ../external/netcipher/libnetcipher/libs/spongycastle*.jar
+
+  - versionName: 4.2.3a
+    versionCode: 84
+    commit: v4.2.3
+    subdir: app
+    submodules: true
+    gradle:
+      - lightningPlus
+    scanignore:
+      - external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+  - versionName: 4.3.3
+    versionCode: 88
+    commit: v4.3.3
+    subdir: app
+    submodules: true
+    gradle:
+      - lightningPlus
+    scanignore:
+      - external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+  - versionName: 4.4.0
+    versionCode: 89
+    commit: v4.4.0
+    subdir: app
+    submodules: true
+    gradle:
+      - lightningPlus
+    scanignore:
+      - external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+  - versionName: 4.4.1
+    versionCode: 90
+    commit: v4.4.1
+    subdir: app
+    submodules: true
+    gradle:
+      - lightningPlus
+    scanignore:
+      - external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+  - versionName: 4.4.2
+    versionCode: 91
+    commit: e4a46b66b188d120faf2fdf3bcaf76bfffd5f5f7
+    subdir: app
+    submodules: true
+    gradle:
+      - lightningPlus
+    scanignore:
+      - external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+  - versionName: 4.5.0
+    versionCode: 95
+    commit: v4.5.0
+    subdir: app
+    gradle:
+      - lightningPlus
+
+  - versionName: 4.5.1
+    versionCode: 96
+    commit: v4.5.1
+    subdir: app
+    gradle:
+      - lightningPlus
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 4.4.1
+CurrentVersionCode: 90
diff --git a/metadata/android.androidVNC.txt b/metadata/android.androidVNC.txt
deleted file mode 100644
index 96287e8ab1..0000000000
--- a/metadata/android.androidVNC.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Categories:System
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/antlersoft/android-vnc-viewer
-Issue Tracker:https://github.com/antlersoft/android-vnc-viewer/issues
-
-Auto Name:androidVNC
-Summary:VNC (remote desktop) viewer
-Description:
-A VNC (Virtual Network Computing) client: See and control your computer's
-desktop from your device. androidVNC lets you connect to most VNC servers: incl
-TightVNC, RealVNC on Win and Linux, x11vnc, and Apple Remote Desktop on OS/X.
-Lots of customizable features let you adapt the way your device controls map to
-the controls of your desktop.
-.
-
-Repo Type:git
-Repo:https://github.com/antlersoft/android-vnc-viewer
-
-Build:0.5.0,13
-    commit=197
-    subdir=androidVNC
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest/antlersoft
-Current Version:0.6.0
-Current Version Code:13
diff --git a/metadata/android.androidVNC.yml b/metadata/android.androidVNC.yml
new file mode 100644
index 0000000000..a321db4192
--- /dev/null
+++ b/metadata/android.androidVNC.yml
@@ -0,0 +1,28 @@
+Categories:
+  - System
+License: GPL-2.0-or-later
+SourceCode: https://github.com/antlersoft/android-vnc-viewer
+IssueTracker: https://github.com/antlersoft/android-vnc-viewer/issues
+
+AutoName: androidVNC
+Summary: VNC (remote desktop) viewer
+Description: |-
+    A VNC (Virtual Network Computing) client: See and control your computer's
+    desktop from your device. androidVNC lets you connect to most VNC servers: incl
+    TightVNC, RealVNC on Win and Linux, x11vnc, and Apple Remote Desktop on OS/X.
+    Lots of customizable features let you adapt the way your device controls map to
+    the controls of your desktop.
+
+RepoType: git
+Repo: https://github.com/antlersoft/android-vnc-viewer
+
+Builds:
+  - versionName: 0.5.0
+    versionCode: 13
+    commit: '197'
+    subdir: androidVNC
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest/antlersoft
+CurrentVersion: 0.6.0
+CurrentVersionCode: 13
diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt
deleted file mode 100644
index 8074e5d59e..0000000000
--- a/metadata/android.game.prboom.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://archive.softwareheritage.org/browse/origin/http://prboom4android.googlecode.com/svn//directory/
-Issue Tracker:
-
-Auto Name:PrBoom For Android
-Summary:PrBoom Doom game engine
-Description:
-PrBoom4Android is a port of the PrBoom Doom engine.
-
-It was originally ported to Android by Vladimir Silva when the first Android
-device, the G1, was released. Since the original port was designed to work with
-the G1's hardware keyboard, it did not function with touchscreen only devices.
-This release adds on-screen multitouch controls to support newer devices. If you
-have a hardware keyboard, you can always use that or enable the touch controls,
-the choice is yours!
-
-You will need a WAD file (Doom game data file) to play, you will be offered to
-download one of free WAD files by the game on first run.
-.
-
-Build:1.3.1-beta,31
-    commit=49
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.3.1-beta
-Current Version Code:31
diff --git a/metadata/android.game.prboom.yml b/metadata/android.game.prboom.yml
new file mode 100644
index 0000000000..7c88655dd7
--- /dev/null
+++ b/metadata/android.game.prboom.yml
@@ -0,0 +1,31 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://archive.softwareheritage.org/browse/origin/http://prboom4android.googlecode.com/svn//directory/
+
+AutoName: PrBoom For Android
+Summary: PrBoom Doom game engine
+Description: |-
+    PrBoom4Android is a port of the PrBoom Doom engine.
+
+    It was originally ported to Android by Vladimir Silva when the first Android
+    device, the G1, was released. Since the original port was designed to work with
+    the G1's hardware keyboard, it did not function with touchscreen only devices.
+    This release adds on-screen multitouch controls to support newer devices. If you
+    have a hardware keyboard, you can always use that or enable the touch controls,
+    the choice is yours!
+
+    You will need a WAD file (Doom game data file) to play, you will be offered to
+    download one of free WAD files by the game on first run.
+
+Builds:
+  - versionName: 1.3.1-beta
+    versionCode: 31
+    commit: '49'
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 1.3.1-beta
+CurrentVersionCode: 31
diff --git a/metadata/android.tether.txt b/metadata/android.tether.txt
deleted file mode 100644
index e6c021f815..0000000000
--- a/metadata/android.tether.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Disabled:Prebuilts
-Categories:Connectivity
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/android-wifi-tether
-Source Code:https://code.google.com/p/android-wifi-tether/source
-Issue Tracker:
-
-Auto Name:WiFi Tether
-Summary:Wireless internet tethering
-Description:
-'''N.B''' The app isn't built entirely from source; there are bunch of prebuilt
-programs like dnsmasq and iptables in the source code repository.
-
-There is a beta version of this under [[com.googlecode.android.wifi.tether]],
-and we will remove this when that gets released.
-
-This program enables tethering (via WiFi and BT) for rooted handsets running
-Android. Clients (your laptop for example) can connect (via ad-hoc mode) and get
-access to the internet using the cellular data connection which is established
-by the handset.
-
-This application requires a rooted device (basic Android still doesn't allow
-ad-hoc mode) and (probably) a custom-kernel which supports netfilter (iptables).
-Please see the website for detailed information.
-.
-
-Requires Root:yes
-
-Build:2.0.7,26
-    commit=523
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:None
-
-No Source Since:2.0.8
diff --git a/metadata/android.tether.yml b/metadata/android.tether.yml
new file mode 100644
index 0000000000..b3b85cfe3e
--- /dev/null
+++ b/metadata/android.tether.yml
@@ -0,0 +1,38 @@
+Disabled: Prebuilts
+Categories:
+  - Connectivity
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/android-wifi-tether
+SourceCode: https://code.google.com/p/android-wifi-tether/source
+
+AutoName: WiFi Tether
+Summary: Wireless internet tethering
+Description: |-
+    '''N.B''' The app isn't built entirely from source; there are bunch of prebuilt
+    programs like dnsmasq and iptables in the source code repository.
+
+    There is a beta version of this under [[com.googlecode.android.wifi.tether]],
+    and we will remove this when that gets released.
+
+    This program enables tethering (via WiFi and BT) for rooted handsets running
+    Android. Clients (your laptop for example) can connect (via ad-hoc mode) and get
+    access to the internet using the cellular data connection which is established
+    by the handset.
+
+    This application requires a rooted device (basic Android still doesn't allow
+    ad-hoc mode) and (probably) a custom-kernel which supports netfilter (iptables).
+    Please see the website for detailed information.
+
+RequiresRoot: 'yes'
+
+Builds:
+  - versionName: 2.0.7
+    versionCode: 26
+    commit: '523'
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+
+NoSourceSince: 2.0.8
diff --git a/metadata/app.android.com.materialfilemanager.txt b/metadata/app.android.com.materialfilemanager.txt
deleted file mode 100644
index 2c76d3aa48..0000000000
--- a/metadata/app.android.com.materialfilemanager.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/CosimoSguanci/Material-File-Manager
-Issue Tracker:https://github.com/CosimoSguanci/Material-File-Manager/issues
-
-Auto Name:Material File Manager
-Summary:Manage your local files
-Description:
-Simple file manager.
-.
-
-Repo Type:git
-Repo:https://github.com/CosimoSguanci/Material-File-Manager
-
-Build:1.5,4
-    disable=https://github.com/CosimoSguanci/Material-File-Manager/issues/3
-    commit=0a966006ce939725d8e7cc236fdaadaa26d8677d
-    subdir=app
-    gradle=yes
-    srclibs=CommonsIO@2.5
-    rm=app/libs/*
-    prebuild=sed -i -e '/compile files/d' -e '/play-services/d' -e '/dependencies/acompile "net.lingala.zip4j:zip4j:1.3.2"' build.gradle && \
-        pushd $$CommonsIO$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$CommonsIO$$/target/commons-io-2.5.jar libs/
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5
-Current Version Code:4