From afb68a8bfc9adc8ff9f5869ea95be76a4e893217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 26 Aug 2013 12:57:51 +0200
Subject: [PATCH] Update AdAway (org.adaway) to 2.5 (44)

---
 metadata/org.adaway.txt                 |  4 +--
 metadata/org.adaway/no-signing-44.patch | 34 +++++++++----------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 9c96f0dafa..5a6743ef60 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -74,8 +74,8 @@ find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysec
 cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
 android-libs/Donations/src/org/donations/,buildjni=yes
 
-Build Version:2.5,44,!gradle wip v2.5,subdir=AdAway,buildjni=yes,gradle=yes,preassemble=renameExecutables,\
-patch=no-signing-44.patch,prebuild=mv ../libraries libraries
+Build Version:2.5,44,v2.5,subdir=AdAway,buildjni=yes,gradle=yes@..,preassemble=renameExecutables,\
+patch=no-signing-44.patch
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.adaway/no-signing-44.patch b/metadata/org.adaway/no-signing-44.patch
index 460c406811..da295715e4 100644
--- a/metadata/org.adaway/no-signing-44.patch
+++ b/metadata/org.adaway/no-signing-44.patch
@@ -1,19 +1,11 @@
 diff --git a/AdAway/build.gradle b/AdAway/build.gradle
-index 378ce1c..951466d 100644
+index 378ce1c..0c97252 100644
 --- a/AdAway/build.gradle
 +++ b/AdAway/build.gradle
-@@ -16,28 +16,6 @@ android {
-         targetSdkVersion 17
-     }
- 
--    /*
--     * To sign release build, create file gradle.properties in .gradle/ with this content:
--     *
--     * signingStoreLocation=/home/key.store
--     * signingStorePassword=xxx
--     * signingKeyAlias=alias
--     * signingKeyPassword=xxx
--     */
+@@ -24,18 +24,9 @@ android {
+      * signingKeyAlias=alias
+      * signingKeyPassword=xxx
+      */
 -    signingConfigs {
 -        myConfig {
 -            storeFile file(signingStoreLocation)
@@ -22,16 +14,14 @@ index 378ce1c..951466d 100644
 -            keyPassword signingKeyPassword
 -        }
 -    }
--
--    buildTypes {
--        release {
--            signingConfig signingConfigs.myConfig
--        }
--    }
- }
  
- /**
-@@ -65,4 +43,4 @@ task renameExecutables(type: Copy) {
+     buildTypes {
+         release {
+-            signingConfig signingConfigs.myConfig
+         }
+     }
+ }
+@@ -65,4 +56,4 @@ task renameExecutables(type: Copy) {
  }